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

package/lib/index.qwik.cjs

@@ -2,12 +2,16 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("@qwik.dev/core/jsx-runtime");
 const core = require("@qwik.dev/core");
-const preloader = require("@qwik.dev/core/preloader");
-const internal = require("@qwik.dev/core/internal");
+const routing = require("./chunks/routing.qwik.cjs");
 const qwikRouterConfig = require("@qwik-router-config");
-const zod = require("zod");
+const internal = require("@qwik.dev/core/internal");
+const requestHandler = require("@qwik.dev/router/middleware/request-handler");
+const v = require("valibot");
+const z = require("zod");
 const swRegister = require("@qwik-router-sw-register");
 const server = require("@qwik.dev/core/server");
+require("@qwik.dev/core/preloader");
+require("./chunks/types.qwik.cjs");
 function _interopNamespaceDefault(e) {
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
   if (e) {
@@ -25,231 +29,21 @@ function _interopNamespaceDefault(e) {
   return Object.freeze(n);
 }
 const qwikRouterConfig__namespace = /* @__PURE__ */ _interopNamespaceDefault(qwikRouterConfig);
+const v__namespace = /* @__PURE__ */ _interopNamespaceDefault(v);
+const z__namespace = /* @__PURE__ */ _interopNamespaceDefault(z);
 const ErrorBoundary = core.component$((props) => {
-  const store2 = core.useErrorBoundary();
-  core.useOnWindow("qerror", core.$((e) => {
-    store2.error = e.detail.error;
-  }));
-  if (store2.error && props.fallback$) {
-    return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, {
-      children: props.fallback$(store2.error)
-    });
+  const store = core.useErrorBoundary();
+  core.useOnWindow(
+    "qerror",
+    core.$((e) => {
+      store.error = e.detail.error;
+    })
+  );
+  if (store.error && props.fallback$) {
+    return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: props.fallback$(store.error) });
   }
   return /* @__PURE__ */ jsxRuntime.jsx(core.Slot, {});
 });
-const MODULE_CACHE = /* @__PURE__ */ new WeakMap();
-const CLIENT_DATA_CACHE = /* @__PURE__ */ new Map();
-const QACTION_KEY = "qaction";
-const QLOADER_KEY = "qloaders";
-const QFN_KEY = "qfunc";
-const QDATA_KEY = "qdata";
-const Q_ROUTE = "q:route";
-const DEFAULT_LOADERS_SERIALIZATION_STRATEGY = globalThis.__DEFAULT_LOADERS_SERIALIZATION_STRATEGY__ || "never";
-const MAX_Q_DATA_RETRY_COUNT = 3;
-const loadClientData = async (url, element, opts, retryCount = 0) => {
-  const pagePathname = url.pathname;
-  const pageSearch = url.search;
-  const clientDataPath = getClientDataPath(pagePathname, pageSearch, {
-    actionId: opts?.action?.id,
-    loaderIds: opts?.loaderIds
-  });
-  let qData;
-  if (!opts?.action) {
-    qData = CLIENT_DATA_CACHE.get(clientDataPath);
-  }
-  if (opts?.preloadRouteBundles !== false) {
-    preloadRouteBundles(pagePathname, 0.8);
-  }
-  let resolveFn;
-  if (!qData) {
-    const fetchOptions = getFetchOptions(opts?.action, opts?.clearCache);
-    if (opts?.action) {
-      opts.action.data = void 0;
-    }
-    qData = fetch(clientDataPath, fetchOptions).then((rsp) => {
-      if (rsp.status === 404 && opts?.loaderIds && retryCount < MAX_Q_DATA_RETRY_COUNT) {
-        opts.loaderIds = void 0;
-        return loadClientData(url, element, opts, retryCount + 1);
-      }
-      if (rsp.redirected) {
-        const redirectedURL = new URL(rsp.url);
-        const isQData = redirectedURL.pathname.endsWith("/q-data.json");
-        if (!isQData || redirectedURL.origin !== location.origin) {
-          if (!opts?.isPrefetch) {
-            location.href = redirectedURL.href;
-          }
-          return;
-        }
-      }
-      if ((rsp.headers.get("content-type") || "").includes("json")) {
-        return rsp.text().then((text) => {
-          const [clientData] = internal._deserialize(text, element);
-          if (!clientData) {
-            location.href = url.href;
-            return;
-          }
-          if (opts?.clearCache) {
-            CLIENT_DATA_CACHE.delete(clientDataPath);
-          }
-          if (clientData.redirect) {
-            location.href = clientData.redirect;
-          } else if (opts?.action) {
-            const { action } = opts;
-            const actionData = clientData.loaders[action.id];
-            resolveFn = () => {
-              action.resolve({
-                status: rsp.status,
-                result: actionData
-              });
-            };
-          }
-          return clientData;
-        });
-      } else {
-        if (opts?.isPrefetch !== true) {
-          location.href = url.href;
-        }
-        return void 0;
-      }
-    });
-    if (!opts?.action) {
-      CLIENT_DATA_CACHE.set(clientDataPath, qData);
-    }
-  }
-  return qData.then((v) => {
-    if (!v) {
-      CLIENT_DATA_CACHE.delete(clientDataPath);
-    }
-    resolveFn && resolveFn();
-    return v;
-  });
-};
-const getFetchOptions = (action, noCache) => {
-  const actionData = action?.data;
-  if (!actionData) {
-    if (noCache) {
-      return {
-        cache: "no-cache",
-        headers: {
-          "Cache-Control": "no-cache",
-          Pragma: "no-cache"
-        }
-      };
-    }
-    return void 0;
-  }
-  if (actionData instanceof FormData) {
-    return {
-      method: "POST",
-      body: actionData
-    };
-  } else {
-    return {
-      method: "POST",
-      body: JSON.stringify(actionData),
-      headers: {
-        "Content-Type": "application/json; charset=UTF-8"
-      }
-    };
-  }
-};
-const toPath = (url) => url.pathname + url.search + url.hash;
-const toUrl = (url, baseUrl) => new URL(url, baseUrl.href);
-const isSameOrigin = (a, b) => a.origin === b.origin;
-const withSlash = (path) => path.endsWith("/") ? path : path + "/";
-const isSamePathname = ({ pathname: a }, { pathname: b }) => {
-  const lDiff = Math.abs(a.length - b.length);
-  return lDiff === 0 ? a === b : lDiff === 1 && withSlash(a) === withSlash(b);
-};
-const isSameSearchQuery = (a, b) => a.search === b.search;
-const isSamePath = (a, b) => isSameSearchQuery(a, b) && isSamePathname(a, b);
-const getClientDataPath = (pathname, pageSearch, options) => {
-  let search = pageSearch ?? "";
-  if (options?.actionId) {
-    search += (search ? "&" : "?") + QACTION_KEY + "=" + encodeURIComponent(options.actionId);
-  }
-  if (options?.loaderIds) {
-    for (const loaderId of options.loaderIds) {
-      search += (search ? "&" : "?") + QLOADER_KEY + "=" + encodeURIComponent(loaderId);
-    }
-  }
-  return pathname + (pathname.endsWith("/") ? "" : "/") + "q-data.json" + search;
-};
-const getClientNavPath = (props, baseUrl) => {
-  const href = props.href;
-  if (typeof href === "string" && typeof props.target !== "string" && !props.reload) {
-    try {
-      const linkUrl = toUrl(href.trim(), baseUrl.url);
-      const currentUrl = toUrl("", baseUrl.url);
-      if (isSameOrigin(linkUrl, currentUrl)) {
-        return toPath(linkUrl);
-      }
-    } catch (e) {
-      console.error(e);
-    }
-  } else if (props.reload) {
-    return toPath(toUrl("", baseUrl.url));
-  }
-  return null;
-};
-const shouldPreload = (clientNavPath, currentLoc) => {
-  if (clientNavPath) {
-    const prefetchUrl = toUrl(clientNavPath, currentLoc.url);
-    const currentUrl = toUrl("", currentLoc.url);
-    return !isSamePathname(prefetchUrl, currentUrl);
-  }
-  return false;
-};
-const isPromise = (value) => {
-  return value && typeof value.then === "function";
-};
-const createLoaderSignal = (loadersObject, loaderId, url, serializationStrategy, container) => {
-  return core.createAsyncComputed$(async () => {
-    if (core.isBrowser && loadersObject[loaderId] === internal._UNINITIALIZED) {
-      const data = await loadClientData(url, void 0, {
-        loaderIds: [
-          loaderId
-        ]
-      });
-      loadersObject[loaderId] = data?.loaders[loaderId] ?? internal._UNINITIALIZED;
-    }
-    return loadersObject[loaderId];
-  }, {
-    container,
-    serializationStrategy
-  });
-};
-const clientNavigate = (win, navType, fromURL, toURL, replaceState = false) => {
-  if (navType !== "popstate") {
-    const samePath = isSamePath(fromURL, toURL);
-    const sameHash = fromURL.hash === toURL.hash;
-    if (!samePath || !sameHash) {
-      const newState = {
-        _qRouterScroll: newScrollState()
-      };
-      if (replaceState) {
-        win.history.replaceState(newState, "", toPath(toURL));
-      } else {
-        win.history.pushState(newState, "", toPath(toURL));
-      }
-    }
-  }
-};
-const newScrollState = () => {
-  return {
-    x: 0,
-    y: 0,
-    w: 0,
-    h: 0
-  };
-};
-const preloadRouteBundles = (path, probability = 0.8) => {
-  if (core.isBrowser) {
-    path = path.endsWith("/") ? path : path + "/";
-    path = path.length > 1 && path.startsWith("/") ? path.slice(1) : path;
-    preloader.p(path, probability);
-  }
-};
 const RouteStateContext = /* @__PURE__ */ core.createContextId("qc-s");
 const ContentContext = /* @__PURE__ */ core.createContextId("qc-c");
 const ContentInternalContext = /* @__PURE__ */ core.createContextId("qc-ic");
@@ -257,7 +51,6 @@ const DocumentHeadContext = /* @__PURE__ */ core.createContextId("qc-h");
 const RouteLocationContext = /* @__PURE__ */ core.createContextId("qc-l");
 const RouteNavigateContext = /* @__PURE__ */ core.createContextId("qc-n");
 const RouteActionContext = /* @__PURE__ */ core.createContextId("qc-a");
-const RouteInternalContext = /* @__PURE__ */ core.createContextId("qc-ir");
 const RoutePreventNavigateContext = /* @__PURE__ */ core.createContextId("qc-p");
 const useContent = () => core.useContext(ContentContext);
 const useDocumentHead = () => core.useContext(DocumentHeadContext);
@@ -265,7 +58,9 @@ const useLocation = () => core.useContext(RouteLocationContext);
 const useNavigate = () => core.useContext(RouteNavigateContext);
 const usePreventNavigateQrl = (fn) => {
   if (!__EXPERIMENTAL__.preventNavigate) {
-    throw new Error('usePreventNavigate$ is experimental and must be enabled with `experimental: ["preventNavigate"]` in the `qwikVite` plugin.');
+    throw new Error(
+      'usePreventNavigate$ is experimental and must be enabled with `experimental: ["preventNavigate"]` in the `qwikVite` plugin.'
+    );
   }
   const registerPreventNav = core.useContext(RoutePreventNavigateContext);
   core.useVisibleTask$(() => registerPreventNav(fn));
@@ -278,23 +73,31 @@ const Link = core.component$((props) => {
   const loc = useLocation();
   const originalHref = props.href;
   const anchorRef = core.useSignal();
-  const { onClick$, prefetch: prefetchProp, reload, replaceState, scroll, ...linkProps } = /* @__PURE__ */ (() => props)();
-  const clientNavPath = core.untrack(() => getClientNavPath({
-    ...linkProps,
-    reload
-  }, loc));
+  const {
+    onClick$,
+    prefetch: prefetchProp,
+    reload,
+    replaceState,
+    scroll,
+    ...linkProps
+  } = /* @__PURE__ */ (() => props)();
+  const clientNavPath = core.untrack(() => routing.getClientNavPath({ ...linkProps, reload }, loc));
   linkProps.href = clientNavPath || originalHref;
-  const prefetchData = core.untrack(() => !!clientNavPath && prefetchProp !== false && prefetchProp !== "js" || void 0);
-  const prefetch = core.untrack(() => prefetchData || !!clientNavPath && prefetchProp !== false && shouldPreload(clientNavPath, loc));
+  const prefetchData = core.untrack(
+    () => !!clientNavPath && prefetchProp !== false && prefetchProp !== "js" || void 0
+  );
+  const prefetch = core.untrack(
+    () => prefetchData || !!clientNavPath && prefetchProp !== false && routing.shouldPreload(clientNavPath, loc)
+  );
   const handlePrefetch = prefetch ? core.$((_, elm) => {
     if (navigator.connection?.saveData) {
       return;
     }
     if (elm && elm.href) {
       const url = new URL(elm.href);
-      preloadRouteBundles(url.pathname);
+      routing.preloadRouteBundles(url.pathname);
       if (elm.hasAttribute("data-prefetch")) {
-        loadClientData(url, elm, {
+        routing.loadClientData(url, elm, {
           preloadRouteBundles: false,
           isPrefetch: true
         });
@@ -310,11 +113,7 @@ const Link = core.component$((props) => {
     if (event.defaultPrevented) {
       if (elm.href) {
         elm.setAttribute("aria-pressed", "true");
-        nav(elm.href, {
-          forceReload: reload,
-          replaceState,
-          scroll
-        }).then(() => {
+        nav(elm.href, { forceReload: reload, replaceState, scroll }).then(() => {
           elm.removeAttribute("aria-pressed");
         });
       }
@@ -322,7 +121,7 @@ const Link = core.component$((props) => {
   }) : void 0;
   const handlePreload = core.$((_, elm) => {
     const url = new URL(elm.href);
-    preloadRouteBundles(url.pathname, 1);
+    routing.preloadRouteBundles(url.pathname, 1);
   });
   core.useVisibleTask$(({ track }) => {
     track(() => loc.url.pathname);
@@ -330,7 +129,9 @@ const Link = core.component$((props) => {
     if (handler) {
       const event = new CustomEvent("qvisible");
       if (Array.isArray(handler)) {
-        handler.flat(10).forEach((handler2) => handler2?.(event, anchorRef.value));
+        handler.flat(10).forEach(
+          (handler2) => handler2?.(event, anchorRef.value)
+        );
       } else {
         handler?.(event, anchorRef.value);
       }
@@ -339,45 +140,44 @@ const Link = core.component$((props) => {
       handlePrefetch?.(void 0, anchorRef.value);
     }
   });
-  return /* @__PURE__ */ jsxRuntime.jsx("a", {
-    ref: anchorRef,
-    "q:link": !!clientNavPath,
-    ...linkProps,
-    onClick$: [
-      preventDefault,
-      handlePreload,
-      onClick$,
-      handleClientSideNavigation
-    ],
-    "data-prefetch": prefetchData,
-    onMouseOver$: [
-      linkProps.onMouseOver$,
-      handlePrefetch
-    ],
-    onFocus$: [
-      linkProps.onFocus$,
-      handlePrefetch
-    ],
-    // We need to prevent the onQVisible$ from being called twice since it is handled in the visible task
-    onQVisible$: [],
-    children: /* @__PURE__ */ jsxRuntime.jsx(core.Slot, {})
-  });
+  return /* @__PURE__ */ jsxRuntime.jsx(
+    "a",
+    {
+      ref: anchorRef,
+      ...{ "q:link": !!clientNavPath },
+      ...linkProps,
+      onClick$: [
+        preventDefault,
+        handlePreload,
+        // needs to be in between preventDefault and onClick$ to ensure it starts asap.
+        onClick$,
+        handleClientSideNavigation
+      ],
+      "data-prefetch": prefetchData,
+      onMouseOver$: [linkProps.onMouseOver$, handlePrefetch],
+      onFocus$: [linkProps.onFocus$, handlePrefetch],
+      onQVisible$: [],
+      children: /* @__PURE__ */ jsxRuntime.jsx(core.Slot, {})
+    }
+  );
 });
-const resolveHead = (endpoint, routeLocation, contentModules, locale, defaults) => {
+const resolveHead = (endpoint, routeLocation, contentModules, locale, defaults) => core.withLocale(locale, () => {
   const head = createDocumentHead(defaults);
-  const getData = (loaderOrAction) => {
+  const getData = ((loaderOrAction) => {
     const id = loaderOrAction.__id;
     if (loaderOrAction.__brand === "server_loader") {
       if (!(id in endpoint.loaders)) {
-        throw new Error("You can not get the returned data of a loader that has not been executed for this request.");
+        throw new Error(
+          "You can not get the returned data of a loader that has not been executed for this request."
+        );
       }
     }
     const data = endpoint.loaders[id];
-    if (isPromise(data)) {
+    if (routing.isPromise(data)) {
       throw new Error("Loaders returning a promise can not be resolved for the head function.");
     }
     return data;
-  };
+  });
   const fns = [];
   for (const contentModule of contentModules) {
     const contentModuleHead = contentModule?.head;
@@ -392,18 +192,16 @@ const resolveHead = (endpoint, routeLocation, contentModules, locale, defaults)
   if (fns.length) {
     const headProps = {
       head,
-      withLocale: (fn) => core.withLocale(locale, fn),
+      withLocale: (fn) => fn(),
       resolveValue: getData,
       ...routeLocation
     };
-    core.withLocale(locale, () => {
-      for (const fn of fns) {
-        resolveDocumentHead(head, fn(headProps));
-      }
-    });
+    for (const fn of fns) {
+      resolveDocumentHead(head, fn(headProps));
+    }
   }
   return head;
-};
+});
 const resolveDocumentHead = (resolvedHead, updatedHead) => {
   if (typeof updatedHead.title === "string") {
     resolvedHead.title = updatedHead.title;
@@ -430,244 +228,34 @@ const mergeArray = (existingArr, newArr) => {
 };
 const createDocumentHead = (defaults) => ({
   title: defaults?.title || "",
-  meta: [
-    ...defaults?.meta || []
-  ],
-  links: [
-    ...defaults?.links || []
-  ],
-  styles: [
-    ...defaults?.styles || []
-  ],
-  scripts: [
-    ...defaults?.scripts || []
-  ],
-  frontmatter: {
-    ...defaults?.frontmatter
-  }
+  meta: [...defaults?.meta || []],
+  links: [...defaults?.links || []],
+  styles: [...defaults?.styles || []],
+  scripts: [...defaults?.scripts || []],
+  frontmatter: { ...defaults?.frontmatter }
 });
-function matchRoute(route, path) {
-  const routeIdx = startIdxSkipSlash(route);
-  const routeLength = lengthNoTrailingSlash(route);
-  const pathIdx = startIdxSkipSlash(path);
-  const pathLength = lengthNoTrailingSlash(path);
-  return matchRoutePart(route, routeIdx, routeLength, path, pathIdx, pathLength);
-}
-function matchRoutePart(route, routeIdx, routeLength, path, pathIdx, pathLength) {
-  if (path.startsWith("/build/")) {
-    return null;
-  }
-  let params = null;
-  while (routeIdx < routeLength) {
-    const routeCh = route.charCodeAt(routeIdx++);
-    const pathCh = path.charCodeAt(pathIdx++);
-    if (routeCh === 91) {
-      const isMany = isThreeDots(route, routeIdx);
-      const paramNameStart = routeIdx + (isMany ? 3 : 0);
-      const paramNameEnd = scan(route, paramNameStart, routeLength, 93);
-      const paramName = route.substring(paramNameStart, paramNameEnd);
-      const paramSuffixEnd = scan(route, paramNameEnd + 1, routeLength, 47);
-      const suffix = route.substring(paramNameEnd + 1, paramSuffixEnd);
-      routeIdx = paramNameEnd + 1;
-      const paramValueStart = pathIdx - 1;
-      if (isMany) {
-        const match = recursiveScan(paramName, suffix, path, paramValueStart, pathLength, route, routeIdx + suffix.length + 1, routeLength);
-        if (match) {
-          return Object.assign(params || (params = {}), match);
-        }
-      }
-      const paramValueEnd = scan(path, paramValueStart, pathLength, 47, suffix);
-      if (paramValueEnd == -1) {
-        return null;
-      }
-      const paramValue = path.substring(paramValueStart, paramValueEnd);
-      if (!isMany && !suffix && !paramValue) {
-        return null;
-      }
-      pathIdx = paramValueEnd;
-      (params || (params = {}))[paramName] = decodeURIComponent(paramValue);
-    } else if (routeCh !== pathCh) {
-      if (!(isNaN(pathCh) && isRestParameter(route, routeIdx))) {
-        return null;
-      }
-    }
-  }
-  if (allConsumed(route, routeIdx) && allConsumed(path, pathIdx)) {
-    return params || {};
-  } else {
-    return null;
-  }
-}
-function isRestParameter(text, idx) {
-  return text.charCodeAt(idx) === 91 && isThreeDots(text, idx + 1);
-}
-function lengthNoTrailingSlash(text) {
-  const length = text.length;
-  return length > 1 && text.charCodeAt(length - 1) === 47 ? length - 1 : length;
-}
-function allConsumed(text, idx) {
-  const length = text.length;
-  return idx >= length || idx == length - 1 && text.charCodeAt(idx) === 47;
-}
-function startIdxSkipSlash(text) {
-  return text.charCodeAt(0) === 47 ? 1 : 0;
-}
-function isThreeDots(text, idx) {
-  return text.charCodeAt(idx) === 46 && text.charCodeAt(idx + 1) === 46 && text.charCodeAt(idx + 2) === 46;
-}
-function scan(text, idx, end, ch, suffix = "") {
-  while (idx < end && text.charCodeAt(idx) !== ch) {
-    idx++;
-  }
-  const suffixLength = suffix.length;
-  for (let i = 0; i < suffixLength; i++) {
-    if (text.charCodeAt(idx - suffixLength + i) !== suffix.charCodeAt(i)) {
-      return -1;
-    }
-  }
-  return idx - suffixLength;
-}
-function recursiveScan(paramName, suffix, path, pathStart, pathLength, route, routeStart, routeLength) {
-  if (path.charCodeAt(pathStart) === 47) {
-    pathStart++;
-  }
-  let pathIdx = pathLength;
-  const sep = suffix + "/";
-  while (pathIdx >= pathStart) {
-    const match = matchRoutePart(route, routeStart, routeLength, path, pathIdx, pathLength);
-    if (match) {
-      let value = path.substring(pathStart, Math.min(pathIdx, pathLength));
-      if (value.endsWith(sep)) {
-        value = value.substring(0, value.length - sep.length);
-      }
-      match[paramName] = decodeURIComponent(value);
-      return match;
-    }
-    const newPathIdx = lastIndexOf(path, pathStart, sep, pathIdx, pathStart - 1) + sep.length;
-    if (pathIdx === newPathIdx) {
-      break;
-    }
-    pathIdx = newPathIdx;
-  }
-  return null;
-}
-function lastIndexOf(text, start, match, searchIdx, notFoundIdx) {
-  let idx = text.lastIndexOf(match, searchIdx);
-  if (idx == searchIdx - match.length) {
-    idx = text.lastIndexOf(match, searchIdx - match.length - 1);
-  }
-  return idx > start ? idx : notFoundIdx;
-}
-var RouteDataProp = /* @__PURE__ */ (function(RouteDataProp2) {
-  RouteDataProp2[RouteDataProp2["RouteName"] = 0] = "RouteName";
-  RouteDataProp2[RouteDataProp2["Loaders"] = 1] = "Loaders";
-  RouteDataProp2[RouteDataProp2["OriginalPathname"] = 2] = "OriginalPathname";
-  RouteDataProp2[RouteDataProp2["RouteBundleNames"] = 3] = "RouteBundleNames";
-  return RouteDataProp2;
-})({});
-var MenuDataProp = /* @__PURE__ */ (function(MenuDataProp2) {
-  MenuDataProp2[MenuDataProp2["Pathname"] = 0] = "Pathname";
-  MenuDataProp2[MenuDataProp2["MenuLoader"] = 1] = "MenuLoader";
-  return MenuDataProp2;
-})({});
-const deepFreeze = (obj) => {
-  if (obj == null) {
-    return obj;
-  }
-  Object.getOwnPropertyNames(obj).forEach((prop) => {
-    const value = obj[prop];
-    if (value && typeof value === "object" && !Object.isFrozen(value)) {
-      deepFreeze(value);
-    }
-  });
-  return Object.freeze(obj);
-};
-const loadRoute = async (routes, menus, cacheModules, pathname, isInternal) => {
-  if (!Array.isArray(routes)) {
-    return null;
-  }
-  for (const routeData of routes) {
-    const routeName = routeData[RouteDataProp.RouteName];
-    const params = matchRoute(routeName, pathname);
-    if (!params) {
-      continue;
-    }
-    const loaders = routeData[RouteDataProp.Loaders];
-    const routeBundleNames = routeData[RouteDataProp.RouteBundleNames];
-    const modules = new Array(loaders.length);
-    const pendingLoads = [];
-    loaders.forEach((moduleLoader, i) => {
-      loadModule(moduleLoader, pendingLoads, (routeModule) => modules[i] = routeModule, cacheModules);
-    });
-    let menu = void 0;
-    {
-      const menuLoader = getMenuLoader(menus, pathname);
-      loadModule(menuLoader, pendingLoads, (menuModule) => menu = menuModule?.default, cacheModules);
-    }
-    if (pendingLoads.length > 0) {
-      await Promise.all(pendingLoads);
-    }
-    return [
-      routeName,
-      params,
-      modules,
-      deepFreeze(menu),
-      routeBundleNames
-    ];
-  }
-  return null;
-};
-const loadModule = (moduleLoader, pendingLoads, moduleSetter, cacheModules) => {
-  if (typeof moduleLoader === "function") {
-    const loadedModule = MODULE_CACHE.get(moduleLoader);
-    if (loadedModule) {
-      moduleSetter(loadedModule);
-    } else {
-      const moduleOrPromise = moduleLoader();
-      if (typeof moduleOrPromise.then === "function") {
-        pendingLoads.push(moduleOrPromise.then((loadedModule2) => {
-          if (cacheModules !== false) {
-            MODULE_CACHE.set(moduleLoader, loadedModule2);
-          }
-          moduleSetter(loadedModule2);
-        }));
-      } else if (moduleOrPromise) {
-        moduleSetter(moduleOrPromise);
-      }
-    }
-  }
-};
-const getMenuLoader = (menus, pathname) => {
-  if (menus) {
-    pathname = pathname.endsWith("/") ? pathname : pathname + "/";
-    const menu = menus.find((m) => m[MenuDataProp.Pathname] === pathname || pathname.startsWith(m[MenuDataProp.Pathname]));
-    if (menu) {
-      return menu[MenuDataProp.MenuLoader];
-    }
-  }
-};
 function callRestoreScrollOnDocument() {
   if (document.__q_scroll_restore__) {
     document.__q_scroll_restore__();
     document.__q_scroll_restore__ = void 0;
   }
 }
-const restoreScroll = (type, toUrl2, fromUrl, scroller, scrollState) => {
+const restoreScroll = (type, toUrl, fromUrl, scroller, scrollState) => {
   if (type === "popstate" && scrollState) {
     scroller.scrollTo(scrollState.x, scrollState.y);
   } else if (type === "link" || type === "form") {
-    if (!hashScroll(toUrl2, fromUrl)) {
+    if (!hashScroll(toUrl, fromUrl)) {
       scroller.scrollTo(0, 0);
     }
   }
 };
-const hashScroll = (toUrl2, fromUrl) => {
-  const elmId = toUrl2.hash.slice(1);
+const hashScroll = (toUrl, fromUrl) => {
+  const elmId = toUrl.hash.slice(1);
   const elm = elmId && document.getElementById(elmId);
   if (elm) {
     elm.scrollIntoView();
     return true;
-  } else if (!elm && toUrl2.hash && isSamePath(toUrl2, fromUrl)) {
+  } else if (!elm && toUrl.hash && routing.isSamePath(toUrl, fromUrl)) {
     return true;
   }
   return false;
@@ -690,21 +278,11 @@ const saveScrollHistory = (scrollState) => {
   history.replaceState(state, "");
 };
 const spaInit = core.event$((_, el) => {
-  const win = window;
-  const spa = "_qRouterSPA";
-  const initPopstate = "_qRouterInitPopstate";
-  const initAnchors = "_qRouterInitAnchors";
-  const initVisibility = "_qRouterInitVisibility";
-  const initScroll = "_qRouterInitScroll";
-  if (!win[spa] && !win[initPopstate] && !win[initAnchors] && !win[initVisibility] && !win[initScroll]) {
+  if (!window._qRouterSPA && !window._qRouterInitPopstate) {
     const currentPath = location.pathname + location.search;
-    const historyPatch = "_qRouterHistoryPatch";
-    const scrollEnabled = "_qRouterScrollEnabled";
-    const debounceTimeout = "_qRouterScrollDebounce";
-    const scrollHistory = "_qRouterScroll";
     const checkAndScroll = (scrollState) => {
       if (scrollState) {
-        win.scrollTo(scrollState.x, scrollState.y);
+        window.scrollTo(scrollState.x, scrollState.y);
       }
     };
     const currentScrollState2 = () => {
@@ -718,16 +296,16 @@ const spaInit = core.event$((_, el) => {
     };
     const saveScrollState = (scrollState) => {
       const state = history.state || {};
-      state[scrollHistory] = scrollState || currentScrollState2();
+      state._qRouterScroll = scrollState || currentScrollState2();
       history.replaceState(state, "");
     };
     saveScrollState();
-    win[initPopstate] = () => {
-      if (win[spa]) {
+    window._qRouterInitPopstate = () => {
+      if (window._qRouterSPA) {
         return;
       }
-      win[scrollEnabled] = false;
-      clearTimeout(win[debounceTimeout]);
+      window._qRouterScrollEnabled = false;
+      clearTimeout(window._qRouterScrollDebounce);
       if (currentPath !== location.pathname + location.search) {
         const getContainer = (el2) => el2.closest("[q\\:container]:not([q\\:container=html]):not([q\\:container=text])");
         const container = getContainer(el);
@@ -737,33 +315,31 @@ const spaInit = core.event$((_, el) => {
           id: "qc--n"
         });
         if (nav) {
-          nav(location.href, {
-            type: "popstate"
-          });
+          nav(location.href, { type: "popstate" });
         } else {
           location.reload();
         }
       } else {
         if (history.scrollRestoration === "manual") {
-          const scrollState = history.state?.[scrollHistory];
+          const scrollState = history.state?._qRouterScroll;
           checkAndScroll(scrollState);
-          win[scrollEnabled] = true;
+          window._qRouterScrollEnabled = true;
         }
       }
     };
-    if (!win[historyPatch]) {
-      win[historyPatch] = true;
+    if (!window._qRouterHistoryPatch) {
+      window._qRouterHistoryPatch = true;
       const pushState = history.pushState;
       const replaceState = history.replaceState;
       const prepareState = (state) => {
         if (state === null || typeof state === "undefined") {
           state = {};
         } else if (state?.constructor !== Object) {
-          state = {
-            _data: state
-          };
+          state = { _data: state };
           if (core.isDev) {
-            console.warn("In a Qwik SPA context, `history.state` is used to store scroll state. Direct calls to `pushState()` and `replaceState()` must supply an actual Object type. We need to be able to automatically attach the scroll state to your state object. A new state object has been created, your data has been moved to: `history.state._data`");
+            console.warn(
+              "In a Qwik SPA context, `history.state` is used to store scroll state. Direct calls to `pushState()` and `replaceState()` must supply an actual Object type. We need to be able to automatically attach the scroll state to your state object. A new state object has been created, your data has been moved to: `history.state._data`"
+            );
           }
         }
         state._qRouterScroll = state._qRouterScroll || currentScrollState2();
@@ -778,8 +354,8 @@ const spaInit = core.event$((_, el) => {
         return replaceState.call(history, state, title, url);
       };
     }
-    win[initAnchors] = (event) => {
-      if (win[spa] || event.defaultPrevented) {
+    window._qRouterInitAnchors = (event) => {
+      if (window._qRouterSPA || event.defaultPrevented) {
         return;
       }
       const target = event.target.closest("a[href]");
@@ -798,13 +374,9 @@ const spaInit = core.event$((_, el) => {
             if (dest.href.endsWith("#")) {
               window.scrollTo(0, 0);
             } else {
-              win[scrollEnabled] = false;
-              clearTimeout(win[debounceTimeout]);
-              saveScrollState({
-                ...currentScrollState2(),
-                x: 0,
-                y: 0
-              });
+              window._qRouterScrollEnabled = false;
+              clearTimeout(window._qRouterScrollDebounce);
+              saveScrollState({ ...currentScrollState2(), x: 0, y: 0 });
               location.reload();
             }
           } else {
@@ -817,30 +389,28 @@ const spaInit = core.event$((_, el) => {
         }
       }
     };
-    win[initVisibility] = () => {
-      if (!win[spa] && win[scrollEnabled] && document.visibilityState === "hidden") {
+    window._qRouterInitVisibility = () => {
+      if (!window._qRouterSPA && window._qRouterScrollEnabled && document.visibilityState === "hidden") {
         saveScrollState();
       }
     };
-    win[initScroll] = () => {
-      if (win[spa] || !win[scrollEnabled]) {
+    window._qRouterInitScroll = () => {
+      if (window._qRouterSPA || !window._qRouterScrollEnabled) {
         return;
       }
-      clearTimeout(win[debounceTimeout]);
-      win[debounceTimeout] = setTimeout(() => {
+      clearTimeout(window._qRouterScrollDebounce);
+      window._qRouterScrollDebounce = setTimeout(() => {
         saveScrollState();
-        win[debounceTimeout] = void 0;
+        window._qRouterScrollDebounce = void 0;
       }, 200);
     };
-    win[scrollEnabled] = true;
+    window._qRouterScrollEnabled = true;
     setTimeout(() => {
-      win.addEventListener("popstate", win[initPopstate]);
-      win.addEventListener("scroll", win[initScroll], {
-        passive: true
-      });
-      document.body.addEventListener("click", win[initAnchors]);
-      if (!win.navigation) {
-        document.addEventListener("visibilitychange", win[initVisibility], {
+      window.addEventListener("popstate", window._qRouterInitPopstate);
+      window.addEventListener("scroll", window._qRouterInitScroll, { passive: true });
+      document.addEventListener("click", window._qRouterInitAnchors);
+      if (!window.navigation) {
+        document.addEventListener("visibilitychange", window._qRouterInitVisibility, {
           passive: true
         });
       }
@@ -858,37 +428,40 @@ const startViewTransition = (params) => {
     } catch {
       transition = document.startViewTransition(params.update);
     }
-    const event = new CustomEvent("qviewtransition", {
-      detail: transition
-    });
+    const event = new CustomEvent("qviewtransition", { detail: transition });
     document.dispatchEvent(event);
     return transition;
   } else {
     params.update?.();
   }
 };
-const transitionCss = "@layer qwik {\n  @supports selector(html:active-view-transition-type(type)) {\n    html:active-view-transition-type(qwik-navigation) {\n      :root {\n        view-transition-name: none;\n      }\n    }\n  }\n  @supports not selector(html:active-view-transition-type(type)) {\n    :root {\n      view-transition-name: none;\n    }\n  }\n}\n";
+const transitionCss = "@layer qwik{@supports selector(html:active-view-transition-type(type)){html:active-view-transition-type(qwik-navigation){:root{view-transition-name:none}}}@supports not selector(html:active-view-transition-type(type)){:root{view-transition-name:none}}}";
 const QWIK_CITY_SCROLLER = "_qCityScroller";
 const QWIK_ROUTER_SCROLLER = "_qRouterScroller";
 const preventNav = {};
-const internalState = {
-  navCount: 0
-};
+const internalState = { navCount: 0 };
 const useQwikRouter = (props) => {
+  if (!core.isServer) {
+    throw new Error(
+      "useQwikRouter can only run during SSR on the server. If you are seeing this, it means you are re-rendering the root of your application. Fix that or use the <QwikRouterProvider> component around the root of your application."
+    );
+  }
   core.useStyles$(transitionCss);
   const env = useQwikRouterEnv();
   if (!env?.params) {
-    throw new Error(`Missing Qwik Router Env Data for help visit https://github.com/QwikDev/qwik/issues/6237`);
+    throw new Error(
+      `Missing Qwik Router Env Data for help visit https://github.com/QwikDev/qwik/issues/6237`
+    );
   }
   const urlEnv = core.useServerData("url");
   if (!urlEnv) {
     throw new Error(`Missing Qwik URL Env Data`);
   }
   const serverHead = core.useServerData("documentHead");
-  if (core.isServer) {
-    if (env.ev.originalUrl.pathname !== env.ev.url.pathname && !__EXPERIMENTAL__.enableRequestRewrite) {
-      throw new Error(`enableRequestRewrite is an experimental feature and is not enabled. Please enable the feature flag by adding \`experimental: ["enableRequestRewrite"]\` to your qwikVite plugin options.`);
-    }
+  if (env.ev.originalUrl.pathname !== env.ev.url.pathname && !__EXPERIMENTAL__.enableRequestRewrite) {
+    throw new Error(
+      `enableRequestRewrite is an experimental feature and is not enabled. Please enable the feature flag by adding \`experimental: ["enableRequestRewrite"]\` to your qwikVite plugin options.`
+    );
   }
   const url = new URL(urlEnv);
   const routeLocationTarget = {
@@ -897,35 +470,39 @@ const useQwikRouter = (props) => {
     isNavigating: false,
     prevUrl: void 0
   };
-  const routeLocation = core.useStore(routeLocationTarget, {
-    deep: false
-  });
+  const routeLocation = core.useStore(routeLocationTarget, { deep: false });
   const navResolver = {};
   const container = internal._getContextContainer();
   const getSerializationStrategy = (loaderId) => {
-    return env.response.loadersSerializationStrategy.get(loaderId) || DEFAULT_LOADERS_SERIALIZATION_STRATEGY;
+    return env.response.loadersSerializationStrategy.get(loaderId) || routing.DEFAULT_LOADERS_SERIALIZATION_STRATEGY;
   };
   const loadersObject = {};
   const loaderState = {};
   for (const [key, value] of Object.entries(env.response.loaders)) {
     loadersObject[key] = value;
-    loaderState[key] = createLoaderSignal(loadersObject, key, url, getSerializationStrategy(key), container);
+    loaderState[key] = routing.createLoaderSignal(
+      loadersObject,
+      key,
+      url,
+      getSerializationStrategy(key),
+      container
+    );
   }
   loadersObject[internal.SerializerSymbol] = (obj) => {
     const loadersSerializationObject = {};
-    for (const [k, v] of Object.entries(obj)) {
-      loadersSerializationObject[k] = getSerializationStrategy(k) === "always" ? v : internal._UNINITIALIZED;
+    for (const [k, v2] of Object.entries(obj)) {
+      loadersSerializationObject[k] = getSerializationStrategy(k) === "always" ? v2 : internal._UNINITIALIZED;
     }
     return loadersSerializationObject;
   };
   const routeInternal = core.useSignal({
     type: "initial",
     dest: url,
-    forceReload: false,
-    replaceState: false,
     scroll: true
   });
-  const documentHead = core.useStore(() => createDocumentHead(serverHead));
+  const documentHead = core.useStore(
+    () => createDocumentHead(serverHead)
+  );
   const content = core.useStore({
     headings: void 0,
     menu: void 0
@@ -933,14 +510,16 @@ const useQwikRouter = (props) => {
   const contentInternal = core.useSignal();
   const currentActionId = env.response.action;
   const currentAction = currentActionId ? env.response.loaders[currentActionId] : void 0;
-  const actionState = core.useSignal(currentAction ? {
-    id: currentActionId,
-    data: env.response.formData,
-    output: {
-      result: currentAction,
-      status: env.response.status
-    }
-  } : void 0);
+  const actionState = core.useSignal(
+    currentAction ? {
+      id: currentActionId,
+      data: env.response.formData,
+      output: {
+        result: currentAction,
+        status: env.response.status
+      }
+    } : void 0
+  );
   const registerPreventNav = core.$((fn$) => {
     if (!core.isBrowser) {
       return;
@@ -950,9 +529,9 @@ const useQwikRouter = (props) => {
       if (!preventNav.$cbs$) {
         return;
       }
-      const prevents = [
-        ...preventNav.$cbs$.values()
-      ].map((cb) => cb.resolved ? cb.resolved() : cb());
+      const prevents = [...preventNav.$cbs$.values()].map(
+        (cb) => cb.resolved ? cb.resolved() : cb()
+      );
       if (prevents.some(Boolean)) {
         event.preventDefault();
         event.returnValue = true;
@@ -972,17 +551,22 @@ const useQwikRouter = (props) => {
     };
   });
   const goto = core.$(async (path, opt) => {
-    const { type = "link", forceReload = path === void 0, replaceState = false, scroll = true } = typeof opt === "object" ? opt : {
-      forceReload: opt
-    };
+    const {
+      type = "link",
+      forceReload = path === void 0,
+      // Hack for nav() because this API is already set.
+      replaceState = false,
+      scroll = true
+    } = typeof opt === "object" ? opt : { forceReload: opt };
     internalState.navCount++;
+    if (core.isBrowser && type === "link" && routeInternal.value.type === "initial") {
+      routeInternal.value.dest = new URL(window.location.href);
+    }
     const lastDest = routeInternal.value.dest;
-    const dest = path === void 0 ? lastDest : typeof path === "number" ? path : toUrl(path, routeLocation.url);
-    if (preventNav.$cbs$ && (forceReload || typeof dest === "number" || !isSamePath(dest, lastDest) || !isSameOrigin(dest, lastDest))) {
+    const dest = path === void 0 ? lastDest : typeof path === "number" ? path : routing.toUrl(path, routeLocation.url);
+    if (preventNav.$cbs$ && (forceReload || typeof dest === "number" || !routing.isSamePath(dest, lastDest) || !routing.isSameOrigin(dest, lastDest))) {
       const ourNavId = internalState.navCount;
-      const prevents = await Promise.all([
-        ...preventNav.$cbs$.values()
-      ].map((cb) => cb(dest)));
+      const prevents = await Promise.all([...preventNav.$cbs$.values()].map((cb) => cb(dest)));
       if (ourNavId !== internalState.navCount || prevents.some(Boolean)) {
         if (ourNavId === internalState.navCount && type === "popstate") {
           history.pushState(null, "", lastDest);
@@ -996,13 +580,13 @@ const useQwikRouter = (props) => {
       }
       return;
     }
-    if (!isSameOrigin(dest, lastDest)) {
+    if (!routing.isSameOrigin(dest, lastDest)) {
       if (core.isBrowser) {
         location.href = dest.href;
       }
       return;
     }
-    if (!forceReload && isSamePath(dest, lastDest)) {
+    if (!forceReload && routing.isSamePath(dest, lastDest)) {
       if (core.isBrowser) {
         if (type === "link" && dest.href !== location.href) {
           history.pushState(null, "", dest);
@@ -1011,7 +595,9 @@ const useQwikRouter = (props) => {
         if (!scroller) {
           scroller = document.getElementById(QWIK_CITY_SCROLLER);
           if (scroller && core.isDev) {
-            console.warn(`Please update your scroller ID to "${QWIK_ROUTER_SCROLLER}" as "${QWIK_CITY_SCROLLER}" is deprecated and will be removed in V3`);
+            console.warn(
+              `Please update your scroller ID to "${QWIK_ROUTER_SCROLLER}" as "${QWIK_CITY_SCROLLER}" is deprecated and will be removed in V3`
+            );
           }
         }
         if (!scroller) {
@@ -1032,8 +618,13 @@ const useQwikRouter = (props) => {
       scroll
     };
     if (core.isBrowser) {
-      loadClientData(dest, internal._getContextElement());
-      loadRoute(qwikRouterConfig__namespace.routes, qwikRouterConfig__namespace.menus, qwikRouterConfig__namespace.cacheModules, dest.pathname);
+      routing.loadClientData(dest, internal._getContextElement());
+      routing.loadRoute(
+        qwikRouterConfig__namespace.routes,
+        qwikRouterConfig__namespace.menus,
+        qwikRouterConfig__namespace.cacheModules,
+        dest.pathname
+      );
     }
     actionState.value = void 0;
     routeLocation.isNavigating = true;
@@ -1048,14 +639,11 @@ const useQwikRouter = (props) => {
   core.useContextProvider(RouteNavigateContext, goto);
   core.useContextProvider(RouteStateContext, loaderState);
   core.useContextProvider(RouteActionContext, actionState);
-  core.useContextProvider(RouteInternalContext, routeInternal);
   core.useContextProvider(RoutePreventNavigateContext, registerPreventNav);
   core.useTask$(({ track }) => {
     async function run() {
-      const [navigation, action] = track(() => [
-        routeInternal.value,
-        actionState.value
-      ]);
+      const navigation = track(routeInternal);
+      const action = track(actionState);
       const locale = core.getLocale("");
       const prevUrl = routeLocation.url;
       const navType = action ? "form" : navigation.type;
@@ -1077,26 +665,28 @@ const useQwikRouter = (props) => {
         } else if (!globalThis.__NO_TRAILING_SLASH__) {
           trackUrl.pathname += "/";
         }
-        let loadRoutePromise = loadRoute(qwikRouterConfig__namespace.routes, qwikRouterConfig__namespace.menus, qwikRouterConfig__namespace.cacheModules, trackUrl.pathname);
+        let loadRoutePromise = routing.loadRoute(
+          qwikRouterConfig__namespace.routes,
+          qwikRouterConfig__namespace.menus,
+          qwikRouterConfig__namespace.cacheModules,
+          trackUrl.pathname
+        );
         elm = internal._getContextElement();
-        const pageData = clientPageData = await loadClientData(trackUrl, elm, {
+        const pageData = clientPageData = await routing.loadClientData(trackUrl, elm, {
           action,
           clearCache: true
         });
         if (!pageData) {
-          routeInternal.untrackedValue = {
-            type: navType,
-            dest: trackUrl
-          };
+          routeInternal.untrackedValue = { type: navType, dest: trackUrl };
           return;
         }
         const newHref = pageData.href;
         const newURL = new URL(newHref, trackUrl);
-        if (!isSamePath(newURL, trackUrl)) {
+        if (!routing.isSamePath(newURL, trackUrl)) {
           if (!pageData.isRewrite) {
             trackUrl = newURL;
           }
-          loadRoutePromise = loadRoute(
+          loadRoutePromise = routing.loadRoute(
             qwikRouterConfig__namespace.routes,
             qwikRouterConfig__namespace.menus,
             qwikRouterConfig__namespace.cacheModules,
@@ -1116,13 +706,13 @@ const useQwikRouter = (props) => {
         const [routeName, params, mods, menu] = loadedRoute;
         const contentModules = mods;
         const pageModule = contentModules[contentModules.length - 1];
-        if (navigation.dest.search && !!isSamePath(trackUrl, prevUrl)) {
+        if (navigation.dest.search && !!routing.isSamePath(trackUrl, prevUrl)) {
           trackUrl.search = navigation.dest.search;
         }
         let shouldForcePrevUrl = false;
         let shouldForceUrl = false;
         let shouldForceParams = false;
-        if (!isSamePath(trackUrl, prevUrl)) {
+        if (!routing.isSamePath(trackUrl, prevUrl)) {
           if (internal._hasStoreEffects(routeLocation, "prevUrl")) {
             shouldForcePrevUrl = true;
           }
@@ -1140,11 +730,14 @@ const useQwikRouter = (props) => {
           }
           routeLocationTarget.params = params;
         }
-        routeInternal.untrackedValue = {
-          type: navType,
-          dest: trackUrl
-        };
-        const resolvedHead = resolveHead(clientPageData, routeLocation, contentModules, locale, serverHead);
+        routeInternal.untrackedValue = { type: navType, dest: trackUrl };
+        const resolvedHead = resolveHead(
+          clientPageData,
+          routeLocation,
+          contentModules,
+          locale,
+          serverHead
+        );
         content.headings = pageModule.headings;
         content.menu = menu;
         contentInternal.untrackedValue = core.noSerialize(contentModules);
@@ -1160,7 +753,8 @@ const useQwikRouter = (props) => {
             scrollState = getScrollHistory();
           }
           const scroller = document.getElementById(QWIK_ROUTER_SCROLLER) ?? document.documentElement;
-          if (navigation.scroll && (!navigation.forceReload || !isSamePath(trackUrl, prevUrl)) && (navType === "link" || navType === "popstate") || navType === "form" && !isSamePath(trackUrl, prevUrl)) {
+          if (navigation.scroll && (!navigation.forceReload || !routing.isSamePath(trackUrl, prevUrl)) && (navType === "link" || navType === "popstate") || // Action might have responded with a redirect.
+          navType === "form" && !routing.isSamePath(trackUrl, prevUrl)) {
             document.__q_scroll_restore__ = () => restoreScroll(navType, trackUrl, prevUrl, scroller, scrollState);
           }
           const loaders = clientPageData?.loaders;
@@ -1171,39 +765,44 @@ const useQwikRouter = (props) => {
               const awaitedValue = await value;
               loadersObject[key] = awaitedValue;
               if (!signal) {
-                loaderState[key] = createLoaderSignal(loadersObject, key, trackUrl, DEFAULT_LOADERS_SERIALIZATION_STRATEGY, container2);
+                loaderState[key] = routing.createLoaderSignal(
+                  loadersObject,
+                  key,
+                  trackUrl,
+                  routing.DEFAULT_LOADERS_SERIALIZATION_STRATEGY,
+                  container2
+                );
               } else {
                 signal.invalidate();
               }
             }
           }
-          CLIENT_DATA_CACHE.clear();
-          const win = window;
-          if (!win._qRouterSPA) {
-            win._qRouterSPA = true;
+          routing.CLIENT_DATA_CACHE.clear();
+          if (!window._qRouterSPA) {
+            window._qRouterSPA = true;
             history.scrollRestoration = "manual";
-            win.addEventListener("popstate", () => {
-              win._qRouterScrollEnabled = false;
-              clearTimeout(win._qRouterScrollDebounce);
+            window.addEventListener("popstate", () => {
+              window._qRouterScrollEnabled = false;
+              clearTimeout(window._qRouterScrollDebounce);
               goto(location.href, {
                 type: "popstate"
               });
             });
-            win.removeEventListener("popstate", win._qRouterInitPopstate);
-            win._qRouterInitPopstate = void 0;
-            if (!win._qRouterHistoryPatch) {
-              win._qRouterHistoryPatch = true;
+            window.removeEventListener("popstate", window._qRouterInitPopstate);
+            window._qRouterInitPopstate = void 0;
+            if (!window._qRouterHistoryPatch) {
+              window._qRouterHistoryPatch = true;
               const pushState = history.pushState;
               const replaceState2 = history.replaceState;
               const prepareState = (state) => {
                 if (state === null || typeof state === "undefined") {
                   state = {};
                 } else if (state?.constructor !== Object) {
-                  state = {
-                    _data: state
-                  };
+                  state = { _data: state };
                   if (core.isDev) {
-                    console.warn("In a Qwik SPA context, `history.state` is used to store scroll state. Direct calls to `pushState()` and `replaceState()` must supply an actual Object type. We need to be able to automatically attach the scroll state to your state object. A new state object has been created, your data has been moved to: `history.state._data`");
+                    console.warn(
+                      "In a Qwik SPA context, `history.state` is used to store scroll state. Direct calls to `pushState()` and `replaceState()` must supply an actual Object type. We need to be able to automatically attach the scroll state to your state object. A new state object has been created, your data has been moved to: `history.state._data`"
+                    );
                   }
                 }
                 state._qRouterScroll = state._qRouterScroll || currentScrollState(scroller);
@@ -1218,7 +817,7 @@ const useQwikRouter = (props) => {
                 return replaceState2.call(history, state, title, url2);
               };
             }
-            document.body.addEventListener("click", (event) => {
+            document.addEventListener("click", (event) => {
               if (event.defaultPrevented) {
                 return;
               }
@@ -1227,14 +826,14 @@ const useQwikRouter = (props) => {
                 const href = target.getAttribute("href");
                 const prev = new URL(location.href);
                 const dest = new URL(href, prev);
-                if (isSameOrigin(dest, prev) && isSamePath(dest, prev)) {
+                if (routing.isSameOrigin(dest, prev) && routing.isSamePath(dest, prev)) {
                   event.preventDefault();
                   if (!dest.hash && !dest.href.endsWith("#")) {
                     if (dest.href !== prev.href) {
                       history.pushState(null, "", dest);
                     }
-                    win._qRouterScrollEnabled = false;
-                    clearTimeout(win._qRouterScrollDebounce);
+                    window._qRouterScrollEnabled = false;
+                    clearTimeout(window._qRouterScrollDebounce);
                     saveScrollHistory({
                       ...currentScrollState(scroller),
                       x: 0,
@@ -1247,48 +846,54 @@ const useQwikRouter = (props) => {
                 }
               }
             });
-            document.body.removeEventListener("click", win._qRouterInitAnchors);
-            win._qRouterInitAnchors = void 0;
+            document.removeEventListener("click", window._qRouterInitAnchors);
+            window._qRouterInitAnchors = void 0;
             if (!window.navigation) {
-              document.addEventListener("visibilitychange", () => {
-                if ((win._qRouterScrollEnabled || win._qCityScrollEnabled) && document.visibilityState === "hidden") {
-                  if (win._qCityScrollEnabled) {
-                    console.warn('"_qCityScrollEnabled" is deprecated. Use "_qRouterScrollEnabled" instead.');
+              document.addEventListener(
+                "visibilitychange",
+                () => {
+                  if ((window._qRouterScrollEnabled || window._qCityScrollEnabled) && document.visibilityState === "hidden") {
+                    if (window._qCityScrollEnabled) {
+                      console.warn(
+                        '"_qCityScrollEnabled" is deprecated. Use "_qRouterScrollEnabled" instead.'
+                      );
+                    }
+                    const scrollState2 = currentScrollState(scroller);
+                    saveScrollHistory(scrollState2);
                   }
+                },
+                { passive: true }
+              );
+              document.removeEventListener("visibilitychange", window._qRouterInitVisibility);
+              window._qRouterInitVisibility = void 0;
+            }
+            window.addEventListener(
+              "scroll",
+              () => {
+                if (!window._qRouterScrollEnabled && !window._qCityScrollEnabled) {
+                  return;
+                }
+                clearTimeout(window._qRouterScrollDebounce);
+                window._qRouterScrollDebounce = setTimeout(() => {
                   const scrollState2 = currentScrollState(scroller);
                   saveScrollHistory(scrollState2);
-                }
-              }, {
-                passive: true
-              });
-              document.removeEventListener("visibilitychange", win._qRouterInitVisibility);
-              win._qRouterInitVisibility = void 0;
-            }
-            win.addEventListener("scroll", () => {
-              if (!win._qRouterScrollEnabled && !win._qCityScrollEnabled) {
-                return;
-              }
-              clearTimeout(win._qRouterScrollDebounce);
-              win._qRouterScrollDebounce = setTimeout(() => {
-                const scrollState2 = currentScrollState(scroller);
-                saveScrollHistory(scrollState2);
-                win._qRouterScrollDebounce = void 0;
-              }, 200);
-            }, {
-              passive: true
-            });
-            removeEventListener("scroll", win._qRouterInitScroll);
-            win._qRouterInitScroll = void 0;
+                  window._qRouterScrollDebounce = void 0;
+                }, 200);
+              },
+              { passive: true }
+            );
+            removeEventListener("scroll", window._qRouterInitScroll);
+            window._qRouterInitScroll = void 0;
             spaInit.resolve();
           }
           if (navType !== "popstate") {
-            win._qRouterScrollEnabled = false;
-            clearTimeout(win._qRouterScrollDebounce);
+            window._qRouterScrollEnabled = false;
+            clearTimeout(window._qRouterScrollDebounce);
             const scrollState2 = currentScrollState(scroller);
             saveScrollHistory(scrollState2);
           }
           const navigate = () => {
-            clientNavigate(window, navType, prevUrl, trackUrl, replaceState);
+            routing.clientNavigate(window, navType, prevUrl, trackUrl, replaceState);
             contentInternal.force();
             return internal._waitUntilRendered(elm);
           };
@@ -1298,9 +903,7 @@ const useQwikRouter = (props) => {
             } else {
               const viewTransition = startViewTransition({
                 update: navigate,
-                types: [
-                  "qwik-navigation"
-                ]
+                types: ["qwik-navigation"]
               });
               if (!viewTransition) {
                 return Promise.resolve();
@@ -1310,10 +913,10 @@ const useQwikRouter = (props) => {
           };
           _waitNextPage().then(() => {
             const container2 = internal._getQContainerElement(elm);
-            container2.setAttribute(Q_ROUTE, routeName);
+            container2.setAttribute(routing.Q_ROUTE, routeName);
             const scrollState2 = currentScrollState(scroller);
             saveScrollHistory(scrollState2);
-            win._qRouterScrollEnabled = true;
+            window._qRouterScrollEnabled = true;
             if (core.isBrowser) {
               callRestoreScrollOnDocument();
             }
@@ -1347,31 +950,27 @@ const QwikCityProvider = QwikRouterProvider;
 const useQwikMockRouter = (props) => {
   const urlEnv = props.url ?? "http://localhost/";
   const url = new URL(urlEnv);
-  const routeLocation = core.useStore({
-    url,
-    params: props.params ?? {},
-    isNavigating: false,
-    prevUrl: void 0
-  }, {
-    deep: false
-  });
+  const routeLocation = core.useStore(
+    {
+      url,
+      params: props.params ?? {},
+      isNavigating: false,
+      prevUrl: void 0
+    },
+    { deep: false }
+  );
   const loaderState = {};
-  const routeInternal = core.useSignal({
-    type: "initial",
-    dest: url
-  });
   const goto = props.goto ?? core.$(async () => {
     console.warn("QwikRouterMockProvider: goto not provided");
   });
-  const documentHead = core.useStore(createDocumentHead, {
-    deep: false
-  });
-  const content = core.useStore({
-    headings: void 0,
-    menu: void 0
-  }, {
-    deep: false
-  });
+  const documentHead = core.useStore(createDocumentHead, { deep: false });
+  const content = core.useStore(
+    {
+      headings: void 0,
+      menu: void 0
+    },
+    { deep: false }
+  );
   const contentInternal = core.useSignal();
   const actionState = core.useSignal();
   core.useContextProvider(ContentContext, content);
@@ -1381,7 +980,6 @@ const useQwikMockRouter = (props) => {
   core.useContextProvider(RouteNavigateContext, goto);
   core.useContextProvider(RouteStateContext, loaderState);
   core.useContextProvider(RouteActionContext, actionState);
-  core.useContextProvider(RouteInternalContext, routeInternal);
 };
 const QwikRouterMockProvider = core.component$((props) => {
   useQwikMockRouter(props);
@@ -1405,10 +1003,11 @@ const RouterOutlet = core.component$(() => {
         });
       }
     }
-    return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, {
-      children: [
-        cmp,
-        !__EXPERIMENTAL__.noSPA && /* @__PURE__ */ jsxRuntime.jsx("script", {
+    return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+      cmp,
+      !__EXPERIMENTAL__.noSPA && /* @__PURE__ */ jsxRuntime.jsx(
+        "script",
+        {
           "document:onQCInit$": spaInit,
           "document:onQInit$": core.sync$(() => {
             ((w, h) => {
@@ -1422,93 +1021,19 @@ const RouterOutlet = core.component$(() => {
               }
             })(window, history);
           })
-        })
-      ]
-    });
+        }
+      )
+    ] });
   }
   return core.SkipRender;
 });
-var store;
-// @__NO_SIDE_EFFECTS__
-function getGlobalConfig(config2) {
-  return {
-    lang: config2?.lang ?? store?.lang,
-    message: config2?.message,
-    abortEarly: config2?.abortEarly ?? store?.abortEarly,
-    abortPipeEarly: config2?.abortPipeEarly ?? store?.abortPipeEarly
-  };
-}
-// @__NO_SIDE_EFFECTS__
-function getDotPath(issue) {
-  if (issue.path) {
-    let key = "";
-    for (const item of issue.path) {
-      if (typeof item.key === "string" || typeof item.key === "number") {
-        if (key) {
-          key += `.${item.key}`;
-        } else {
-          key += item.key;
-        }
-      } else {
-        return null;
-      }
-    }
-    return key;
-  }
-  return null;
-}
-// @__NO_SIDE_EFFECTS__
-function flatten(issues) {
-  const flatErrors = {};
-  for (const issue of issues) {
-    if (issue.path) {
-      const dotPath = /* @__PURE__ */ getDotPath(issue);
-      if (dotPath) {
-        if (!flatErrors.nested) {
-          flatErrors.nested = {};
-        }
-        if (flatErrors.nested[dotPath]) {
-          flatErrors.nested[dotPath].push(issue.message);
-        } else {
-          flatErrors.nested[dotPath] = [issue.message];
-        }
-      } else {
-        if (flatErrors.other) {
-          flatErrors.other.push(issue.message);
-        } else {
-          flatErrors.other = [issue.message];
-        }
-      }
-    } else {
-      if (flatErrors.root) {
-        flatErrors.root.push(issue.message);
-      } else {
-        flatErrors.root = [issue.message];
-      }
-    }
-  }
-  return flatErrors;
-}
-// @__NO_SIDE_EFFECTS__
-async function safeParseAsync(schema, input, config2) {
-  const dataset = await schema["~run"](
-    { value: input },
-    /* @__PURE__ */ getGlobalConfig(config2)
-  );
-  return {
-    typed: dataset.typed,
-    success: !dataset.issues,
-    output: dataset.value,
-    issues: dataset.issues
-  };
-}
-const routeActionQrl = (actionQrl, ...rest) => {
+const routeActionQrl = ((actionQrl, ...rest) => {
   const { id, validators } = getValidators(rest, actionQrl);
   function action() {
     const loc = useLocation();
     const currentAction = useAction();
     const initialState = {
-      actionPath: `?${QACTION_KEY}=${id}`,
+      actionPath: `?${routing.QACTION_KEY}=${id}`,
       submitted: false,
       isRunning: false,
       status: void 0,
@@ -1568,16 +1093,15 @@ Action.run() can only be called on the browser, for example when a user clicks a
           if (form.getAttribute("data-spa-reset") === "true") {
             form.reset();
           }
-          const detail = {
-            status,
-            value: result
-          };
-          form.dispatchEvent(new CustomEvent("submitcompleted", {
-            bubbles: false,
-            cancelable: false,
-            composed: false,
-            detail
-          }));
+          const detail = { status, value: result };
+          form.dispatchEvent(
+            new CustomEvent("submitcompleted", {
+              bubbles: false,
+              cancelable: false,
+              composed: false,
+              detail
+            })
+          );
         }
         return {
           status,
@@ -1594,8 +1118,8 @@ Action.run() can only be called on the browser, for example when a user clicks a
   action.__id = id;
   Object.freeze(action);
   return action;
-};
-const globalActionQrl = (actionQrl, ...rest) => {
+});
+const globalActionQrl = ((actionQrl, ...rest) => {
   const action = routeActionQrl(actionQrl, ...rest);
   if (core.isServer) {
     if (typeof globalThis._qwikActionsMap === "undefined") {
@@ -1604,10 +1128,14 @@ const globalActionQrl = (actionQrl, ...rest) => {
     globalThis._qwikActionsMap.set(action.__id, action);
   }
   return action;
-};
-const routeAction$ = /* @__PURE__ */ core.implicit$FirstArg(routeActionQrl);
-const globalAction$ = /* @__PURE__ */ core.implicit$FirstArg(globalActionQrl);
-const routeLoaderQrl = (loaderQrl, ...rest) => {
+});
+const routeAction$ = /* @__PURE__ */ core.implicit$FirstArg(
+  routeActionQrl
+);
+const globalAction$ = /* @__PURE__ */ core.implicit$FirstArg(
+  globalActionQrl
+);
+const routeLoaderQrl = ((loaderQrl, ...rest) => {
   const { id, validators, serializationStrategy } = getValidators(rest, loaderQrl);
   function loader() {
     const state = internal._resolveContextWithoutSequentialScope(RouteStateContext);
@@ -1627,18 +1155,19 @@ const routeLoaderQrl = (loaderQrl, ...rest) => {
   loader.__validators = validators;
   loader.__id = id;
   loader.__serializationStrategy = serializationStrategy;
+  loader.__expires = -1;
   Object.freeze(loader);
   return loader;
-};
+});
 const routeLoader$ = /* @__PURE__ */ core.implicit$FirstArg(routeLoaderQrl);
-const validatorQrl = (validator) => {
+const validatorQrl = ((validator) => {
   if (core.isServer) {
     return {
       validate: validator
     };
   }
   return void 0;
-};
+});
 const validator$ = /* @__PURE__ */ core.implicit$FirstArg(validatorQrl);
 const flattenValibotIssues = (issues) => {
   return issues.reduce((acc, issue) => {
@@ -1661,7 +1190,9 @@ const flattenValibotIssues = (issues) => {
 };
 const valibotQrl = (qrl) => {
   if (!__EXPERIMENTAL__.valibot) {
-    throw new Error('Valibot is an experimental feature and is not enabled. Please enable the feature flag by adding `experimental: ["valibot"]` to your qwikVite plugin options.');
+    throw new Error(
+      'Valibot is an experimental feature and is not enabled. Please enable the feature flag by adding `experimental: ["valibot"]` to your qwikVite plugin options.'
+    );
   }
   if (core.isServer) {
     return {
@@ -1669,7 +1200,7 @@ const valibotQrl = (qrl) => {
       async validate(ev, inputData) {
         const schema = await qrl.resolve().then((obj) => typeof obj === "function" ? obj(ev) : obj);
         const data = inputData ?? await ev.parseBody();
-        const result = await /* @__PURE__ */ safeParseAsync(schema, data);
+        const result = await v__namespace.safeParseAsync(schema, data);
         if (result.success) {
           return {
             success: true,
@@ -1683,7 +1214,7 @@ const valibotQrl = (qrl) => {
             success: false,
             status: 400,
             error: {
-              formErrors: (/* @__PURE__ */ flatten(result.issues)).root ?? [],
+              formErrors: v__namespace.flatten(result.issues).root ?? [],
               fieldErrors: flattenValibotIssues(result.issues)
             }
           };
@@ -1695,9 +1226,7 @@ const valibotQrl = (qrl) => {
 };
 const valibot$ = /* @__PURE__ */ core.implicit$FirstArg(valibotQrl);
 const flattenZodIssues = (issues) => {
-  issues = Array.isArray(issues) ? issues : [
-    issues
-  ];
+  issues = Array.isArray(issues) ? issues : [issues];
   return issues.reduce((acc, issue) => {
     const isExpectingArray = "expected" in issue && issue.expected === "array";
     const hasArrayType = issue.path.some((path) => typeof path === "number") || isExpectingArray;
@@ -1722,12 +1251,12 @@ const zodQrl = (qrl) => {
       async validate(ev, inputData) {
         const schema = await qrl.resolve().then((obj) => {
           if (typeof obj === "function") {
-            obj = obj(zod.z, ev);
+            obj = obj(z__namespace, ev);
           }
-          if (obj instanceof zod.z.Schema) {
+          if (obj instanceof z__namespace.Schema) {
             return obj;
           } else {
-            return zod.z.object(obj);
+            return z__namespace.object(obj);
           }
         });
         const data = inputData ?? await ev.parseBody();
@@ -1764,98 +1293,101 @@ const serverQrl = (qrl, options) => {
   const headers = options?.headers || {};
   const origin = options?.origin || "";
   const fetchOptions = options?.fetchOptions || {};
-  function rpc() {
-    return core.$(async function(...args) {
-      const abortSignal = args.length > 0 && args[0] instanceof AbortSignal ? args.shift() : void 0;
-      if (core.isServer) {
-        let requestEvent = globalThis.qcAsyncRequestStore?.getStore();
-        if (!requestEvent) {
-          const contexts = [
-            useQwikRouterEnv()?.ev,
-            this,
-            internal._getContextEvent()
-          ];
-          requestEvent = contexts.find((v2) => v2 && Object.prototype.hasOwnProperty.call(v2, "sharedMap") && Object.prototype.hasOwnProperty.call(v2, "cookie"));
+  return core.$(async function(...args) {
+    const abortSignal = args.length > 0 && args[0] instanceof AbortSignal ? args.shift() : void 0;
+    if (core.isServer) {
+      let requestEvent = requestHandler._asyncRequestStore?.getStore();
+      if (!requestEvent) {
+        const contexts = [useQwikRouterEnv()?.ev, this, internal._getContextEvent()];
+        requestEvent = contexts.find(
+          (v2) => v2 && Object.prototype.hasOwnProperty.call(v2, "sharedMap") && Object.prototype.hasOwnProperty.call(v2, "cookie")
+        );
+      }
+      return qrl.apply(requestEvent, core.isDev ? routing.deepFreeze(args) : args);
+    } else {
+      const ctxElm = internal._getContextElement();
+      const filteredArgs = args.map((arg) => {
+        if (arg instanceof SubmitEvent && arg.target instanceof HTMLFormElement) {
+          return new FormData(arg.target);
+        } else if (arg instanceof Event) {
+          return null;
+        } else if (arg instanceof Node) {
+          return null;
         }
-        return qrl.apply(requestEvent, core.isDev ? deepFreeze(args) : args);
+        return arg;
+      });
+      const qrlHash = qrl.getHash();
+      let query = "";
+      const config = {
+        ...fetchOptions,
+        method,
+        headers: {
+          ...headers,
+          "Content-Type": "application/qwik-json",
+          Accept: "application/json, application/qwik-json, text/qwik-json-stream, text/plain",
+          // Required so we don't call accidentally
+          "X-QRL": qrlHash
+        },
+        signal: abortSignal
+      };
+      const captured = qrl.getCaptured();
+      let toSend;
+      if (captured?.length) {
+        toSend = [filteredArgs, captured];
       } else {
-        const ctxElm = internal._getContextElement();
-        const filteredArgs = args.map((arg) => {
-          if (arg instanceof SubmitEvent && arg.target instanceof HTMLFormElement) {
-            return new FormData(arg.target);
-          } else if (arg instanceof Event) {
-            return null;
-          } else if (arg instanceof Node) {
-            return null;
-          }
-          return arg;
-        });
-        const qrlHash = qrl.getHash();
-        let query = "";
-        const config = {
-          ...fetchOptions,
-          method,
-          headers: {
-            ...headers,
-            "Content-Type": "application/qwik-json",
-            Accept: "application/json, application/qwik-json, text/qwik-json-stream, text/plain",
-            // Required so we don't call accidentally
-            "X-QRL": qrlHash
-          },
-          signal: abortSignal
-        };
-        const body = await internal._serialize([
-          qrl,
-          ...filteredArgs
-        ]);
-        if (method === "GET") {
-          query += `&${QDATA_KEY}=${encodeURIComponent(body)}`;
-        } else {
-          config.body = body;
-        }
-        const res = await fetch(`${origin}?${QFN_KEY}=${qrlHash}${query}`, config);
-        const contentType = res.headers.get("Content-Type");
-        if (res.ok && contentType === "text/qwik-json-stream" && res.body) {
-          return (async function* () {
-            try {
-              for await (const result of deserializeStream(res.body, ctxElm ?? document.documentElement, abortSignal)) {
-                yield result;
-              }
-            } finally {
-              if (!abortSignal?.aborted) {
-                await res.body.cancel();
-              }
+        toSend = filteredArgs.length ? [filteredArgs] : [];
+      }
+      const body = await internal._serialize(toSend);
+      if (method === "GET") {
+        query += `&${routing.QDATA_KEY}=${encodeURIComponent(body)}`;
+      } else {
+        config.body = body;
+      }
+      const res = await fetch(`${origin}?${routing.QFN_KEY}=${qrlHash}${query}`, config);
+      const contentType = res.headers.get("Content-Type");
+      if (res.ok && contentType === "text/qwik-json-stream" && res.body) {
+        return (async function* () {
+          try {
+            for await (const result of deserializeStream(
+              res.body,
+              ctxElm ?? document.documentElement,
+              abortSignal
+            )) {
+              yield result;
+            }
+          } finally {
+            if (!abortSignal?.aborted) {
+              await res.body.cancel();
             }
-          })();
-        } else if (contentType === "application/qwik-json") {
-          const str = await res.text();
-          const [obj] = internal._deserialize(str, ctxElm ?? document.documentElement);
-          if (res.status >= 400) {
-            throw obj;
-          }
-          return obj;
-        } else if (contentType === "application/json") {
-          const obj = await res.json();
-          if (res.status >= 400) {
-            throw obj;
-          }
-          return obj;
-        } else if (contentType === "text/plain" || contentType === "text/html") {
-          const str = await res.text();
-          if (res.status >= 400) {
-            throw str;
           }
-          return str;
+        })();
+      } else if (contentType === "application/qwik-json") {
+        const str = await res.text();
+        const [obj] = internal._deserialize(str, ctxElm ?? document.documentElement);
+        if (res.status >= 400) {
+          throw obj;
         }
+        return obj;
+      } else if (contentType === "application/json") {
+        const obj = await res.json();
+        if (res.status >= 400) {
+          throw obj;
+        }
+        return obj;
+      } else if (contentType === "text/plain" || contentType === "text/html") {
+        const str = await res.text();
+        if (res.status >= 400) {
+          throw str;
+        }
+        return str;
       }
-    });
-  }
-  return rpc();
+    }
+  });
 };
 const server$ = /* @__PURE__ */ core.implicit$FirstArg(serverQrl);
 const getValidators = (rest, qrl) => {
   let id;
-  let serializationStrategy = DEFAULT_LOADERS_SERIALIZATION_STRATEGY;
+  let serializationStrategy = routing.DEFAULT_LOADERS_SERIALIZATION_STRATEGY;
   const validators = [];
   if (rest.length === 1) {
     const options = rest[0];
@@ -1901,9 +1433,7 @@ const deserializeStream = async function* (stream, ctxElm, abortSignal) {
       if (result.done) {
         break;
       }
-      buffer += decoder.decode(result.value, {
-        stream: true
-      });
+      buffer += decoder.decode(result.value, { stream: true });
       const lines = buffer.split(/\n/);
       buffer = lines.pop();
       for (const line of lines) {
@@ -1915,95 +1445,106 @@ const deserializeStream = async function* (stream, ctxElm, abortSignal) {
     reader.releaseLock();
   }
 };
-const ServiceWorkerRegister = (props) => /* @__PURE__ */ jsxRuntime.jsx("script", {
-  type: "module",
-  dangerouslySetInnerHTML: swRegister,
-  nonce: props.nonce
-});
+const ServiceWorkerRegister = (props) => /* @__PURE__ */ jsxRuntime.jsx("script", { type: "module", dangerouslySetInnerHTML: swRegister, nonce: props.nonce });
 const Form = ({ action, spaReset, reloadDocument, onSubmit$, ...rest }, key) => {
   if (action) {
     const isArrayApi = Array.isArray(onSubmit$);
     if (isArrayApi) {
-      return core.jsx("form", {
+      return core.jsx(
+        "form",
+        {
+          ...rest,
+          action: action.actionPath,
+          "preventdefault:submit": !reloadDocument,
+          onSubmit$: [
+            ...onSubmit$,
+            // action.submit "submitcompleted" event for onSubmitCompleted$ events
+            !reloadDocument ? core.$((evt) => {
+              if (!action.submitted) {
+                return action.submit(evt);
+              }
+            }) : void 0
+          ],
+          method: "post",
+          ["data-spa-reset"]: spaReset ? "true" : void 0
+        },
+        key
+      );
+    }
+    return core.jsx(
+      "form",
+      {
         ...rest,
         action: action.actionPath,
         "preventdefault:submit": !reloadDocument,
         onSubmit$: [
-          ...onSubmit$,
+          // Since v2, this fires before the action is executed so it can be prevented
+          onSubmit$,
           // action.submit "submitcompleted" event for onSubmitCompleted$ events
-          !reloadDocument ? core.$((evt) => {
-            if (!action.submitted) {
-              return action.submit(evt);
-            }
-          }) : void 0
+          !reloadDocument ? action.submit : void 0
         ],
         method: "post",
         ["data-spa-reset"]: spaReset ? "true" : void 0
-      }, key);
-    }
-    return core.jsx("form", {
-      ...rest,
-      action: action.actionPath,
-      "preventdefault:submit": !reloadDocument,
-      onSubmit$: [
-        // Since v2, this fires before the action is executed so it can be prevented
-        onSubmit$,
-        // action.submit "submitcompleted" event for onSubmitCompleted$ events
-        !reloadDocument ? action.submit : void 0
-      ],
-      method: "post",
-      ["data-spa-reset"]: spaReset ? "true" : void 0
-    }, key);
+      },
+      key
+    );
   } else {
-    return /* @__PURE__ */ jsxRuntime.jsx(GetForm, {
-      spaReset,
-      reloadDocument,
-      onSubmit$,
-      ...rest
-    }, key);
+    return /* @__PURE__ */ jsxRuntime.jsx(
+      GetForm,
+      {
+        spaReset,
+        reloadDocument,
+        onSubmit$,
+        ...rest
+      },
+      key
+    );
   }
 };
-const GetForm = core.component$(({ action: _0, spaReset, reloadDocument, onSubmit$, ...rest }) => {
-  const nav = useNavigate();
-  return /* @__PURE__ */ jsxRuntime.jsx("form", {
-    action: "get",
-    "preventdefault:submit": !reloadDocument,
-    "data-spa-reset": spaReset ? "true" : void 0,
-    ...rest,
-    onSubmit$: [
-      ...Array.isArray(onSubmit$) ? onSubmit$ : [
-        onSubmit$
-      ],
-      core.$(async (_evt, form) => {
-        const formData = new FormData(form);
-        const params = new URLSearchParams();
-        formData.forEach((value, key) => {
-          if (typeof value === "string") {
-            params.append(key, value);
-          }
-        });
-        await nav("?" + params.toString(), {
-          type: "form",
-          forceReload: true
-        });
-      }),
-      core.$((_evt, form) => {
-        if (form.getAttribute("data-spa-reset") === "true") {
-          form.reset();
-        }
-        form.dispatchEvent(new CustomEvent("submitcompleted", {
-          bubbles: false,
-          cancelable: false,
-          composed: false,
-          detail: {
-            status: 200
-          }
-        }));
-      })
-    ],
-    children: /* @__PURE__ */ jsxRuntime.jsx(core.Slot, {})
-  });
-});
+const GetForm = core.component$(
+  ({ action: _0, spaReset, reloadDocument, onSubmit$, ...rest }) => {
+    const nav = useNavigate();
+    return /* @__PURE__ */ jsxRuntime.jsx(
+      "form",
+      {
+        action: "get",
+        "preventdefault:submit": !reloadDocument,
+        "data-spa-reset": spaReset ? "true" : void 0,
+        ...rest,
+        onSubmit$: [
+          ...Array.isArray(onSubmit$) ? onSubmit$ : [onSubmit$],
+          core.$(async (_evt, form) => {
+            const formData = new FormData(form);
+            const params = new URLSearchParams();
+            formData.forEach((value, key) => {
+              if (typeof value === "string") {
+                params.append(key, value);
+              }
+            });
+            await nav("?" + params.toString(), { type: "form", forceReload: true });
+          }),
+          core.$((_evt, form) => {
+            if (form.getAttribute("data-spa-reset") === "true") {
+              form.reset();
+            }
+            form.dispatchEvent(
+              new CustomEvent("submitcompleted", {
+                bubbles: false,
+                cancelable: false,
+                composed: false,
+                detail: {
+                  status: 200
+                }
+              })
+            );
+          })
+          // end of array
+        ],
+        children: /* @__PURE__ */ jsxRuntime.jsx(core.Slot, {})
+      }
+    );
+  }
+);
 const untypedAppUrl = function appUrl(route, params, paramsPrefix = "") {
   const path = route.split("/");
   for (let i = 0; i < path.length; i++) {
@@ -2041,52 +1582,47 @@ function omitProps(obj, keys) {
   return omittedObj;
 }
 const createRenderer = (getOptions) => {
-  return (opts) => {
+  return ((opts) => {
     const { jsx, options } = getOptions(opts);
     return server.renderToStream(jsx, options);
-  };
+  });
 };
 const DocumentHeadTags = core.component$((props) => {
   let head = useDocumentHead();
   if (props) {
-    head = {
-      ...head,
-      ...props
-    };
+    head = { ...head, ...props };
   }
-  return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, {
-    children: [
-      head.title && /* @__PURE__ */ jsxRuntime.jsx("title", {
-        children: head.title
-      }),
-      head.meta.map((m) => /* @__PURE__ */ jsxRuntime.jsx("meta", {
-        ...m
-      })),
-      head.links.map((l) => /* @__PURE__ */ jsxRuntime.jsx("link", {
-        ...l
-      })),
-      head.styles.map((s) => {
-        const props2 = s.props || s;
-        return /* @__PURE__ */ core.createElement("style", {
+  return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+    head.title && /* @__PURE__ */ jsxRuntime.jsx("title", { children: head.title }),
+    head.meta.map((m) => /* @__PURE__ */ jsxRuntime.jsx("meta", { ...m })),
+    head.links.map((l) => /* @__PURE__ */ jsxRuntime.jsx("link", { ...l })),
+    head.styles.map((s) => {
+      const props2 = s.props || s;
+      return /* @__PURE__ */ core.createElement(
+        "style",
+        {
           ...props2,
           dangerouslySetInnerHTML: s.style || props2.dangerouslySetInnerHTML,
           key: s.key
-        });
-      }),
-      head.scripts.map((s) => {
-        const props2 = s.props || s;
-        return /* @__PURE__ */ core.createElement("script", {
+        }
+      );
+    }),
+    head.scripts.map((s) => {
+      const props2 = s.props || s;
+      return /* @__PURE__ */ core.createElement(
+        "script",
+        {
           ...props2,
           dangerouslySetInnerHTML: s.script || props2.dangerouslySetInnerHTML,
           key: s.key
-        });
-      })
-    ]
-  });
+        }
+      );
+    })
+  ] });
 });
 Object.defineProperty(exports, "z", {
   enumerable: true,
-  get: () => zod.z
+  get: () => z.z
 });
 exports.DocumentHeadTags = DocumentHeadTags;
 exports.ErrorBoundary = ErrorBoundary;