@lolyjs/core 0.2.0-alpha.9 → 0.3.0-alpha.0

package/dist/react/cache.cjs

@@ -113,14 +113,16 @@ function deleteCacheEntry(key) {
 function buildDataUrl(url) {
   return url + (url.includes("?") ? "&" : "?") + "__fw_data=1";
 }
-async function fetchRouteDataOnce(url) {
+async function fetchRouteDataOnce(url, skipLayoutHooks = true) {
   const dataUrl = buildDataUrl(url);
-  const res = await fetch(dataUrl, {
-    headers: {
-      "x-fw-data": "1",
-      Accept: "application/json"
-    }
-  });
+  const headers = {
+    "x-fw-data": "1",
+    Accept: "application/json"
+  };
+  if (skipLayoutHooks) {
+    headers["x-skip-layout-hooks"] = "true";
+  }
+  const res = await fetch(dataUrl, { headers });
   let json = {};
   try {
     const text = await res.text();
@@ -140,7 +142,7 @@ async function fetchRouteDataOnce(url) {
   };
   return result;
 }
-function revalidatePath(path) {
+function revalidatePath(path, skipAutoRevalidate = false) {
   const normalizedPath = path.split("?")[0];
   const hasQueryParams = path.includes("?");
   const keysForPath = pathIndex.get(normalizedPath);
@@ -167,7 +169,7 @@ function revalidatePath(path) {
   keysToDelete.forEach((key) => {
     deleteCacheEntry(key);
   });
-  if (typeof window !== "undefined") {
+  if (!skipAutoRevalidate && typeof window !== "undefined") {
     const currentPathname = window.location.pathname;
     const currentSearch = window.location.search;
     const matchesCurrentPath = normalizedPath === currentPathname;
@@ -193,29 +195,60 @@ function revalidatePath(path) {
     }
   }
 }
+var isRevalidating = false;
 async function revalidate() {
   if (typeof window === "undefined") {
     throw new Error("revalidate() can only be called on the client");
   }
-  const pathname = window.location.pathname + window.location.search;
-  revalidatePath(pathname);
-  const freshData = await getRouteData(pathname, { revalidate: true });
-  if (window.__FW_DATA__ && freshData.ok && freshData.json) {
-    const currentData = window.__FW_DATA__;
-    window.__FW_DATA__ = {
-      ...currentData,
-      pathname: pathname.split("?")[0],
-      params: freshData.json.params || currentData.params || {},
-      props: freshData.json.props || currentData.props || {},
-      metadata: freshData.json.metadata ?? currentData.metadata ?? null,
-      notFound: freshData.json.notFound ?? false,
-      error: freshData.json.error ?? false
-    };
-    window.dispatchEvent(new CustomEvent("fw-data-refresh", {
-      detail: { data: freshData }
-    }));
+  if (isRevalidating) {
+    const key = buildDataUrl(window.location.pathname + window.location.search);
+    const entry = dataCache.get(key);
+    if (entry && entry.status === "pending") {
+      return entry.promise;
+    }
+  }
+  isRevalidating = true;
+  try {
+    const pathname = window.location.pathname + window.location.search;
+    revalidatePath(pathname, true);
+    const freshData = await getRouteData(pathname, { revalidate: true });
+    if (window.__FW_DATA__ && freshData.ok && freshData.json) {
+      const currentData = window.__FW_DATA__;
+      if (freshData.json.layoutProps !== void 0 && freshData.json.layoutProps !== null) {
+        window.__FW_LAYOUT_PROPS__ = freshData.json.layoutProps;
+      }
+      let combinedProps = currentData.props || {};
+      if (freshData.json.layoutProps !== void 0 && freshData.json.layoutProps !== null) {
+        combinedProps = {
+          ...freshData.json.layoutProps,
+          ...freshData.json.pageProps ?? freshData.json.props ?? {}
+        };
+      } else if (freshData.json.pageProps !== void 0) {
+        const preservedLayoutProps = window.__FW_LAYOUT_PROPS__ || {};
+        combinedProps = {
+          ...preservedLayoutProps,
+          ...freshData.json.pageProps
+        };
+      } else if (freshData.json.props) {
+        combinedProps = freshData.json.props;
+      }
+      window.__FW_DATA__ = {
+        ...currentData,
+        pathname: pathname.split("?")[0],
+        params: freshData.json.params || currentData.params || {},
+        props: combinedProps,
+        metadata: freshData.json.metadata ?? currentData.metadata ?? null,
+        notFound: freshData.json.notFound ?? false,
+        error: freshData.json.error ?? false
+      };
+      window.dispatchEvent(new CustomEvent("fw-data-refresh", {
+        detail: { data: freshData }
+      }));
+    }
+    return freshData;
+  } finally {
+    isRevalidating = false;
   }
-  return freshData;
 }
 function revalidateRouteData(url) {
   revalidatePath(url);
@@ -229,7 +262,7 @@ function prefetchRouteData(url) {
     }
     return;
   }
-  const promise = fetchRouteDataOnce(url).then((value) => {
+  const promise = fetchRouteDataOnce(url, true).then((value) => {
     setCacheEntry(key, { status: "fulfilled", value });
     return value;
   }).catch((error) => {
@@ -245,7 +278,7 @@ async function getRouteData(url, options) {
     deleteCacheEntry(key);
   }
   const entry = dataCache.get(key);
-  if (entry) {
+  if (entry && !options?.revalidate) {
     if (entry.status === "fulfilled") {
       updateLRU(key);
       return entry.value;
@@ -254,12 +287,29 @@ async function getRouteData(url, options) {
       return entry.promise;
     }
   }
-  const promise = fetchRouteDataOnce(url).then((value) => {
-    setCacheEntry(key, { status: "fulfilled", value });
+  const skipLayoutHooks = !options?.revalidate;
+  const currentEntry = dataCache.get(key);
+  if (currentEntry && !options?.revalidate) {
+    if (currentEntry.status === "fulfilled") {
+      updateLRU(key);
+      return currentEntry.value;
+    }
+    if (currentEntry.status === "pending") {
+      return currentEntry.promise;
+    }
+  }
+  const promise = fetchRouteDataOnce(url, skipLayoutHooks).then((value) => {
+    const entryAfterFetch = dataCache.get(key);
+    if (!entryAfterFetch || entryAfterFetch.status === "pending") {
+      setCacheEntry(key, { status: "fulfilled", value });
+    }
     return value;
   }).catch((error) => {
     console.error("[client][cache] Error fetching route data:", error);
-    dataCache.set(key, { status: "rejected", error });
+    const entryAfterFetch = dataCache.get(key);
+    if (!entryAfterFetch || entryAfterFetch.status === "pending") {
+      dataCache.set(key, { status: "rejected", error });
+    }
     throw error;
   });
   dataCache.set(key, { status: "pending", promise });

package/dist/react/cache.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../modules/react/cache/index.ts","../../modules/react/cache/client-data-cache/index.ts"],"sourcesContent":["export * from \"./client-data-cache\";","type RouteData = {\n  ok: boolean;\n  status: number;\n  json: any;\n};\n\ntype CacheEntry =\n  | { status: \"pending\"; promise: Promise<RouteData> }\n  | { status: \"fulfilled\"; value: RouteData }\n  | { status: \"rejected\"; error: any };\n\n// Use window to guarantee a single shared cache instance\n// across all bundles/modules\nconst CACHE_KEY = \"__FW_DATA_CACHE__\";\n\n// Maximum number of entries in the cache (LRU)\nconst MAX_CACHE_SIZE = 100;\n\ntype CacheStore = {\n  data: Map<string, CacheEntry>;\n  index: Map<string, Set<string>>; // pathBase -> Set of keys\n  lru: string[]; // Ordered list: most recent at end, oldest at start\n};\n\nfunction getCacheStore(): CacheStore {\n  if (typeof window !== \"undefined\") {\n    if (!(window as any)[CACHE_KEY]) {\n      (window as any)[CACHE_KEY] = {\n        data: new Map<string, CacheEntry>(),\n        index: new Map<string, Set<string>>(),\n        lru: [],\n      };\n    }\n    return (window as any)[CACHE_KEY];\n  }\n  // Fallback for SSR (though this shouldn't be used on the client)\n  return {\n    data: new Map<string, CacheEntry>(),\n    index: new Map<string, Set<string>>(),\n    lru: [],\n  };\n}\n\nconst cacheStore = getCacheStore();\nconst dataCache = cacheStore.data;\nconst pathIndex = cacheStore.index;\nconst lru = cacheStore.lru;\n\n// Helper functions for cache management\n\n/**\n * Extract base path from a cache key (removes query params)\n */\nfunction extractPathBase(key: string): string {\n  return key.split(\"?\")[0];\n}\n\n/**\n * Add key to path index\n */\nfunction addToIndex(key: string): void {\n  const pathBase = extractPathBase(key);\n  if (!pathIndex.has(pathBase)) {\n    pathIndex.set(pathBase, new Set());\n  }\n  pathIndex.get(pathBase)!.add(key);\n}\n\n/**\n * Remove key from path index\n */\nfunction removeFromIndex(key: string): void {\n  const pathBase = extractPathBase(key);\n  const keys = pathIndex.get(pathBase);\n  if (keys) {\n    keys.delete(key);\n    if (keys.size === 0) {\n      pathIndex.delete(pathBase);\n    }\n  }\n}\n\n/**\n * Update LRU order - move key to end (most recent)\n */\nfunction updateLRU(key: string): void {\n  const index = lru.indexOf(key);\n  if (index !== -1) {\n    lru.splice(index, 1);\n  }\n  lru.push(key);\n}\n\n/**\n * Remove oldest entries if cache exceeds MAX_CACHE_SIZE\n */\nfunction evictOldest(): void {\n  while (lru.length >= MAX_CACHE_SIZE && lru.length > 0) {\n    const oldestKey = lru.shift()!;\n    dataCache.delete(oldestKey);\n    removeFromIndex(oldestKey);\n  }\n}\n\n/**\n * Set cache entry and maintain indexes\n */\nfunction setCacheEntry(key: string, entry: CacheEntry): void {\n  const existingEntry = dataCache.get(key);\n  const wasFulfilled = existingEntry?.status === \"fulfilled\";\n  \n  dataCache.set(key, entry);\n  \n  // Only track fulfilled entries in LRU and index (not pending/rejected)\n  if (entry.status === \"fulfilled\") {\n    // Add to index if it wasn't already fulfilled (new entry or transition from pending/rejected)\n    if (!wasFulfilled) {\n      addToIndex(key);\n    }\n    updateLRU(key);\n    evictOldest();\n  } else if (wasFulfilled) {\n    // If entry was fulfilled and now isn't (transitioning to pending/rejected), remove from index\n    removeFromIndex(key);\n  }\n}\n\n/**\n * Delete cache entry and clean up indexes\n */\nfunction deleteCacheEntry(key: string): void {\n  if (dataCache.has(key)) {\n    dataCache.delete(key);\n    removeFromIndex(key);\n    const lruIndex = lru.indexOf(key);\n    if (lruIndex !== -1) {\n      lru.splice(lruIndex, 1);\n    }\n  }\n}\n\nfunction buildDataUrl(url: string): string {\n  return url + (url.includes(\"?\") ? \"&\" : \"?\") + \"__fw_data=1\";\n}\n\nasync function fetchRouteDataOnce(url: string): Promise<RouteData> {\n  const dataUrl = buildDataUrl(url);\n\n  const res = await fetch(dataUrl, {\n    headers: {\n      \"x-fw-data\": \"1\",\n      Accept: \"application/json\",\n    },\n  });\n\n  let json: any = {};\n\n  try {\n    const text = await res.text();\n    if (text) {\n      json = JSON.parse(text);\n    }\n  } catch (parseError) {\n    console.error(\n      \"[client][cache] Failed to parse response as JSON:\",\n      parseError\n    );\n  }\n\n  const result: RouteData = {\n    ok: res.ok,\n    status: res.status,\n    json,\n  };\n\n  return result;\n}\n\n/**\n * Revalidates route data by removing it from the cache.\n * The next time you navigate to this route, fresh data will be fetched from the server.\n * This is a client-side function and does not require a server-side revalidation.\n *\n * @param path - The route path to revalidate (e.g., '/posts/1' or '/posts/1?page=2')\n *               If query params are not included, revalidates all variants of that route.\n *\n * @example\n * ```ts\n * // After saving something to the DB, revalidate the route\n * await saveToDatabase(data);\n * revalidatePath('/posts');\n * \n * // Revalidate a specific route with query params\n * revalidatePath('/posts?page=2');\n * ```\n */\nexport function revalidatePath(path: string): void {\n  // Normalize the base path (without query params)\n  const normalizedPath = path.split(\"?\")[0];\n  const hasQueryParams = path.includes(\"?\");\n  \n  // Get all keys for this path base from index (O(1) lookup)\n  const keysForPath = pathIndex.get(normalizedPath);\n  \n  if (!keysForPath || keysForPath.size === 0) {\n    return; // No entries to revalidate\n  }\n  \n  // If the path includes specific query params, extract them\n  let specificQueryParams: string | undefined;\n  if (hasQueryParams) {\n    const queryPart = path.split(\"?\")[1];\n    // Sort query params for consistent comparison\n    specificQueryParams = queryPart\n      .split(\"&\")\n      .filter((p) => !p.startsWith(\"__fw_data=\"))\n      .sort()\n      .join(\"&\");\n  }\n  \n  // Iterate only over keys for this path (much smaller set)\n  const keysToDelete: string[] = [];\n  for (const key of keysForPath) {\n    // If specific query params were specified, check if they match\n    if (hasQueryParams && specificQueryParams) {\n      const [, keyQuery = \"\"] = key.split(\"?\");\n      const keyQueryParams = keyQuery\n        .split(\"&\")\n        .filter((p) => !p.startsWith(\"__fw_data=\"))\n        .sort()\n        .join(\"&\");\n      \n      if (keyQueryParams === specificQueryParams) {\n        keysToDelete.push(key);\n      }\n    } else {\n      // If no specific query params, revalidate all variants\n      keysToDelete.push(key);\n    }\n  }\n  \n  // Delete matching entries\n  keysToDelete.forEach((key) => {\n    deleteCacheEntry(key);\n  });\n  \n  // If the revalidated path matches the current route, automatically refresh data\n  if (typeof window !== \"undefined\") {\n    const currentPathname = window.location.pathname;\n    const currentSearch = window.location.search;\n    const matchesCurrentPath = normalizedPath === currentPathname;\n    \n    if (matchesCurrentPath) {\n      if (hasQueryParams && specificQueryParams) {\n        const currentQueryParams = currentSearch\n          .replace(\"?\", \"\")\n          .split(\"&\")\n          .filter((p) => !p.startsWith(\"__fw_data=\"))\n          .sort()\n          .join(\"&\");\n        \n        if (currentQueryParams === specificQueryParams) {\n          revalidate().catch((err) => {\n            console.error(\n              \"[client][cache] Error revalidating current route:\",\n              err\n            );\n          });\n        }\n      } else {\n        revalidate().catch((err) => {\n          console.error(\n            \"[client][cache] Error revalidating current route:\",\n            err\n          );\n        });\n      }\n    }\n  }\n}\n\n/**\n * Revalidates and refreshes the current page data.\n * Similar to Next.js's `router.refresh()`.\n * \n * This function:\n * 1. Removes the current route from cache\n * 2. Fetches fresh data from the server\n * 3. Updates window.__FW_DATA__ with the new data\n * 4. Dispatches a 'fw-data-refresh' event for components to listen to\n * \n * @returns Promise that resolves with the fresh route data\n * \n * @example\n * ```ts\n * // Refresh current page data after a mutation\n * await revalidate();\n * ```\n */\nexport async function revalidate(): Promise<RouteData> {\n  if (typeof window === \"undefined\") {\n    throw new Error(\"revalidate() can only be called on the client\");\n  }\n\n  const pathname = window.location.pathname + window.location.search;\n  \n  // Revalidate the path (remove from cache)\n  revalidatePath(pathname);\n  \n  // Fetch fresh data\n  const freshData = await getRouteData(pathname, { revalidate: true });\n  \n  // Update window.__FW_DATA__ if it exists\n  if ((window as any).__FW_DATA__ && freshData.ok && freshData.json) {\n    const currentData = (window as any).__FW_DATA__;\n    (window as any).__FW_DATA__ = {\n      ...currentData,\n      pathname: pathname.split(\"?\")[0],\n      params: freshData.json.params || currentData.params || {},\n      props: freshData.json.props || currentData.props || {},\n      metadata: freshData.json.metadata ?? currentData.metadata ?? null,\n      notFound: freshData.json.notFound ?? false,\n      error: freshData.json.error ?? false,\n    };\n    \n    // Dispatch event for components to listen to\n    window.dispatchEvent(new CustomEvent(\"fw-data-refresh\", {\n      detail: { data: freshData },\n    }));\n  }\n  \n  return freshData;\n}\n\n/**\n * @deprecated Use `revalidatePath()` instead. This function is kept for backwards compatibility.\n */\nexport function revalidateRouteData(url: string): void {\n  revalidatePath(url);\n}\n\nexport function prefetchRouteData(url: string): void {\n  const key = buildDataUrl(url);\n\n  const cached = dataCache.get(key);\n\n  if (cached && cached.status !== \"rejected\") {\n    // Update LRU if it exists and is fulfilled\n    if (cached.status === \"fulfilled\") {\n      updateLRU(key);\n    }\n    return;\n  }\n\n  const promise = fetchRouteDataOnce(url)\n    .then((value) => {\n      setCacheEntry(key, { status: \"fulfilled\", value });\n      return value;\n    })\n    .catch((error) => {\n      console.error(\"[client][cache] Error prefetching route data:\", error);\n      dataCache.set(key, { status: \"rejected\", error });\n      throw error;\n    });\n\n  dataCache.set(key, { status: \"pending\", promise });\n}\n\nexport type GetRouteDataOptions = {\n  /**\n   * If true, forces revalidation of route data,\n   * ignoring the cache and fetching fresh data from the server.\n   * Similar to Next.js's `router.refresh()` behavior.\n   */\n  revalidate?: boolean;\n};\n\nexport async function getRouteData(\n  url: string,\n  options?: GetRouteDataOptions\n): Promise<RouteData> {\n  const key = buildDataUrl(url);\n\n  // If revalidation is requested, remove the entry from cache\n  if (options?.revalidate) {\n    deleteCacheEntry(key);\n  }\n\n  const entry = dataCache.get(key);\n\n  if (entry) {\n    if (entry.status === \"fulfilled\") {\n      // Update LRU: mark as recently used\n      updateLRU(key);\n      return entry.value;\n    }\n    if (entry.status === \"pending\") {\n      return entry.promise;\n    }\n  }\n\n  // No entry in cache, fetch it\n  const promise = fetchRouteDataOnce(url)\n    .then((value) => {\n      setCacheEntry(key, { status: \"fulfilled\", value });\n      return value;\n    })\n    .catch((error) => {\n      console.error(\"[client][cache] Error fetching route data:\", error);\n      dataCache.set(key, { status: \"rejected\", error });\n      throw error;\n    });\n\n  dataCache.set(key, { status: \"pending\", promise });\n  return promise;\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../modules/react/cache/index.ts","../../modules/react/cache/client-data-cache/index.ts"],"sourcesContent":["export * from \"./client-data-cache\";","import type { PageMetadata } from \"@router/index\";\n\n/**\n * Response data structure from server for route data requests\n */\nexport type RouteDataResponse = {\n  /** Combined props (layout + page) - kept for backward compatibility */\n  props?: Record<string, unknown>;\n  /** Layout props (from layout.server.hook.ts) - only present when layout hooks were executed */\n  layoutProps?: Record<string, unknown>;\n  /** Page props (from page.server.hook.ts) - always present in data requests */\n  pageProps?: Record<string, unknown>;\n  metadata?: PageMetadata | null;\n  theme?: string;\n  redirect?: { destination: string; permanent?: boolean };\n  notFound?: boolean;\n  error?: boolean;\n  message?: string;\n  params?: Record<string, string>;\n  /** Pathname after rewrite (for client-side route matching) */\n  pathname?: string;\n};\n\ntype RouteData = {\n  ok: boolean;\n  status: number;\n  json: RouteDataResponse;\n};\n\ntype CacheEntry =\n  | { status: \"pending\"; promise: Promise<RouteData> }\n  | { status: \"fulfilled\"; value: RouteData }\n  | { status: \"rejected\"; error: any };\n\n// Use window to guarantee a single shared cache instance\n// across all bundles/modules\nconst CACHE_KEY = \"__FW_DATA_CACHE__\";\n\n// Maximum number of entries in the cache (LRU)\nconst MAX_CACHE_SIZE = 100;\n\ntype CacheStore = {\n  data: Map<string, CacheEntry>;\n  index: Map<string, Set<string>>; // pathBase -> Set of keys\n  lru: string[]; // Ordered list: most recent at end, oldest at start\n};\n\nfunction getCacheStore(): CacheStore {\n  if (typeof window !== \"undefined\") {\n    if (!(window as any)[CACHE_KEY]) {\n      (window as any)[CACHE_KEY] = {\n        data: new Map<string, CacheEntry>(),\n        index: new Map<string, Set<string>>(),\n        lru: [],\n      };\n    }\n    return (window as any)[CACHE_KEY];\n  }\n  // Fallback for SSR (though this shouldn't be used on the client)\n  return {\n    data: new Map<string, CacheEntry>(),\n    index: new Map<string, Set<string>>(),\n    lru: [],\n  };\n}\n\nconst cacheStore = getCacheStore();\nconst dataCache = cacheStore.data;\nconst pathIndex = cacheStore.index;\nconst lru = cacheStore.lru;\n\n// Helper functions for cache management\n\n/**\n * Extract base path from a cache key (removes query params)\n */\nfunction extractPathBase(key: string): string {\n  return key.split(\"?\")[0];\n}\n\n/**\n * Add key to path index\n */\nfunction addToIndex(key: string): void {\n  const pathBase = extractPathBase(key);\n  if (!pathIndex.has(pathBase)) {\n    pathIndex.set(pathBase, new Set());\n  }\n  pathIndex.get(pathBase)!.add(key);\n}\n\n/**\n * Remove key from path index\n */\nfunction removeFromIndex(key: string): void {\n  const pathBase = extractPathBase(key);\n  const keys = pathIndex.get(pathBase);\n  if (keys) {\n    keys.delete(key);\n    if (keys.size === 0) {\n      pathIndex.delete(pathBase);\n    }\n  }\n}\n\n/**\n * Update LRU order - move key to end (most recent)\n */\nfunction updateLRU(key: string): void {\n  const index = lru.indexOf(key);\n  if (index !== -1) {\n    lru.splice(index, 1);\n  }\n  lru.push(key);\n}\n\n/**\n * Remove oldest entries if cache exceeds MAX_CACHE_SIZE\n */\nfunction evictOldest(): void {\n  while (lru.length >= MAX_CACHE_SIZE && lru.length > 0) {\n    const oldestKey = lru.shift()!;\n    dataCache.delete(oldestKey);\n    removeFromIndex(oldestKey);\n  }\n}\n\n/**\n * Set cache entry and maintain indexes\n */\nfunction setCacheEntry(key: string, entry: CacheEntry): void {\n  const existingEntry = dataCache.get(key);\n  const wasFulfilled = existingEntry?.status === \"fulfilled\";\n  \n  dataCache.set(key, entry);\n  \n  // Only track fulfilled entries in LRU and index (not pending/rejected)\n  if (entry.status === \"fulfilled\") {\n    // Add to index if it wasn't already fulfilled (new entry or transition from pending/rejected)\n    if (!wasFulfilled) {\n      addToIndex(key);\n    }\n    updateLRU(key);\n    evictOldest();\n  } else if (wasFulfilled) {\n    // If entry was fulfilled and now isn't (transitioning to pending/rejected), remove from index\n    removeFromIndex(key);\n  }\n}\n\n/**\n * Delete cache entry and clean up indexes\n */\nfunction deleteCacheEntry(key: string): void {\n  if (dataCache.has(key)) {\n    dataCache.delete(key);\n    removeFromIndex(key);\n    const lruIndex = lru.indexOf(key);\n    if (lruIndex !== -1) {\n      lru.splice(lruIndex, 1);\n    }\n  }\n}\n\nfunction buildDataUrl(url: string): string {\n  return url + (url.includes(\"?\") ? \"&\" : \"?\") + \"__fw_data=1\";\n}\n\nasync function fetchRouteDataOnce(\n  url: string,\n  skipLayoutHooks: boolean = true\n): Promise<RouteData> {\n  const dataUrl = buildDataUrl(url);\n\n  const headers: Record<string, string> = {\n    \"x-fw-data\": \"1\",\n    Accept: \"application/json\",\n  };\n\n  // Send header to skip layout hooks execution in SPA navigation\n  // Only skip if skipLayoutHooks is true (normal SPA navigation)\n  // If false (revalidate), don't send header to force execution of all hooks\n  if (skipLayoutHooks) {\n    headers[\"x-skip-layout-hooks\"] = \"true\";\n  }\n\n  const res = await fetch(dataUrl, { headers });\n\n  let json: any = {};\n\n  try {\n    const text = await res.text();\n    if (text) {\n      json = JSON.parse(text);\n    }\n  } catch (parseError) {\n    console.error(\n      \"[client][cache] Failed to parse response as JSON:\",\n      parseError\n    );\n  }\n\n  const result: RouteData = {\n    ok: res.ok,\n    status: res.status,\n    json,\n  };\n\n  return result;\n}\n\n/**\n * Revalidates route data by removing it from the cache.\n * The next time you navigate to this route, fresh data will be fetched from the server.\n * This is a client-side function and does not require a server-side revalidation.\n *\n * @param path - The route path to revalidate (e.g., '/posts/1' or '/posts/1?page=2')\n *               If query params are not included, revalidates all variants of that route.\n *\n * @example\n * ```ts\n * // After saving something to the DB, revalidate the route\n * await saveToDatabase(data);\n * revalidatePath('/posts');\n * \n * // Revalidate a specific route with query params\n * revalidatePath('/posts?page=2');\n * ```\n */\nexport function revalidatePath(path: string, skipAutoRevalidate: boolean = false): void {\n  // Normalize the base path (without query params)\n  const normalizedPath = path.split(\"?\")[0];\n  const hasQueryParams = path.includes(\"?\");\n  \n  // Get all keys for this path base from index (O(1) lookup)\n  const keysForPath = pathIndex.get(normalizedPath);\n  \n  if (!keysForPath || keysForPath.size === 0) {\n    return; // No entries to revalidate\n  }\n  \n  // If the path includes specific query params, extract them\n  let specificQueryParams: string | undefined;\n  if (hasQueryParams) {\n    const queryPart = path.split(\"?\")[1];\n    // Sort query params for consistent comparison\n    specificQueryParams = queryPart\n      .split(\"&\")\n      .filter((p) => !p.startsWith(\"__fw_data=\"))\n      .sort()\n      .join(\"&\");\n  }\n  \n  // Iterate only over keys for this path (much smaller set)\n  const keysToDelete: string[] = [];\n  for (const key of keysForPath) {\n    // If specific query params were specified, check if they match\n    if (hasQueryParams && specificQueryParams) {\n      const [, keyQuery = \"\"] = key.split(\"?\");\n      const keyQueryParams = keyQuery\n        .split(\"&\")\n        .filter((p) => !p.startsWith(\"__fw_data=\"))\n        .sort()\n        .join(\"&\");\n      \n      if (keyQueryParams === specificQueryParams) {\n        keysToDelete.push(key);\n      }\n    } else {\n      // If no specific query params, revalidate all variants\n      keysToDelete.push(key);\n    }\n  }\n  \n  // Delete matching entries\n  keysToDelete.forEach((key) => {\n    deleteCacheEntry(key);\n  });\n  \n  // If the revalidated path matches the current route, automatically refresh data\n  // UNLESS skipAutoRevalidate is true (to prevent recursive calls from revalidate())\n  if (!skipAutoRevalidate && typeof window !== \"undefined\") {\n    const currentPathname = window.location.pathname;\n    const currentSearch = window.location.search;\n    const matchesCurrentPath = normalizedPath === currentPathname;\n    \n    if (matchesCurrentPath) {\n      if (hasQueryParams && specificQueryParams) {\n        const currentQueryParams = currentSearch\n          .replace(\"?\", \"\")\n          .split(\"&\")\n          .filter((p) => !p.startsWith(\"__fw_data=\"))\n          .sort()\n          .join(\"&\");\n        \n        if (currentQueryParams === specificQueryParams) {\n          revalidate().catch((err) => {\n            console.error(\n              \"[client][cache] Error revalidating current route:\",\n              err\n            );\n          });\n        }\n      } else {\n        revalidate().catch((err) => {\n          console.error(\n            \"[client][cache] Error revalidating current route:\",\n            err\n          );\n        });\n      }\n    }\n  }\n}\n\n/**\n * Revalidates and refreshes the current page data.\n * Similar to Next.js's `router.refresh()`.\n * \n * This function:\n * 1. Removes the current route from cache\n * 2. Fetches fresh data from the server\n * 3. Updates window.__FW_DATA__ with the new data\n * 4. Dispatches a 'fw-data-refresh' event for components to listen to\n * \n * @returns Promise that resolves with the fresh route data\n * \n * @example\n * ```ts\n * // Refresh current page data after a mutation\n * await revalidate();\n * ```\n */\n// Flag to prevent recursive calls to revalidate()\nlet isRevalidating = false;\n\nexport async function revalidate(): Promise<RouteData> {\n  if (typeof window === \"undefined\") {\n    throw new Error(\"revalidate() can only be called on the client\");\n  }\n\n  // Prevent multiple simultaneous revalidations\n  if (isRevalidating) {\n    // Wait for the current revalidation to complete\n    const key = buildDataUrl(window.location.pathname + window.location.search);\n    const entry = dataCache.get(key);\n    if (entry && entry.status === \"pending\") {\n      return entry.promise;\n    }\n    // If no pending entry, something went wrong, allow the call\n  }\n\n  isRevalidating = true;\n  try {\n    const pathname = window.location.pathname + window.location.search;\n    \n    // Revalidate the path (remove from cache)\n    // Pass a flag to prevent revalidatePath from calling revalidate() again (recursive call)\n    revalidatePath(pathname, true); // true = skip auto-revalidate\n    \n    // Fetch fresh data\n    const freshData = await getRouteData(pathname, { revalidate: true });\n    \n    // Update window.__FW_DATA__ if it exists\n    if ((window as any).__FW_DATA__ && freshData.ok && freshData.json) {\n      const currentData = (window as any).__FW_DATA__;\n      \n      // Update preserved layout props if new ones were returned\n      if (freshData.json.layoutProps !== undefined && freshData.json.layoutProps !== null) {\n        (window as any).__FW_LAYOUT_PROPS__ = freshData.json.layoutProps;\n      }\n      \n      // Combine layout props (new or preserved) + page props\n      let combinedProps = currentData.props || {};\n      if (freshData.json.layoutProps !== undefined && freshData.json.layoutProps !== null) {\n        // Use new layout props\n        combinedProps = {\n          ...freshData.json.layoutProps,\n          ...(freshData.json.pageProps ?? freshData.json.props ?? {}),\n        };\n      } else if (freshData.json.pageProps !== undefined) {\n        // Use preserved layout props + new page props\n        const preservedLayoutProps = (window as any).__FW_LAYOUT_PROPS__ || {};\n        combinedProps = {\n          ...preservedLayoutProps,\n          ...freshData.json.pageProps,\n        };\n      } else if (freshData.json.props) {\n        // Fallback to combined props\n        combinedProps = freshData.json.props;\n      }\n      \n      (window as any).__FW_DATA__ = {\n        ...currentData,\n        pathname: pathname.split(\"?\")[0],\n        params: freshData.json.params || currentData.params || {},\n        props: combinedProps,\n        metadata: freshData.json.metadata ?? currentData.metadata ?? null,\n        notFound: freshData.json.notFound ?? false,\n        error: freshData.json.error ?? false,\n      };\n      \n      // Dispatch event for components to listen to\n      window.dispatchEvent(new CustomEvent(\"fw-data-refresh\", {\n        detail: { data: freshData },\n      }));\n    }\n    \n    return freshData;\n  } finally {\n    isRevalidating = false;\n  }\n}\n\n/**\n * @deprecated Use `revalidatePath()` instead. This function is kept for backwards compatibility.\n */\nexport function revalidateRouteData(url: string): void {\n  revalidatePath(url);\n}\n\nexport function prefetchRouteData(url: string): void {\n  const key = buildDataUrl(url);\n\n  const cached = dataCache.get(key);\n\n  if (cached && cached.status !== \"rejected\") {\n    // Update LRU if it exists and is fulfilled\n    if (cached.status === \"fulfilled\") {\n      updateLRU(key);\n    }\n    return;\n  }\n\n  // Prefetch uses skipLayoutHooks: true (normal navigation behavior)\n  const promise = fetchRouteDataOnce(url, true)\n    .then((value) => {\n      setCacheEntry(key, { status: \"fulfilled\", value });\n      return value;\n    })\n    .catch((error) => {\n      console.error(\"[client][cache] Error prefetching route data:\", error);\n      dataCache.set(key, { status: \"rejected\", error });\n      throw error;\n    });\n\n  dataCache.set(key, { status: \"pending\", promise });\n}\n\nexport type GetRouteDataOptions = {\n  /**\n   * If true, forces revalidation of route data,\n   * ignoring the cache and fetching fresh data from the server.\n   * Similar to Next.js's `router.refresh()` behavior.\n   */\n  revalidate?: boolean;\n};\n\nexport async function getRouteData(\n  url: string,\n  options?: GetRouteDataOptions\n): Promise<RouteData> {\n  const key = buildDataUrl(url);\n\n  // If revalidation is requested, remove the entry from cache\n  // This ensures we don't reuse pending or fulfilled entries\n  if (options?.revalidate) {\n    deleteCacheEntry(key);\n  }\n\n  const entry = dataCache.get(key);\n\n  if (entry && !options?.revalidate) {\n    // Only use cached entry if not revalidating\n    if (entry.status === \"fulfilled\") {\n      // Update LRU: mark as recently used\n      updateLRU(key);\n      return entry.value;\n    }\n    if (entry.status === \"pending\") {\n      // Return existing pending promise to avoid duplicate requests\n      return entry.promise;\n    }\n  }\n\n  // No entry in cache (or revalidating), fetch it\n  // skipLayoutHooks: true for normal SPA navigation, false when revalidating\n  const skipLayoutHooks = !options?.revalidate;\n  \n  // Check again if an entry was added while we were processing (race condition)\n  const currentEntry = dataCache.get(key);\n  if (currentEntry && !options?.revalidate) {\n    if (currentEntry.status === \"fulfilled\") {\n      updateLRU(key);\n      return currentEntry.value;\n    }\n    if (currentEntry.status === \"pending\") {\n      return currentEntry.promise;\n    }\n  }\n  \n  // Create a new promise for this fetch\n  const promise = fetchRouteDataOnce(url, skipLayoutHooks)\n    .then((value) => {\n      // Only set cache entry if this is still the current fetch for this key\n      // This prevents race conditions where multiple revalidations happen simultaneously\n      const entryAfterFetch = dataCache.get(key);\n      if (!entryAfterFetch || entryAfterFetch.status === \"pending\") {\n        setCacheEntry(key, { status: \"fulfilled\", value });\n      }\n      return value;\n    })\n    .catch((error) => {\n      console.error(\"[client][cache] Error fetching route data:\", error);\n      const entryAfterFetch = dataCache.get(key);\n      if (!entryAfterFetch || entryAfterFetch.status === \"pending\") {\n        dataCache.set(key, { status: \"rejected\", error });\n      }\n      throw error;\n    });\n\n  // Set pending entry - if revalidating, we already deleted it, so this is safe\n  dataCache.set(key, { status: \"pending\", promise });\n  \n  return promise;\n}\n"],"mappings":"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","names":[]}

package/dist/react/cache.d.mts

@@ -1,7 +1,33 @@
+import { P as PageMetadata } from '../index.types-Duhjyfit.mjs';
+import 'express';
+
+/**
+ * Response data structure from server for route data requests
+ */
+type RouteDataResponse = {
+    /** Combined props (layout + page) - kept for backward compatibility */
+    props?: Record<string, unknown>;
+    /** Layout props (from layout.server.hook.ts) - only present when layout hooks were executed */
+    layoutProps?: Record<string, unknown>;
+    /** Page props (from page.server.hook.ts) - always present in data requests */
+    pageProps?: Record<string, unknown>;
+    metadata?: PageMetadata | null;
+    theme?: string;
+    redirect?: {
+        destination: string;
+        permanent?: boolean;
+    };
+    notFound?: boolean;
+    error?: boolean;
+    message?: string;
+    params?: Record<string, string>;
+    /** Pathname after rewrite (for client-side route matching) */
+    pathname?: string;
+};
 type RouteData = {
     ok: boolean;
     status: number;
-    json: any;
+    json: RouteDataResponse;
 };
 /**
  * Revalidates route data by removing it from the cache.
@@ -21,25 +47,7 @@ type RouteData = {
  * revalidatePath('/posts?page=2');
  * ```
  */
-declare function revalidatePath(path: string): void;
-/**
- * Revalidates and refreshes the current page data.
- * Similar to Next.js's `router.refresh()`.
- *
- * This function:
- * 1. Removes the current route from cache
- * 2. Fetches fresh data from the server
- * 3. Updates window.__FW_DATA__ with the new data
- * 4. Dispatches a 'fw-data-refresh' event for components to listen to
- *
- * @returns Promise that resolves with the fresh route data
- *
- * @example
- * ```ts
- * // Refresh current page data after a mutation
- * await revalidate();
- * ```
- */
+declare function revalidatePath(path: string, skipAutoRevalidate?: boolean): void;
 declare function revalidate(): Promise<RouteData>;
 /**
  * @deprecated Use `revalidatePath()` instead. This function is kept for backwards compatibility.
@@ -56,4 +64,4 @@ type GetRouteDataOptions = {
 };
 declare function getRouteData(url: string, options?: GetRouteDataOptions): Promise<RouteData>;
 
-export { type GetRouteDataOptions, getRouteData, prefetchRouteData, revalidate, revalidatePath, revalidateRouteData };
+export { type GetRouteDataOptions, type RouteDataResponse, getRouteData, prefetchRouteData, revalidate, revalidatePath, revalidateRouteData };

package/dist/react/cache.d.ts

@@ -1,7 +1,33 @@
+import { P as PageMetadata } from '../index.types-Duhjyfit.js';
+import 'express';
+
+/**
+ * Response data structure from server for route data requests
+ */
+type RouteDataResponse = {
+    /** Combined props (layout + page) - kept for backward compatibility */
+    props?: Record<string, unknown>;
+    /** Layout props (from layout.server.hook.ts) - only present when layout hooks were executed */
+    layoutProps?: Record<string, unknown>;
+    /** Page props (from page.server.hook.ts) - always present in data requests */
+    pageProps?: Record<string, unknown>;
+    metadata?: PageMetadata | null;
+    theme?: string;
+    redirect?: {
+        destination: string;
+        permanent?: boolean;
+    };
+    notFound?: boolean;
+    error?: boolean;
+    message?: string;
+    params?: Record<string, string>;
+    /** Pathname after rewrite (for client-side route matching) */
+    pathname?: string;
+};
 type RouteData = {
     ok: boolean;
     status: number;
-    json: any;
+    json: RouteDataResponse;
 };
 /**
  * Revalidates route data by removing it from the cache.
@@ -21,25 +47,7 @@ type RouteData = {
  * revalidatePath('/posts?page=2');
  * ```
  */
-declare function revalidatePath(path: string): void;
-/**
- * Revalidates and refreshes the current page data.
- * Similar to Next.js's `router.refresh()`.
- *
- * This function:
- * 1. Removes the current route from cache
- * 2. Fetches fresh data from the server
- * 3. Updates window.__FW_DATA__ with the new data
- * 4. Dispatches a 'fw-data-refresh' event for components to listen to
- *
- * @returns Promise that resolves with the fresh route data
- *
- * @example
- * ```ts
- * // Refresh current page data after a mutation
- * await revalidate();
- * ```
- */
+declare function revalidatePath(path: string, skipAutoRevalidate?: boolean): void;
 declare function revalidate(): Promise<RouteData>;
 /**
  * @deprecated Use `revalidatePath()` instead. This function is kept for backwards compatibility.
@@ -56,4 +64,4 @@ type GetRouteDataOptions = {
 };
 declare function getRouteData(url: string, options?: GetRouteDataOptions): Promise<RouteData>;
 
-export { type GetRouteDataOptions, getRouteData, prefetchRouteData, revalidate, revalidatePath, revalidateRouteData };
+export { type GetRouteDataOptions, type RouteDataResponse, getRouteData, prefetchRouteData, revalidate, revalidatePath, revalidateRouteData };

package/dist/react/{cache.js → cache.mjs}

@@ -83,14 +83,16 @@ function deleteCacheEntry(key) {
 function buildDataUrl(url) {
   return url + (url.includes("?") ? "&" : "?") + "__fw_data=1";
 }
-async function fetchRouteDataOnce(url) {
+async function fetchRouteDataOnce(url, skipLayoutHooks = true) {
   const dataUrl = buildDataUrl(url);
-  const res = await fetch(dataUrl, {
-    headers: {
-      "x-fw-data": "1",
-      Accept: "application/json"
-    }
-  });
+  const headers = {
+    "x-fw-data": "1",
+    Accept: "application/json"
+  };
+  if (skipLayoutHooks) {
+    headers["x-skip-layout-hooks"] = "true";
+  }
+  const res = await fetch(dataUrl, { headers });
   let json = {};
   try {
     const text = await res.text();
@@ -110,7 +112,7 @@ async function fetchRouteDataOnce(url) {
   };
   return result;
 }
-function revalidatePath(path) {
+function revalidatePath(path, skipAutoRevalidate = false) {
   const normalizedPath = path.split("?")[0];
   const hasQueryParams = path.includes("?");
   const keysForPath = pathIndex.get(normalizedPath);
@@ -137,7 +139,7 @@ function revalidatePath(path) {
   keysToDelete.forEach((key) => {
     deleteCacheEntry(key);
   });
-  if (typeof window !== "undefined") {
+  if (!skipAutoRevalidate && typeof window !== "undefined") {
     const currentPathname = window.location.pathname;
     const currentSearch = window.location.search;
     const matchesCurrentPath = normalizedPath === currentPathname;
@@ -163,29 +165,60 @@ function revalidatePath(path) {
     }
   }
 }
+var isRevalidating = false;
 async function revalidate() {
   if (typeof window === "undefined") {
     throw new Error("revalidate() can only be called on the client");
   }
-  const pathname = window.location.pathname + window.location.search;
-  revalidatePath(pathname);
-  const freshData = await getRouteData(pathname, { revalidate: true });
-  if (window.__FW_DATA__ && freshData.ok && freshData.json) {
-    const currentData = window.__FW_DATA__;
-    window.__FW_DATA__ = {
-      ...currentData,
-      pathname: pathname.split("?")[0],
-      params: freshData.json.params || currentData.params || {},
-      props: freshData.json.props || currentData.props || {},
-      metadata: freshData.json.metadata ?? currentData.metadata ?? null,
-      notFound: freshData.json.notFound ?? false,
-      error: freshData.json.error ?? false
-    };
-    window.dispatchEvent(new CustomEvent("fw-data-refresh", {
-      detail: { data: freshData }
-    }));
-  }
-  return freshData;
+  if (isRevalidating) {
+    const key = buildDataUrl(window.location.pathname + window.location.search);
+    const entry = dataCache.get(key);
+    if (entry && entry.status === "pending") {
+      return entry.promise;
+    }
+  }
+  isRevalidating = true;
+  try {
+    const pathname = window.location.pathname + window.location.search;
+    revalidatePath(pathname, true);
+    const freshData = await getRouteData(pathname, { revalidate: true });
+    if (window.__FW_DATA__ && freshData.ok && freshData.json) {
+      const currentData = window.__FW_DATA__;
+      if (freshData.json.layoutProps !== void 0 && freshData.json.layoutProps !== null) {
+        window.__FW_LAYOUT_PROPS__ = freshData.json.layoutProps;
+      }
+      let combinedProps = currentData.props || {};
+      if (freshData.json.layoutProps !== void 0 && freshData.json.layoutProps !== null) {
+        combinedProps = {
+          ...freshData.json.layoutProps,
+          ...freshData.json.pageProps ?? freshData.json.props ?? {}
+        };
+      } else if (freshData.json.pageProps !== void 0) {
+        const preservedLayoutProps = window.__FW_LAYOUT_PROPS__ || {};
+        combinedProps = {
+          ...preservedLayoutProps,
+          ...freshData.json.pageProps
+        };
+      } else if (freshData.json.props) {
+        combinedProps = freshData.json.props;
+      }
+      window.__FW_DATA__ = {
+        ...currentData,
+        pathname: pathname.split("?")[0],
+        params: freshData.json.params || currentData.params || {},
+        props: combinedProps,
+        metadata: freshData.json.metadata ?? currentData.metadata ?? null,
+        notFound: freshData.json.notFound ?? false,
+        error: freshData.json.error ?? false
+      };
+      window.dispatchEvent(new CustomEvent("fw-data-refresh", {
+        detail: { data: freshData }
+      }));
+    }
+    return freshData;
+  } finally {
+    isRevalidating = false;
+  }
 }
 function revalidateRouteData(url) {
   revalidatePath(url);
@@ -199,7 +232,7 @@ function prefetchRouteData(url) {
     }
     return;
   }
-  const promise = fetchRouteDataOnce(url).then((value) => {
+  const promise = fetchRouteDataOnce(url, true).then((value) => {
     setCacheEntry(key, { status: "fulfilled", value });
     return value;
   }).catch((error) => {
@@ -215,7 +248,7 @@ async function getRouteData(url, options) {
     deleteCacheEntry(key);
   }
   const entry = dataCache.get(key);
-  if (entry) {
+  if (entry && !options?.revalidate) {
     if (entry.status === "fulfilled") {
       updateLRU(key);
       return entry.value;
@@ -224,12 +257,29 @@ async function getRouteData(url, options) {
       return entry.promise;
     }
   }
-  const promise = fetchRouteDataOnce(url).then((value) => {
-    setCacheEntry(key, { status: "fulfilled", value });
+  const skipLayoutHooks = !options?.revalidate;
+  const currentEntry = dataCache.get(key);
+  if (currentEntry && !options?.revalidate) {
+    if (currentEntry.status === "fulfilled") {
+      updateLRU(key);
+      return currentEntry.value;
+    }
+    if (currentEntry.status === "pending") {
+      return currentEntry.promise;
+    }
+  }
+  const promise = fetchRouteDataOnce(url, skipLayoutHooks).then((value) => {
+    const entryAfterFetch = dataCache.get(key);
+    if (!entryAfterFetch || entryAfterFetch.status === "pending") {
+      setCacheEntry(key, { status: "fulfilled", value });
+    }
     return value;
   }).catch((error) => {
     console.error("[client][cache] Error fetching route data:", error);
-    dataCache.set(key, { status: "rejected", error });
+    const entryAfterFetch = dataCache.get(key);
+    if (!entryAfterFetch || entryAfterFetch.status === "pending") {
+      dataCache.set(key, { status: "rejected", error });
+    }
     throw error;
   });
   dataCache.set(key, { status: "pending", promise });
@@ -242,4 +292,4 @@ export {
   revalidatePath,
   revalidateRouteData
 };
-//# sourceMappingURL=cache.js.map
+//# sourceMappingURL=cache.mjs.map

package/dist/react/cache.mjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../modules/react/cache/client-data-cache/index.ts"],"sourcesContent":["import type { PageMetadata } from \"@router/index\";\n\n/**\n * Response data structure from server for route data requests\n */\nexport type RouteDataResponse = {\n  /** Combined props (layout + page) - kept for backward compatibility */\n  props?: Record<string, unknown>;\n  /** Layout props (from layout.server.hook.ts) - only present when layout hooks were executed */\n  layoutProps?: Record<string, unknown>;\n  /** Page props (from page.server.hook.ts) - always present in data requests */\n  pageProps?: Record<string, unknown>;\n  metadata?: PageMetadata | null;\n  theme?: string;\n  redirect?: { destination: string; permanent?: boolean };\n  notFound?: boolean;\n  error?: boolean;\n  message?: string;\n  params?: Record<string, string>;\n  /** Pathname after rewrite (for client-side route matching) */\n  pathname?: string;\n};\n\ntype RouteData = {\n  ok: boolean;\n  status: number;\n  json: RouteDataResponse;\n};\n\ntype CacheEntry =\n  | { status: \"pending\"; promise: Promise<RouteData> }\n  | { status: \"fulfilled\"; value: RouteData }\n  | { status: \"rejected\"; error: any };\n\n// Use window to guarantee a single shared cache instance\n// across all bundles/modules\nconst CACHE_KEY = \"__FW_DATA_CACHE__\";\n\n// Maximum number of entries in the cache (LRU)\nconst MAX_CACHE_SIZE = 100;\n\ntype CacheStore = {\n  data: Map<string, CacheEntry>;\n  index: Map<string, Set<string>>; // pathBase -> Set of keys\n  lru: string[]; // Ordered list: most recent at end, oldest at start\n};\n\nfunction getCacheStore(): CacheStore {\n  if (typeof window !== \"undefined\") {\n    if (!(window as any)[CACHE_KEY]) {\n      (window as any)[CACHE_KEY] = {\n        data: new Map<string, CacheEntry>(),\n        index: new Map<string, Set<string>>(),\n        lru: [],\n      };\n    }\n    return (window as any)[CACHE_KEY];\n  }\n  // Fallback for SSR (though this shouldn't be used on the client)\n  return {\n    data: new Map<string, CacheEntry>(),\n    index: new Map<string, Set<string>>(),\n    lru: [],\n  };\n}\n\nconst cacheStore = getCacheStore();\nconst dataCache = cacheStore.data;\nconst pathIndex = cacheStore.index;\nconst lru = cacheStore.lru;\n\n// Helper functions for cache management\n\n/**\n * Extract base path from a cache key (removes query params)\n */\nfunction extractPathBase(key: string): string {\n  return key.split(\"?\")[0];\n}\n\n/**\n * Add key to path index\n */\nfunction addToIndex(key: string): void {\n  const pathBase = extractPathBase(key);\n  if (!pathIndex.has(pathBase)) {\n    pathIndex.set(pathBase, new Set());\n  }\n  pathIndex.get(pathBase)!.add(key);\n}\n\n/**\n * Remove key from path index\n */\nfunction removeFromIndex(key: string): void {\n  const pathBase = extractPathBase(key);\n  const keys = pathIndex.get(pathBase);\n  if (keys) {\n    keys.delete(key);\n    if (keys.size === 0) {\n      pathIndex.delete(pathBase);\n    }\n  }\n}\n\n/**\n * Update LRU order - move key to end (most recent)\n */\nfunction updateLRU(key: string): void {\n  const index = lru.indexOf(key);\n  if (index !== -1) {\n    lru.splice(index, 1);\n  }\n  lru.push(key);\n}\n\n/**\n * Remove oldest entries if cache exceeds MAX_CACHE_SIZE\n */\nfunction evictOldest(): void {\n  while (lru.length >= MAX_CACHE_SIZE && lru.length > 0) {\n    const oldestKey = lru.shift()!;\n    dataCache.delete(oldestKey);\n    removeFromIndex(oldestKey);\n  }\n}\n\n/**\n * Set cache entry and maintain indexes\n */\nfunction setCacheEntry(key: string, entry: CacheEntry): void {\n  const existingEntry = dataCache.get(key);\n  const wasFulfilled = existingEntry?.status === \"fulfilled\";\n  \n  dataCache.set(key, entry);\n  \n  // Only track fulfilled entries in LRU and index (not pending/rejected)\n  if (entry.status === \"fulfilled\") {\n    // Add to index if it wasn't already fulfilled (new entry or transition from pending/rejected)\n    if (!wasFulfilled) {\n      addToIndex(key);\n    }\n    updateLRU(key);\n    evictOldest();\n  } else if (wasFulfilled) {\n    // If entry was fulfilled and now isn't (transitioning to pending/rejected), remove from index\n    removeFromIndex(key);\n  }\n}\n\n/**\n * Delete cache entry and clean up indexes\n */\nfunction deleteCacheEntry(key: string): void {\n  if (dataCache.has(key)) {\n    dataCache.delete(key);\n    removeFromIndex(key);\n    const lruIndex = lru.indexOf(key);\n    if (lruIndex !== -1) {\n      lru.splice(lruIndex, 1);\n    }\n  }\n}\n\nfunction buildDataUrl(url: string): string {\n  return url + (url.includes(\"?\") ? \"&\" : \"?\") + \"__fw_data=1\";\n}\n\nasync function fetchRouteDataOnce(\n  url: string,\n  skipLayoutHooks: boolean = true\n): Promise<RouteData> {\n  const dataUrl = buildDataUrl(url);\n\n  const headers: Record<string, string> = {\n    \"x-fw-data\": \"1\",\n    Accept: \"application/json\",\n  };\n\n  // Send header to skip layout hooks execution in SPA navigation\n  // Only skip if skipLayoutHooks is true (normal SPA navigation)\n  // If false (revalidate), don't send header to force execution of all hooks\n  if (skipLayoutHooks) {\n    headers[\"x-skip-layout-hooks\"] = \"true\";\n  }\n\n  const res = await fetch(dataUrl, { headers });\n\n  let json: any = {};\n\n  try {\n    const text = await res.text();\n    if (text) {\n      json = JSON.parse(text);\n    }\n  } catch (parseError) {\n    console.error(\n      \"[client][cache] Failed to parse response as JSON:\",\n      parseError\n    );\n  }\n\n  const result: RouteData = {\n    ok: res.ok,\n    status: res.status,\n    json,\n  };\n\n  return result;\n}\n\n/**\n * Revalidates route data by removing it from the cache.\n * The next time you navigate to this route, fresh data will be fetched from the server.\n * This is a client-side function and does not require a server-side revalidation.\n *\n * @param path - The route path to revalidate (e.g., '/posts/1' or '/posts/1?page=2')\n *               If query params are not included, revalidates all variants of that route.\n *\n * @example\n * ```ts\n * // After saving something to the DB, revalidate the route\n * await saveToDatabase(data);\n * revalidatePath('/posts');\n * \n * // Revalidate a specific route with query params\n * revalidatePath('/posts?page=2');\n * ```\n */\nexport function revalidatePath(path: string, skipAutoRevalidate: boolean = false): void {\n  // Normalize the base path (without query params)\n  const normalizedPath = path.split(\"?\")[0];\n  const hasQueryParams = path.includes(\"?\");\n  \n  // Get all keys for this path base from index (O(1) lookup)\n  const keysForPath = pathIndex.get(normalizedPath);\n  \n  if (!keysForPath || keysForPath.size === 0) {\n    return; // No entries to revalidate\n  }\n  \n  // If the path includes specific query params, extract them\n  let specificQueryParams: string | undefined;\n  if (hasQueryParams) {\n    const queryPart = path.split(\"?\")[1];\n    // Sort query params for consistent comparison\n    specificQueryParams = queryPart\n      .split(\"&\")\n      .filter((p) => !p.startsWith(\"__fw_data=\"))\n      .sort()\n      .join(\"&\");\n  }\n  \n  // Iterate only over keys for this path (much smaller set)\n  const keysToDelete: string[] = [];\n  for (const key of keysForPath) {\n    // If specific query params were specified, check if they match\n    if (hasQueryParams && specificQueryParams) {\n      const [, keyQuery = \"\"] = key.split(\"?\");\n      const keyQueryParams = keyQuery\n        .split(\"&\")\n        .filter((p) => !p.startsWith(\"__fw_data=\"))\n        .sort()\n        .join(\"&\");\n      \n      if (keyQueryParams === specificQueryParams) {\n        keysToDelete.push(key);\n      }\n    } else {\n      // If no specific query params, revalidate all variants\n      keysToDelete.push(key);\n    }\n  }\n  \n  // Delete matching entries\n  keysToDelete.forEach((key) => {\n    deleteCacheEntry(key);\n  });\n  \n  // If the revalidated path matches the current route, automatically refresh data\n  // UNLESS skipAutoRevalidate is true (to prevent recursive calls from revalidate())\n  if (!skipAutoRevalidate && typeof window !== \"undefined\") {\n    const currentPathname = window.location.pathname;\n    const currentSearch = window.location.search;\n    const matchesCurrentPath = normalizedPath === currentPathname;\n    \n    if (matchesCurrentPath) {\n      if (hasQueryParams && specificQueryParams) {\n        const currentQueryParams = currentSearch\n          .replace(\"?\", \"\")\n          .split(\"&\")\n          .filter((p) => !p.startsWith(\"__fw_data=\"))\n          .sort()\n          .join(\"&\");\n        \n        if (currentQueryParams === specificQueryParams) {\n          revalidate().catch((err) => {\n            console.error(\n              \"[client][cache] Error revalidating current route:\",\n              err\n            );\n          });\n        }\n      } else {\n        revalidate().catch((err) => {\n          console.error(\n            \"[client][cache] Error revalidating current route:\",\n            err\n          );\n        });\n      }\n    }\n  }\n}\n\n/**\n * Revalidates and refreshes the current page data.\n * Similar to Next.js's `router.refresh()`.\n * \n * This function:\n * 1. Removes the current route from cache\n * 2. Fetches fresh data from the server\n * 3. Updates window.__FW_DATA__ with the new data\n * 4. Dispatches a 'fw-data-refresh' event for components to listen to\n * \n * @returns Promise that resolves with the fresh route data\n * \n * @example\n * ```ts\n * // Refresh current page data after a mutation\n * await revalidate();\n * ```\n */\n// Flag to prevent recursive calls to revalidate()\nlet isRevalidating = false;\n\nexport async function revalidate(): Promise<RouteData> {\n  if (typeof window === \"undefined\") {\n    throw new Error(\"revalidate() can only be called on the client\");\n  }\n\n  // Prevent multiple simultaneous revalidations\n  if (isRevalidating) {\n    // Wait for the current revalidation to complete\n    const key = buildDataUrl(window.location.pathname + window.location.search);\n    const entry = dataCache.get(key);\n    if (entry && entry.status === \"pending\") {\n      return entry.promise;\n    }\n    // If no pending entry, something went wrong, allow the call\n  }\n\n  isRevalidating = true;\n  try {\n    const pathname = window.location.pathname + window.location.search;\n    \n    // Revalidate the path (remove from cache)\n    // Pass a flag to prevent revalidatePath from calling revalidate() again (recursive call)\n    revalidatePath(pathname, true); // true = skip auto-revalidate\n    \n    // Fetch fresh data\n    const freshData = await getRouteData(pathname, { revalidate: true });\n    \n    // Update window.__FW_DATA__ if it exists\n    if ((window as any).__FW_DATA__ && freshData.ok && freshData.json) {\n      const currentData = (window as any).__FW_DATA__;\n      \n      // Update preserved layout props if new ones were returned\n      if (freshData.json.layoutProps !== undefined && freshData.json.layoutProps !== null) {\n        (window as any).__FW_LAYOUT_PROPS__ = freshData.json.layoutProps;\n      }\n      \n      // Combine layout props (new or preserved) + page props\n      let combinedProps = currentData.props || {};\n      if (freshData.json.layoutProps !== undefined && freshData.json.layoutProps !== null) {\n        // Use new layout props\n        combinedProps = {\n          ...freshData.json.layoutProps,\n          ...(freshData.json.pageProps ?? freshData.json.props ?? {}),\n        };\n      } else if (freshData.json.pageProps !== undefined) {\n        // Use preserved layout props + new page props\n        const preservedLayoutProps = (window as any).__FW_LAYOUT_PROPS__ || {};\n        combinedProps = {\n          ...preservedLayoutProps,\n          ...freshData.json.pageProps,\n        };\n      } else if (freshData.json.props) {\n        // Fallback to combined props\n        combinedProps = freshData.json.props;\n      }\n      \n      (window as any).__FW_DATA__ = {\n        ...currentData,\n        pathname: pathname.split(\"?\")[0],\n        params: freshData.json.params || currentData.params || {},\n        props: combinedProps,\n        metadata: freshData.json.metadata ?? currentData.metadata ?? null,\n        notFound: freshData.json.notFound ?? false,\n        error: freshData.json.error ?? false,\n      };\n      \n      // Dispatch event for components to listen to\n      window.dispatchEvent(new CustomEvent(\"fw-data-refresh\", {\n        detail: { data: freshData },\n      }));\n    }\n    \n    return freshData;\n  } finally {\n    isRevalidating = false;\n  }\n}\n\n/**\n * @deprecated Use `revalidatePath()` instead. This function is kept for backwards compatibility.\n */\nexport function revalidateRouteData(url: string): void {\n  revalidatePath(url);\n}\n\nexport function prefetchRouteData(url: string): void {\n  const key = buildDataUrl(url);\n\n  const cached = dataCache.get(key);\n\n  if (cached && cached.status !== \"rejected\") {\n    // Update LRU if it exists and is fulfilled\n    if (cached.status === \"fulfilled\") {\n      updateLRU(key);\n    }\n    return;\n  }\n\n  // Prefetch uses skipLayoutHooks: true (normal navigation behavior)\n  const promise = fetchRouteDataOnce(url, true)\n    .then((value) => {\n      setCacheEntry(key, { status: \"fulfilled\", value });\n      return value;\n    })\n    .catch((error) => {\n      console.error(\"[client][cache] Error prefetching route data:\", error);\n      dataCache.set(key, { status: \"rejected\", error });\n      throw error;\n    });\n\n  dataCache.set(key, { status: \"pending\", promise });\n}\n\nexport type GetRouteDataOptions = {\n  /**\n   * If true, forces revalidation of route data,\n   * ignoring the cache and fetching fresh data from the server.\n   * Similar to Next.js's `router.refresh()` behavior.\n   */\n  revalidate?: boolean;\n};\n\nexport async function getRouteData(\n  url: string,\n  options?: GetRouteDataOptions\n): Promise<RouteData> {\n  const key = buildDataUrl(url);\n\n  // If revalidation is requested, remove the entry from cache\n  // This ensures we don't reuse pending or fulfilled entries\n  if (options?.revalidate) {\n    deleteCacheEntry(key);\n  }\n\n  const entry = dataCache.get(key);\n\n  if (entry && !options?.revalidate) {\n    // Only use cached entry if not revalidating\n    if (entry.status === \"fulfilled\") {\n      // Update LRU: mark as recently used\n      updateLRU(key);\n      return entry.value;\n    }\n    if (entry.status === \"pending\") {\n      // Return existing pending promise to avoid duplicate requests\n      return entry.promise;\n    }\n  }\n\n  // No entry in cache (or revalidating), fetch it\n  // skipLayoutHooks: true for normal SPA navigation, false when revalidating\n  const skipLayoutHooks = !options?.revalidate;\n  \n  // Check again if an entry was added while we were processing (race condition)\n  const currentEntry = dataCache.get(key);\n  if (currentEntry && !options?.revalidate) {\n    if (currentEntry.status === \"fulfilled\") {\n      updateLRU(key);\n      return currentEntry.value;\n    }\n    if (currentEntry.status === \"pending\") {\n      return currentEntry.promise;\n    }\n  }\n  \n  // Create a new promise for this fetch\n  const promise = fetchRouteDataOnce(url, skipLayoutHooks)\n    .then((value) => {\n      // Only set cache entry if this is still the current fetch for this key\n      // This prevents race conditions where multiple revalidations happen simultaneously\n      const entryAfterFetch = dataCache.get(key);\n      if (!entryAfterFetch || entryAfterFetch.status === \"pending\") {\n        setCacheEntry(key, { status: \"fulfilled\", value });\n      }\n      return value;\n    })\n    .catch((error) => {\n      console.error(\"[client][cache] Error fetching route data:\", error);\n      const entryAfterFetch = dataCache.get(key);\n      if (!entryAfterFetch || entryAfterFetch.status === \"pending\") {\n        dataCache.set(key, { status: \"rejected\", error });\n      }\n      throw error;\n    });\n\n  // Set pending entry - if revalidating, we already deleted it, so this is safe\n  dataCache.set(key, { status: \"pending\", promise });\n  \n  return promise;\n}\n"],"mappings":"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","names":[]}