clear-react-router 1.0.13 → 1.0.16

package/dist/hooks/useHandleNavigation.d.ts

@@ -1,4 +1,4 @@
-import type { BlockerState, Location, RouteItem, UpdateBlockedRouteProps } from '../types/global';
+import type { BlockerState, Location, RouteItem, UpdateBlockedRouteProps } from '../types/global.ts';
 type UseHandleNavigation = {
     routeList: RouteItem[];
     setLocation: (arg: Location) => void;

package/dist/index.js

@@ -199,29 +199,24 @@ var l = (e, t) => () => (t || (e((t = { exports: {} }).exports, t), e = null), t
 			children: e
 		})
 	})
-}), v = (e) => {
-	let t = s(e);
-	return a(() => {
-		t.current = e;
-	}, [e]), t;
-}, y = (t, r) => {
+}), v = (t, r) => {
 	let i = n(() => t().then((e) => ({ default: e.default || e })));
 	return () => /* @__PURE__ */ (0, g.jsx)(e, {
 		fallback: typeof r == "function" ? r() : r || null,
 		children: /* @__PURE__ */ (0, g.jsx)(i, {})
 	});
-}, b = (e) => typeof e.element == "function" && e.element.toString().includes("import("), x = (e, t = [], n = "") => {
+}, y = (e) => typeof e.element == "function" && e.element.toString().includes("import("), b = (e, t = [], n = "") => {
 	let r = e.path.match(/:[^/]+/g), i = e.path.replaceAll(/:[^/]+(\/|$)/g, "").split("/").filter(Boolean), a = e.path.split("/"), o = r ? [...t, ...r.map((e, t) => ({
 		key: i[t],
 		value: e.slice(1)
-	}))] : t, s = o.length ? `${n}${a.slice(0, a.length - 1).join("/")}` : e.path, c = b(e) ? y(e.element, e.fallback) : e.element;
+	}))] : t, s = o.length ? `${n}${a.slice(0, a.length - 1).join("/")}` : e.path, c = y(e) ? v(e.element, e.fallback) : e.element;
 	return [{
 		...e,
 		path: s,
 		params: o,
 		element: c
-	}, ...e.children?.flatMap((e) => x(e, o, s)) || []];
-}, S = (e) => e.flatMap((e) => x(e, [])), C = (e) => {
+	}, ...e.children?.flatMap((e) => b(e, o, s)) || []];
+}, x = (e) => e.flatMap((e) => b(e, [])), S = (e) => {
 	let { pathname: t } = window.location, n = t.split("/");
 	return (e || []).map((e) => ({
 		index: n.findIndex((t) => t === e.key),
@@ -230,32 +225,32 @@ var l = (e, t) => () => (t || (e((t = { exports: {} }).exports, t), e = null), t
 		...e,
 		[t.value]: n[t.index + 1]
 	}), {});
-}, w = (e) => ({
+}, C = (e) => ({
 	pathname: e.pathname,
 	search: e.search
-}), T = (e, t) => {
+}), w = (e, t) => {
 	let n = e.path.split("/").filter(Boolean), r = e.params ? Object.keys(e.params).length : 0, i = t.split("/").filter(Boolean);
 	return n.every((e, t) => e === i[t + +!!t]) && i.length === n.length + r;
-}, E = class {
-	url;
-	search;
-	cause;
-	constructor(e, t) {
-		this.url = e, this.search = t, this.cause = "redirect";
-	}
-}, D = (e, t) => Promise.reject(new E(e, t)), O = ({ setLocation: e, routeList: t, context: n, revalidateCache: i }) => {
+}, T = (e) => {
+	let t = s(e);
+	return a(() => {
+		t.current = e;
+	}, [e]), t;
+}, E = (e) => typeof e == "object" && !!e && e.cause === "redirect", D = ({ setLocation: e, routeList: t, context: n, revalidateCache: i }) => {
 	let [l, u] = c({
 		from: "",
 		to: ""
-	}), d = s(""), f = v(r(async (r) => {
+	}), d = s(""), f = T(r(async (r) => {
 		try {
-			let a = t.find((e) => T(e, r.pathname));
-			console.log("before beforeLoad execution", a, n), a?.beforeLoad && await a?.beforeLoad(n), console.log("after beforeLoad execution", a, n), e(r), console.log(r.pathname !== window.location.pathname), r.pathname !== window.location.pathname && (history.pushState(null, "", r.pathname), d.current = r.pathname), await i(a), a?.afterLoad && await a?.afterLoad(n);
+			let a = t.find((e) => w(e, r.pathname));
+			console.log("before beforeLoad execution", a), a?.beforeLoad && await a?.beforeLoad(n), console.log("after beforeLoad execution", a), e(r), r.pathname !== window.location.pathname && (history.pushState(null, "", r.pathname), d.current = r.pathname), await i(a), a?.afterLoad && await a?.afterLoad(n);
 		} catch (t) {
-			if (console.log("redirect", t), !(t instanceof E)) return t;
-			history.replaceState(null, "", `${t.url}${t.search || ""}`), e({
-				pathname: t.url,
-				search: t.search
+			console.log("redirect caught", t);
+			let n = t;
+			if (!E(n)) return n;
+			console.log("redirect after type guard"), history.replaceState(null, "", n.url), e({
+				pathname: n.url,
+				search: n.search
 			});
 		}
 	}, [
@@ -280,7 +275,7 @@ var l = (e, t) => () => (t || (e((t = { exports: {} }).exports, t), e = null), t
 	}, [l.from, f]);
 	return a(() => {
 		let e = async (e) => {
-			let t = w(e.target.location);
+			let t = C(e.target.location);
 			d.current === l.from ? (u({
 				from: d.current,
 				to: t.pathname
@@ -288,14 +283,14 @@ var l = (e, t) => () => (t || (e((t = { exports: {} }).exports, t), e = null), t
 		};
 		return window.addEventListener("popstate", e), () => window.removeEventListener("popstate", e);
 	}, [l.from, f]), a(() => {
-		let e = w(window.location);
+		let e = C(window.location);
 		f.current(e), d.current = e.pathname;
 	}, [f]), {
 		blockerState: o(() => l.from && l.to ? "blocked" : l.from ? "charged" : "unblocked", [l]),
 		updateLocation: m,
 		updateBlockedRoute: p
 	};
-}, k = (e) => {
+}, O = (e) => {
 	let [t, n] = c({}), [i, a] = c(!1), [o, l] = c({}), u = s({}), d = r(({ key: e, value: t }) => n((n) => ({
 		...n,
 		[e]: t
@@ -332,7 +327,7 @@ var l = (e, t) => () => (t || (e((t = { exports: {} }).exports, t), e = null), t
 			}
 		}
 	}, [f, d]), m = r(async (t) => {
-		let n = e.find((e) => T(e, t));
+		let n = e.find((e) => w(e, t));
 		n && await p(n);
 	}, [p, e]);
 	return {
@@ -342,13 +337,13 @@ var l = (e, t) => () => (t || (e((t = { exports: {} }).exports, t), e = null), t
 		revalidateCache: p,
 		isLoading: o[window.location.pathname]
 	};
-}, A = (e) => e ? typeof e == "function" ? /* @__PURE__ */ (0, g.jsx)(e, {}) : e : null, j = "error 404. Page not found", M = "*", N = ({ routeList: e, context: t = {} }) => {
-	let [n, r] = c(w(window.location)), [i, a] = c(t), s = o(() => e.find((e) => e.path === M || T(e, n.pathname)), [n.pathname, e]), { loaderError: l, loaderCache: u, prefetchLoader: d, revalidateCache: f, isLoading: p } = k(e), { blockerState: m, updateLocation: h, updateBlockedRoute: v } = O({
+}, k = (e) => e ? typeof e == "function" ? /* @__PURE__ */ (0, g.jsx)(e, {}) : e : null, A = "error 404. Page not found", j = "*", M = ({ routeList: e, context: t = {} }) => {
+	let [n, r] = c(C(window.location)), [i, a] = c(t), s = o(() => e.find((e) => e.path === j || w(e, n.pathname)), [n.pathname, e]), { loaderError: l, loaderCache: u, prefetchLoader: d, revalidateCache: f, isLoading: p } = O(e), { blockerState: m, updateLocation: h, updateBlockedRoute: v } = D({
 		setLocation: r,
 		routeList: e,
 		context: i,
 		revalidateCache: f
-	}), y = o(() => s?.params ? C(s.params) : {}, [s]), b = o(() => ({
+	}), y = o(() => s?.params ? S(s.params) : {}, [s]), b = o(() => ({
 		location: n,
 		updateLocation: h,
 		params: y,
@@ -370,45 +365,45 @@ var l = (e, t) => () => (t || (e((t = { exports: {} }).exports, t), e = null), t
 	]);
 	return s?.loader && !l && p ? /* @__PURE__ */ (0, g.jsx)(_, {
 		...b,
-		children: A(s?.loaderFallback)
+		children: k(s?.loaderFallback)
 	}) : l ? /* @__PURE__ */ (0, g.jsx)(_, {
 		...b,
-		children: A(s?.errorElement)
+		children: k(s?.errorElement)
 	}) : /* @__PURE__ */ (0, g.jsx)(_, {
 		...b,
-		children: A(s?.element) || j
+		children: k(s?.element) || A
 	});
-}, P = () => {
+}, N = () => {
 	let e = i(p);
 	if (!Object.keys(e).length) throw Error("useNavigationState must be used within Router component");
 	return e;
-}, F = () => {
+}, P = () => {
 	let e = i(d);
 	if (!Object.keys(e).length) throw Error("useRouterActions must be used within Router component");
 	return e;
-}, I = () => {
+}, F = () => {
 	let e = i(f);
 	if (!Object.keys(e).length) throw Error("useRouterData must be used within Router component");
 	return e;
-}, L = () => {
-	let { updateLocation: e } = F();
+}, I = () => {
+	let { updateLocation: e } = P();
 	return r(async (t) => t === -1 ? history.go(-1) : await e(t), [e]);
-}, R = ({ children: e, to: t, prefetch: n = !0 }) => {
-	let { prefetchLoader: r } = F(), i = L();
+}, L = ({ children: e, to: t, prefetch: n = !0 }) => {
+	let { prefetchLoader: r } = P(), i = I();
 	return /* @__PURE__ */ (0, g.jsx)("a", {
 		style: { cursor: "pointer" },
 		onClick: () => i({ pathname: t }),
 		onMouseOver: () => n && r(t),
 		children: e
 	});
-}, z = () => {
-	let { params: e } = P();
+}, R = () => {
+	let { params: e } = N();
 	return e;
-}, B = () => P().location, V = () => {
-	let { loaderCache: e } = I();
+}, z = () => N().location, B = () => {
+	let { loaderCache: e } = F();
 	return e;
-}, H = (e) => {
-	let { location: { pathname: t }, blockerState: n } = P(), { updateBlockedRoute: r } = F(), i = e();
+}, V = (e) => {
+	let { location: { pathname: t }, blockerState: n } = N(), { updateBlockedRoute: r } = P(), i = e();
 	return a(() => r(i ? {
 		type: "charge",
 		payload: t
@@ -421,19 +416,25 @@ var l = (e, t) => () => (t || (e((t = { exports: {} }).exports, t), e = null), t
 		process: () => r({ type: "process" }),
 		reset: () => r({ type: "reset" })
 	};
-}, U = (e) => {
+}, H = (e) => {
 	a(() => {
 		let t = (t) => {
 			e && (t.preventDefault(), e());
 		};
 		return window.addEventListener("beforeunload", t), () => window.removeEventListener("beforeunload", t);
 	}, [e]);
-}, W = () => {
-	let { context: e } = I(), { setContext: t } = F();
+}, U = () => {
+	let { context: e } = F(), { setContext: t } = P();
 	return {
 		context: e,
 		setContext: t
 	};
+}, W = (e, t) => {
+	let n = /* @__PURE__ */ Error();
+	throw n.cause = "redirect", Object.assign(n, {
+		url: e,
+		search: t || ""
+	});
 };
 //#endregion
-export { R as Link, N as Router, S as createRouter, D as redirect, U as useBeforeUnload, H as useBlocker, V as useLoaderState, B as useLocation, L as useNavigate, z as useParams, W as useRouterContext };
+export { L as Link, M as Router, x as createRouter, W as redirect, H as useBeforeUnload, V as useBlocker, B as useLoaderState, z as useLocation, I as useNavigate, R as useParams, U as useRouterContext };

package/dist/utils/redirect.d.ts

@@ -1,7 +1 @@
-export declare class RedirectInstance {
-    url: string;
-    search?: string;
-    cause: 'redirect';
-    constructor(url: string, search?: string);
-}
-export declare const redirect: (url: string, search?: string) => Promise<never>;
+export declare const redirect: (url: string, search?: string) => never;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clear-react-router",
-  "version": "1.0.13",
+  "version": "1.0.16",
   "description": "A lightweight, type-safe routing library for React applications",
   "author": "Andrew Bubnov",
   "main": "./dist/index.js",