@vielzeug/wayfinder 2.0.0 → 2.2.0

package/dist/router.js

@@ -1,22 +1,22 @@
-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 { WayfinderDisposedError as e, WayfinderRedirectLoopError as t, WayfinderRouteError as n } from "./errors.js";
+import { createBrowserHistory as r } from "./history.js";
+import { createNavigationCoordinator as i } from "./_navigation.js";
+import { buildPreloadKey as a, buildUrl as o, joinPaths as s, matchRouteFor as c, matchesPrefix as l, normalizePath as u, parseQuery as d, readLocation as f, stripBase as p } from "./path.js";
+import { compileRoutes as m } from "./compile.js";
+import { buildMatchBranch as h, createRouteContext as g, createRouteState as _, executeMiddlewarePipeline as v, reportError as y } from "./context.js";
+import { runLeaveBlockers as b } from "./guards.js";
 import { createHydrationManager as x } from "./hydration.js";
 import { createPreloadManager as S } from "./preload.js";
 //#region src/router.ts
 function C(e, t) {
-	let n = t.get(e);
-	if (n) return n;
+	let r = t.get(e);
+	if (r) return r;
 	let i = [...t.keys()].join(", ");
-	throw new r(i ? `Unknown route name: ${e}. Available routes: ${i}` : `Unknown route name: ${e}`);
+	throw new n(i ? `Unknown route name: ${e}. Available routes: ${i}` : `Unknown route name: ${e}`);
 }
 function w(e, t, n = "/") {
 	if ("path" in e) return e.path;
-	let r = C(e.name, t), i = a(n, r.path, e.params, e.query);
+	let r = C(e.name, t), i = o(n, r.path, e.params, e.query);
 	return e.hash ? `${i}#${e.hash}` : i;
 }
 var T = Symbol("wayfinder.errorContext");
@@ -40,7 +40,7 @@ var k = class {
 	#s;
 	#c;
 	#l = /* @__PURE__ */ new Set();
-	#u = e();
+	#u = i();
 	#d;
 	#f = !1;
 	#p = new AbortController();
@@ -52,8 +52,8 @@ var k = class {
 	#y;
 	ready;
 	constructor(e) {
-		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({
+		let t = m(e);
+		if (this.#e = u(e.base ?? "/"), this.#t = e.middleware ?? [], this.#n = e.coerceSearch, this.#r = e.history ?? r(), 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 = _({
 			location: {
 				hash: "",
 				historyState: null,
@@ -82,14 +82,14 @@ var k = class {
 			};
 		} else this.#g = null;
 		this.#y = this.#x();
-		let { hash: n, pathname: r, search: i } = this.#r.location;
-		this.#m = `${r}${i}${n}`;
-		let a = this.#u.begin();
-		this.ready = this.#F(a, d(this.#e, this.#r), void 0, 0, !1, (e, t) => {
-			if (!a.isCurrent()) return;
+		let { hash: n, pathname: i, search: a } = this.#r.location;
+		this.#m = `${i}${a}${n}`;
+		let o = this.#u.begin();
+		this.ready = this.#F(o, f(this.#e, this.#r), (e, t) => {
+			if (!o.isCurrent()) return;
 			let n = this.#z(e);
 			t && this.#r.replace(n, e.historyState), this.#m = n;
-		}).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.loadPath = this.loadPath.bind(this), this.matchPath = this.matchPath.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);
+		}, 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;
@@ -105,34 +105,34 @@ var k = class {
 	}
 	url(e, t, n) {
 		let r = C(e, this.#a);
-		return a(this.#e, r.path, t, n);
+		return o(this.#e, r.path, t, n);
 	}
 	isActive(e, t = {}) {
 		let n = C(e, this.#a), r = this.#d.location.pathname;
-		return t.exact ?? !1 ? s(r, [n]).record != null : c(r, n);
+		return t.exact ?? !1 ? c(r, [n]).record != null : l(r, n);
 	}
-	matchPath(e) {
-		let t = f(l(e), this.#e), { params: n, record: r } = s(t, this.#i);
+	match(e) {
+		let t = p(u(e), this.#e), { params: n, record: r } = c(t, this.#i);
 		if (!r || r.redirect) return null;
-		let i = this.#_.effectiveDefs(r), a = m(i, n, t, i.map(() => void 0));
+		let i = this.#_.effectiveDefs(r), a = h(i, n, t, i.map(() => void 0));
 		return a.length ? a : null;
 	}
-	async loadPath(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 = m(s, i, r.pathname, l), a = h(r, o, i, n, () => Promise.resolve());
+			let e = t?.signal ?? new AbortController().signal, n = h(s, i, r.pathname, l), a = g(r, o, i, n, () => Promise.resolve());
 			try {
 				l = await this.#D(s, a, e);
 			} catch (e) {
 				u = e, d = "error";
 			}
 		}
-		return g({
+		return _({
 			error: u,
 			location: r,
-			matches: m(s, i, r.pathname, l),
+			matches: h(s, i, r.pathname, l),
 			status: d
 		});
 	}
@@ -157,12 +157,12 @@ var k = class {
 	}
 	async preload(e, t, n) {
 		this.#b();
-		let r = C(e, this.#a), a = i(this.#e, r.path, t, n), o = this.#v.getInflight(a);
+		let r = C(e, this.#a), i = a(this.#e, r.path, t, n), o = this.#v.getInflight(i);
 		if (o) return o;
-		let s = this.#A(a, this.#p.signal, n).finally(() => {
-			this.#v.untrack(a);
+		let s = this.#A(i, this.#p.signal, n).finally(() => {
+			this.#v.untrack(i);
 		});
-		this.#v.track(a, s);
+		this.#v.track(i, s);
 		try {
 			return await s;
 		} catch (e) {
@@ -186,13 +186,13 @@ var k = class {
 		return this.#f;
 	}
 	dispose() {
-		this.#f || (this.#f = !0, this.#l.clear(), this.#h.clear(), this.#u.invalidate(new t()), this.#y(), this.#p.abort(new t()));
+		this.#f || (this.#f = !0, this.#l.clear(), this.#h.clear(), this.#u.invalidate(new e()), this.#y(), this.#p.abort(new e()));
 	}
 	[Symbol.dispose]() {
 		this.dispose();
 	}
 	#b() {
-		if (this.#f) throw new t();
+		if (this.#f) throw new e();
 	}
 	#x() {
 		return this.#r.onPopstate(() => {
@@ -201,21 +201,21 @@ var k = class {
 		});
 	}
 	async #S(e, t) {
-		let n = this.#u.begin(), r = this.#d.matches.map((e) => e.name), i = this.#B(e), a = await y(this.#l, r, i);
+		let n = this.#u.begin(), r = this.#d.matches.map((e) => e.name), i = this.#B(e), a = await b(this.#l, r, i);
 		if (!n.isCurrent()) return;
 		if (!a) {
 			this.#r.replace(t, this.#d.location.historyState);
 			return;
 		}
-		let o = await this.#F(n, d(this.#e, this.#r), void 0, 0, !1, (e, t) => {
+		let o = await this.#F(n, f(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) {
-		v(e, t, this.#c);
+		y(e, t, this.#c);
 	}
 	#w(e, t) {
 		e.catch((e) => {
@@ -223,7 +223,9 @@ var k = class {
 		});
 	}
 	#T() {
-		this.#h.forEach((e) => e(this.#d));
+		this.#h.forEach((e) => {
+			e(this.#d);
+		});
 	}
 	async #E(e, t) {
 		let n;
@@ -281,9 +283,9 @@ var k = class {
 			if (!r()) return;
 			l[n] = t;
 			let o = e.map((e, t) => s.includes(t) ? "streaming" : "idle");
-			this.#d = g({
+			this.#d = _({
 				location: i,
-				matches: m(e, a, i.pathname, l, o),
+				matches: h(e, a, i.pathname, l, o),
 				status: "streaming"
 			}), this.#T();
 		};
@@ -302,29 +304,29 @@ var k = class {
 		})), l;
 	}
 	async #k(e) {
-		let t = e;
+		let n = e;
 		for (let e = 0; e < 5; e += 1) {
-			let e = new URL(t, "http://localhost"), n = {
+			let e = new URL(n, "http://localhost"), t = {
 				hash: e.hash.replace(/^#/, ""),
 				historyState: null,
-				pathname: f(e.pathname, this.#e),
-				query: u(e.search)
-			}, r = await this.#j(n);
+				pathname: p(e.pathname, this.#e),
+				query: d(e.search)
+			}, r = await this.#j(t);
 			if (r.type !== "redirect") return r;
-			t = this.#L(r.redirectTo);
+			n = this.#L(r.redirectTo);
 		}
-		throw new n();
+		throw new t();
 	}
 	async #A(e, t, n) {
 		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);
+		let { location: i, params: o, record: s, resolvedQuery: c } = r, l = this.#_.effectiveDefs(s);
 		if (!l.some((e) => e.dataFn != null)) return;
-		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);
+		let u = h(l, o, i.pathname, l.map(() => void 0)), d = g(i, c, o, u, () => Promise.resolve()), f = await this.#D(l, d, t);
+		this.#v.set(a(this.#e, s.path, o, n ?? i.query), f);
 	}
 	async #j(e) {
-		let { params: t, record: n } = s(e.pathname, this.#i);
+		let { params: t, record: n } = c(e.pathname, this.#i);
 		if (!n) return {
 			location: e,
 			params: t,
@@ -345,7 +347,7 @@ var k = class {
 		await this.#_.hydrate(n);
 		let a = this.#_.effectiveDefs(n);
 		return {
-			branch: m(a, t, e.pathname, a.map(() => void 0)),
+			branch: h(a, t, e.pathname, a.map(() => void 0)),
 			location: e,
 			params: t,
 			record: n,
@@ -366,27 +368,27 @@ var k = class {
 			throw await e.return(void 0).catch(() => void 0), t;
 		}
 	}
-	async #N(e, t, n, r, 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 = i(this.#e, e.path, r, n.query), l = this.#v.consume(a);
-			if (l) u = l;
+	async #N(e, t, n, r, i, 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 = a(this.#e, e.path, r, n.query), u = this.#v.consume(c);
+			if (u) l = u;
 			else {
-				let i = c.map((e) => e.dataFn ? "loading" : "idle");
-				this.#d = g({
+				let a = s.map((e) => e.dataFn ? "loading" : "idle");
+				this.#d = _({
 					location: n,
-					matches: m(c, r, n.pathname, u, i),
+					matches: h(s, r, n.pathname, l, a),
 					status: "loading"
 				}), this.#T();
 				try {
-					u = await this.#O(c, t, o, s, n, r);
+					l = await this.#O(s, t, i, o, n, r);
 				} catch (t) {
-					if (!s()) return;
-					throw this.#d = g({
+					if (!o()) return;
+					throw this.#d = _({
 						error: t,
 						location: n,
-						matches: m(c, r, n.pathname, u),
+						matches: h(s, r, n.pathname, l),
 						status: "error"
 					}), E(t, {
 						routeName: e.leaf.name,
@@ -395,9 +397,9 @@ var k = class {
 				}
 			}
 		}
-		s() && (this.#d = g({
+		o() && (this.#d = _({
 			location: n,
-			matches: m(c, r, n.pathname, u),
+			matches: h(s, r, n.pathname, l),
 			status: "idle"
 		}));
 	}
@@ -411,50 +413,50 @@ var k = class {
 		}
 		await e();
 	}
-	async #F(e, t, r, i = 0, a = !1, o = () => void 0) {
-		let s = this.#d, c = () => e.isCurrent() && !this.#f, l = await this.#j(t);
+	async #F(e, n, r, i, a = 0, o = !1) {
+		let s = this.#d, c = () => e.isCurrent() && !this.#f, l = await this.#j(n);
 		if (!c()) return !1;
 		if (l.type === "redirect") {
-			if (i >= 5) throw new n();
-			return this.#F(e, this.#R(l.redirectTo, t.historyState), r, i + 1, !0, o);
+			if (a >= 5) throw new t();
+			return this.#F(e, this.#R(l.redirectTo, n.historyState), r, i, a + 1, !0);
 		}
 		if (l.type === "unmatched") {
 			if (this.#g) {
-				let n = [this.#g.leaf], i = m(n, {}, t.pathname, [void 0]), l = !1, u = !1, d = t.query;
+				let t = [this.#g.leaf], a = h(t, {}, n.pathname, [void 0]), l = !1, u = !1, d = n.query;
 				if (this.#n) try {
-					d = this.#n(t.query);
+					d = this.#n(n.query);
 				} catch (e) {
 					this.#C(e, { source: "coerce-search" });
 				}
 				let f = async () => {
 					if (!c()) return;
-					let n = h(t, d, {}, i, (e, t) => this.navigate(e, t));
-					u = await _(n, [...this.#t, ...this.#g.ownMiddleware], async () => {
-						c() && (l = !0, o(t, a), c() && await this.#N(this.#g, n, t, {}, i, e.signal, c));
+					let t = g(n, d, {}, a, (e, t) => this.navigate(e, t));
+					u = await v(t, [...this.#t, ...this.#g.ownMiddleware], async () => {
+						c() && (l = !0, r(n, o), c() && await this.#N(this.#g, t, n, {}, e.signal, c));
 					});
 				};
 				try {
-					await this.#P(f, r);
+					await this.#P(f, i);
 				} finally {
 					c() && l && (this.#T(), this.#I(this.#d, s));
 				}
 				return u && l;
 			}
-			return !c() || (o(l.location, a), !c()) ? !1 : (this.#d = g({
+			return !c() || (r(l.location, o), !c()) ? !1 : (this.#d = _({
 				location: l.location,
 				matches: [],
 				status: "idle"
 			}), this.#T(), this.#I(this.#d, s), !0);
 		}
-		let { branch: u, location: d, params: f, record: p, resolvedQuery: v } = l, y = !1, b = !1, x = async () => {
+		let { branch: u, location: d, params: f, record: p, resolvedQuery: m } = 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, o(d, a), c() && await this.#N(p, t, d, f, u, e.signal, c));
+			let t = g(d, m, f, u, (e, t) => this.navigate(e, t));
+			b = await v(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(x, r);
+			await this.#P(x, i);
 		} finally {
 			c() && y && (this.#T(), this.#I(this.#d, s));
 		}
@@ -472,43 +474,45 @@ var k = class {
 		}
 	}
 	#L(e) {
-		let t = new URL(e, "http://localhost"), n = f(t.pathname, this.#e);
-		return `${o(this.#e, n)}${t.search}${t.hash}`;
+		let t = new URL(e, "http://localhost"), n = p(t.pathname, this.#e);
+		return `${s(this.#e, n)}${t.search}${t.hash}`;
 	}
 	#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)
+			pathname: p(n.pathname, this.#e),
+			query: d(n.search)
 		};
 	}
 	#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);
+		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}`;
+		return `${s(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);
+		let t = new URL(e, "http://localhost"), n = p(t.pathname, this.#e), { params: r, record: i } = c(n, this.#i);
 		return {
 			name: i?.leaf.name,
 			params: r,
 			pathname: n,
-			query: u(t.search)
+			query: d(t.search)
 		};
 	}
 	async #V(e, t = {}) {
 		this.#b();
 		let n = this.#L(e);
 		if (!t.force && n === this.#m) return;
-		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), t.viewTransition, 0, t.replace ?? !1, (e, t) => {
+		let r = this.#u.begin(), i = this.#d.matches.map((e) => e.name), a = await b(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 A(e) {