@funstack/router 1.0.0 → 1.1.0

package/dist/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","names":[],"sources":["../src/types.ts","../src/Router/index.tsx","../src/Outlet.tsx","../src/hooks/useLocation.ts","../src/hooks/useSearchParams.ts","../src/hooks/useBlocker.ts","../src/hooks/useRouteParams.ts","../src/hooks/useRouteState.ts","../src/hooks/useRouteData.ts","../src/hooks/useIsPending.ts","../src/bypassInterception.ts"],"mappings":";;;;cAGM,6BAAA;;AAFoE;;;;;;;KAgB9D,uBAAA;EAAA,CACT,6BAAA,UAyB0B;EAvB3B,IAAA,WA4Be;EA1Bf,QAAA,GAAW,uBAAA;EAgCc;;;;;;EAzBzB,KAAA;EAPA;;;;;EAaA,eAAA,YAM2B;EAA3B,MAAA,IAAU,IAAA,EAAM,UAAA,CAAW,MAAA,+BAE3B;EAAA,MAAA,IAAU,IAAA,EAAM,UAAA,CAAW,MAAA,wCAAA;EAE3B,SAAA,GACI,aAAA;IACE,IAAA;IACA,MAAA,GAAS,MAAA;IACT,KAAA;IACA,QAAA,IACE,KAAA,cAAmB,IAAA,2BAChB,OAAA;IACL,YAAA,IAAgB,KAAA,cAAmB,IAAA;IACnC,UAAA,SAAmB,OAAA;IACnB,cAAA;IACA,IAAA;EAAA,KAEF,SAAA;AAAA;;;AAmBN;KAAY,YAAA;sCAEV,KAAA,EAAO,uBAAA,EAAP;EAEA,MAAA,EAAQ,MAAA,kBAAR;EAEA,QAAA;AAAA;;;;KAcU,cAAA;EAMQ,4DAJlB,OAAA,WAAkB,YAAA,WAUR;EARV,YAAA;EAEA,QAAA,EAAU,QAAA;AAAA;;;;KAMA,eAAA;EAYA,uDAVV,OAAA;EAEA,KAAA,YASA;EAPA,IAAA;AAAA;;;AAmBF;KAbY,QAAA;EACV,QAAA;EACA,MAAA;EACA,IAAA;AAAA;;;;;AAqBF;;;KAXY,kBAAA,IACV,KAAA,EAAO,aAAA,EACP,IAAA,EAAM,cAAA;;;;;AChGR;;KDyGY,YAAA;;;;AAhJ8D;;KCuC9D,SAAA;EDrCkC;;AAc9C;;;;EC8BE,IAAA;EDN2B;;;;;;;;;;;ECkB3B,UAAA;AAAA;AAAA,KAGU,WAAA;EACV,MAAA,EAAQ,eAAA;EDlCR;;;;;;;EC0CA,UAAA,GAAa,kBAAA;ED5Bc;;;;;;ECmC3B,QAAA,GAAW,YAAA;ED7BL;;;;;;;;;;;;;;;AA4BR;;;;;ECsBE,GAAA,GAAM,SAAA;AAAA;AAAA,iBAGQ,MAAA,CAAA;EACd,MAAA,EAAQ,WAAA;EACR,UAAA;EACA,QAAA;EACA;AAAA,GACC,WAAA,GAAc,SAAA;;;;;;AD1GyD;iBEM1D,MAAA,CAAA,GAAU,SAAA;;;;;;iBCAV,WAAA,CAAA,GAAe,QAAA;;;KCJ1B,eAAA,IACH,MAAA,EACI,eAAA,GACA,MAAA,qBACE,IAAA,EAAM,eAAA,KAAoB,eAAA,GAAkB,MAAA;;;;iBAMpC,eAAA,CAAA,IAAoB,eAAA,EAAiB,eAAA;;;KCVzC,iBAAA;;;;ALF8D;EKOxE,WAAA;AAAA;;;ALSF;;;;;;;;;;;;;;;;;;;;;;;;;iBKqBgB,UAAA,CAAW,OAAA,EAAS,iBAAA;;;;;;ALrCsC;;;;;AAgB1E;;;;;;;;;;;;iBMUgB,cAAA,WAEV,4BAAA,SAEE,MAAA,sCAIF,sBAAA,SAA+B,MAAA,oCAAA,CACnC,KAAA,EAAO,CAAA,GAAI,kBAAA,CAAmB,CAAA;;;;;;ANnC0C;;;;;AAgB1E;;;;;;;;;;;;;iBOWgB,aAAA,WAEV,4BAAA,SAEE,MAAA,sCAIF,sBAAA,SAA+B,MAAA,oCAAA,CACnC,KAAA,EAAO,CAAA,GAAI,iBAAA,CAAkB,CAAA;;;;;;APpC2C;;;;;AAgB1E;;;;;;;;;;;;;;;;iBQcgB,YAAA,WAEV,4BAAA,SAEE,MAAA,sCAIF,sBAAA,SAA+B,MAAA,oCAAA,CACnC,KAAA,EAAO,CAAA,GAAI,gBAAA,CAAiB,CAAA;;;;;;iBClCd,YAAA,CAAA;;;ATL0D;;;AAAA,iBUW1D,UAAA,CAAA;;AVKhB;;;iBUGgB,YAAA,CAAa,GAAA"}
+{"version":3,"file":"index.d.mts","names":[],"sources":["../src/types.ts","../src/Router/index.tsx","../src/Outlet.tsx","../src/hooks/useLocation.ts","../src/hooks/useSearchParams.ts","../src/hooks/useBlocker.ts","../src/hooks/useRouteParams.ts","../src/hooks/useRouteState.ts","../src/hooks/useRouteData.ts","../src/hooks/useIsPending.ts","../src/bypassInterception.ts"],"mappings":";;;;cAGM,6BAAA;;AAFoE;;;;;;;KAgB9D,uBAAA;EAAA,CACT,6BAAA,UAyB0B;EAvB3B,IAAA,WA4Be;EA1Bf,QAAA,GAAW,uBAAA;EAgCc;;;;;;EAzBzB,KAAA;EAPA;;;;;EAaA,eAAA,YAM2B;EAA3B,MAAA,IAAU,IAAA,EAAM,UAAA,CAAW,MAAA,+BAE3B;EAAA,MAAA,IAAU,IAAA,EAAM,UAAA,CAAW,MAAA,wCAAA;EAE3B,SAAA,GACI,aAAA;IACE,IAAA;IACA,MAAA,GAAS,MAAA;IACT,KAAA;IACA,QAAA,IACE,KAAA,cAAmB,IAAA,2BAChB,OAAA;IACL,YAAA,IAAgB,KAAA,cAAmB,IAAA;IACnC,UAAA,SAAmB,OAAA;IACnB,cAAA;IACA,IAAA;EAAA,KAEF,SAAA;AAAA;;;AAmBN;KAAY,YAAA;sCAEV,KAAA,EAAO,uBAAA,EAAP;EAEA,MAAA,EAAQ,MAAA,kBAAR;EAEA,QAAA;AAAA;;;;KAcU,cAAA;EAMQ,4DAJlB,OAAA,WAAkB,YAAA,WAUR;EARV,YAAA;EAEA,QAAA,EAAU,QAAA;AAAA;;;;KAMA,eAAA;EAYA,uDAVV,OAAA;EAEA,KAAA,YASA;EAPA,IAAA;AAAA;;;;KAMU,QAAA;EACV,QAAA;EACA,MAAA;EACA,IAAA;EAgCoB;;;;;;;AAStB;;EA/BE,OAAA;EA+BsB;;;;;AC7HxB;;;;EDwGE,QAAA;AAAA;;;;;;;;KAUU,kBAAA,IACV,KAAA,EAAO,aAAA,EACP,IAAA,EAAM,cAAA;;;;;;;KASI,YAAA;;;;AApK8D;;KCuC9D,SAAA;EDrCkC;;AAc9C;;;;EC8BE,IAAA;EDN2B;;;;;;;;;;;ECkB3B,UAAA;AAAA;AAAA,KAGU,WAAA;EACV,MAAA,EAAQ,eAAA;EDlCR;;;;;;;EC0CA,UAAA,GAAa,kBAAA;ED5Bc;;;;;;ECmC3B,QAAA,GAAW,YAAA;ED7BL;;;;;;;;;;;;;;;AA4BR;;;;;ECsBE,GAAA,GAAM,SAAA;AAAA;AAAA,iBAGQ,MAAA,CAAA;EACd,MAAA,EAAQ,WAAA;EACR,UAAA;EACA,QAAA;EACA;AAAA,GACC,WAAA,GAAc,SAAA;;;;;;AD1GyD;iBEM1D,MAAA,CAAA,GAAU,SAAA;;;;;;iBCAV,WAAA,CAAA,GAAe,QAAA;;;KCJ1B,eAAA,IACH,MAAA,EACI,eAAA,GACA,MAAA,qBACE,IAAA,EAAM,eAAA,KAAoB,eAAA,GAAkB,MAAA;;;;iBAMpC,eAAA,CAAA,IAAoB,eAAA,EAAiB,eAAA;;;KCVzC,iBAAA;;;;ALF8D;EKOxE,WAAA;AAAA;;;ALSF;;;;;;;;;;;;;;;;;;;;;;;;;iBKqBgB,UAAA,CAAW,OAAA,EAAS,iBAAA;;;;;;ALrCsC;;;;;AAgB1E;;;;;;;;;;;;iBMUgB,cAAA,WAEV,4BAAA,SAEE,MAAA,sCAIF,sBAAA,SAA+B,MAAA,oCAAA,CACnC,KAAA,EAAO,CAAA,GAAI,kBAAA,CAAmB,CAAA;;;;;;ANnC0C;;;;;AAgB1E;;;;;;;;;;;;;iBOWgB,aAAA,WAEV,4BAAA,SAEE,MAAA,sCAIF,sBAAA,SAA+B,MAAA,oCAAA,CACnC,KAAA,EAAO,CAAA,GAAI,iBAAA,CAAkB,CAAA;;;;;;APpC2C;;;;;AAgB1E;;;;;;;;;;;;;;;;iBQcgB,YAAA,WAEV,4BAAA,SAEE,MAAA,sCAIF,sBAAA,SAA+B,MAAA,oCAAA,CACnC,KAAA,EAAO,CAAA,GAAI,gBAAA,CAAiB,CAAA;;;;;;iBClCd,YAAA,CAAA;;;ATL0D;;;AAAA,iBUW1D,UAAA,CAAA;;AVKhB;;;iBUGgB,YAAA,CAAa,GAAA"}

package/dist/index.mjs

@@ -1,12 +1,9 @@
 "use client";
-
-import { n as route, r as routeState, t as bindRoute } from "./bindRoute-C7JBYje-.mjs";
+import { n as route, r as routeState, t as bindRoute } from "./bindRoute-CQ2-ruTp.mjs";
 import { createContext, useCallback, useContext, useEffect, useEffectEvent, useId, useMemo, useRef, useState, useSyncExternalStore, useTransition } from "react";
 import { jsx } from "react/jsx-runtime";
-
 //#region src/context/RouterContext.ts
 const RouterContext = createContext(null);
-
 //#endregion
 //#region src/context/BlockerContext.ts
 /**
@@ -29,7 +26,6 @@ function createBlockerRegistry() {
 	};
 }
 const BlockerContext = createContext(null);
-
 //#endregion
 //#region src/types.ts
 /**
@@ -42,7 +38,6 @@ const BlockerContext = createContext(null);
 function internalRoutes(routes) {
 	return routes;
 }
-
 //#endregion
 //#region src/core/matchRoutes.ts
 const SKIPPED = Symbol("skipped");
@@ -167,7 +162,6 @@ function matchPath(pattern, pathname, exact) {
 		consumedPathname
 	};
 }
-
 //#endregion
 //#region src/bypassInterception.ts
 const bypassInterceptionSymbol = Symbol("bypassInterception");
@@ -190,10 +184,20 @@ function hardReload() {
 function hardNavigate(url) {
 	navigation.navigate(url, { info: bypassInterceptionSymbol });
 }
-
 //#endregion
 //#region src/core/loaderCache.ts
 /**
+* Wrapper for synchronous errors thrown by loaders.
+* Cached instead of the raw error so the Router's useMemo doesn't throw.
+* RouteRenderer checks for this class and re-throws the original error
+* during rendering, where Error Boundaries can catch it.
+*/
+var LoaderError = class {
+	constructor(error) {
+		this.error = error;
+	}
+};
+/**
 * Cache for loader results.
 * Key format: `${entryId}:${matchIndex}`
 */
@@ -205,7 +209,11 @@ const loaderCache = /* @__PURE__ */ new Map();
 function getOrCreateLoaderResult(entryId, matchIndex, route, args) {
 	if (!route.loader) return;
 	const cacheKey = `${entryId}:${matchIndex}`;
-	if (!loaderCache.has(cacheKey)) loaderCache.set(cacheKey, route.loader(args));
+	if (!loaderCache.has(cacheKey)) try {
+		loaderCache.set(cacheKey, route.loader(args));
+	} catch (error) {
+		loaderCache.set(cacheKey, new LoaderError(error));
+	}
 	return loaderCache.get(cacheKey);
 }
 /**
@@ -250,7 +258,6 @@ function clearLoaderCacheForEntry(entryId) {
 	const prefix = `${entryId}:`;
 	for (const key of loaderCache.keys()) if (key.startsWith(prefix)) loaderCache.delete(key);
 }
-
 //#endregion
 //#region src/core/NavigationAPIAdapter.ts
 /**
@@ -267,6 +274,7 @@ var NavigationAPIAdapter = class {
 	#cachedSnapshot = null;
 	#cachedEntryId = null;
 	#currentNavigationInfo = void 0;
+	#reloadCounts = /* @__PURE__ */ new Map();
 	getSnapshot() {
 		const entry = navigation.currentEntry;
 		if (!entry?.url) return null;
@@ -274,7 +282,9 @@ var NavigationAPIAdapter = class {
 		this.#cachedEntryId = entry.id;
 		this.#cachedSnapshot = {
 			url: new URL(entry.url),
-			key: entry.id,
+			key: this.#effectiveKey(entry.id),
+			entryId: entry.id,
+			entryKey: entry.key,
 			state: entry.getState(),
 			info: this.#currentNavigationInfo
 		};
@@ -307,9 +317,19 @@ var NavigationAPIAdapter = class {
 			entry.addEventListener("dispose", () => {
 				clearLoaderCacheForEntry(entryId);
 				this.#subscribedEntryIds.delete(entryId);
+				this.#reloadCounts.delete(entryId);
 			}, { signal });
 		}
 	}
+	/**
+	* Compute the effective cache key for a given entry.
+	* Includes a reload suffix when the entry has been reloaded,
+	* so loaders get a fresh cache key and re-execute.
+	*/
+	#effectiveKey(entryId) {
+		const count = this.#reloadCounts.get(entryId) ?? 0;
+		return count > 0 ? `${entryId}:r${count}` : entryId;
+	}
 	navigate(to, options) {
 		navigation.navigate(to, {
 			history: options?.replace ? "replace" : "push",
@@ -371,6 +391,13 @@ var NavigationAPIAdapter = class {
 				if (event.defaultPrevented) return;
 			}
 			if (!willIntercept) return;
+			if (event.navigationType === "reload") {
+				const entryId = navigation.currentEntry.id;
+				const oldCount = this.#reloadCounts.get(entryId) ?? 0;
+				if (oldCount >= 2) clearLoaderCacheForEntry(`${entryId}:r${oldCount - 1}`);
+				this.#reloadCounts.set(entryId, oldCount + 1);
+				this.#cachedSnapshot = null;
+			}
 			if (idleController) {
 				idleController.abort();
 				idleController = null;
@@ -378,6 +405,7 @@ var NavigationAPIAdapter = class {
 			event.intercept({ handler: async () => {
 				const currentEntry = navigation.currentEntry;
 				if (!currentEntry) throw new Error("Navigation currentEntry is null during navigation interception");
+				const effectiveKey = this.#effectiveKey(currentEntry.id);
 				let actionResult = void 0;
 				if (isFormSubmission) {
 					const actionRoute = findActionRoute(matched);
@@ -391,8 +419,7 @@ var NavigationAPIAdapter = class {
 					}
 					clearLoaderCacheForEntry(currentEntry.id);
 				}
-				const request = createLoaderRequest(url);
-				const results = executeLoaders(matched, currentEntry.id, request, event.signal, actionResult);
+				const results = executeLoaders(matched, effectiveKey, createLoaderRequest(url), event.signal, actionResult);
 				await Promise.all(results.map((r) => r.data));
 			} });
 		};
@@ -418,7 +445,6 @@ var NavigationAPIAdapter = class {
 function findActionRoute(matched) {
 	for (let i = matched.length - 1; i >= 0; i--) if (matched[i].route.action) return matched[i];
 }
-
 //#endregion
 //#region src/core/StaticAdapter.ts
 /**
@@ -434,6 +460,8 @@ var StaticAdapter = class {
 		if (!this.#cachedSnapshot) this.#cachedSnapshot = {
 			url: new URL(window.location.href),
 			key: "__static__",
+			entryId: null,
+			entryKey: null,
 			state: void 0,
 			info: void 0
 		};
@@ -455,7 +483,6 @@ var StaticAdapter = class {
 	}
 	updateCurrentEntryState(_state) {}
 };
-
 //#endregion
 //#region src/core/NullAdapter.ts
 /**
@@ -483,7 +510,6 @@ var NullAdapter = class {
 	}
 	updateCurrentEntryState(_state) {}
 };
-
 //#endregion
 //#region src/core/createAdapter.ts
 /**
@@ -504,7 +530,6 @@ function createAdapter(fallback) {
 	if (fallback === "static") return new StaticAdapter();
 	return new NullAdapter();
 }
-
 //#endregion
 //#region src/Router/ServerLocationSnapshot.ts
 /**
@@ -520,7 +545,6 @@ function isServerSnapshot(value) {
 	return value instanceof ServerLocationSnapshot;
 }
 const noopSubscribe = () => () => {};
-
 //#endregion
 //#region src/context/RouteContext.ts
 const RouteContext = createContext(null);
@@ -536,7 +560,6 @@ function findRouteContextById(context, id) {
 	}
 	return null;
 }
-
 //#endregion
 //#region src/Router/useRouteStateCallbacks.ts
 function useRouteStateCallbacks(index, internalState, url, navigateAsync, updateCurrentEntryState) {
@@ -598,7 +621,6 @@ function useRouteStateCallbacks(index, internalState, url, navigateAsync, update
 		resetStateSync
 	};
 }
-
 //#endregion
 //#region src/Router/RouteRenderer.tsx
 /**
@@ -650,6 +672,7 @@ function RouteRenderer({ matchedRoutes, index }) {
 			resetStateSync
 		};
 		const info = locationInfo;
+		if (data instanceof LoaderError) throw data.error;
 		if (route.loader) return /* @__PURE__ */ jsx(Component, {
 			data,
 			params,
@@ -669,7 +692,6 @@ function RouteRenderer({ matchedRoutes, index }) {
 		children: renderComponent()
 	});
 }
-
 //#endregion
 //#region src/Router/index.tsx
 function Router({ routes: inputRoutes, onNavigate, fallback = "none", ssr }) {
@@ -749,10 +771,14 @@ function Router({ routes: inputRoutes, onNavigate, fallback = "none", ssr }) {
 	]);
 	const locationState = locationEntry?.state;
 	const locationInfo = locationEntry?.info;
+	const entryId = locationEntry?.entryId ?? (isServerSnapshot(locationEntryInternal) ? locationEntryInternal.actualLocationEntry?.entryId : null) ?? null;
+	const entryKey = locationEntry?.entryKey ?? (isServerSnapshot(locationEntryInternal) ? locationEntryInternal.actualLocationEntry?.entryKey : null) ?? null;
 	const routerContextValue = useMemo(() => ({
 		locationState,
 		locationInfo,
 		url: urlObject,
+		entryId,
+		entryKey,
 		isPending,
 		navigateAsync,
 		updateCurrentEntryState
@@ -760,6 +786,8 @@ function Router({ routes: inputRoutes, onNavigate, fallback = "none", ssr }) {
 		locationState,
 		locationInfo,
 		urlObject,
+		entryId,
+		entryKey,
 		isPending,
 		navigateAsync,
 		updateCurrentEntryState
@@ -782,7 +810,6 @@ function Router({ routes: inputRoutes, onNavigate, fallback = "none", ssr }) {
 		blockerRegistry
 	]);
 }
-
 //#endregion
 //#region src/Outlet.tsx
 /**
@@ -794,7 +821,6 @@ function Outlet() {
 	if (!routeContext) return null;
 	return routeContext.outlet;
 }
-
 //#endregion
 //#region src/hooks/useLocation.ts
 /**
@@ -803,17 +829,22 @@ function Outlet() {
 function useLocation() {
 	const context = useContext(RouterContext);
 	if (!context) throw new Error("useLocation must be used within a Router");
-	const { url } = context;
+	const { url, entryId, entryKey } = context;
 	if (url === null) throw new Error("useLocation: URL is not available during SSR.");
 	return useMemo(() => {
 		return {
 			pathname: url.pathname,
 			search: url.search,
-			hash: url.hash
+			hash: url.hash,
+			entryId,
+			entryKey
 		};
-	}, [url]);
+	}, [
+		url,
+		entryId,
+		entryKey
+	]);
 }
-
 //#endregion
 //#region src/hooks/useSearchParams.ts
 /**
@@ -837,7 +868,6 @@ function useSearchParams() {
 		navigateAsync(url.pathname + url.search + url.hash, { replace: true });
 	}, [currentUrl, navigateAsync])];
 }
-
 //#endregion
 //#region src/hooks/useBlocker.ts
 /**
@@ -881,7 +911,6 @@ function useBlocker(options) {
 		registry
 	]);
 }
-
 //#endregion
 //#region src/hooks/useRouteContext.ts
 /**
@@ -903,7 +932,6 @@ function useRouteContext(hookName, routeId) {
 	if (!matchedContext) throw new Error(`${hookName}: Route ID "${routeId}" not found in current route hierarchy. Current route is "${context.id ?? "(no id)"}"`);
 	return matchedContext;
 }
-
 //#endregion
 //#region src/hooks/useRouteParams.ts
 /**
@@ -930,7 +958,6 @@ function useRouteParams(route) {
 	const routeId = route.id;
 	return useRouteContext("useRouteParams", routeId).params;
 }
-
 //#endregion
 //#region src/hooks/useRouteState.ts
 /**
@@ -958,7 +985,6 @@ function useRouteState(route) {
 	const routeId = route.id;
 	return useRouteContext("useRouteState", routeId).state;
 }
-
 //#endregion
 //#region src/hooks/useRouteData.ts
 /**
@@ -989,7 +1015,6 @@ function useRouteData(route) {
 	const routeId = route.id;
 	return useRouteContext("useRouteData", routeId).data;
 }
-
 //#endregion
 //#region src/hooks/useIsPending.ts
 /**
@@ -1000,7 +1025,7 @@ function useIsPending() {
 	if (!context) throw new Error("useIsPending must be used within a Router");
 	return context.isPending;
 }
-
 //#endregion
 export { Outlet, Router, bindRoute, hardNavigate, hardReload, route, routeState, useBlocker, useIsPending, useLocation, useRouteData, useRouteParams, useRouteState, useSearchParams };
+
 //# sourceMappingURL=index.mjs.map