@qwik.dev/router 2.0.0-beta.35 → 2.0.0-beta.37

package/lib/chunks/{routing.qwik.mjs → head.qwik.mjs}

@@ -1,381 +1,6 @@
-import { createAsyncQrl, inlinedQrl, _captures, isBrowser, withLocale } from '@qwik.dev/core';
-import { _deserialize, _UNINITIALIZED } from '@qwik.dev/core/internal';
-import { p } from '@qwik.dev/core/preloader';
-import { d as deepFreeze } from './deepFreeze.qwik.mjs';
-
-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 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 loadClientData = async (url, 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, 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 = _deserialize(text);
-          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 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 createAsyncQrl(/* @__PURE__ */ inlinedQrl(async () => {
-    const loaderId2 = _captures[0], loadersObject2 = _captures[1], url2 = _captures[2];
-    if (isBrowser && loadersObject2[loaderId2] === _UNINITIALIZED) {
-      const data = await loadClientData(url2, {
-        loaderIds: [
-          loaderId2
-        ]
-      });
-      loadersObject2[loaderId2] = data?.loaders[loaderId2] ?? _UNINITIALIZED;
-    }
-    return loadersObject2[loaderId2];
-  }, "createLoaderSignal_createAsync_CFLMoh8rnzw", [
-    loaderId,
-    loadersObject,
-    url
-  ]), {
-    container,
-    serializationStrategy
-  });
-};
-
-const newScrollState = () => {
-  return {
-    x: 0,
-    y: 0,
-    w: 0,
-    h: 0
-  };
-};
-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 preloadRouteBundles = (path, probability = 0.8) => {
-  if (isBrowser) {
-    path = path.endsWith("/") ? path : path + "/";
-    path = path.length > 1 && path.startsWith("/") ? path.slice(1) : path;
-    p(path, probability);
-  }
-};
-
-const mergeArray = (existingArr, newArr) => {
-  if (Array.isArray(newArr)) {
-    for (const newItem of newArr) {
-      if (typeof newItem.key === "string") {
-        const existingIndex = existingArr.findIndex((i) => i.key === newItem.key);
-        if (existingIndex > -1) {
-          existingArr[existingIndex] = newItem;
-          continue;
-        }
-      }
-      existingArr.push(newItem);
-    }
-  }
-};
-const resolveDocumentHead = (resolvedHead, updatedHead) => {
-  if (typeof updatedHead.title === "string") {
-    resolvedHead.title = updatedHead.title;
-  }
-  mergeArray(resolvedHead.meta, updatedHead.meta);
-  mergeArray(resolvedHead.links, updatedHead.links);
-  mergeArray(resolvedHead.styles, updatedHead.styles);
-  mergeArray(resolvedHead.scripts, updatedHead.scripts);
-  Object.assign(resolvedHead.frontmatter, updatedHead.frontmatter);
-};
-const createDocumentHead = (defaults, manifestHash) => ({
-  title: defaults?.title || "",
-  meta: [
-    ...defaults?.meta || []
-  ],
-  links: [
-    ...defaults?.links || []
-  ],
-  styles: [
-    ...defaults?.styles || []
-  ],
-  scripts: [
-    ...defaults?.scripts || []
-  ],
-  frontmatter: {
-    ...defaults?.frontmatter
-  },
-  manifestHash: manifestHash || "dev"
-});
-const resolveRouteConfig = (resolveValue, routeLocation, contentModules, locale, status, defaults) => withLocale(locale, () => {
-  const head = createDocumentHead(defaults);
-  let eTag;
-  let cacheKey;
-  const fns = [];
-  for (let i = 0; i < contentModules.length; i++) {
-    const contentModule = contentModules[i];
-    if (!contentModule) {
-      continue;
-    }
-    const isLast = i === contentModules.length - 1;
-    let config;
-    if (contentModule.routeConfig) {
-      config = contentModule.routeConfig;
-    } else if (contentModule.head) {
-      const synthetic = {
-        head: void 0
-      };
-      const headExport = contentModule.head;
-      if (typeof headExport === "function") {
-        const mod = contentModule;
-        config = (props) => ({
-          head: headExport(props),
-          eTag: mod.eTag,
-          cacheKey: mod.cacheKey
-        });
-      } else {
-        synthetic.head = headExport;
-        const mod = contentModule;
-        if (mod.eTag !== void 0) {
-          synthetic.eTag = mod.eTag;
-        }
-        if (mod.cacheKey !== void 0) {
-          synthetic.cacheKey = mod.cacheKey;
-        }
-        config = synthetic;
-      }
-    } else {
-      const mod = contentModule;
-      if (mod.eTag !== void 0 || mod.cacheKey !== void 0) {
-        config = {
-          eTag: mod.eTag,
-          cacheKey: mod.cacheKey
-        };
-      }
-    }
-    if (!config) {
-      continue;
-    }
-    if (typeof config === "function") {
-      fns.unshift({
-        fn: config,
-        isLast
-      });
-    } else {
-      if (config.head) {
-        resolveDocumentHead(head, config.head);
-      }
-      if (config.eTag !== void 0) {
-        eTag = config.eTag;
-      }
-      if (config.cacheKey !== void 0) {
-        cacheKey = config.cacheKey;
-      }
-    }
-  }
-  if (fns.length) {
-    const headProps = {
-      head,
-      status,
-      withLocale: (fn) => fn(),
-      resolveValue,
-      ...routeLocation
-    };
-    for (const { fn } of fns) {
-      const result = fn(headProps);
-      if (result.head) {
-        resolveDocumentHead(head, result.head);
-      }
-      if (result.eTag !== void 0) {
-        eTag = result.eTag;
-      }
-      if (result.cacheKey !== void 0) {
-        cacheKey = result.cacheKey;
-      }
-    }
-  }
-  return {
-    head,
-    eTag,
-    cacheKey
-  };
-});
-const resolveHead = (endpoint, routeLocation, contentModules, locale, defaults) => {
-  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.");
-      }
-    }
-    const data = endpoint.loaders[id];
-    if (isPromise(data)) {
-      throw new Error("Loaders returning a promise can not be resolved for the head function.");
-    }
-    return data;
-  };
-  return resolveRouteConfig(getData, routeLocation, contentModules, locale, endpoint.status, defaults).head;
-};
+import { e as ensureSlash } from './pathname.mjs';
+import { v as deepFreeze } from './deepFreeze.qwik.mjs';
+import { withLocale } from '@qwik.dev/core';
 
 const MODULE_CACHE = /* @__PURE__ */ new WeakMap();
 const httpErrorLoader = () => import('./http-error.qwik.mjs');
@@ -385,10 +10,12 @@ function walkTrieKeys(root, keys) {
   if (node._L) {
     layouts.push(node._L);
   }
-  for (const key of keys) {
+  for (let i = 0; i < keys.length; i++) {
+    const key = keys[i];
     let next = node[key];
     if (!next && node._M) {
-      for (const group of node._M) {
+      for (let j = 0; j < node._M.length; j++) {
+        const group = node._M[j];
         next = group[key];
         if (next) {
           if (group._L) {
@@ -411,11 +38,21 @@ function walkTrieKeys(root, keys) {
     layouts
   };
 }
-function collectNodeMeta(node, groups, layouts, errorLoaderRef, notFoundLoaderRef, menuLoaderRef) {
-  for (const g of groups) {
+function collectNodeMeta(node, groups, layouts, errorLoaderRef, notFoundLoaderRef, menuLoaderRef, loaderHashes, loaderPathsByHash, matchedPathname = "/") {
+  for (let j = 0; j < groups.length; j++) {
+    const g = groups[j];
     if (g._L) {
       layouts.push(g._L);
     }
+    if (g._R && loaderHashes) {
+      loaderHashes.push(...g._R);
+      if (loaderPathsByHash) {
+        for (let i = 0; i < g._R.length; i++) {
+          const hash = g._R[i];
+          loaderPathsByHash[hash] = matchedPathname;
+        }
+      }
+    }
     if (g._E) {
       errorLoaderRef.v = g._E;
     }
@@ -429,6 +66,15 @@ function collectNodeMeta(node, groups, layouts, errorLoaderRef, notFoundLoaderRe
   if (node._L) {
     layouts.push(node._L);
   }
+  if (node._R && loaderHashes) {
+    loaderHashes.push(...node._R);
+    if (loaderPathsByHash) {
+      for (let i = 0; i < node._R.length; i++) {
+        const hash = node._R[i];
+        loaderPathsByHash[hash] = matchedPathname;
+      }
+    }
+  }
   if (node._E) {
     errorLoaderRef.v = node._E;
   }
@@ -439,7 +85,7 @@ function collectNodeMeta(node, groups, layouts, errorLoaderRef, notFoundLoaderRe
     menuLoaderRef.v = node._N;
   }
 }
-function tryWildcardMatch(node, part, partLower, parts, partIndex, params) {
+function tryWildcardMatch(node, part, partLower, parts, partIndex) {
   let next = node._W;
   if (next) {
     const prefix = next._0;
@@ -450,20 +96,24 @@ function tryWildcardMatch(node, part, partLower, parts, partIndex, params) {
       if (partLower.length > pre.length + suf.length && (!pre || partLower.startsWith(pre.toLowerCase())) && (!suf || partLower.endsWith(suf.toLowerCase()))) {
         const paramName = next._P;
         const value = part.slice(pre.length, suf ? part.length - suf.length : void 0);
-        params[paramName] = value;
         return {
           next,
           routePart: `${pre}[${paramName}]${suf}`,
-          done: false
+          done: false,
+          kind: 1,
+          paramName,
+          paramValue: value
         };
       }
     } else {
       const paramName = next._P;
-      params[paramName] = part;
       return {
         next,
         routePart: `[${paramName}]`,
-        done: false
+        done: false,
+        kind: 1,
+        paramName,
+        paramValue: part
       };
     }
   }
@@ -471,35 +121,39 @@ function tryWildcardMatch(node, part, partLower, parts, partIndex, params) {
   if (next) {
     const paramName = next._P;
     const restValue = parts.slice(partIndex).join("/");
-    params[paramName] = restValue;
     return {
       next,
       routePart: `[...${paramName}]`,
-      done: true
+      done: true,
+      kind: 2,
+      paramName,
+      paramValue: restValue
     };
   }
   return void 0;
 }
-function findChild(node, part, partLower, parts, partIndex, params) {
+function findChild(node, part, partLower, parts, partIndex) {
   const exact = node[partLower];
   if (exact) {
     return {
       next: exact,
       groups: [],
       routePart: part,
-      done: false
+      done: false,
+      kind: 0
     };
   }
   if (node._M) {
-    for (const group of node._M) {
-      const groupResult = findChild(group, part, partLower, parts, partIndex, params);
+    for (let j = 0; j < node._M.length; j++) {
+      const group = node._M[j];
+      const groupResult = findChild(group, part, partLower, parts, partIndex);
       if (groupResult) {
         groupResult.groups.unshift(group);
         return groupResult;
       }
     }
   }
-  const wildcard = tryWildcardMatch(node, part, partLower, parts, partIndex, params);
+  const wildcard = tryWildcardMatch(node, part, partLower, parts, partIndex);
   if (wildcard) {
     return {
       ...wildcard,
@@ -516,7 +170,8 @@ function findIndexNode(node) {
     };
   }
   if (node._M) {
-    for (const group of node._M) {
+    for (let j = 0; j < node._M.length; j++) {
+      const group = node._M[j];
       const result = findIndexNode(group);
       if (result) {
         if (result.target !== group) {
@@ -540,7 +195,8 @@ function resolveLoaders(root, node, gatheredLayouts) {
     if (!targetNode._I && targetNode._G == null) {
       const indexResult = findIndexNode(targetNode);
       if (indexResult) {
-        for (const g of indexResult.groups) {
+        for (let j = 0; j < indexResult.groups.length; j++) {
+          const g = indexResult.groups[j];
           if (g._L) {
             targetLayouts.push(g._L);
           }
@@ -573,7 +229,8 @@ function findRestNode(node) {
     };
   }
   if (node._M) {
-    for (const group of node._M) {
+    for (let j = 0; j < node._M.length; j++) {
+      const group = node._M[j];
       const result = findRestNode(group);
       if (result) {
         result.groups.unshift(group);
@@ -588,6 +245,8 @@ function matchRouteTree(root = {}, pathname) {
   const params = {};
   const routeParts = [];
   const layouts = [];
+  const loaderHashes = [];
+  const loaderPathsByHash = {};
   const errorLoaderRef = {
     v: void 0
   };
@@ -600,6 +259,13 @@ function matchRouteTree(root = {}, pathname) {
   if (root._L) {
     layouts.push(root._L);
   }
+  if (root._R) {
+    loaderHashes.push(...root._R);
+    for (let i2 = 0; i2 < root._R.length; i2++) {
+      const hash = root._R[i2];
+      loaderPathsByHash[hash] = "/";
+    }
+  }
   if (root._E) {
     errorLoaderRef.v = root._E;
   }
@@ -618,7 +284,12 @@ function matchRouteTree(root = {}, pathname) {
   for (; !done && i < len; i++) {
     const part = parts[i];
     const partLower = part.toLowerCase();
-    const restInfo = findRestNode(node);
+    const found = findChild(node, part, partLower, parts, i);
+    if (!found) {
+      matched = false;
+      break;
+    }
+    const restInfo = found.kind === 1 ? findRestNode(node) : void 0;
     if (restInfo) {
       restFallback = {
         aNode: restInfo.next,
@@ -634,26 +305,28 @@ function matchRouteTree(root = {}, pathname) {
         layouts: [
           ...layouts
         ],
+        loaderPathsByHash: {
+          ...loaderPathsByHash
+        },
         errorLoader: errorLoaderRef.v,
         notFoundLoader: notFoundLoaderRef.v,
         menuLoader: menuLoaderRef.v
       };
     }
-    const found = findChild(node, part, partLower, parts, i, params);
-    if (!found) {
-      matched = false;
-      break;
+    if (found.paramName) {
+      params[found.paramName] = found.paramValue;
     }
     routeParts.push(found.routePart);
     done = found.done;
     node = found.next;
-    collectNodeMeta(node, found.groups, layouts, errorLoaderRef, notFoundLoaderRef, menuLoaderRef);
+    const matchedPathname = `/${parts.slice(0, found.done ? len : i + 1).join("/")}/`;
+    collectNodeMeta(node, found.groups, layouts, errorLoaderRef, notFoundLoaderRef, menuLoaderRef, loaderHashes, loaderPathsByHash, matchedPathname);
   }
   if (matched && !done && i === len) {
     if (!node._I && node._G == null) {
       const indexResult = findIndexNode(node);
       if (indexResult) {
-        collectNodeMeta(indexResult.target, indexResult.groups, layouts, errorLoaderRef, notFoundLoaderRef, menuLoaderRef);
+        collectNodeMeta(indexResult.target, indexResult.groups, layouts, errorLoaderRef, notFoundLoaderRef, menuLoaderRef, loaderHashes, loaderPathsByHash, pathname);
         node = indexResult.target;
       }
     }
@@ -677,7 +350,7 @@ function matchRouteTree(root = {}, pathname) {
         const paramName = next._P;
         params[paramName] = "";
         routeParts.push(`[...${paramName}]`);
-        collectNodeMeta(next, restInfo.groups, layouts, errorLoaderRef, notFoundLoaderRef, menuLoaderRef);
+        collectNodeMeta(next, restInfo.groups, layouts, errorLoaderRef, notFoundLoaderRef, menuLoaderRef, loaderHashes, loaderPathsByHash, pathname);
         node = next;
       }
     }
@@ -696,6 +369,9 @@ function matchRouteTree(root = {}, pathname) {
     const fbLayouts = [
       ...fb.layouts
     ];
+    const fbLoaderPathsByHash = {
+      ...fb.loaderPathsByHash
+    };
     const fbErrorRef = {
       v: fb.errorLoader
     };
@@ -705,7 +381,8 @@ function matchRouteTree(root = {}, pathname) {
     const fbMenuRef = {
       v: fb.menuLoader
     };
-    collectNodeMeta(fb.aNode, fb.groups, fbLayouts, fbErrorRef, fbNotFoundRef, fbMenuRef);
+    const fbLoaderHashes = [];
+    collectNodeMeta(fb.aNode, fb.groups, fbLayouts, fbErrorRef, fbNotFoundRef, fbMenuRef, fbLoaderHashes, fbLoaderPathsByHash, pathname);
     const fbLoaders = resolveLoaders(root, fb.aNode, fbLayouts);
     if (fbLoaders) {
       return {
@@ -714,6 +391,8 @@ function matchRouteTree(root = {}, pathname) {
         routeParts: fbRouteParts,
         notFound: false,
         routeBundleNames: fb.aNode._B,
+        loaderHashes: fbLoaderHashes.length > 0 ? fbLoaderHashes : void 0,
+        loaderPathsByHash: Object.keys(fbLoaderPathsByHash).length > 0 ? fbLoaderPathsByHash : void 0,
         menuLoader: fbMenuRef.v,
         errorLoader: fbErrorRef.v,
         notFoundLoader: fbNotFoundRef.v
@@ -733,17 +412,29 @@ function matchRouteTree(root = {}, pathname) {
       routeParts,
       notFound: true,
       routeBundleNames: void 0,
+      loaderHashes: void 0,
+      loaderPathsByHash: void 0,
       menuLoader: menuLoaderRef.v,
       errorLoader: errorLoaderRef.v,
       notFoundLoader: notFoundLoaderRef.v
     };
   }
+  if (node._R) {
+    loaderHashes.push(...node._R);
+    const matchedPathname = ensureSlash(pathname);
+    for (let i2 = 0; i2 < node._R.length; i2++) {
+      const hash = node._R[i2];
+      loaderPathsByHash[hash] = matchedPathname;
+    }
+  }
   return {
     loaders,
     params,
     routeParts,
     notFound: false,
     routeBundleNames: node._B,
+    loaderHashes: loaderHashes.length > 0 ? loaderHashes : void 0,
+    loaderPathsByHash: Object.keys(loaderPathsByHash).length > 0 ? loaderPathsByHash : void 0,
     menuLoader: menuLoaderRef.v,
     errorLoader: errorLoaderRef.v,
     notFoundLoader: notFoundLoaderRef.v
@@ -769,19 +460,18 @@ const loadModule = (moduleLoader, pendingLoads, moduleSetter, cacheModules) => {
     }
   }
 };
-const loadRoute = async (routes, cacheModules, pathname, isInternal) => {
+const loadRoute = async (routes, cacheModules, pathname) => {
   const result = matchRouteTree(routes, pathname);
-  const { loaders, params, routeParts, notFound, routeBundleNames, menuLoader, errorLoader, notFoundLoader } = result;
+  const { loaders, params, routeParts, notFound, routeBundleNames, loaderHashes, loaderPathsByHash, menuLoader, errorLoader, notFoundLoader } = result;
   const routeName = "/" + routeParts.join("/");
   const modules = new Array(loaders.length);
   const pendingLoads = [];
-  loaders.forEach((moduleLoader, i) => {
+  for (let i = 0; i < loaders.length; i++) {
+    const moduleLoader = loaders[i];
     loadModule(moduleLoader, pendingLoads, (routeModule) => modules[i] = routeModule, cacheModules);
-  });
-  let menu = void 0;
-  if (!isInternal) {
-    loadModule(menuLoader, pendingLoads, (menuModule) => menu = menuModule?.default, cacheModules);
   }
+  let menu = void 0;
+  loadModule(menuLoader, pendingLoads, (menuModule) => menu = menuModule?.default, cacheModules);
   if (notFound && notFoundLoader) {
     let notFoundMod;
     let errorMod;
@@ -801,7 +491,9 @@ const loadRoute = async (routes, cacheModules, pathname, isInternal) => {
       $menu$: deepFreeze(menu),
       $routeBundleNames$: routeBundleNames,
       $notFound$: notFound,
-      $errorLoader$: errorLoader
+      $errorLoader$: errorLoader,
+      $loaders$: loaderHashes,
+      $loaderPaths$: loaderPathsByHash
     };
   }
   if (pendingLoads.length > 0) {
@@ -814,8 +506,199 @@ const loadRoute = async (routes, cacheModules, pathname, isInternal) => {
     $menu$: deepFreeze(menu),
     $routeBundleNames$: routeBundleNames,
     $notFound$: notFound,
-    $errorLoader$: errorLoader
+    $errorLoader$: errorLoader,
+    $loaders$: loaderHashes,
+    $loaderPaths$: loaderPathsByHash
+  };
+};
+
+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 isSamePathname = ({ pathname: a }, { pathname: b }) => {
+  const lDiff = Math.abs(a.length - b.length);
+  return lDiff === 0 ? a === b : lDiff === 1 && ensureSlash(a) === ensureSlash(b);
+};
+const isSameSearchQuery = (a, b) => a.search === b.search;
+const isSamePath = (a, b) => isSameSearchQuery(a, b) && isSamePathname(a, b);
+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 mergeArray = (existingArr, newArr) => {
+  if (Array.isArray(newArr)) {
+    for (const newItem of newArr) {
+      if (typeof newItem.key === "string") {
+        const existingIndex = existingArr.findIndex((i) => i.key === newItem.key);
+        if (existingIndex > -1) {
+          existingArr[existingIndex] = newItem;
+          continue;
+        }
+      }
+      existingArr.push(newItem);
+    }
+  }
+};
+const resolveDocumentHead = (resolvedHead, updatedHead) => {
+  if (typeof updatedHead.title === "string") {
+    resolvedHead.title = updatedHead.title;
+  }
+  mergeArray(resolvedHead.meta, updatedHead.meta);
+  mergeArray(resolvedHead.links, updatedHead.links);
+  mergeArray(resolvedHead.styles, updatedHead.styles);
+  mergeArray(resolvedHead.scripts, updatedHead.scripts);
+  Object.assign(resolvedHead.frontmatter, updatedHead.frontmatter);
+};
+const createDocumentHead = (defaults, manifestHash) => ({
+  title: defaults?.title || "",
+  meta: [
+    ...defaults?.meta || []
+  ],
+  links: [
+    ...defaults?.links || []
+  ],
+  styles: [
+    ...defaults?.styles || []
+  ],
+  scripts: [
+    ...defaults?.scripts || []
+  ],
+  frontmatter: {
+    ...defaults?.frontmatter
+  },
+  manifestHash: manifestHash || "dev"
+});
+const resolveRouteConfig = (resolveValue, routeLocation, contentModules, locale, status, defaults) => withLocale(locale, () => {
+  const head = createDocumentHead(defaults);
+  let eTag;
+  let cacheKey;
+  const fns = [];
+  for (let i = 0; i < contentModules.length; i++) {
+    const contentModule = contentModules[i];
+    if (!contentModule) {
+      continue;
+    }
+    const isLast = i === contentModules.length - 1;
+    let config;
+    if (contentModule.routeConfig) {
+      config = contentModule.routeConfig;
+    } else if (contentModule.head) {
+      const synthetic = {
+        head: void 0
+      };
+      const headExport = contentModule.head;
+      if (typeof headExport === "function") {
+        const mod = contentModule;
+        config = (props) => ({
+          head: headExport(props),
+          eTag: mod.eTag,
+          cacheKey: mod.cacheKey
+        });
+      } else {
+        synthetic.head = headExport;
+        const mod = contentModule;
+        if (mod.eTag !== void 0) {
+          synthetic.eTag = mod.eTag;
+        }
+        if (mod.cacheKey !== void 0) {
+          synthetic.cacheKey = mod.cacheKey;
+        }
+        config = synthetic;
+      }
+    } else {
+      const mod = contentModule;
+      if (mod.eTag !== void 0 || mod.cacheKey !== void 0) {
+        config = {
+          eTag: mod.eTag,
+          cacheKey: mod.cacheKey
+        };
+      }
+    }
+    if (!config) {
+      continue;
+    }
+    if (typeof config === "function") {
+      fns.unshift({
+        fn: config,
+        isLast
+      });
+    } else {
+      if (config.head) {
+        resolveDocumentHead(head, config.head);
+      }
+      if (config.eTag !== void 0) {
+        eTag = config.eTag;
+      }
+      if (config.cacheKey !== void 0) {
+        cacheKey = config.cacheKey;
+      }
+    }
+  }
+  if (fns.length) {
+    const headProps = {
+      head,
+      status,
+      withLocale: (fn) => fn(),
+      resolveValue,
+      ...routeLocation
+    };
+    for (const { fn } of fns) {
+      const result = fn(headProps);
+      if (result.head) {
+        resolveDocumentHead(head, result.head);
+      }
+      if (result.eTag !== void 0) {
+        eTag = result.eTag;
+      }
+      if (result.cacheKey !== void 0) {
+        cacheKey = result.cacheKey;
+      }
+    }
+  }
+  return {
+    head,
+    eTag,
+    cacheKey
+  };
+});
+const resolveHead = (actionData, loaderState, routeLocation, contentModules, locale, defaults) => {
+  const getData = (loaderOrAction) => {
+    const id = loaderOrAction.__id;
+    const signal = loaderState?.[id];
+    if (signal) {
+      return signal.value;
+    }
+    if (actionData?.action === id) {
+      return actionData.actionResult;
+    }
+    return void 0;
   };
+  return resolveRouteConfig(getData, routeLocation, contentModules, locale, actionData?.status ?? 200, defaults).head;
 };
 
-export { CLIENT_DATA_CACHE as C, DEFAULT_LOADERS_SERIALIZATION_STRATEGY as D, Q_ROUTE as Q, createDocumentHead as a, loadRoute as b, createLoaderSignal as c, isSameOrigin as d, clientNavigate as e, toPath as f, getClientNavPath as g, QFN_KEY as h, isSamePath as i, QACTION_KEY as j, QDATA_KEY as k, loadClientData as l, resolveRouteConfig as m, QLOADER_KEY as n, isPromise as o, preloadRouteBundles as p, resolveHead as r, shouldPreload as s, toUrl as t };
+export { toUrl as a, isSameOrigin as b, createDocumentHead as c, resolveRouteConfig as d, isPromise as e, getClientNavPath as g, isSamePath as i, loadRoute as l, resolveHead as r, shouldPreload as s, toPath as t };