clear-react-router 1.9.8 → 2.0.0

package/README.md

@@ -572,6 +572,8 @@ const UserProfile = () => {
   staleTime: 60000, // 1 minute — cache is fresh for 60 seconds
 }
 ```
+ - Stale cache entries are cleaned up incrementally on every navigation, keeping the loader cache from growing unbounded over long sessions.
+
 
 ### `useInvalidate()`
 

package/dist/index.js

@@ -113,13 +113,12 @@ var createCommitNavigation = (navigationExecutor, routeItemDataState) => (nextLo
 };
 //#endregion
 //#region utils/isCacheItemFresh.ts
-var createIsCacheItemFresh = (loaderMap) => ({ routeItem, pathname }) => {
-	if (!routeItem) return true;
-	const item = loaderMap.get(pathname);
+var createIsCacheItemFresh = (loaderMap) => (pathname, search) => {
+	const item = loaderMap.get(`${pathname}${search}`);
 	if (item === void 0) return false;
-	const staleTime = routeItem.staleTime ?? routerConfig.defaultStaleTime;
-	if (staleTime === void 0) return true;
-	return Date.now() - item.timestamp <= staleTime;
+	const resolvedStaleTime = item.staleTime ?? routerConfig.defaultStaleTime;
+	if (resolvedStaleTime === void 0) return true;
+	return Date.now() - item.timestamp <= resolvedStaleTime;
 };
 //#endregion
 //#region ../../node_modules/react/cjs/react-jsx-runtime.production.js
@@ -281,10 +280,7 @@ var createNavigate = (routerState, revalidateCache) => {
 			const currentLoaderState = loaderMap.get(location.pathname)?.state;
 			if (currentLoaderState) loaderStateRef.set(currentLoaderState);
 		} else {
-			const pendingShouldExist = routeItem?.loader && !isCacheItemFresh({
-				routeItem,
-				pathname: location.pathname
-			});
+			const pendingShouldExist = routeItem?.loader && !isCacheItemFresh(location.pathname, location.search);
 			pendingState.setState(pendingShouldExist ? {
 				routeItem,
 				location
@@ -423,15 +419,20 @@ var getRetry = (routeItem) => {
 var sleep = async (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 var createRevalidateCache = (routerState) => {
 	const { loaderStateRef, contextState, loaderMap } = routerState;
+	const removeFirstStaleItem = () => {
+		const deletedItem = [...loaderMap.entries()].find(([, item]) => {
+			const staleTime = item.staleTime ?? routerConfig.defaultStaleTime;
+			return staleTime && staleTime + item.timestamp < Date.now();
+		});
+		if (deletedItem) loaderMap.delete(deletedItem[0]);
+	};
 	const revalidateCache = async ({ routeItem, pathname, search = "" }, retried = 0) => {
 		if (!routeItem?.loader) return;
 		const isCacheItemFresh = createIsCacheItemFresh(loaderMap);
-		if (loadingPromises.has(pathname)) return loadingPromises.get(pathname);
-		if (isCacheItemFresh({
-			routeItem,
-			pathname
-		})) {
-			const item = loaderMap.get(pathname);
+		removeFirstStaleItem();
+		if (loadingPromises.has(pathname)) return loadingPromises.get(`${pathname}${search}`);
+		if (isCacheItemFresh(pathname, search)) {
+			const item = loaderMap.get(`${pathname}${search}`);
 			if (item?.state) loaderStateRef.set(item.state);
 			return;
 		}
@@ -455,7 +456,8 @@ var createRevalidateCache = (routerState) => {
 				}));
 				loaderMap.set(`${pathname}${search}`, {
 					state: loaderStateRef.value,
-					timestamp: Date.now()
+					timestamp: Date.now(),
+					staleTime: routeItem.staleTime
 				});
 				return {
 					data: result,

package/dist/types.d.ts

@@ -102,6 +102,7 @@ export type RouterProps = {
 export type LoaderStateItem = {
     state: LoaderState;
     timestamp: number;
+    staleTime: number | undefined;
 };
 export type RouterState = {
     routeItemDataState: Store<RouteItemData>;

package/dist/utils/isCacheItemFresh.d.ts

@@ -1,5 +1,2 @@
-import { LoaderStateItem, RouteItem } from '../types';
-export declare const createIsCacheItemFresh: (loaderMap: Map<string, LoaderStateItem>) => ({ routeItem, pathname }: {
-    routeItem?: RouteItem;
-    pathname: string;
-}) => boolean;
+import { LoaderStateItem } from '../types';
+export declare const createIsCacheItemFresh: (loaderMap: Map<string, LoaderStateItem>) => (pathname: string, search?: string) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clear-react-router",
-  "version": "1.9.8",
+  "version": "2.0.0",
   "description": "A lightweight, type-safe routing library for React applications",
   "author": "Andrew Bubnov",
   "scripts": {