@vielzeug/wayfinder 1.0.5 → 2.1.0

package/dist/router.js

@@ -1,34 +1,35 @@
-import { WayfinderDisposedError as e, WayfinderRedirectLoopError as t, WayfinderRouteError as n } from "./errors.js";
-import { buildPreloadKey as r, buildUrl as i, joinPaths as a, matchRouteFor as o, matchesPrefix as s, normalizePath as c, parseQuery as l, readLocation as u, stripBase as d } from "./path.js";
-import { compileRoutes as f } from "./compile.js";
-import { buildMatchBranch as p, createRouteContext as m, createRouteState as h, executeMiddlewarePipeline as g, reportError as _ } from "./context.js";
-import { runLeaveBlockers as v } from "./guards.js";
-import { createBrowserHistory as y } from "./history.js";
-import { createHydrationManager as b } from "./hydration.js";
-import { createPreloadManager as x } from "./preload.js";
+import { createNavigationCoordinator as e } from "./_navigation.js";
+import { WayfinderDisposedError as t, WayfinderRedirectLoopError as n, WayfinderRouteError as r } from "./errors.js";
+import { buildPreloadKey as i, buildUrl as a, joinPaths as o, matchRouteFor as s, matchesPrefix as c, normalizePath as l, parseQuery as u, readLocation as d, stripBase as f } from "./path.js";
+import { compileRoutes as p } from "./compile.js";
+import { buildMatchBranch as m, createRouteContext as h, createRouteState as g, executeMiddlewarePipeline as _, reportError as v } from "./context.js";
+import { runLeaveBlockers as y } from "./guards.js";
+import { createBrowserHistory as b } from "./history.js";
+import { createHydrationManager as x } from "./hydration.js";
+import { createPreloadManager as S } from "./preload.js";
 //#region src/router.ts
-function S(e, t) {
-	let r = t.get(e);
-	if (r) return r;
+function C(e, t) {
+	let n = t.get(e);
+	if (n) return n;
 	let i = [...t.keys()].join(", ");
-	throw new n(i ? `Unknown route name: ${e}. Available routes: ${i}` : `Unknown route name: ${e}`);
+	throw new r(i ? `Unknown route name: ${e}. Available routes: ${i}` : `Unknown route name: ${e}`);
 }
-function C(e, t, n = "/") {
+function w(e, t, n = "/") {
 	if ("path" in e) return e.path;
-	let r = S(e.name, t), a = i(n, r.path, e.params, e.query);
-	return e.hash ? `${a}#${e.hash}` : a;
+	let r = C(e.name, t), i = a(n, r.path, e.params, e.query);
+	return e.hash ? `${i}#${e.hash}` : i;
 }
-var w = Symbol("wayfinder.errorContext");
-function T(e, t) {
-	typeof e == "object" && e && (e[w] = t);
-}
-function E(e) {
-	if (typeof e == "object" && e) return e[w];
+var T = Symbol("wayfinder.errorContext");
+function E(e, t) {
+	typeof e == "object" && e && (e[T] = t);
 }
 function D(e) {
+	if (typeof e == "object" && e) return e[T];
+}
+function O(e) {
 	return typeof e == "object" && !!e && typeof e[Symbol.asyncIterator] == "function" && typeof e.next == "function" && typeof e.return == "function";
 }
-var O = class {
+var k = class {
 	#e;
 	#t;
 	#n;
@@ -38,8 +39,8 @@ var O = class {
 	#o;
 	#s;
 	#c;
-	#l = null;
-	#u = /* @__PURE__ */ new Set();
+	#l = /* @__PURE__ */ new Set();
+	#u = e();
 	#d;
 	#f = !1;
 	#p = new AbortController();
@@ -49,9 +50,10 @@ var O = class {
 	#_;
 	#v;
 	#y;
+	ready;
 	constructor(e) {
-		let t = f(e);
-		if (this.#e = c(e.base ?? "/"), this.#t = e.middleware ?? [], this.#n = e.coerceSearch, this.#r = e.history ?? y(), this.#s = e.viewTransition ?? !1, this.#o = e.scroll, this.#c = e.onError, this.#i = t.records, this.#a = t.routesByName, this.#_ = b(), this.#v = x(), this.#d = h({
+		let t = p(e);
+		if (this.#e = l(e.base ?? "/"), this.#t = e.middleware ?? [], this.#n = e.coerceSearch, this.#r = e.history ?? b(), this.#s = e.viewTransition ?? !1, this.#o = e.scroll, this.#c = e.onError, this.#i = t.records, this.#a = t.routesByName, this.#_ = x(), this.#v = S(), this.#d = g({
 			location: {
 				hash: "",
 				historyState: null,
@@ -81,7 +83,13 @@ var O = class {
 		} else this.#g = null;
 		this.#y = this.#x();
 		let { hash: n, pathname: r, search: i } = this.#r.location;
-		this.#m = `${r}${i}${n}`, this.#w(this.#F(), { source: "initial-navigation" });
+		this.#m = `${r}${i}${n}`;
+		let a = this.#u.begin();
+		this.ready = this.#F(a, d(this.#e, this.#r), (e, t) => {
+			if (!a.isCurrent()) return;
+			let n = this.#z(e);
+			t && this.#r.replace(n, e.historyState), this.#m = n;
+		}, void 0, 0, !1).then(() => void 0), this.#w(this.ready, { source: "initial-navigation" }), this.beforeLeave = this.beforeLeave.bind(this), this.dispose = this.dispose.bind(this), this.getSnapshot = this.getSnapshot.bind(this), this.isActive = this.isActive.bind(this), this.load = this.load.bind(this), this.match = this.match.bind(this), this.navigate = this.navigate.bind(this), this.preload = this.preload.bind(this), this.subscribe = this.subscribe.bind(this), this.url = this.url.bind(this), this.waitFor = this.waitFor.bind(this);
 	}
 	getSnapshot() {
 		return this.#d;
@@ -92,39 +100,39 @@ var O = class {
 		};
 	}
 	navigate(e, t) {
-		let n = C(typeof e == "string" ? { path: e } : e, this.#a);
-		return this.#z(n, t);
+		let n = w(typeof e == "string" ? { path: e } : e, this.#a);
+		return this.#V(n, t);
 	}
 	url(e, t, n) {
-		let r = S(e, this.#a);
-		return i(this.#e, r.path, t, n);
+		let r = C(e, this.#a);
+		return a(this.#e, r.path, t, n);
 	}
 	isActive(e, t = {}) {
-		let n = S(e, this.#a), r = this.#d.location.pathname;
-		return t.exact ?? !1 ? o(r, [n]).record != null : s(r, n);
+		let n = C(e, this.#a), r = this.#d.location.pathname;
+		return t.exact ?? !1 ? s(r, [n]).record != null : c(r, n);
 	}
-	resolve(e) {
-		let t = d(c(e), this.#e), { params: n, record: r } = o(t, this.#i);
+	match(e) {
+		let t = f(l(e), this.#e), { params: n, record: r } = s(t, this.#i);
 		if (!r || r.redirect) return null;
-		let i = this.#_.effectiveDefs(r), a = p(i, n, t, i.map(() => void 0));
+		let i = this.#_.effectiveDefs(r), a = m(i, n, t, i.map(() => void 0));
 		return a.length ? a : null;
 	}
-	async match(e, t) {
+	async load(e, t) {
 		let n = await this.#k(e);
 		if (n.type !== "matched") return null;
 		let { location: r, params: i, record: a, resolvedQuery: o } = n, s = this.#_.effectiveDefs(a), c = s.some((e) => e.dataFn != null), l = s.map(() => void 0), u, d = "idle";
 		if (c) {
-			let e = t?.signal ?? new AbortController().signal, n = p(s, i, r.pathname, l), a = m(r, o, i, n, () => Promise.resolve());
+			let e = t?.signal ?? new AbortController().signal, n = m(s, i, r.pathname, l), a = h(r, o, i, n, () => Promise.resolve());
 			try {
 				l = await this.#D(s, a, e);
 			} catch (e) {
 				u = e, d = "error";
 			}
 		}
-		return h({
+		return g({
 			error: u,
 			location: r,
-			matches: p(s, i, r.pathname, l),
+			matches: m(s, i, r.pathname, l),
 			status: d
 		});
 	}
@@ -149,7 +157,7 @@ var O = class {
 	}
 	async preload(e, t, n) {
 		this.#b();
-		let i = S(e, this.#a), a = r(this.#e, i.path, t, n), o = this.#v.getInflight(a);
+		let r = C(e, this.#a), a = i(this.#e, r.path, t, n), o = this.#v.getInflight(a);
 		if (o) return o;
 		let s = this.#A(a, this.#p.signal, n).finally(() => {
 			this.#v.untrack(a);
@@ -167,8 +175,8 @@ var O = class {
 			handler: e,
 			routes: t?.routes
 		};
-		return this.#u.add(n), () => {
-			this.#u.delete(n);
+		return this.#l.add(n), () => {
+			this.#l.delete(n);
 		};
 	}
 	get disposalSignal() {
@@ -178,13 +186,13 @@ var O = class {
 		return this.#f;
 	}
 	dispose() {
-		this.#f || (this.#f = !0, this.#u.clear(), this.#h.clear(), this.#l?.abort(), this.#l = null, this.#y(), this.#p.abort(new e()));
+		this.#f || (this.#f = !0, this.#l.clear(), this.#h.clear(), this.#u.invalidate(new t()), this.#y(), this.#p.abort(new t()));
 	}
 	[Symbol.dispose]() {
 		this.dispose();
 	}
 	#b() {
-		if (this.#f) throw new e();
+		if (this.#f) throw new t();
 	}
 	#x() {
 		return this.#r.onPopstate(() => {
@@ -193,28 +201,31 @@ var O = class {
 		});
 	}
 	async #S(e, t) {
-		let n = this.#d.matches.map((e) => e.name), r = new URL(e, "http://localhost"), i = d(r.pathname, this.#e), { params: a, record: s } = o(i, this.#i), c = {
-			name: s?.leaf.name,
-			params: a,
-			pathname: i,
-			query: l(r.search)
-		};
-		if (!await v(this.#u, n, c)) {
+		let n = this.#u.begin(), r = this.#d.matches.map((e) => e.name), i = this.#B(e), a = await y(this.#l, r, i);
+		if (!n.isCurrent()) return;
+		if (!a) {
 			this.#r.replace(t, this.#d.location.historyState);
 			return;
 		}
-		this.#m = e, await this.#F();
+		let o = await this.#F(n, d(this.#e, this.#r), (e, t) => {
+			if (!n.isCurrent()) return;
+			let r = this.#z(e);
+			t && this.#r.replace(r, e.historyState), this.#m = r;
+		}, void 0, 0, !1);
+		n.isCurrent() && !o && this.#r.replace(t, this.#d.location.historyState);
 	}
 	#C(e, t) {
-		_(e, t, this.#c);
+		v(e, t, this.#c);
 	}
 	#w(e, t) {
 		e.catch((e) => {
-			this.#C(e, E(e) ?? t);
+			this.#C(e, D(e) ?? t);
 		});
 	}
 	#T() {
-		this.#h.forEach((e) => e(this.#d));
+		this.#h.forEach((e) => {
+			e(this.#d);
+		});
 	}
 	async #E(e, t) {
 		let n;
@@ -233,7 +244,7 @@ var O = class {
 				signal: n
 			});
 			try {
-				return D(i) ? await this.#E(i, n) : await i;
+				return O(i) ? await this.#E(i, n) : await i;
 			} catch (r) {
 				if (e.onError) return e.onError(r, {
 					...t,
@@ -252,7 +263,7 @@ var O = class {
 				signal: n
 			});
 		}), s = [], c = await Promise.all(o.map(async (r, i) => {
-			if (D(r)) {
+			if (O(r)) {
 				s.push(i);
 				return;
 			}
@@ -272,9 +283,9 @@ var O = class {
 			if (!r()) return;
 			l[n] = t;
 			let o = e.map((e, t) => s.includes(t) ? "streaming" : "idle");
-			this.#d = h({
+			this.#d = g({
 				location: i,
-				matches: p(e, a, i.pathname, l, o),
+				matches: m(e, a, i.pathname, l, o),
 				status: "streaming"
 			}), this.#T();
 		};
@@ -293,29 +304,29 @@ var O = class {
 		})), l;
 	}
 	async #k(e) {
-		let n = e;
+		let t = e;
 		for (let e = 0; e < 5; e += 1) {
-			let e = new URL(n, "http://localhost"), t = {
+			let e = new URL(t, "http://localhost"), n = {
 				hash: e.hash.replace(/^#/, ""),
 				historyState: null,
-				pathname: d(e.pathname, this.#e),
-				query: l(e.search)
-			}, r = await this.#j(t);
+				pathname: f(e.pathname, this.#e),
+				query: u(e.search)
+			}, r = await this.#j(n);
 			if (r.type !== "redirect") return r;
-			n = this.#L(r.redirectTo);
+			t = this.#L(r.redirectTo);
 		}
-		throw new t();
+		throw new n();
 	}
 	async #A(e, t, n) {
-		let i = await this.#k(e);
-		if (i.type !== "matched") return;
-		let { location: a, params: o, record: s, resolvedQuery: c } = i, l = this.#_.effectiveDefs(s);
+		let r = await this.#k(e);
+		if (r.type !== "matched") return;
+		let { location: a, params: o, record: s, resolvedQuery: c } = r, l = this.#_.effectiveDefs(s);
 		if (!l.some((e) => e.dataFn != null)) return;
-		let u = p(l, o, a.pathname, l.map(() => void 0)), d = m(a, c, o, u, () => Promise.resolve()), f = await this.#D(l, d, t);
-		this.#v.set(r(this.#e, s.path, o, n ?? a.query), f);
+		let u = m(l, o, a.pathname, l.map(() => void 0)), d = h(a, c, o, u, () => Promise.resolve()), f = await this.#D(l, d, t);
+		this.#v.set(i(this.#e, s.path, o, n ?? a.query), f);
 	}
 	async #j(e) {
-		let { params: t, record: n } = o(e.pathname, this.#i);
+		let { params: t, record: n } = s(e.pathname, this.#i);
 		if (!n) return {
 			location: e,
 			params: t,
@@ -324,7 +335,7 @@ var O = class {
 		if (n.redirect) return {
 			location: e,
 			params: t,
-			redirectTo: C(n.redirect, this.#a, this.#e),
+			redirectTo: w(n.redirect, this.#a, this.#e),
 			type: "redirect"
 		};
 		let r = e.query, i = n.coerceSearch ?? this.#n;
@@ -336,7 +347,7 @@ var O = class {
 		await this.#_.hydrate(n);
 		let a = this.#_.effectiveDefs(n);
 		return {
-			branch: p(a, t, e.pathname, a.map(() => void 0)),
+			branch: m(a, t, e.pathname, a.map(() => void 0)),
 			location: e,
 			params: t,
 			record: n,
@@ -357,37 +368,38 @@ var O = class {
 			throw await e.return(void 0).catch(() => void 0), t;
 		}
 	}
-	async #N(e, t, n, i, a, o, s) {
-		if (!s()) return;
-		let c = this.#_.effectiveDefs(e), l = c.some((e) => e.dataFn != null), u = c.map(() => void 0);
-		if (l) {
-			let a = r(this.#e, e.path, i, n.query), l = this.#v.consume(a);
-			if (l) u = l;
+	async #N(e, t, n, r, a, o) {
+		if (!o()) return;
+		let s = this.#_.effectiveDefs(e), c = s.some((e) => e.dataFn != null), l = s.map(() => void 0);
+		if (c) {
+			let c = i(this.#e, e.path, r, n.query), u = this.#v.consume(c);
+			if (u) l = u;
 			else {
-				let r = c.map((e) => e.dataFn ? "loading" : "idle");
-				this.#d = h({
+				let i = s.map((e) => e.dataFn ? "loading" : "idle");
+				this.#d = g({
 					location: n,
-					matches: p(c, i, n.pathname, u, r),
+					matches: m(s, r, n.pathname, l, i),
 					status: "loading"
 				}), this.#T();
 				try {
-					u = await this.#O(c, t, o, s, n, i);
+					l = await this.#O(s, t, a, o, n, r);
 				} catch (t) {
-					throw this.#d = h({
+					if (!o()) return;
+					throw this.#d = g({
 						error: t,
 						location: n,
-						matches: p(c, i, n.pathname, u),
+						matches: m(s, r, n.pathname, l),
 						status: "error"
-					}), T(t, {
+					}), E(t, {
 						routeName: e.leaf.name,
 						source: "data-loader"
 					}), t;
 				}
 			}
 		}
-		s() && (this.#d = h({
+		o() && (this.#d = g({
 			location: n,
-			matches: p(c, i, n.pathname, u),
+			matches: m(s, r, n.pathname, l),
 			status: "idle"
 		}));
 	}
@@ -401,57 +413,54 @@ var O = class {
 		}
 		await e();
 	}
-	async #F(e, t = 0) {
-		this.#l?.abort();
-		let n = new AbortController();
-		this.#l = n;
-		let r = this.#d, i = () => !n.signal.aborted && !this.#f, a = u(this.#e, this.#r), o = await this.#j(a);
-		if (!i()) return;
-		if (o.type === "redirect") {
-			await this.#R(o.redirectTo, !0, t);
-			return;
+	async #F(e, t, r, i, a = 0, o = !1) {
+		let s = this.#d, c = () => e.isCurrent() && !this.#f, l = await this.#j(t);
+		if (!c()) return !1;
+		if (l.type === "redirect") {
+			if (a >= 5) throw new n();
+			return this.#F(e, this.#R(l.redirectTo, t.historyState), r, i, a + 1, !0);
 		}
-		if (o.type === "unmatched") {
+		if (l.type === "unmatched") {
 			if (this.#g) {
-				let t = [this.#g.leaf], o = p(t, {}, a.pathname, [void 0]), s = !1, c = a.query;
+				let n = [this.#g.leaf], a = m(n, {}, t.pathname, [void 0]), l = !1, u = !1, d = t.query;
 				if (this.#n) try {
-					c = this.#n(a.query);
+					d = this.#n(t.query);
 				} catch (e) {
 					this.#C(e, { source: "coerce-search" });
 				}
-				let l = async () => {
-					if (!i()) return;
-					let e = m(a, c, {}, o, (e, t) => this.navigate(e, t));
-					await g(e, [...this.#t, ...this.#g.ownMiddleware], async () => {
-						s = !0, await this.#N(this.#g, e, a, {}, o, n.signal, i);
+				let f = async () => {
+					if (!c()) return;
+					let n = h(t, d, {}, a, (e, t) => this.navigate(e, t));
+					u = await _(n, [...this.#t, ...this.#g.ownMiddleware], async () => {
+						c() && (l = !0, r(t, o), c() && await this.#N(this.#g, n, t, {}, e.signal, c));
 					});
 				};
 				try {
-					await this.#P(l, e);
+					await this.#P(f, i);
 				} finally {
-					i() && s && (this.#T(), this.#I(this.#d, r));
+					c() && l && (this.#T(), this.#I(this.#d, s));
 				}
-				return;
+				return u && l;
 			}
-			this.#d = h({
-				location: o.location,
+			return !c() || (r(l.location, o), !c()) ? !1 : (this.#d = g({
+				location: l.location,
 				matches: [],
 				status: "idle"
-			}), this.#T(), this.#I(this.#d, r);
-			return;
+			}), this.#T(), this.#I(this.#d, s), !0);
 		}
-		let { branch: s, location: c, params: l, record: d, resolvedQuery: f } = o, _ = !1, v = async () => {
-			if (!i()) return;
-			let e = m(c, f, l, s, (e, t) => this.navigate(e, t));
-			await g(e, [...this.#t, ...d.ownMiddleware], async () => {
-				_ = !0, await this.#N(d, e, c, l, s, n.signal, i);
+		let { branch: u, location: d, params: f, record: p, resolvedQuery: v } = l, y = !1, b = !1, x = async () => {
+			if (!c()) return;
+			let t = h(d, v, f, u, (e, t) => this.navigate(e, t));
+			b = await _(t, [...this.#t, ...p.ownMiddleware], async () => {
+				c() && (y = !0, r(d, o), c() && await this.#N(p, t, d, f, e.signal, c));
 			});
 		};
 		try {
-			await this.#P(v, e);
+			await this.#P(x, i);
 		} finally {
-			i() && _ && (this.#T(), this.#I(this.#d, r));
+			c() && y && (this.#T(), this.#I(this.#d, s));
 		}
+		return b && y;
 	}
 	#I(e, t) {
 		if (!this.#o || typeof window > "u") return;
@@ -465,38 +474,51 @@ var O = class {
 		}
 	}
 	#L(e) {
-		let t = new URL(e, "http://localhost"), n = d(t.pathname, this.#e);
-		return `${a(this.#e, n)}${t.search}${t.hash}`;
+		let t = new URL(e, "http://localhost"), n = f(t.pathname, this.#e);
+		return `${o(this.#e, n)}${t.search}${t.hash}`;
 	}
-	async #R(e, n = !0, r = 0) {
-		if (r >= 5) throw new t();
-		let i = this.#L(e);
-		this.#m = i, n ? this.#r.replace(i) : this.#r.push(i), await this.#F(void 0, r + 1);
+	#R(e, t) {
+		let n = new URL(this.#L(e), "http://localhost");
+		return {
+			hash: n.hash.replace(/^#/, ""),
+			historyState: t,
+			pathname: f(n.pathname, this.#e),
+			query: u(n.search)
+		};
 	}
-	async #z(e, t = {}) {
+	#z(e) {
+		let t = new URLSearchParams();
+		for (let [n, r] of Object.entries(e.query)) Array.isArray(r) ? r.forEach((e) => {
+			t.append(n, e);
+		}) : t.set(n, r);
+		let n = t.toString(), r = e.hash ? `#${e.hash}` : "";
+		return `${o(this.#e, e.pathname)}${n ? `?${n}` : ""}${r}`;
+	}
+	#B(e) {
+		let t = new URL(e, "http://localhost"), n = f(t.pathname, this.#e), { params: r, record: i } = s(n, this.#i);
+		return {
+			name: i?.leaf.name,
+			params: r,
+			pathname: n,
+			query: u(t.search)
+		};
+	}
+	async #V(e, t = {}) {
 		this.#b();
 		let n = this.#L(e);
 		if (!t.force && n === this.#m) return;
-		let r = this.#m, i = this.#d.matches.map((e) => e.name), a = new URL(n, "http://localhost"), s = d(a.pathname, this.#e), { params: c, record: u } = o(s, this.#i), f = {
-			name: u?.leaf.name,
-			params: c,
-			pathname: s,
-			query: l(a.search)
-		};
-		if (await v(this.#u, i, f)) {
-			this.#m = n, t.replace ? this.#r.replace(n, t.state) : this.#r.push(n, t.state);
-			try {
-				await this.#F(t.viewTransition);
-			} catch (e) {
-				throw this.#m = r, e;
-			}
-		}
+		let r = this.#u.begin(), i = this.#d.matches.map((e) => e.name), a = await y(this.#l, i, this.#B(n));
+		!r.isCurrent() || !a || await this.#F(r, this.#R(n, t.state), (e, t) => {
+			if (!r.isCurrent()) return;
+			let n = this.#z(e);
+			t ? this.#r.replace(n, e.historyState) : this.#r.push(n, e.historyState), this.#m = n;
+		}, t.viewTransition, 0, t.replace ?? !1);
 	}
 };
-function k(e) {
-	return new O(e);
+function A(e) {
+	return new k(e);
 }
 //#endregion
-export { k as createRouter };
+export { A as createRouter };
 
 //# sourceMappingURL=router.js.map