@flemo/core 1.12.0 → 1.12.1

package/dist/index.mjs

@@ -1,6 +1,7 @@
 import { createStore as e } from "zustand/vanilla";
 import { compile as t, match as n, parse as r, pathToRegexp as i } from "path-to-regexp";
-var a = new class {
+//#region src/core/TaskManger.ts
+var a = 1200, o = new class {
 	tasks = /* @__PURE__ */ new Map();
 	instanceId = Date.now().toString();
 	isLocked = !1;
@@ -8,6 +9,9 @@ var a = new class {
 	taskQueue = Promise.resolve();
 	signalListeners = /* @__PURE__ */ new Map();
 	pendingTaskQueue = [];
+	get pendingTaskIds() {
+		return this.pendingTaskQueue.map((e) => e.id);
+	}
 	isProcessingPending = !1;
 	async acquireLock(e) {
 		for (let t = 0; t < 10; t++) {
@@ -45,16 +49,20 @@ var a = new class {
 			}
 		}
 	}
+	pendingWaiters = /* @__PURE__ */ new Set();
+	notifyPendingWaiters() {
+		for (let e of [...this.pendingWaiters]) e();
+	}
 	async waitForPendingTasks() {
 		return new Promise((e) => {
-			let t = () => {
-				this.pendingTaskQueue.filter((e) => e.status === "MANUAL_PENDING" || e.status === "SIGNAL_PENDING").length === 0 ? e() : setTimeout(t, 100);
+			let t = null, n = () => {
+				this.pendingTaskQueue.filter((e) => e.status === "MANUAL_PENDING" || e.status === "SIGNAL_PENDING").length === 0 ? (this.pendingWaiters.delete(n), t && clearTimeout(t), e()) : (t && clearTimeout(t), t = setTimeout(n, 100));
 			};
-			t();
+			this.pendingWaiters.add(n), n();
 		});
 	}
 	async onTaskStatusChange(e, t) {
-		(t === "COMPLETED" || t === "FAILED" || t === "ROLLEDBACK") && (this.pendingTaskQueue = this.pendingTaskQueue.filter((t) => t.id !== e), await this.processPendingTasks());
+		(t === "COMPLETED" || t === "FAILED" || t === "ROLLEDBACK") && (this.pendingTaskQueue = this.pendingTaskQueue.filter((t) => t.id !== e), await this.processPendingTasks(), this.notifyPendingWaiters());
 	}
 	async addTask(e, t = {}) {
 		let n = t.id || this.generateTaskId();
@@ -103,7 +111,7 @@ var a = new class {
 										resolve: r,
 										reject: i,
 										result: e
-									}, this.pendingTaskQueue.push(d), await this.onTaskStatusChange(d.id, "MANUAL_PENDING");
+									}, this.pendingTaskQueue.push(d), this.armBackstop(d), await this.onTaskStatusChange(d.id, "MANUAL_PENDING");
 									return;
 								}
 								if (n.signal) {
@@ -111,7 +119,7 @@ var a = new class {
 										resolve: r,
 										reject: i,
 										result: e
-									}, this.signalListeners.has(n.signal) || this.signalListeners.set(n.signal, /* @__PURE__ */ new Set()), this.signalListeners.get(n.signal).add(d.id), this.pendingTaskQueue.push(d), await this.onTaskStatusChange(d.id, "SIGNAL_PENDING");
+									}, this.signalListeners.has(n.signal) || this.signalListeners.set(n.signal, /* @__PURE__ */ new Set()), this.signalListeners.get(n.signal).add(d.id), this.pendingTaskQueue.push(d), this.armBackstop(d), await this.onTaskStatusChange(d.id, "SIGNAL_PENDING");
 									return;
 								}
 								if (n.condition && !await n.condition()) {
@@ -119,7 +127,7 @@ var a = new class {
 										resolve: r,
 										reject: i,
 										result: e
-									}, this.pendingTaskQueue.push(d), await this.onTaskStatusChange(d.id, "MANUAL_PENDING");
+									}, this.pendingTaskQueue.push(d), this.armBackstop(d), await this.onTaskStatusChange(d.id, "MANUAL_PENDING");
 									return;
 								}
 							}
@@ -147,9 +155,15 @@ var a = new class {
 			}).catch(i);
 		});
 	}
+	armBackstop(e) {
+		let t = e.control?.maxLifetimeMs;
+		!t || t <= 0 || typeof setTimeout > "u" || (e.backstopTimer = setTimeout(() => {
+			delete e.backstopTimer, this.resolveTask(e.id);
+		}, t));
+	}
 	async resolveTask(e) {
 		let t = this.tasks.get(e);
-		if (!t || t.status !== "MANUAL_PENDING" && t.status !== "SIGNAL_PENDING") return !1;
+		if (t?.backstopTimer && (clearTimeout(t.backstopTimer), delete t.backstopTimer), !t || t.status !== "MANUAL_PENDING" && t.status !== "SIGNAL_PENDING") return !1;
 		if (t.manualResolver) {
 			if (t.control?.condition && !await t.control.condition()) return !1;
 			t.status = "COMPLETED";
@@ -175,7 +189,7 @@ var a = new class {
 }();
 //#endregion
 //#region src/history/store.ts
-function o(t = [], n = -1) {
+function s(t = [], n = -1) {
 	return e((e) => ({
 		index: n,
 		pendingIndex: n,
@@ -227,13 +241,13 @@ function o(t = [], n = -1) {
 }
 //#endregion
 //#region src/utils/getMatchedPathPattern.ts
-function s(e, t) {
+function c(e, t) {
 	return Array.isArray(e) ? e.find((e) => i(e).regexp.test(t)) ?? "" : i(e).regexp.test(t) ? e : "";
 }
 //#endregion
 //#region src/utils/getParams.ts
-function c(e, t, r) {
-	let i = n(s(e, t))(t), a = new URLSearchParams(r), o = Object.fromEntries(a.entries());
+function l(e, t, r) {
+	let i = n(c(e, t))(t), a = new URLSearchParams(r), o = Object.fromEntries(a.entries());
 	return i ? {
 		...i.params,
 		...o
@@ -241,24 +255,24 @@ function c(e, t, r) {
 }
 //#endregion
 //#region src/history/seedInitialHistory.ts
-function l(e, t, n, r) {
+function u(e, t, n, r) {
 	return {
 		id: "root",
 		pathname: t,
-		params: c(e, t, n),
+		params: l(e, t, n),
 		transitionName: r,
 		layoutId: null
 	};
 }
 //#endregion
 //#region src/utils/isServer.ts
-function u() {
+function d() {
 	return typeof document > "u";
 }
 //#endregion
 //#region src/history/ensureWindowHistoryState.ts
-function d(e, t, n = {}) {
-	if (u()) return;
+function f(e, t, n = {}) {
+	if (d()) return;
 	let r = {
 		id: "root",
 		index: 0,
@@ -279,12 +293,24 @@ function d(e, t, n = {}) {
 	}, "", window.location.href);
 }
 //#endregion
+//#region src/history/seedRouterEntry.ts
+function p(e) {
+	let { driver: t, routerKey: n, nested: r, seedPathname: i, defaultTransitionName: a, rootParams: o } = e;
+	if (d()) return;
+	if (r) {
+		let e = t.readPathname().replace(/\/+$/, "") || "/";
+		if (!(e === i || e !== "/" && i.startsWith(`${e}/`))) return;
+	}
+	let s = r && n !== null ? t.readState() == null : !1;
+	f(n, a, o), r && n !== null && s && t.readPathname() !== i && t.replaceState(t.readState(), i);
+}
+//#endregion
 //#region src/history/historyDriver.ts
-var f = (e, t) => ({
+var m = (e, t) => ({
 	...window.history.state ?? {},
 	[e]: t
 });
-function p(e) {
+function h(e) {
 	return e === void 0 ? {
 		readState: () => window.history.state,
 		readPathname: () => window.location.pathname,
@@ -302,8 +328,8 @@ function p(e) {
 	} : {
 		readState: () => window.history.state?.[e] ?? null,
 		readPathname: () => window.location.pathname,
-		pushState: (t, n) => window.history.pushState(f(e, t), "", n),
-		replaceState: (t, n) => window.history.replaceState(f(e, t), "", n),
+		pushState: (t, n) => window.history.pushState(m(e, t), "", n),
+		replaceState: (t, n) => window.history.replaceState(m(e, t), "", n),
 		go: (e) => window.history.go(e),
 		back: () => window.history.back(),
 		subscribe: (t) => {
@@ -317,7 +343,7 @@ function p(e) {
 }
 //#endregion
 //#region src/navigate/selfPopGuard.ts
-function m() {
+function g() {
 	let e = 0;
 	return {
 		mark() {
@@ -328,72 +354,149 @@ function m() {
 		}
 	};
 }
-var h = m();
-function g() {
-	h.mark();
+var _ = g();
+function v() {
+	_.mark();
 }
-function _() {
-	return h.consume();
+function y() {
+	return _.consume();
 }
 //#endregion
 //#region src/history/createHistorySync.ts
-function v(e) {
-	let { stores: t, driver: n = p(), consume: r = _ } = e, i = !1, o = n.subscribe(async (e) => {
-		if (i || r()) return;
-		let o = e.state, s = t.history.getState().truncationEpoch, c = a.generateTaskId();
-		(await a.addTask(async (r) => {
+function b(e) {
+	let { stores: t, driver: n = h(), consume: r = y } = e, i = !1, s = 0, c = async (e) => {
+		let n = e.state, r = t.history.getState().truncationEpoch, i = o.generateTaskId();
+		s += 1;
+		try {
+			await l(e, n, r, i);
+		} finally {
+			--s;
+		}
+	}, l = async (r, s, l, u) => {
+		(await o.addTask(async (a) => {
 			if (i) {
-				r.abort();
+				a.abort();
 				return;
 			}
-			let { setStatus: a, setTransitionTaskId: l } = t.navigate.getState(), { index: u, histories: d, addHistory: f, popHistory: p, popHistories: m, setPendingIndex: h } = t.history.getState();
-			if (s !== t.history.getState().truncationEpoch && n.readState()?.id !== e.state?.id) {
-				r.abort();
+			if (e.ownsPathname && !e.ownsPathname(r.pathname)) {
+				a.abort();
 				return;
 			}
-			if (!o?.id) {
-				r.abort();
+			let { setStatus: o, setTransitionTaskId: d } = t.navigate.getState(), { index: f, histories: p, addHistory: m, popHistory: h, setPendingIndex: g } = t.history.getState();
+			if (l !== t.history.getState().truncationEpoch && n.readState()?.id !== r.state?.id) {
+				a.abort();
 				return;
 			}
-			let g = d.findIndex((e) => e.id === o.id);
-			if (g === u) {
-				r.abort();
+			if (!s?.id) {
+				a.abort();
+				return;
+			}
+			let _ = p.findIndex((e) => e.id === s.id);
+			if (_ === f) {
+				a.abort();
 				return;
 			}
-			let _ = {
-				id: o.id,
-				pathname: e.pathname,
-				params: o.params,
-				transitionName: o.transitionName,
-				layoutId: o.layoutId,
-				frameIndex: o.index
+			let v = {
+				id: s.id,
+				pathname: r.pathname,
+				params: s.params,
+				transitionName: s.transitionName,
+				layoutId: s.layoutId,
+				frameIndex: s.index
 			};
-			if (g === -1) {
-				let e = d[u]?.frameIndex ?? u;
-				if (!(o.index > e && (o.status === "PUSHING" || o.status === "REPLACING"))) {
-					t.history.getState().adoptHistory(_), r.abort();
+			if (_ === -1) {
+				let e = p[f]?.frameIndex ?? f;
+				if (!(s.index > e && (s.status === "PUSHING" || s.status === "REPLACING"))) {
+					t.history.getState().adoptHistory(v), a.abort();
 					return;
 				}
-				return l(c), a(o.status === "REPLACING" ? "REPLACING" : "PUSHING"), f(_), async () => {
-					a("COMPLETED");
+				return d(u), o(s.status === "REPLACING" ? "REPLACING" : "PUSHING"), m(v), async () => {
+					o("COMPLETED");
 				};
 			}
-			let v = u - g - 1;
-			return l(c), v > 0 && m(v), h(g), a("POPPING"), async () => {
-				p(g + 1), a("COMPLETED");
+			let y = f - 1;
+			return d(u), g(y), o("POPPING"), async () => {
+				h(y + 1), o("COMPLETED"), y > _ && !i && c(r);
 			};
 		}, {
-			id: c,
-			control: { manual: !0 }
+			id: u,
+			control: {
+				manual: !0,
+				maxLifetimeMs: a
+			}
 		})).result?.();
+	}, u = null, d = 0, f = "", p = 0, m = () => typeof performance < "u" ? performance.now() : Number.MAX_VALUE, g = () => {
+		i || typeof setTimeout > "u" || (u && clearTimeout(u), u = setTimeout(function e() {
+			if (u = null, i) return;
+			if (s > 0 || o.pendingTaskIds.length > 0 || m() - d < 400) {
+				u = setTimeout(e, 150);
+				return;
+			}
+			let r = n.readPathname(), { histories: a, index: l } = t.history.getState(), h = a[l];
+			if (!h || h.pathname === r) {
+				p = 0;
+				return;
+			}
+			let g = n.readState(), _ = `${l}:${h.id}:${g?.id ?? "-"}:${r}`;
+			if (_ === f) {
+				if (p += 1, p > 4) return;
+			} else f = _, p = 0;
+			g?.id && g.id !== h.id && c({
+				state: g,
+				pathname: r
+			}), u = setTimeout(e, 150);
+		}, 150));
+	}, _ = n.subscribe((e) => {
+		if (!i && (d = m(), g(), C(e.pathname), !r())) return c(e);
 	});
-	return () => {
-		i = !0, o();
+	if (e.routerKey && e.zoneEntryId && T(n, e.zoneEntryId)) {
+		let n = t.history.getState().histories[t.history.getState().index]?.pathname, r = w(n);
+		for (let t of r) c({
+			state: t.raw?.[e.routerKey] ?? null,
+			pathname: t.pathname
+		});
+	}
+	return g(), () => {
+		i = !0, u && clearTimeout(u), _();
 	};
 }
+var x = [], S = !1, C = (e) => {
+	S || typeof window > "u" || (S = !0, queueMicrotask(() => {
+		S = !1;
+	}), x.push({
+		raw: window.history.state,
+		pathname: e
+	}));
+}, w = (e) => {
+	if (!e) return [];
+	for (let t = x.length - 1; t >= 0; --t) if (x[t].pathname === e) return x.slice(t + 1);
+	return [];
+}, T = (e, t) => {
+	if (typeof window > "u") return !1;
+	let n = window.history.state;
+	return n ? Object.values(n).some((e) => !!e && typeof e == "object" && e.id === t) : !1;
+};
+function E(e, t) {
+	for (let n = x.length - 1; n >= 0; --n) if (x[n].pathname === t) return x[n].raw?.[e] ?? null;
+	return null;
+}
+var D = /* @__PURE__ */ new WeakMap();
+function ee(e) {
+	D.has(e) || D.set(e, b({
+		stores: e,
+		driver: e.driver,
+		consume: e.consume,
+		routerKey: e.routerKey,
+		zoneEntryId: e.zoneEntryId,
+		ownsPathname: e.ownsPathname
+	}));
+}
+function te(e) {
+	e.persistent || (D.get(e)?.(), D.delete(e));
+}
 //#endregion
 //#region src/history/memoryHistoryDriver.ts
-function y(e) {
+function ne(e) {
 	let t = [{
 		state: e?.state ?? null,
 		url: e?.url ?? "/"
@@ -435,7 +538,7 @@ function y(e) {
 }
 //#endregion
 //#region src/navigate/store.ts
-function b() {
+function re() {
 	return e((e) => ({
 		status: "IDLE",
 		transitionTaskId: null,
@@ -445,11 +548,11 @@ function b() {
 }
 //#endregion
 //#region src/navigate/createNavigationController.ts
-var x = (e, t, n) => {
+var O = (e, t, n) => {
 	let { regexp: r } = i(e);
 	for (let e = t - 1; e >= 0; e--) if (r.test(n[e].pathname)) return t - e;
 	return -1;
-}, S = (e, t) => typeof e == "number" && Number.isFinite(e) ? Math.max(0, Math.trunc(e)) : t, C = async (e, t, n, r) => {
+}, k = (e, t) => typeof e == "number" && Number.isFinite(e) ? Math.max(0, Math.trunc(e)) : t, A = async (e, t, n, r) => {
 	let i, a = new Promise((t) => {
 		i = e.subscribe(() => t(!0));
 	}), o = new Promise((e) => setTimeout(() => e(!1), 200));
@@ -457,8 +560,8 @@ var x = (e, t, n) => {
 	let s = await Promise.race([a, o]);
 	i(), s && r();
 };
-function w(e) {
-	let { stores: t, buildPathname: n, driver: r = p(), markSelfInduced: i = g } = e, o = () => t.history.getState().bumpTruncationEpoch(), s = () => {
+function ie(e) {
+	let { stores: t, buildPathname: n, driver: r = h(), markSelfInduced: i = v } = e, s = () => t.history.getState().bumpTruncationEpoch(), c = () => {
 		let e = r.readState();
 		if (!e?.id) return null;
 		let { index: n, histories: i, adoptHistory: a, truncateHistory: o } = t.history.getState();
@@ -472,172 +575,181 @@ function w(e) {
 			layoutId: e.layoutId ?? null,
 			frameIndex: e.index
 		}), e;
-	}, c = async (e, c, l) => {
-		let { status: u } = t.navigate.getState();
-		if (u !== "COMPLETED" && u !== "IDLE") return;
-		let d = t.transition.getState().defaultTransitionName, { transitionName: f = d, layoutId: p = null } = l ?? {}, m = a.generateTaskId();
-		(await a.addTask(async (a) => {
+	}, l = async (e, l, u) => {
+		let { status: d } = t.navigate.getState();
+		if (d !== "COMPLETED" && d !== "IDLE") return;
+		let f = t.transition.getState().defaultTransitionName, { transitionName: p = f, layoutId: m = null } = u ?? {}, h = o.generateTaskId();
+		(await o.addTask(async (a) => {
 			if (t.life && !t.life.alive) {
 				a.abort();
 				return;
 			}
-			let u = s(), { index: d, histories: h, addHistory: g, popHistories: _ } = t.history.getState(), v = (() => {
-				if (l?.until != null) {
-					let e = x(l.until, d, h);
+			let o = c(), { index: d, histories: f, addHistory: g, popHistories: _ } = t.history.getState(), v = (() => {
+				if (u?.until != null) {
+					let e = O(u.until, d, f);
 					return e < 0 ? 0 : e;
 				}
-				return Math.min(S(l?.skip, 0), Math.max(0, d));
+				return Math.min(k(u?.skip, 0), Math.max(0, d));
 			})(), { setStatus: y, setTransitionTaskId: b } = t.navigate.getState();
-			y("PUSHING"), b(m);
-			let { pathname: w, toPathname: T } = n(e, c ?? {}), E = {
-				id: m,
-				pathname: T,
-				params: c ?? {},
-				transitionName: f,
-				layoutId: p
-			}, D = u?.index ?? h[d]?.frameIndex ?? d;
-			if (v === 0) return o(), r.pushState({
-				id: m,
-				index: D + 1,
+			y("PUSHING"), b(h);
+			let { pathname: x, toPathname: S } = n(e, l ?? {}), C = {
+				id: h,
+				pathname: S,
+				params: l ?? {},
+				transitionName: p,
+				layoutId: m
+			}, w = o?.index ?? f[d]?.frameIndex ?? d;
+			if (v === 0) return s(), r.pushState({
+				id: h,
+				index: w + 1,
 				status: "PUSHING",
-				params: c,
-				transitionName: f,
-				layoutId: p
-			}, w), g({
-				...E,
-				frameIndex: D + 1
+				params: l,
+				transitionName: p,
+				layoutId: m
+			}, x), g({
+				...C,
+				frameIndex: w + 1
 			}), () => {
 				y("COMPLETED");
 			};
-			let O = h[d - v]?.frameIndex ?? d - v;
+			let T = f[d - v]?.frameIndex ?? d - v;
 			return g({
-				...E,
-				frameIndex: O + 1
-			}), await C(r, i, v, () => {
-				o(), r.pushState({
-					id: m,
-					index: O + 1,
+				...C,
+				frameIndex: T + 1
+			}), await A(r, i, v, () => {
+				s(), r.pushState({
+					id: h,
+					index: T + 1,
 					status: "PUSHING",
-					params: c,
-					transitionName: f,
-					layoutId: p
-				}, w);
+					params: l,
+					transitionName: p,
+					layoutId: m
+				}, x);
 			}), async () => {
 				_(v), y("COMPLETED");
 			};
 		}, {
-			id: m,
-			control: { manual: !0 }
+			id: h,
+			control: {
+				manual: !0,
+				maxLifetimeMs: a
+			}
 		})).result?.();
-	}, l = async (e, c, l) => {
-		let { status: u } = t.navigate.getState();
-		if (u !== "COMPLETED" && u !== "IDLE") return;
-		let d = t.transition.getState().defaultTransitionName, { transitionName: f = d, layoutId: p = null } = l ?? {}, m = a.generateTaskId();
-		(await a.addTask(async (a) => {
+	}, u = async (e, l, u) => {
+		let { status: d } = t.navigate.getState();
+		if (d !== "COMPLETED" && d !== "IDLE") return;
+		let f = t.transition.getState().defaultTransitionName, { transitionName: p = f, layoutId: m = null } = u ?? {}, h = o.generateTaskId();
+		(await o.addTask(async (a) => {
 			if (t.life && !t.life.alive) {
 				a.abort();
 				return;
 			}
-			let u = s(), { index: d, histories: h, addHistory: g, replaceHistory: _, popHistories: v } = t.history.getState(), y = (() => {
-				if (l?.until != null) {
-					let e = x(l.until, d, h);
+			let o = c(), { index: d, histories: f, addHistory: g, replaceHistory: _, popHistories: v } = t.history.getState(), y = (() => {
+				if (u?.until != null) {
+					let e = O(u.until, d, f);
 					return e < 0 ? 0 : e + 1;
 				}
-				return Math.min(S(l?.skip, 0) + 1, d + 1);
+				return Math.min(k(u?.skip, 0) + 1, d + 1);
 			})();
 			if (y <= 0) {
 				a.abort();
 				return;
 			}
-			let { setStatus: b, setTransitionTaskId: w } = t.navigate.getState();
-			b("REPLACING"), w(m);
-			let { pathname: T, toPathname: E } = n(e, c ?? {}), D = {
-				id: m,
-				pathname: E,
-				params: c ?? {},
-				transitionName: f,
-				layoutId: p
-			}, O = u?.index ?? h[d]?.frameIndex ?? d;
-			if (y === 1) return o(), r.replaceState({
-				id: m,
-				index: O,
+			let { setStatus: b, setTransitionTaskId: x } = t.navigate.getState();
+			b("REPLACING"), x(h);
+			let { pathname: S, toPathname: C } = n(e, l ?? {}), w = {
+				id: h,
+				pathname: C,
+				params: l ?? {},
+				transitionName: p,
+				layoutId: m
+			}, T = o?.index ?? f[d]?.frameIndex ?? d;
+			if (y === 1) return s(), r.replaceState({
+				id: h,
+				index: T,
 				status: "REPLACING",
-				params: c,
-				transitionName: f,
-				layoutId: p
-			}, T), g({
-				...D,
-				frameIndex: O
+				params: l,
+				transitionName: p,
+				layoutId: m
+			}, S), g({
+				...w,
+				frameIndex: T
 			}), async () => {
 				_(d), b("COMPLETED");
 			};
-			let k = y <= d ? (h[d - y]?.frameIndex ?? d - y) + 1 : h[0]?.frameIndex ?? 0;
+			let E = y <= d ? (f[d - y]?.frameIndex ?? d - y) + 1 : f[0]?.frameIndex ?? 0;
 			return v(y - 1), g({
-				...D,
-				frameIndex: k
-			}), y <= d ? await C(r, i, y, () => {
-				o(), r.pushState({
-					id: m,
-					index: k,
+				...w,
+				frameIndex: E
+			}), y <= d ? await A(r, i, y, () => {
+				s(), r.pushState({
+					id: h,
+					index: E,
 					status: "REPLACING",
-					params: c,
-					transitionName: f,
-					layoutId: p
-				}, T);
-			}) : await C(r, i, d, () => {
-				o(), r.replaceState({
-					id: m,
-					index: k,
+					params: l,
+					transitionName: p,
+					layoutId: m
+				}, S);
+			}) : await A(r, i, d, () => {
+				s(), r.replaceState({
+					id: h,
+					index: E,
 					status: "REPLACING",
-					params: c,
-					transitionName: f,
-					layoutId: p
-				}, T);
+					params: l,
+					transitionName: p,
+					layoutId: m
+				}, S);
 			}), async () => {
 				_(t.history.getState().index - 1), b("COMPLETED");
 			};
 		}, {
-			id: m,
-			control: { manual: !0 }
+			id: h,
+			control: {
+				manual: !0,
+				maxLifetimeMs: a
+			}
 		})).result?.();
-	}, u = async (e, n) => {
-		let o = a.generateTaskId();
-		(await a.addTask(async (a) => {
+	}, d = async (e, n) => {
+		let s = o.generateTaskId();
+		(await o.addTask(async (a) => {
 			if (t.life && !t.life.alive) {
 				a.abort();
 				return;
 			}
-			s();
-			let { index: c, histories: l, popHistory: u, popHistories: d, setPendingIndex: f, setTransitionName: p } = t.history.getState();
-			if (c <= 0) {
+			c();
+			let { index: o, histories: l, popHistory: u, popHistories: d, setPendingIndex: f, setTransitionName: p } = t.history.getState();
+			if (o <= 0) {
 				a.abort();
 				return;
 			}
-			let m = Math.min(e(c, l), c);
+			let m = Math.min(e(o, l), o);
 			if (m <= 0) {
 				a.abort();
 				return;
 			}
-			f(c - m);
+			f(o - m);
 			let { setStatus: h, setTransitionTaskId: g } = t.navigate.getState();
-			return n && p(c, n), h("POPPING"), g(o), d(m - 1), i(), m === 1 ? r.back() : r.go(-m), async () => {
+			return n && p(o, n), h("POPPING"), g(s), d(m - 1), i(), m === 1 ? r.back() : r.go(-m), async () => {
 				u(t.history.getState().index), h("COMPLETED");
 			};
 		}, {
-			id: o,
-			control: { manual: !0 }
+			id: s,
+			control: {
+				manual: !0,
+				maxLifetimeMs: a
+			}
 		})).result?.();
 	};
 	return {
-		push: c,
-		replace: l,
+		push: l,
+		replace: u,
 		pop: async (e) => {
-			await u((t, n) => {
+			await d((t, n) => {
 				if (e?.until != null) {
-					let r = x(e.until, t, n);
+					let r = O(e.until, t, n);
 					return r < 0 ? 0 : r;
 				}
-				let r = S(e?.skip, 1);
+				let r = k(e?.skip, 1);
 				return r <= 0 ? 0 : Math.min(r, t);
 			}, e?.transitionName);
 		}
@@ -645,18 +757,18 @@ function w(e) {
 }
 //#endregion
 //#region src/navigate/createStepController.ts
-var T = (e) => {
+var ae = (e) => {
 	let t = e;
 	return t?.step ? t.params ?? {} : null;
-}, E = (e, t) => {
+}, oe = (e, t) => {
 	let n = new URLSearchParams(Object.fromEntries(Object.entries(t).map(([e, t]) => [e, String(t)]))).toString();
 	return n ? `${e}?${n}` : e;
 };
-function D(e) {
-	let { stores: t, driver: n, markSelfInduced: r, buildStepPathname: i, applyParams: o } = e;
+function se(e) {
+	let { stores: t, driver: n, markSelfInduced: r, buildStepPathname: i, applyParams: s } = e;
 	return {
 		pushStep: async (e) => {
-			(await a.addTask(async () => {
+			(await o.addTask(async () => {
 				let t = i(e), r = n.readState();
 				return r?.step || n.replaceState({
 					...r,
@@ -665,35 +777,35 @@ function D(e) {
 					...n.readState(),
 					step: !0,
 					params: e
-				}, t), async () => o(e);
+				}, t), async () => s(e);
 			})).result?.();
 		},
 		replaceStep: async (e) => {
-			(await a.addTask(async () => {
+			(await o.addTask(async () => {
 				let t = i(e);
 				return n.replaceState({
 					...n.readState(),
 					step: !0,
 					params: e
-				}, t), async () => o(e);
+				}, t), async () => s(e);
 			})).result?.();
 		},
 		popStep: async () => {
-			let e = a.generateTaskId();
-			(await a.addTask(async (i) => {
+			let e = o.generateTaskId();
+			(await o.addTask(async (i) => {
 				let a = new Promise((e) => {
 					let t = n.subscribe((n) => {
 						t(), e(n.state);
 					});
-				}), s = new Promise((e) => setTimeout(() => e(void 0), 200));
+				}), o = new Promise((e) => setTimeout(() => e(void 0), 200));
 				r(), n.back();
-				let c = await Promise.race([a, s]);
+				let c = await Promise.race([a, o]);
 				if (!c) {
 					i.abort();
 					return;
 				}
 				if (c.step) {
-					o(c.params ?? {}), i.abort();
+					s(c.params ?? {}), i.abort();
 					return;
 				}
 				let { setStatus: l, setTransitionTaskId: u } = t.navigate.getState(), { index: d, popHistory: f } = t.history.getState();
@@ -702,30 +814,38 @@ function D(e) {
 				};
 			}, {
 				id: e,
-				control: { manual: !0 }
+				control: {
+					manual: !0,
+					maxLifetimeMs: a
+				}
 			})).result?.();
 		}
 	};
 }
-function O(e, t) {
+function ce(e, t) {
 	return e.subscribe((e) => {
 		let n = e.state;
-		n?.step && a.addTask(async () => {
+		n?.step && o.addTask(async () => {
 			t(n.params ?? {});
 		});
 	});
 }
 //#endregion
 //#region src/transition/store.ts
-function k(t = "cupertino") {
+function le(t = "cupertino") {
 	return e((e) => ({
 		defaultTransitionName: t,
 		setDefaultTransitionName: (t) => e({ defaultTransitionName: t })
 	}));
 }
 //#endregion
+//#region src/utils/matchesPathname.ts
+function ue(e, t) {
+	return i(e).regexp.test(t);
+}
+//#endregion
 //#region src/screen/store.ts
-function A() {
+function de() {
 	return e((e) => ({
 		dragStatus: "IDLE",
 		replaceTransitionStatus: "IDLE",
@@ -756,49 +876,62 @@ function A() {
 }
 //#endregion
 //#region src/core/createRouterScope.ts
-var ee = {
+var fe = {
 	mark: () => {},
 	consume: () => !1
-};
-function te(e) {
-	let { routePaths: t, pathname: n, search: r, defaultTransitionName: i, memory: a, browserDriver: s } = e, c = l(t, n, r, i), d = s && !u() ? s.readState() : null, f = d?.id ? {
-		...c,
-		id: d.id,
-		params: d.params ?? c.params,
-		frameIndex: d.index ?? 0
+}, pe = /* @__PURE__ */ new Map();
+function me(e) {
+	let { routePaths: t, pathname: n, search: r, defaultTransitionName: i, memory: a, browserDriver: o } = e, c = d() ? void 0 : e.persistKey;
+	if (c) {
+		let e = pe.get(c);
+		if (e) {
+			e.life.alive = !0, e.navigate.getState().setStatus("IDLE"), e.navigate.getState().setTransitionTaskId(null);
+			let t = e.history.getState();
+			return t.setPendingIndex(t.index), e;
+		}
+	}
+	let l = u(t, n, r, i), f = (e.routerKey && !d() ? E(e.routerKey, n) : null) ?? (o && !d() ? o.readState() : null), p = f?.id ? {
+		...l,
+		id: f.id,
+		params: f.params ?? l.params,
+		frameIndex: f.index ?? 0
 	} : {
-		...c,
+		...l,
 		frameIndex: 0
 	};
 	if (e.hostedScope) return e.hostedScope.life.alive = !0, e.hostedScope.history.getState().index === -1 && e.hostedScope.history.setState({
 		index: 0,
-		histories: [f]
+		histories: [p]
 	}), e.hostedScope;
-	let p = a ? y({
+	let m = a ? ne({
 		state: {
-			id: f.id,
+			id: p.id,
 			index: 0,
 			status: "IDLE",
-			params: f.params,
-			transitionName: f.transitionName,
-			layoutId: f.layoutId
+			params: p.params,
+			transitionName: p.transitionName,
+			layoutId: p.layoutId
 		},
-		url: f.pathname
-	}) : s, h = a ? ee : m();
-	return {
-		history: o([f], 0),
-		navigate: b(),
-		transition: k(i),
-		screen: A(),
-		driver: p,
+		url: p.pathname
+	}) : o, h = a ? fe : g(), _ = {
+		history: s([p], 0),
+		navigate: re(),
+		transition: le(i),
+		screen: de(),
+		driver: m,
 		markSelfInduced: h.mark,
 		consume: h.consume,
+		routerKey: e.routerKey,
+		zoneEntryId: e.zoneEntryId,
+		ownsPathname: (e) => ue(t, e),
+		persistent: !!c,
 		life: { alive: !0 }
 	};
+	return c && pe.set(c, _), _;
 }
 //#endregion
 //#region src/screen/createScreenSelector.ts
-function ne(e, t) {
+function he(e, t) {
 	return e.map((n, r) => ({
 		...n,
 		isActive: r === t,
@@ -811,7 +944,7 @@ function ne(e, t) {
 }
 //#endregion
 //#region src/screen/computeScreenFreeze.ts
-function re(e) {
+function ge(e) {
 	let t = e.status === "COMPLETED" && e.dragStatus === "IDLE";
 	return !e.isActive && t || e.isPrev && e.index - 2 <= e.zIndex && e.replaceTransitionStatus === "IDLE" || e.isPrev && e.index - 2 > e.zIndex;
 }
@@ -838,7 +971,7 @@ function j({ name: e, initial: t, idle: n, enter: r, enterBack: i, exit: a, exit
 }
 //#endregion
 //#region src/transition/createRawTransition.ts
-function ie({ name: e, initial: t, idle: n, pushOnEnter: r, pushOnExit: i, replaceOnEnter: a, replaceOnExit: o, popOnEnter: s, popOnExit: c, completedOnExit: l, completedOnEnter: u, options: d }) {
+function _e({ name: e, initial: t, idle: n, pushOnEnter: r, pushOnExit: i, replaceOnEnter: a, replaceOnExit: o, popOnEnter: s, popOnExit: c, completedOnExit: l, completedOnEnter: u, options: d }) {
 	return {
 		name: e,
 		initial: t,
@@ -859,10 +992,10 @@ function ie({ name: e, initial: t, idle: n, pushOnEnter: r, pushOnExit: i, repla
 }
 //#endregion
 //#region src/transition/cupertino.ts
-var ae = (e, t, n) => {
+var ve = (e, t, n) => {
 	let [r, i] = t, [a, o] = n;
 	return i === r ? a : a + (e - r) / (i - r) * (o - a);
-}, oe = j({
+}, ye = j({
 	name: "cupertino",
 	initial: { x: "100%" },
 	idle: {
@@ -922,7 +1055,7 @@ var ae = (e, t, n) => {
 		swipeDirection: "x",
 		onSwipeStart: async () => !0,
 		onSwipe: (e, t, { animate: n, currentScreen: r, prevScreen: i, onProgress: a }) => {
-			let { offset: o } = t, s = o.x, c = ae(s, [0, window.innerWidth], [0, 100]);
+			let { offset: o } = t, s = o.x, c = ve(s, [0, window.innerWidth], [0, 100]);
 			return a?.(!0, c), n(r, { x: Math.max(0, s) }, { duration: 0 }), n(i, { x: `${-30 + c * .3}%` }, { duration: 0 }), c;
 		},
 		onSwipeEnd: async (e, t, { animate: n, currentScreen: r, prevScreen: i, onStart: a }) => {
@@ -946,10 +1079,10 @@ var ae = (e, t, n) => {
 			})]), c;
 		}
 	}
-}), se = (e, t, n) => {
+}), be = (e, t, n) => {
 	let [r, i] = t, [a, o] = n;
 	return i === r ? a : a + (e - r) / (i - r) * (o - a);
-}, M = j({
+}, xe = j({
 	name: "layout",
 	initial: { opacity: .97 },
 	idle: {
@@ -977,7 +1110,7 @@ var ae = (e, t, n) => {
 		swipeDirection: "y",
 		onSwipeStart: async () => !0,
 		onSwipe: (e, t, { animate: n, currentScreen: r, onProgress: i }) => {
-			let { offset: a } = t, o = a.y, s = Math.max(0, Math.min(56, o)), c = se(s, [0, 56], [1, .96]), l = Math.max(0, o - 56), u = Math.min(1, l / 160), d = Math.sqrt(u) * 12, f = Math.max(0, s + d), p = Math.min(56, f);
+			let { offset: a } = t, o = a.y, s = Math.max(0, Math.min(56, o)), c = be(s, [0, 56], [1, .96]), l = Math.max(0, o - 56), u = Math.min(1, l / 160), d = Math.sqrt(u) * 12, f = Math.max(0, s + d), p = Math.min(56, f);
 			return i?.(!0, 100), n(r, {
 				y: f,
 				opacity: c
@@ -994,7 +1127,7 @@ var ae = (e, t, n) => {
 			}, { duration: .3 })]), c;
 		}
 	}
-}), ce = j({
+}), Se = j({
 	name: "material",
 	initial: { y: "100%" },
 	idle: {
@@ -1102,7 +1235,7 @@ var ae = (e, t, n) => {
 			})]), c;
 		}
 	}
-}), le = j({
+}), Ce = j({
 	name: "none",
 	initial: {},
 	idle: {
@@ -1125,20 +1258,20 @@ var ae = (e, t, n) => {
 		value: {},
 		options: { duration: 0 }
 	}
-}), N = new Map([
-	["none", le],
-	["cupertino", oe],
-	["material", ce],
-	["layout", M]
+}), M = new Map([
+	["none", Ce],
+	["cupertino", ye],
+	["material", Se],
+	["layout", xe]
 ]);
 //#endregion
 //#region src/transition/resolveTransition.ts
-function ue(e) {
-	return N.get(e) ?? N.get("none");
+function we(e) {
+	return M.get(e) ?? M.get("none");
 }
 //#endregion
 //#region src/transition/decorator/createDecorator.ts
-function de({ name: e, initial: t, idle: n, enter: r, exit: i, options: a }) {
+function Te({ name: e, initial: t, idle: n, enter: r, exit: i, options: a }) {
 	return {
 		name: e,
 		initial: t,
@@ -1159,7 +1292,7 @@ function de({ name: e, initial: t, idle: n, enter: r, exit: i, options: a }) {
 }
 //#endregion
 //#region src/transition/decorator/createRawDecorator.ts
-function fe({ name: e, initial: t, idle: n, pushOnEnter: r, pushOnExit: i, replaceOnEnter: a, replaceOnExit: o, popOnEnter: s, popOnExit: c, completedOnEnter: l, completedOnExit: u, options: d }) {
+function Ee({ name: e, initial: t, idle: n, pushOnEnter: r, pushOnExit: i, replaceOnEnter: a, replaceOnExit: o, popOnEnter: s, popOnExit: c, completedOnEnter: l, completedOnExit: u, options: d }) {
 	return {
 		name: e,
 		initial: t,
@@ -1180,30 +1313,30 @@ function fe({ name: e, initial: t, idle: n, pushOnEnter: r, pushOnExit: i, repla
 }
 //#endregion
 //#region src/transition/decorator/overlay.ts
-var P = "rgba(0, 0, 0, 0.3)", pe = de({
+var N = "rgba(0, 0, 0, 0.3)", De = Te({
 	name: "overlay",
 	initial: {
 		opacity: 0,
-		backgroundColor: P
+		backgroundColor: N
 	},
 	idle: {
 		value: {
 			opacity: 0,
-			backgroundColor: P
+			backgroundColor: N
 		},
 		options: { duration: 0 }
 	},
 	enter: {
 		value: {
 			opacity: 1,
-			backgroundColor: P
+			backgroundColor: N
 		},
 		options: { duration: .7 }
 	},
 	exit: {
 		value: {
 			opacity: 0,
-			backgroundColor: P
+			backgroundColor: N
 		},
 		options: { duration: .6 }
 	},
@@ -1212,10 +1345,10 @@ var P = "rgba(0, 0, 0, 0.3)", pe = de({
 		onSwipe: (e, t, { animate: n, prevDecorator: r }) => n(r, { opacity: Math.max(0, 1 - t / 100) }, { duration: 0 }),
 		onSwipeEnd: (e, { animate: t, prevDecorator: n }) => t(n, { opacity: +!e }, { duration: .3 })
 	}
-}), F = new Map([["overlay", pe]]);
+}), P = new Map([["overlay", De]]);
 //#endregion
 //#region src/transition/partTransition/createPartTransition.ts
-function me({ name: e, initial: t, idle: n, enter: r, exit: i, options: a }) {
+function Oe({ name: e, initial: t, idle: n, enter: r, exit: i, options: a }) {
 	return {
 		name: e,
 		initial: t,
@@ -1236,7 +1369,7 @@ function me({ name: e, initial: t, idle: n, enter: r, exit: i, options: a }) {
 }
 //#endregion
 //#region src/transition/partTransition/createRawPartTransition.ts
-function he({ name: e, initial: t, idle: n, pushOnEnter: r, pushOnExit: i, replaceOnEnter: a, replaceOnExit: o, popOnEnter: s, popOnExit: c, completedOnEnter: l, completedOnExit: u, options: d }) {
+function ke({ name: e, initial: t, idle: n, pushOnEnter: r, pushOnExit: i, replaceOnEnter: a, replaceOnExit: o, popOnEnter: s, popOnExit: c, completedOnEnter: l, completedOnExit: u, options: d }) {
 	return {
 		name: e,
 		initial: t,
@@ -1257,7 +1390,7 @@ function he({ name: e, initial: t, idle: n, pushOnEnter: r, pushOnExit: i, repla
 }
 //#endregion
 //#region src/transition/partTransition/partTransition.ts
-var I = /* @__PURE__ */ new Map(), L = {
+var F = /* @__PURE__ */ new Map(), I = {
 	"IDLE-true": "self",
 	"IDLE-false": "self",
 	"PUSHING-true": "initial",
@@ -1268,7 +1401,7 @@ var I = /* @__PURE__ */ new Map(), L = {
 	"POPPING-false": "PUSHING-false",
 	"COMPLETED-true": "self",
 	"COMPLETED-false": "self"
-}, ge = Object.keys(L), _e = ge, ve = (e) => e.replace(/[^a-zA-Z0-9_-]/g, "_"), ye = (e) => typeof e == "object" && !!e && !Array.isArray(e), be = new Set(/* @__PURE__ */ "opacity.scale.scaleX.scaleY.scaleZ.aspectRatio.columnCount.columns.flex.flexGrow.flexShrink.fontWeight.gridArea.gridColumn.gridColumnEnd.gridColumnStart.gridRow.gridRowEnd.gridRowStart.lineHeight.lineClamp.order.orphans.tabSize.widows.zIndex.zoom.fillOpacity.floodOpacity.stopOpacity.strokeOpacity.strokeDasharray.strokeDashoffset.strokeMiterlimit.strokeWidth".split(".")), xe = (e, t) => t.startsWith("--") || be.has(t) ? `${e}` : t === "rotate" || t === "rotateX" || t === "rotateY" || t === "rotateZ" ? `${e}deg` : `${e}px`, Se = (e, t) => typeof t == "number" ? xe(t, e) : typeof t == "string" ? t : "", Ce = (e) => e.replace(/[A-Z]/g, (e) => `-${e.toLowerCase()}`), we = new Set([
+}, Ae = Object.keys(I), je = Ae, Me = (e) => e.replace(/[^a-zA-Z0-9_-]/g, "_"), Ne = (e) => typeof e == "object" && !!e && !Array.isArray(e), Pe = new Set(/* @__PURE__ */ "opacity.scale.scaleX.scaleY.scaleZ.aspectRatio.columnCount.columns.flex.flexGrow.flexShrink.fontWeight.gridArea.gridColumn.gridColumnEnd.gridColumnStart.gridRow.gridRowEnd.gridRowStart.lineHeight.lineClamp.order.orphans.tabSize.widows.zIndex.zoom.fillOpacity.floodOpacity.stopOpacity.strokeOpacity.strokeDasharray.strokeDashoffset.strokeMiterlimit.strokeWidth".split(".")), Fe = (e, t) => t.startsWith("--") || Pe.has(t) ? `${e}` : t === "rotate" || t === "rotateX" || t === "rotateY" || t === "rotateZ" ? `${e}deg` : `${e}px`, Ie = (e, t) => typeof t == "number" ? Fe(t, e) : typeof t == "string" ? t : "", Le = (e) => e.replace(/[A-Z]/g, (e) => `-${e.toLowerCase()}`), Re = new Set([
 	"x",
 	"y",
 	"z",
@@ -1279,7 +1412,7 @@ var I = /* @__PURE__ */ new Map(), L = {
 	"rotateX",
 	"rotateY",
 	"rotateZ"
-]), Te = /^-?0(\.0+)?(px|%|em|rem|vh|vw|vmin|vmax)?$/, Ee = /^-?0(\.0+)?(deg|rad|grad|turn)?$/, De = /^1(\.0+)?$/, Oe = (e, t) => e === "scale" || e === "scaleX" || e === "scaleY" ? t === 1 ? !0 : typeof t == "string" ? De.test(t.trim()) : !1 : e === "rotate" || e === "rotateX" || e === "rotateY" || e === "rotateZ" ? t === 0 ? !0 : typeof t == "string" ? Ee.test(t.trim()) : !1 : t === 0 ? !0 : typeof t == "string" ? Te.test(t.trim()) : !1, ke = (e, t) => {
+]), ze = /^-?0(\.0+)?(px|%|em|rem|vh|vw|vmin|vmax)?$/, Be = /^-?0(\.0+)?(deg|rad|grad|turn)?$/, Ve = /^1(\.0+)?$/, He = (e, t) => e === "scale" || e === "scaleX" || e === "scaleY" ? t === 1 ? !0 : typeof t == "string" ? Ve.test(t.trim()) : !1 : e === "rotate" || e === "rotateX" || e === "rotateY" || e === "rotateZ" ? t === 0 ? !0 : typeof t == "string" ? Be.test(t.trim()) : !1 : t === 0 ? !0 : typeof t == "string" ? ze.test(t.trim()) : !1, Ue = (e, t) => {
 	switch (e) {
 		case "x": return `translateX(${t})`;
 		case "y": return `translateY(${t})`;
@@ -1293,23 +1426,23 @@ var I = /* @__PURE__ */ new Map(), L = {
 		case "rotateY": return `rotateY(${t})`;
 		default: return "";
 	}
-}, Ae = (e) => {
+}, We = (e) => {
 	let t = /* @__PURE__ */ new Set(), n = !1, r = (e) => {
-		if (ye(e)) for (let r of Object.keys(e)) {
+		if (Ne(e)) for (let r of Object.keys(e)) {
 			let i = e[r];
-			Se(r, i) !== "" && (we.has(r) ? n = !0 : t.add(Ce(r)));
+			Ie(r, i) !== "" && (Re.has(r) ? n = !0 : t.add(Le(r)));
 		}
 	};
 	r(e.initial);
 	for (let t of Object.values(e.variants)) r(t.value);
 	return n && t.add("transform"), Array.from(t);
-}, R = (e) => {
-	if (!ye(e)) return [];
+}, L = (e) => {
+	if (!Ne(e)) return [];
 	let t = [], n = !0, r = [];
 	for (let i of Object.keys(e)) {
-		let a = e[i], o = Se(i, a);
-		o !== "" && (we.has(i) ? (t.push(ke(i, o)), Oe(i, a) || (n = !1)) : r.push({
-			property: Ce(i),
+		let a = e[i], o = Ie(i, a);
+		o !== "" && (Re.has(i) ? (t.push(Ue(i, o)), He(i, a) || (n = !1)) : r.push({
+			property: Le(i),
 			value: o
 		}));
 	}
@@ -1317,7 +1450,7 @@ var I = /* @__PURE__ */ new Map(), L = {
 		property: "transform",
 		value: n ? "none" : t.join(" ")
 	}), r;
-}, z = (e) => e.map((e) => `  ${e.property}: ${e.value};`).join("\n"), B = (e) => Array.isArray(e) ? e.length === 4 && e.every((e) => typeof e == "number") ? `cubic-bezier(${e.join(", ")})` : "linear" : typeof e == "string" ? {
+}, R = (e) => e.map((e) => `  ${e.property}: ${e.value};`).join("\n"), z = (e) => Array.isArray(e) ? e.length === 4 && e.every((e) => typeof e == "number") ? `cubic-bezier(${e.join(", ")})` : "linear" : typeof e == "string" ? {
 	linear: "linear",
 	easeIn: "ease-in",
 	easeOut: "ease-out",
@@ -1327,33 +1460,33 @@ var I = /* @__PURE__ */ new Map(), L = {
 	backIn: "cubic-bezier(0.31, 0.01, 0.66, -0.59)",
 	backOut: "cubic-bezier(0.33, 1.53, 0.69, 0.99)",
 	anticipate: "cubic-bezier(0.36, 0, 0.66, -0.56)"
-}[e] ?? "ease" : "ease", V = (e) => {
+}[e] ?? "ease" : "ease", Ge = (e) => {
 	if (!e) return 0;
 	let t = e.duration;
 	return typeof t == "number" && t >= 0 ? t : 0;
-}, je = (e) => e && typeof e.delay == "number" && e.delay > 0 ? e.delay : 0, Me = (e, t) => {
+}, Ke = (e) => e && typeof e.delay == "number" && e.delay > 0 ? e.delay : 0, qe = (e, t) => {
 	let [n, r] = t.split("-");
 	return `[data-flemo-screen][data-flemo-transition="${e}"][data-flemo-status="${n}"][data-flemo-active="${r}"]`;
-}, Ne = (e, t) => {
+}, Je = (e, t) => {
 	let [n, r] = t.split("-");
 	return `[data-flemo-decorator][data-flemo-decorator-name="${e}"][data-flemo-status="${n}"][data-flemo-active="${r}"]`;
-}, Pe = (e, t) => {
+}, Ye = (e, t) => {
 	let [n, r] = t.split("-");
 	return `[data-flemo-bar][data-flemo-bar-transition="${e}"][data-flemo-bar-status="${n}"][data-flemo-bar-active="${r}"][data-flemo-bar-riding="true"]`;
-}, Fe = (e, t) => {
+}, Xe = (e, t) => {
 	let [n, r] = t.split("-");
 	return `[data-flemo-part-name="${e}"][data-flemo-status="${n}"][data-flemo-active="${r}"]`;
-}, H = (e, t, n) => `flemo-${e}-${ve(t)}-${n}`, U = (e, t, n, r, i, a) => {
-	let o = R(r), s = R(i.value), c = V(i.options), l = je(i.options), u = B(i.options?.ease), d = a(t, n), f = e === "screen" ? `${d},\n${Pe(t, n)}` : d;
+}, B = (e, t, n) => `flemo-${e}-${Me(t)}-${n}`, V = (e, t, n, r, i, a) => {
+	let o = L(r), s = L(i.value), c = Ge(i.options), l = Ke(i.options), u = z(i.options?.ease), d = a(t, n), f = e === "screen" ? `${d},\n${Ye(t, n)}` : d;
 	if (s.length === 0 && o.length === 0) return "";
-	if (c <= 0 && l <= 0) return s.length === 0 ? "" : `${f} {\n${z(s)}\n  animation: none;\n}`;
-	let p = H(e, t, n), m = [
+	if (c <= 0 && l <= 0) return s.length === 0 ? "" : `${f} {\n${R(s)}\n  animation: none;\n}`;
+	let p = B(e, t, n), m = [
 		`@keyframes ${p} {`,
 		"  from {",
-		z(o).replace(/^/gm, "  "),
+		R(o).replace(/^/gm, "  "),
 		"  }",
 		"  to {",
-		z(s).replace(/^/gm, "  "),
+		R(s).replace(/^/gm, "  "),
 		"  }",
 		"}"
 	].join("\n"), h = [
@@ -1363,90 +1496,96 @@ var I = /* @__PURE__ */ new Map(), L = {
 		l > 0 ? `${l}s` : null,
 		"both"
 	].filter(Boolean).join(" "), g = Array.from(new Set([...o.map((e) => e.property), ...s.map((e) => e.property)])), _ = g.length > 0 ? `  will-change: ${g.join(", ")};\n` : "", v = n.split("-")[0];
-	return `${m}\n${`${f} {\n  animation: ${h};\n${_}${v === "PUSHING" || v === "REPLACING" ? "  contain: layout;\n  pointer-events: none;\n" : ""}}`}${e === "screen" && n.endsWith("-false") && Ie(r) && s.length > 0 ? `\n${d}[data-flemo-anim-hold="park"] {\n  animation: none;\n${z(s)}\n}` : ""}`;
-}, Ie = (e) => {
+	return `${m}\n${`${f} {\n  animation: ${h};\n${_}${v === "PUSHING" || v === "REPLACING" ? "  contain: layout;\n  pointer-events: none;\n" : ""}}`}${e === "screen" && n.endsWith("-false") && Ze(r) && s.length > 0 ? `\n${d}[data-flemo-anim-hold="park"] {\n  animation: none;\n${R(s)}\n}` : ""}`;
+}, Ze = (e) => {
 	if (!e) return !1;
 	if (e.opacity === 0) return !0;
 	let t = (e) => typeof e == "string" && e.trim().endsWith("%") && Math.abs(parseFloat(e)) >= 100;
 	return t(e.x) || t(e.y);
-}, W = (e, t, n, r) => {
-	let i = R(r.value);
-	return i.length === 0 ? "" : `${e(t, n)} {\n${z(i)}\n}`;
-}, Le = (e, t, n = []) => {
+}, H = (e, t, n, r) => {
+	let i = L(r.value);
+	return i.length === 0 ? "" : `${e(t, n)} {\n${R(i)}\n}`;
+}, Qe = (e, t, n = []) => {
 	let r = [];
 	for (let t of e) {
 		let e = t.name;
-		for (let n of ge) {
-			let i = t.variants[n], a = L[n];
+		for (let n of Ae) {
+			let i = t.variants[n], a = I[n];
 			if (a === "self") {
-				r.push(W(Me, e, n, i));
+				r.push(H(qe, e, n, i));
 				continue;
 			}
 			let o = a === "initial" ? t.initial : t.variants[a].value;
-			r.push(U("screen", e, n, o, i, Me));
+			r.push(V("screen", e, n, o, i, qe));
 		}
 	}
 	for (let e of t) {
 		let t = e.name;
-		for (let n of _e) {
-			let i = e.variants[n], a = L[n];
+		for (let n of je) {
+			let i = e.variants[n], a = I[n];
 			if (a === "self") {
-				r.push(W(Ne, t, n, i));
+				r.push(H(Je, t, n, i));
 				continue;
 			}
 			let o = a === "initial" ? e.initial : e.variants[a].value;
-			r.push(U("decorator", t, n, o, i, Ne));
+			r.push(V("decorator", t, n, o, i, Je));
 		}
 	}
 	for (let e of n) {
 		let t = e.name;
-		for (let n of _e) {
-			let i = e.variants[n], a = L[n];
+		for (let n of je) {
+			let i = e.variants[n], a = I[n];
 			if (a === "self") {
-				r.push(W(Fe, t, n, i));
+				r.push(H(Xe, t, n, i));
 				continue;
 			}
 			let o = a === "initial" ? e.initial : e.variants[a].value;
-			r.push(U("part", t, n, o, i, Fe));
+			r.push(V("part", t, n, o, i, Xe));
 		}
 	}
-	return [...r.filter((e) => e.length > 0), Re].join("\n\n");
-}, Re = [
+	return [...r.filter((e) => e.length > 0), $e].join("\n\n");
+}, $e = [
 	"[data-flemo-anim-hold=\"true\"],",
 	"[data-flemo-anim-hold=\"park\"],",
 	"[data-flemo-anim-hold=\"true\"] [data-flemo-part-name],",
 	"[data-flemo-anim-hold=\"park\"] [data-flemo-part-name] {",
 	"  animation-play-state: paused !important;",
 	"}"
-].join("\n"), ze = (e, t) => {
-	let n = L[t];
+].join("\n"), et = (e, t) => {
+	let n = I[t];
 	if (n === "self") return !1;
-	let r = e.variants[t], i = V(r.options), a = je(r.options);
+	let r = e.variants[t], i = Ge(r.options), a = Ke(r.options);
 	if (i <= 0 && a <= 0) return !1;
-	let o = R(n === "initial" ? e.initial : e.variants[n].value), s = R(r.value);
+	let o = L(n === "initial" ? e.initial : e.variants[n].value), s = L(r.value);
 	return o.length > 0 || s.length > 0;
-}, Be = "data-flemo";
-function G() {
-	if (u()) return;
-	let e = Le(N.values(), F.values(), I.values()), t = document.head.querySelector(`style[${Be}]`);
-	t || (t = document.createElement("style"), t.setAttribute(Be, ""), document.head.appendChild(t)), t.textContent !== e && (t.textContent = e);
+}, tt = "data-flemo";
+function U() {
+	if (d()) return;
+	let e = Qe(M.values(), P.values(), F.values()), t = document.head.querySelector(`style[${tt}]`);
+	t || (t = document.createElement("style"), t.setAttribute(tt, ""), document.head.appendChild(t)), t.textContent !== e && (t.textContent = e);
 }
 //#endregion
 //#region src/transition/registerTransitionDefinitions.ts
-function Ve(e, t, n = []) {
-	for (let t of e) N.set(t.name, t);
-	for (let e of t) F.set(e.name, e);
-	for (let e of n) I.set(e.name, e);
-	return G(), () => {
-		for (let t of e) N.delete(t.name);
-		for (let e of t) F.delete(e.name);
-		for (let e of n) I.delete(e.name);
-		G();
+var nt = /* @__PURE__ */ new Map(), rt = /* @__PURE__ */ new Map(), it = /* @__PURE__ */ new Map(), W = (e, t) => {
+	e.set(t, (e.get(t) ?? 0) + 1);
+}, G = (e, t) => {
+	let n = (e.get(t) ?? 1) - 1;
+	return n <= 0 ? (e.delete(t), !0) : (e.set(t, n), !1);
+};
+function at(e, t, n = []) {
+	for (let t of e) M.set(t.name, t), W(nt, t.name);
+	for (let e of t) P.set(e.name, e), W(rt, e.name);
+	for (let e of n) F.set(e.name, e), W(it, e.name);
+	return U(), () => {
+		for (let t of e) G(nt, t.name) && M.delete(t.name);
+		for (let e of t) G(rt, e.name) && P.delete(e.name);
+		for (let e of n) G(it, e.name) && F.delete(e.name);
+		U();
 	};
 }
 //#endregion
 //#region src/transition/enteringInitialStyle.ts
-function He(e) {
+function ot(e) {
 	let { initial: t, isActive: n, status: r } = e;
 	if (!n || r !== "PUSHING" && r !== "REPLACING") return {};
 	let i = {};
@@ -1454,7 +1593,7 @@ function He(e) {
 }
 //#endregion
 //#region src/transition/animateInline.ts
-var Ue = (e) => typeof HTMLElement < "u" && e instanceof HTMLElement, K = /* @__PURE__ */ new WeakMap(), We = (e, t) => {
+var st = (e) => typeof HTMLElement < "u" && e instanceof HTMLElement, K = /* @__PURE__ */ new WeakMap(), ct = (e, t) => {
 	let n = K.get(e);
 	n || (n = /* @__PURE__ */ new Set(), K.set(e, n)), n.add(t);
 }, q = (e, t) => {
@@ -1471,18 +1610,18 @@ var Ue = (e) => typeof HTMLElement < "u" && e instanceof HTMLElement, K = /* @__
 	}
 	e.style.removeProperty("transform"), e.style.removeProperty("opacity");
 }, J = (e, t, n = {}) => {
-	if (!Ue(e)) return Promise.resolve();
-	let r = e, i = R(t);
+	if (!st(e)) return Promise.resolve();
+	let r = e, i = L(t);
 	if (i.length === 0) return Promise.resolve();
-	let a = typeof n.duration == "number" ? n.duration : 0, o = typeof n.delay == "number" && n.delay > 0 ? n.delay : 0, s = B(n.ease);
+	let a = typeof n.duration == "number" ? n.duration : 0, o = typeof n.delay == "number" && n.delay > 0 ? n.delay : 0, s = z(n.ease);
 	if (a <= 0 && o <= 0) {
 		r.style.transition = "none";
-		for (let e of i) r.style.setProperty(e.property, e.value), We(r, e.property);
+		for (let e of i) r.style.setProperty(e.property, e.value), ct(r, e.property);
 		return Promise.resolve();
 	}
 	let c = i.map((e) => `${e.property} ${a}s ${s} ${o}s`).join(", ");
 	r.style.transition = c, r.offsetWidth;
-	for (let e of i) r.style.setProperty(e.property, e.value), We(r, e.property);
+	for (let e of i) r.style.setProperty(e.property, e.value), ct(r, e.property);
 	return new Promise((e) => {
 		let t = !1, n = () => {
 			t || (t = !0, r.removeEventListener("transitionend", i), e());
@@ -1492,26 +1631,26 @@ var Ue = (e) => typeof HTMLElement < "u" && e instanceof HTMLElement, K = /* @__
 		r.addEventListener("transitionend", i), setTimeout(n, (a + o) * 1e3 + 60);
 	});
 }, Y = "data-flemo-skip-animation", X = () => {};
-function Ge(e) {
+function lt(e) {
 	return { driveScreenLifecycle: (t) => {
-		let { getElements: n, transitionName: r, prevTransitionName: i, status: o, isActive: s } = t;
-		if (!s) return o === "REPLACING" && i !== r && e.setReplaceTransitionStatus("PENDING"), X;
-		if (o === "COMPLETED") {
+		let { getElements: n, transitionName: r, prevTransitionName: i, status: a, isActive: s } = t;
+		if (!s) return a === "REPLACING" && i !== r && e.setReplaceTransitionStatus("PENDING"), X;
+		if (a === "COMPLETED") {
 			e.setDragStatus("IDLE"), e.setReplaceTransitionStatus("IDLE");
 			let { scope: t, decorator: r, bars: i } = n();
 			t && (q(t), t.removeAttribute(Y)), r && (q(r), r.removeAttribute(Y));
 			for (let e of i ?? []) e && (q(e), e.style.removeProperty("will-change"));
 			return X;
 		}
-		if (o === "IDLE") return X;
+		if (a === "IDLE") return X;
 		let { scope: c } = n();
 		if (!c) return X;
 		let l = () => {
 			let t = e.getTransitionTaskId();
-			t && a.resolveTask(t);
-		}, u = ue(r), d = `${o}-true`;
-		if (!(c.getAttribute("data-flemo-skip-animation") !== "true" && ze(u, d))) return queueMicrotask(l), X;
-		let f = H("screen", r, d), p = (e) => {
+			t && o.resolveTask(t);
+		}, u = we(r), d = `${a}-true`;
+		if (!(c.getAttribute("data-flemo-skip-animation") !== "true" && et(u, d))) return queueMicrotask(l), X;
+		let f = B("screen", r, d), p = (e) => {
 			e.target === c && e.animationName === f && (c.removeEventListener("animationend", p), l());
 		};
 		return c.addEventListener("animationend", p), () => {
@@ -1522,7 +1661,7 @@ function Ge(e) {
 //#endregion
 //#region src/utils/findScrollable.ts
 function Z(e, t) {
-	let { direction: n = "x", markerSelector: r = "[data-swipe-at-edge]", depthLimit: i = 24, verifyByScroll: a = !1 } = t ?? {}, o = Ke(e);
+	let { direction: n = "x", markerSelector: r = "[data-swipe-at-edge]", depthLimit: i = 24, verifyByScroll: a = !1 } = t ?? {}, o = ut(e);
 	if (!o) return {
 		element: null,
 		hasMarker: !1
@@ -1545,7 +1684,7 @@ function Z(e, t) {
 		hasMarker: !1
 	};
 }
-function Ke(e) {
+function ut(e) {
 	if (!e) return null;
 	let t = e, n = typeof t.composedPath == "function" ? t.composedPath() : void 0;
 	if (n && n.length) {
@@ -1563,8 +1702,8 @@ function $(e, t) {
 }
 //#endregion
 //#region src/core/engine/createSwipeController.ts
-var qe = "data-flemo-skip-animation";
-function Je(e) {
+var dt = "data-flemo-skip-animation";
+function ft(e) {
 	let t = null, n = null, r = {
 		current: [],
 		prev: []
@@ -1626,7 +1765,7 @@ function Je(e) {
 			current: i,
 			prev: s
 		};
-		let c = Ae(e.getTransition()).join(", ");
+		let c = We(e.getTransition()).join(", ");
 		for (let e of i) e.style.willChange = c;
 		for (let e of s) e.style.willChange = c;
 	}, b = () => {
@@ -1644,7 +1783,7 @@ function Je(e) {
 		};
 	}, S = (e, t, n) => {
 		let r = (r, i) => {
-			let a = I.get(r.getAttribute("data-flemo-part-name"));
+			let a = F.get(r.getAttribute("data-flemo-part-name"));
 			if (!a) return;
 			let o = {
 				animate: J,
@@ -1727,7 +1866,7 @@ function Je(e) {
 				}), S("end", e, 0);
 			}
 		})) {
-			c?.setAttribute(qe, "true"), l?.setAttribute(qe, "true");
+			c?.setAttribute(dt, "true"), l?.setAttribute(dt, "true");
 			for (let e of r.current) e.style.removeProperty("will-change");
 			for (let e of r.prev) q(e), e.style.removeProperty("will-change");
 			r = {
@@ -1775,7 +1914,7 @@ function Je(e) {
 }
 //#endregion
 //#region src/screen/computeBarRiding.ts
-function Ye(e) {
+function pt(e) {
 	return !(e.status === "PUSHING" || e.status === "POPPING" || e.status === "REPLACING") || !e.isTopOrTopPrev ? {
 		app: !1,
 		nav: !1
@@ -1786,24 +1925,24 @@ function Ye(e) {
 }
 //#endregion
 //#region src/screen/animStartAnchor.ts
-function Xe(e) {
+function mt(e) {
 	return !(e.status === "PUSHING" || e.status === "POPPING" || e.status === "REPLACING") || !e.isTopOrTopPrev ? null : `${e.status}:${e.transitionName}`;
 }
-var Ze = 300, Qe = 20;
-function $e(e) {
-	return Array.from(e.querySelectorAll("img")).filter((e) => e.complete && typeof e.decode == "function").slice(0, Qe);
+var ht = 300, gt = 20;
+function _t(e) {
+	return Array.from(e.querySelectorAll("img")).filter((e) => e.complete && typeof e.decode == "function").slice(0, gt);
 }
-function et(e) {
-	if (!(!e || typeof e.querySelectorAll != "function")) for (let t of $e(e)) t.decode().catch(() => {});
+function vt(e) {
+	if (!(!e || typeof e.querySelectorAll != "function")) for (let t of _t(e)) t.decode().catch(() => {});
 }
-function tt(e, t = {}) {
+function yt(e, t = {}) {
 	let n = !1, r = 0, i = () => {
 		let r = t.scope;
 		if (!r || typeof r.querySelectorAll != "function") {
 			e();
 			return;
 		}
-		let i = $e(r);
+		let i = _t(r);
 		if (i.length === 0) {
 			e();
 			return;
@@ -1823,7 +1962,7 @@ function tt(e, t = {}) {
 }
 //#endregion
 //#region src/screen/observeBarHeight.ts
-function nt(e, t) {
+function bt(e, t) {
 	e.offsetHeight > 0 && t(e.offsetHeight);
 	let n = new ResizeObserver(([e]) => {
 		e.contentRect.height > 0 && t(e.contentRect.height);
@@ -1834,14 +1973,14 @@ function nt(e, t) {
 }
 //#endregion
 //#region src/screen/observeViewportScrollHeight.ts
-var rt = 0;
-function it(e) {
+var xt = 0;
+function St(e) {
 	let t = 0, n = () => {
 		cancelAnimationFrame(t), t = requestAnimationFrame(() => {
 			let t = document.documentElement.scrollHeight - (window.visualViewport?.height || 0);
 			t = t < 0 ? 0 : t;
-			let n = t - rt;
-			n = n < 0 ? 0 : n, rt ||= t, e(t, n);
+			let n = t - xt;
+			n = n < 0 ? 0 : n, xt ||= t, e(t, n);
 		});
 	};
 	return window.visualViewport?.addEventListener("resize", n), window.visualViewport?.addEventListener("scroll", n), () => {
@@ -1849,13 +1988,8 @@ function it(e) {
 	};
 }
 //#endregion
-//#region src/utils/matchesPathname.ts
-function at(e, t) {
-	return i(e).regexp.test(t);
-}
-//#endregion
 //#region src/utils/isOpaqueColor.ts
-function ot(e) {
+function Ct(e) {
 	let t = e.trim().toLowerCase();
 	if (t === "transparent" || t === "") return !1;
 	if (t.match(/^rgb\(\s*\d+[\s,]+\d+[\s,]+\d+\s*\)$/)) return !0;
@@ -1866,7 +2000,7 @@ function ot(e) {
 }
 //#endregion
 //#region src/utils/buildRoutePath.ts
-function st(e, n) {
+function wt(e, n) {
 	let i = n ?? {}, a = t(e)(Object.fromEntries(Object.entries(i).map(([e, t]) => [e, String(t)]))), o = (typeof e == "string" ? r(e) : e).tokens.filter((e) => e.type === "param").map((e) => e.name), s = Object.fromEntries(Object.entries(i).filter(([e]) => !o.includes(e))), c = new URLSearchParams(s).toString();
 	return {
 		pathname: `${a}${c ? `?${c}` : ""}`,
@@ -1874,4 +2008,4 @@ function st(e, n) {
 	};
 }
 //#endregion
-export { Ze as ANIM_HOLD_RELEASE_BACKSTOP_MS, Y as SKIP_ANIMATION_ATTR, a as TaskManger, Xe as animHoldKey, J as animateInline, H as animationName, E as appendParamsQuery, G as applyTransitionStyles, st as buildRoutePath, $ as canProgrammaticallyScroll, q as clearInlineAnimation, Ae as collectAnimatedProperties, Le as compileTransitionStyles, Ye as computeBarRiding, re as computeScreenFreeze, _ as consumeSelfInducedPop, p as createBrowserHistoryDriver, de as createDecorator, o as createHistoryStore, v as createHistorySync, y as createMemoryHistoryDriver, b as createNavigateStore, w as createNavigationController, me as createPartTransition, fe as createRawDecorator, he as createRawPartTransition, ie as createRawTransition, te as createRouterScope, ne as createScreenSelector, A as createScreenStore, m as createSelfPopGuard, D as createStepController, Je as createSwipeController, j as createTransition, Ge as createTransitionEngine, k as createTransitionStore, oe as cupertino, F as decoratorMap, et as eagerlyDecodeImages, B as easingToCss, d as ensureWindowHistoryState, He as enteringInitialStyle, Z as findScrollable, s as getMatchedPathPattern, c as getParams, ot as isOpaqueColor, u as isServer, M as layout, g as markSelfInducedPop, at as matchesPathname, ce as material, le as none, nt as observeBarHeight, it as observeViewportScrollHeight, Q as overflowsAxis, pe as overlay, I as partTransitionMap, T as readStepParams, Ve as registerTransitionDefinitions, ue as resolveTransition, tt as scheduleAnimHoldRelease, l as seedInitialHistory, O as subscribeStepParamsRestore, R as targetToDecls, N as transitionMap, ze as variantHasAnimation };
+export { ht as ANIM_HOLD_RELEASE_BACKSTOP_MS, Y as SKIP_ANIMATION_ATTR, o as TaskManger, mt as animHoldKey, J as animateInline, B as animationName, oe as appendParamsQuery, U as applyTransitionStyles, wt as buildRoutePath, $ as canProgrammaticallyScroll, q as clearInlineAnimation, We as collectAnimatedProperties, Qe as compileTransitionStyles, pt as computeBarRiding, ge as computeScreenFreeze, y as consumeSelfInducedPop, h as createBrowserHistoryDriver, Te as createDecorator, s as createHistoryStore, b as createHistorySync, ne as createMemoryHistoryDriver, re as createNavigateStore, ie as createNavigationController, Oe as createPartTransition, Ee as createRawDecorator, ke as createRawPartTransition, _e as createRawTransition, me as createRouterScope, he as createScreenSelector, de as createScreenStore, g as createSelfPopGuard, se as createStepController, ft as createSwipeController, j as createTransition, lt as createTransitionEngine, le as createTransitionStore, ye as cupertino, P as decoratorMap, vt as eagerlyDecodeImages, z as easingToCss, ee as ensureScopeHistorySync, f as ensureWindowHistoryState, ot as enteringInitialStyle, Z as findScrollable, c as getMatchedPathPattern, l as getParams, Ct as isOpaqueColor, d as isServer, xe as layout, v as markSelfInducedPop, ue as matchesPathname, Se as material, Ce as none, bt as observeBarHeight, St as observeViewportScrollHeight, Q as overflowsAxis, De as overlay, F as partTransitionMap, ae as readStepParams, at as registerTransitionDefinitions, te as releaseScopeHistorySync, we as resolveTransition, yt as scheduleAnimHoldRelease, u as seedInitialHistory, p as seedRouterEntry, ce as subscribeStepParamsRestore, L as targetToDecls, M as transitionMap, et as variantHasAnimation };