@vielzeug/wayfinder 2.2.0 → 3.0.0

package/dist/router.js

@@ -1,35 +1,37 @@
 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";
+import { 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";
 //#region src/router.ts
-function C(e, t) {
+function b(e, t) {
 	let r = t.get(e);
 	if (r) return r;
 	let i = [...t.keys()].join(", ");
 	throw new n(i ? `Unknown route name: ${e}. Available routes: ${i}` : `Unknown route name: ${e}`);
 }
-function w(e, t, n = "/") {
+function x(e, t, n = "/") {
 	if ("path" in e) return e.path;
-	let r = C(e.name, t), i = o(n, r.path, e.params, e.query);
+	let r = b(e.name, t), i = a(n, r.path, e.params, e.query);
 	return e.hash ? `${i}#${e.hash}` : i;
 }
-var T = Symbol("wayfinder.errorContext");
-function E(e, t) {
-	typeof e == "object" && e && (e[T] = t);
+var S = Symbol("wayfinder.routerError");
+function C(e, t) {
+	return {
+		[S]: !0,
+		context: t,
+		error: e
+	};
 }
-function D(e) {
-	if (typeof e == "object" && e) return e[T];
+function w(e) {
+	return typeof e == "object" && !!e && S in e;
 }
-function O(e) {
-	return typeof e == "object" && !!e && typeof e[Symbol.asyncIterator] == "function" && typeof e.next == "function" && typeof e.return == "function";
+function T(e) {
+	throw w(e) ? e.error : e;
 }
-var k = class {
+var E = class {
 	#e;
 	#t;
 	#n;
@@ -46,14 +48,14 @@ var k = class {
 	#p = new AbortController();
 	#m = "/";
 	#h = /* @__PURE__ */ new Set();
-	#g;
-	#_;
+	#g = /* @__PURE__ */ new Map();
+	#_ = /* @__PURE__ */ new Map();
 	#v;
 	#y;
 	ready;
 	constructor(e) {
-		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 = _({
+		let t = p(e);
+		if (this.#e = l(e.base ?? "/"), this.#t = e.middleware ?? [], this.#n = e.coerceSearch, this.#r = e.history ?? r(), this.#o = e.onError, this.#s = e.scroll, this.#c = e.viewTransition ?? !1, this.#i = t.records, this.#a = t.routesByName, this.#d = g({
 			location: {
 				hash: "",
 				historyState: null,
@@ -64,12 +66,10 @@ var k = class {
 			status: "idle"
 		}), e.notFound) {
 			let t = e.notFound, n = {
-				component: t.component,
 				dataFn: t.data,
-				meta: t.meta,
 				name: "__notFound__"
 			};
-			this.#g = {
+			this.#v = {
 				branchDefs: [n],
 				leaf: n,
 				matcher: {
@@ -80,62 +80,87 @@ var k = class {
 				ownMiddleware: t.middleware ?? [],
 				path: "/*"
 			};
-		} else this.#g = null;
+		} else this.#v = null;
 		this.#y = this.#x();
 		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) => {
+		let o = this.#u.begin(), s = this.#A(o, d(this.#e, this.#r), (e, t) => {
 			if (!o.isCurrent()) return;
-			let n = this.#z(e);
+			let n = this.#F(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);
+		}, void 0, 0, !1).then(() => void 0);
+		this.ready = s.catch(T), this.ready.catch(() => {}), this.#w(s, { source: "initial-navigation" }), this.beforeLeave = this.beforeLeave.bind(this), this.createViewRegistry = this.createViewRegistry.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;
 	}
+	createViewRegistry(e, t) {
+		return { resolve: (n) => {
+			let r = n.matches.at(-1)?.name;
+			return r === "__notFound__" ? t?.notFound : r ? e[r] : void 0;
+		} };
+	}
 	subscribe(e) {
 		return this.#b(), this.#h.add(e), () => {
 			this.#h.delete(e);
 		};
 	}
 	navigate(e, t) {
-		let n = w(typeof e == "string" ? { path: e } : e, this.#a);
-		return this.#V(n, t);
+		let n = x(typeof e == "string" ? { path: e } : e, this.#a);
+		return this.#L(n, t);
 	}
 	url(e, t, n) {
-		let r = C(e, this.#a);
-		return o(this.#e, r.path, t, n);
+		let r = b(e, this.#a);
+		return a(this.#e, r.path, t, n);
 	}
 	isActive(e, t = {}) {
-		let n = C(e, this.#a), r = this.#d.location.pathname;
-		return t.exact ?? !1 ? c(r, [n]).record != null : l(r, n);
+		let n = b(e, this.#a), r = this.#d.location.pathname;
+		return t.exact ?? !1 ? s(r, [n]).record != null : c(r, n);
 	}
 	match(e) {
-		let t = p(u(e), this.#e), { params: n, record: r } = c(t, this.#i);
+		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 = h(i, n, t, i.map(() => void 0));
-		return a.length ? a : null;
+		let i = m(r.branchDefs, n, t, r.branchDefs.map(() => void 0));
+		return i.length ? i : null;
 	}
 	async load(e, t) {
-		let n = await this.#k(e);
+		let n = await this.#D(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";
+		let { location: r, params: i, record: a, resolvedQuery: o } = n, s = a.branchDefs, 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 = h(s, i, r.pathname, l), a = g(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);
+				l = await this.#E(s, a, e);
 			} catch (e) {
 				u = e, d = "error";
 			}
 		}
-		return _({
+		return g({
 			error: u,
 			location: r,
-			matches: h(s, i, r.pathname, l),
+			matches: m(s, i, r.pathname, l),
 			status: d
 		});
 	}
+	async preload(e) {
+		this.#b();
+		let t = this.#N(x(e, this.#a, this.#e)), n = this.#_.get(t);
+		if (n) return n;
+		let r = this.load(t, { signal: this.#p.signal }).then((e) => {
+			if (this.#f) throw this.#p.signal.reason;
+			if (e?.status === "error") throw e.error;
+			if (e) {
+				let t = this.#F(e.location);
+				this.#g.size >= 20 && this.#g.delete(this.#g.keys().next().value), this.#g.set(t, e.matches.map((e) => e.data));
+			}
+			return e;
+		}).catch((e) => {
+			throw this.#o && this.#C(e, { source: "preload" }), e;
+		}).finally(() => {
+			this.#_.delete(t);
+		});
+		return this.#_.set(t, r), r;
+	}
 	waitFor(e) {
 		return this.#b(), new Promise((t, n) => {
 			let r = (t) => t.status === "idle" && t.matches.some((t) => t.name === e);
@@ -155,20 +180,6 @@ var k = class {
 			}, { once: !0 });
 		});
 	}
-	async preload(e, t, n) {
-		this.#b();
-		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(i, this.#p.signal, n).finally(() => {
-			this.#v.untrack(i);
-		});
-		this.#v.track(i, s);
-		try {
-			return await s;
-		} catch (e) {
-			throw this.#c && this.#C(e, { source: "preload" }), e;
-		}
-	}
 	beforeLeave(e, t) {
 		this.#b();
 		let n = {
@@ -186,7 +197,7 @@ var k = class {
 		return this.#f;
 	}
 	dispose() {
-		this.#f || (this.#f = !0, this.#l.clear(), this.#h.clear(), this.#u.invalidate(new e()), this.#y(), this.#p.abort(new e()));
+		this.#f || (this.#f = !0, this.#l.clear(), this.#h.clear(), this.#g.clear(), this.#_.clear(), this.#u.invalidate(new e()), this.#y(), this.#p.abort(new e()));
 	}
 	[Symbol.dispose]() {
 		this.dispose();
@@ -201,25 +212,25 @@ 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 b(this.#l, r, i);
+		let n = this.#u.begin(), r = this.#d.matches.map((e) => e.name), i = this.#I(e), a = await y(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, f(this.#e, this.#r), (e, t) => {
+		let o = await this.#A(n, d(this.#e, this.#r), (e, t) => {
 			if (!n.isCurrent()) return;
-			let r = this.#z(e);
+			let r = this.#F(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) {
-		y(e, t, this.#c);
+		v(e, t, this.#o);
 	}
 	#w(e, t) {
 		e.catch((e) => {
-			this.#C(e, D(e) ?? t);
+			w(e) ? this.#C(e.error, e.context) : this.#C(e, t);
 		});
 	}
 	#T() {
@@ -227,106 +238,40 @@ var k = class {
 			e(this.#d);
 		});
 	}
-	async #E(e, t) {
-		let n;
-		for (;;) {
-			if (t.aborted) return await e.return(void 0).catch(() => void 0), n;
-			let { done: r, value: i } = await e.next();
-			if (r) return i ?? n;
-			n = i;
-		}
-	}
-	async #D(e, t, n) {
+	async #E(e, t, n) {
 		return Promise.all(e.map(async (e) => {
 			if (!e.dataFn) return;
-			let r = e.dataFn, i = r({
-				...t,
-				signal: n
-			});
+			let r = e.dataFn;
 			try {
-				return O(i) ? await this.#E(i, n) : await i;
-			} catch (r) {
-				if (e.onError) return e.onError(r, {
+				return await r({
 					...t,
 					signal: n
 				});
-				throw r;
-			}
-		}));
-	}
-	async #O(e, t, n, r, i, a) {
-		let o = e.map((e) => {
-			if (!e.dataFn) return;
-			let r = e.dataFn;
-			return r({
-				...t,
-				signal: n
-			});
-		}), s = [], c = await Promise.all(o.map(async (r, i) => {
-			if (O(r)) {
-				s.push(i);
-				return;
-			}
-			if (r !== void 0) try {
-				return await r;
 			} catch (r) {
-				let a = e[i];
-				if (a.onError) return a.onError(r, {
+				if (e.onError) return e.onError(r, {
 					...t,
 					signal: n
 				});
 				throw r;
 			}
 		}));
-		if (s.length === 0) return c;
-		let l = [...c], u = (t, n) => {
-			if (!r()) return;
-			l[n] = t;
-			let o = e.map((e, t) => s.includes(t) ? "streaming" : "idle");
-			this.#d = _({
-				location: i,
-				matches: h(e, a, i.pathname, l, o),
-				status: "streaming"
-			}), this.#T();
-		};
-		return await Promise.all(s.map(async (i) => {
-			let a = o[i];
-			try {
-				l[i] = await this.#M(a, i, n, r, u);
-			} catch (r) {
-				let a = e[i];
-				if (a.onError) l[i] = await a.onError(r, {
-					...t,
-					signal: n
-				});
-				else throw r;
-			}
-		})), l;
 	}
-	async #k(e) {
+	async #D(e) {
 		let n = e;
 		for (let e = 0; e < 5; e += 1) {
 			let e = new URL(n, "http://localhost"), t = {
 				hash: e.hash.replace(/^#/, ""),
 				historyState: null,
-				pathname: p(e.pathname, this.#e),
-				query: d(e.search)
-			}, r = await this.#j(t);
+				pathname: f(e.pathname, this.#e),
+				query: u(e.search)
+			}, r = await this.#O(t);
 			if (r.type !== "redirect") return r;
-			n = this.#L(r.redirectTo);
+			n = this.#N(r.redirectTo);
 		}
 		throw new t();
 	}
-	async #A(e, t, n) {
-		let r = await this.#k(e);
-		if (r.type !== "matched") return;
-		let { location: i, params: o, record: s, resolvedQuery: c } = r, l = this.#_.effectiveDefs(s);
-		if (!l.some((e) => e.dataFn != null)) return;
-		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 } = c(e.pathname, this.#i);
+	async #O(e) {
+		let { params: t, record: n } = s(e.pathname, this.#i);
 		if (!n) return {
 			location: e,
 			params: t,
@@ -335,7 +280,7 @@ var k = class {
 		if (n.redirect) return {
 			location: e,
 			params: t,
-			redirectTo: w(n.redirect, this.#a, this.#e),
+			redirectTo: x(n.redirect, this.#a, this.#e),
 			type: "redirect"
 		};
 		let r = e.query, i = n.coerceSearch ?? this.#n;
@@ -344,10 +289,8 @@ var k = class {
 		} catch (t) {
 			this.#C(t, { source: "coerce-search" }), r = e.query;
 		}
-		await this.#_.hydrate(n);
-		let a = this.#_.effectiveDefs(n);
 		return {
-			branch: h(a, t, e.pathname, a.map(() => void 0)),
+			branch: m(n.branchDefs, t, e.pathname, n.branchDefs.map(() => void 0)),
 			location: e,
 			params: t,
 			record: n,
@@ -355,116 +298,121 @@ var k = class {
 			type: "matched"
 		};
 	}
-	async #M(e, t, n, r, i) {
-		let a;
-		try {
-			for (;;) {
-				if (n.aborted || !r()) return await e.return(void 0), a;
-				let { done: o, value: s } = await e.next();
-				if (o) return s ?? a;
-				a = s, i(s, t);
-			}
-		} catch (t) {
-			throw await e.return(void 0).catch(() => void 0), t;
-		}
-	}
-	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);
+	async #k(e, t, n, r, i, a, o) {
+		if (!a()) return;
+		let s = e.branchDefs, 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;
+			let e = this.#F(n), c = this.#_.get(e);
+			if (c && (await c.catch(() => void 0), !a())) return;
+			let u = this.#g.get(e);
+			if (u) this.#g.delete(e), l = u;
 			else {
-				let a = s.map((e) => e.dataFn ? "loading" : "idle");
-				this.#d = _({
+				this.#d = g({
 					location: n,
-					matches: h(s, r, n.pathname, l, a),
+					matches: m(s, r, n.pathname, l),
 					status: "loading"
 				}), this.#T();
 				try {
-					l = await this.#O(s, t, i, o, n, r);
-				} catch (t) {
-					if (!o()) return;
-					throw this.#d = _({
-						error: t,
+					l = await this.#E(s, t, i);
+				} catch (e) {
+					if (!a()) return;
+					throw this.#d = g({
+						error: e,
 						location: n,
-						matches: h(s, r, n.pathname, l),
+						matches: m(s, r, n.pathname, l),
 						status: "error"
-					}), E(t, {
-						routeName: e.leaf.name,
-						source: "data-loader"
-					}), t;
+					}), o?.(e), e;
 				}
 			}
 		}
-		o() && (this.#d = _({
+		a() && (this.#d = g({
 			location: n,
-			matches: h(s, r, n.pathname, l),
+			matches: m(s, r, n.pathname, l),
 			status: "idle"
 		}));
 	}
-	async #P(e, t) {
-		if ((t ?? this.#s) && typeof document < "u") {
-			let t = document;
-			if (t.startViewTransition) {
-				await t.startViewTransition(e).finished;
-				return;
-			}
-		}
-		await e();
-	}
-	async #F(e, n, r, i, a = 0, o = !1) {
-		let s = this.#d, c = () => e.isCurrent() && !this.#f, l = await this.#j(n);
+	async #A(e, n, r, i, a = 0, o = !1) {
+		let s = this.#d, c = () => e.isCurrent() && !this.#f, l = await this.#O(n);
 		if (!c()) return !1;
 		if (l.type === "redirect") {
 			if (a >= 5) throw new t();
-			return this.#F(e, this.#R(l.redirectTo, n.historyState), r, i, a + 1, !0);
+			return this.#A(e, this.#P(l.redirectTo, n.historyState), r, i, a + 1, !0);
 		}
 		if (l.type === "unmatched") {
-			if (this.#g) {
-				let t = [this.#g.leaf], a = h(t, {}, n.pathname, [void 0]), l = !1, u = !1, d = n.query;
+			if (this.#v) {
+				let t = [this.#v.leaf], a = m(t, {}, n.pathname, [void 0]), l = !1, u, d = !1, f = !1, p = n.query;
 				if (this.#n) try {
-					d = this.#n(n.query);
+					p = this.#n(n.query);
 				} catch (e) {
 					this.#C(e, { source: "coerce-search" });
 				}
-				let f = async () => {
+				let g = async () => {
 					if (!c()) return;
-					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));
-					});
+					let t = h(n, p, {}, a, (e, t) => this.navigate(e, t));
+					f = await _(t, [...this.#t, ...this.#v.ownMiddleware], async () => {
+						c() && (l = !0, r(n, o), c() && await this.#k(this.#v, t, n, {}, e.signal, c, (e) => {
+							u = e, d = !0;
+						}));
+					}, (e) => w(e) || d && e === u ? e : C(e, {
+						routeName: "__notFound__",
+						source: "middleware"
+					}));
 				};
 				try {
-					await this.#P(f, i);
+					await this.#j(g, i);
+				} catch (e) {
+					throw d && e === u ? C(e, {
+						routeName: "__notFound__",
+						source: "data-loader"
+					}) : e;
 				} finally {
-					c() && l && (this.#T(), this.#I(this.#d, s));
+					c() && l && (this.#T(), this.#M(this.#d, s));
 				}
-				return u && l;
+				return f && l;
 			}
-			return !c() || (r(l.location, o), !c()) ? !1 : (this.#d = _({
+			return !c() || (r(l.location, o), !c()) ? !1 : (this.#d = g({
 				location: l.location,
 				matches: [],
 				status: "idle"
-			}), this.#T(), this.#I(this.#d, s), !0);
+			}), this.#T(), this.#M(this.#d, s), !0);
 		}
-		let { branch: u, location: d, params: f, record: p, resolvedQuery: m } = l, y = !1, b = !1, x = async () => {
+		let { branch: u, location: d, params: f, record: p, resolvedQuery: v } = l, y = !1, b, x = !1, S = !1, T = async () => {
 			if (!c()) return;
-			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));
-			});
+			let t = h(d, v, f, u, (e, t) => this.navigate(e, t));
+			S = await _(t, [...this.#t, ...p.ownMiddleware], async () => {
+				c() && (y = !0, r(d, o), c() && await this.#k(p, t, d, f, e.signal, c, (e) => {
+					b = e, x = !0;
+				}));
+			}, (e) => w(e) || x && e === b ? e : C(e, {
+				routeName: p.leaf.name,
+				source: "middleware"
+			}));
 		};
 		try {
-			await this.#P(x, i);
+			await this.#j(T, i);
+		} catch (e) {
+			throw x && e === b ? C(e, {
+				routeName: p.leaf.name,
+				source: "data-loader"
+			}) : e;
 		} finally {
-			c() && y && (this.#T(), this.#I(this.#d, s));
+			c() && y && (this.#T(), this.#M(this.#d, s));
 		}
-		return b && y;
+		return S && y;
 	}
-	#I(e, t) {
-		if (!this.#o || typeof window > "u") return;
-		let n = this.#o(e, t);
+	async #j(e, t) {
+		if ((t ?? this.#c) && typeof document < "u") {
+			let t = document.startViewTransition;
+			if (t) {
+				await t.call(document, e).finished;
+				return;
+			}
+		}
+		await e();
+	}
+	#M(e, t) {
+		if (!this.#s || typeof window > "u") return;
+		let n = this.#s(e, t);
 		if (n !== "preserve") {
 			if (n === "top") {
 				window.scrollTo(0, 0);
@@ -473,52 +421,56 @@ var k = class {
 			window.scrollTo(n.x, n.y);
 		}
 	}
-	#L(e) {
-		let t = new URL(e, "http://localhost"), n = p(t.pathname, this.#e);
-		return `${s(this.#e, n)}${t.search}${t.hash}`;
+	#N(e) {
+		let t = new URL(e, "http://localhost"), n = f(t.pathname, this.#e);
+		return `${o(this.#e, n)}${t.search}${t.hash}`;
 	}
-	#R(e, t) {
-		let n = new URL(this.#L(e), "http://localhost");
+	#P(e, t) {
+		let n = new URL(this.#N(e), "http://localhost");
 		return {
 			hash: n.hash.replace(/^#/, ""),
 			historyState: t,
-			pathname: p(n.pathname, this.#e),
-			query: d(n.search)
+			pathname: f(n.pathname, this.#e),
+			query: u(n.search)
 		};
 	}
-	#z(e) {
+	#F(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 `${s(this.#e, e.pathname)}${n ? `?${n}` : ""}${r}`;
+		return `${o(this.#e, e.pathname)}${n ? `?${n}` : ""}${r}`;
 	}
-	#B(e) {
-		let t = new URL(e, "http://localhost"), n = p(t.pathname, this.#e), { params: r, record: i } = c(n, this.#i);
+	#I(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: d(t.search)
+			query: u(t.search)
 		};
 	}
-	async #V(e, t = {}) {
+	async #L(e, t = {}) {
 		this.#b();
-		let n = this.#L(e);
+		let n = this.#N(e);
 		if (!t.force && n === this.#m) return;
-		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);
+		let r = this.#u.begin(), i = this.#d.matches.map((e) => e.name), a = await y(this.#l, i, this.#I(n));
+		if (r.isCurrent() && a) try {
+			await this.#A(r, this.#P(n, t.state), (e, t) => {
+				if (!r.isCurrent()) return;
+				let n = this.#F(e);
+				t ? this.#r.replace(n, e.historyState) : this.#r.push(n, e.historyState), this.#m = n;
+			}, t.viewTransition, 0, t.replace ?? !1);
+		} catch (e) {
+			throw w(e) ? e.error : e;
+		}
 	}
 };
-function A(e) {
-	return new k(e);
+function D(e) {
+	return new E(e);
 }
 //#endregion
-export { A as createRouter };
+export { D as createRouter };
 
 //# sourceMappingURL=router.js.map