@flemo/core 1.10.0 → 1.11.0

package/dist/core/createRouterScope.d.ts

@@ -13,6 +13,9 @@ export interface FlemoStores {
     driver: HistoryDriver;
     markSelfInduced: () => void;
     consume: () => boolean;
+    life: {
+        alive: boolean;
+    };
 }
 export interface CreateRouterScopeInput {
     routePaths: Path[];

package/dist/history/__tests__/historyConvergence.property.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/history/store.d.ts

@@ -6,6 +6,7 @@ export interface History {
     params: object;
     transitionName: TransitionName;
     layoutId: string | number | null;
+    frameIndex?: number;
 }
 export interface HistoryStore {
     index: number;
@@ -16,6 +17,8 @@ export interface HistoryStore {
     popHistory: (index: number) => void;
     popHistories: (count: number) => void;
     setPendingIndex: (index: number) => void;
+    adoptHistory: (history: History) => void;
+    truncateHistory: (position: number) => void;
     setTransitionName: (index: number, transitionName: TransitionName) => void;
 }
 export type HistoryStoreApi = StoreApi<HistoryStore>;

package/dist/index.mjs

@@ -206,6 +206,12 @@ function o(t = [], n = -1) {
 			});
 		},
 		setPendingIndex: (t) => e({ pendingIndex: t }),
+		adoptHistory: (t) => e((e) => ({ histories: e.histories.slice(0, e.index).concat(t) })),
+		truncateHistory: (t) => e((e) => ({
+			index: t,
+			pendingIndex: t,
+			histories: e.histories.slice(0, t + 1)
+		})),
 		setTransitionName: (t, n) => e((e) => {
 			let r = e.histories[t];
 			if (!r || r.transitionName === n) return {};
@@ -330,35 +336,58 @@ function _() {
 //#endregion
 //#region src/history/createHistorySync.ts
 function v(e) {
-	let { stores: t, driver: n = p(), consume: r = _ } = e;
-	return n.subscribe(async (e) => {
-		if (r()) return;
-		let n = e.state, i = a.generateTaskId();
+	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 = a.generateTaskId();
 		(await a.addTask(async (r) => {
-			let { setStatus: a, setTransitionTaskId: o } = t.navigate.getState(), { index: s, addHistory: c, popHistory: l, setPendingIndex: u } = t.history.getState(), d = n?.index, f = d !== void 0 && d < s, p = n?.status === "PUSHING" && d !== void 0 && d > s, m = n?.status === "REPLACING" && d !== void 0 && d > s;
-			if (!f && !p && !m) {
+			if (i) {
+				r.abort();
+				return;
+			}
+			if (n.readState()?.id !== e.state?.id) {
 				r.abort();
 				return;
 			}
-			if (o(i), f) u(d), a("POPPING");
-			else {
-				let t = n;
-				a(p ? "PUSHING" : "REPLACING"), c({
-					id: t.id,
-					pathname: e.pathname,
-					params: t.params,
-					transitionName: t.transitionName,
-					layoutId: t.layoutId
-				});
+			let { setStatus: a, setTransitionTaskId: c } = t.navigate.getState(), { index: l, histories: u, addHistory: d, popHistory: f, popHistories: p, setPendingIndex: m } = t.history.getState();
+			if (!o?.id) {
+				r.abort();
+				return;
+			}
+			let h = u.findIndex((e) => e.id === o.id);
+			if (h === l) {
+				r.abort();
+				return;
+			}
+			let g = {
+				id: o.id,
+				pathname: e.pathname,
+				params: o.params,
+				transitionName: o.transitionName,
+				layoutId: o.layoutId,
+				frameIndex: o.index
+			};
+			if (h === -1) {
+				let e = u[l]?.frameIndex ?? l;
+				if (!(o.index > e && (o.status === "PUSHING" || o.status === "REPLACING"))) {
+					t.history.getState().adoptHistory(g), r.abort();
+					return;
+				}
+				return c(s), a(o.status === "REPLACING" ? "REPLACING" : "PUSHING"), d(g), async () => {
+					a("COMPLETED");
+				};
 			}
-			return async () => {
-				f && d !== void 0 && l(d + 1), a("COMPLETED");
+			let _ = l - h - 1;
+			return c(s), _ > 0 && p(_), m(h), a("POPPING"), async () => {
+				f(h + 1), a("COMPLETED");
 			};
 		}, {
-			id: i,
+			id: s,
 			control: { manual: !0 }
 		})).result?.();
 	});
+	return () => {
+		i = !0, o();
+	};
 }
 //#endregion
 //#region src/history/memoryHistoryDriver.ts
@@ -427,138 +456,181 @@ var x = (e, t, n) => {
 	i(), s && r();
 };
 function w(e) {
-	let { stores: t, buildPathname: n, driver: r = p(), markSelfInduced: i = g } = e, o = async (e, o, s) => {
-		let { status: c } = t.navigate.getState();
-		if (c !== "COMPLETED" && c !== "IDLE") return;
-		let l = t.transition.getState().defaultTransitionName, { transitionName: u = l, layoutId: d = null } = s ?? {}, f = a.generateTaskId();
-		(await a.addTask(async () => {
-			let { index: a, histories: c, addHistory: l, popHistories: p } = t.history.getState(), m = (() => {
-				if (s?.until != null) {
-					let e = x(s.until, a, c);
+	let { stores: t, buildPathname: n, driver: r = p(), markSelfInduced: i = g } = e, o = () => {
+		let e = r.readState();
+		if (!e?.id) return null;
+		let { index: n, histories: i, adoptHistory: a, truncateHistory: o } = t.history.getState();
+		if (i[n]?.id === e.id) return e;
+		let s = i.findIndex((t) => t.id === e.id);
+		return s >= 0 ? o(s) : a({
+			id: e.id,
+			pathname: r.readPathname(),
+			params: e.params ?? {},
+			transitionName: e.transitionName ?? "none",
+			layoutId: e.layoutId ?? null,
+			frameIndex: e.index
+		}), e;
+	}, s = async (e, s, c) => {
+		let { status: l } = t.navigate.getState();
+		if (l !== "COMPLETED" && l !== "IDLE") return;
+		let u = t.transition.getState().defaultTransitionName, { transitionName: d = u, layoutId: f = null } = c ?? {}, p = a.generateTaskId();
+		(await a.addTask(async (a) => {
+			if (t.life && !t.life.alive) {
+				a.abort();
+				return;
+			}
+			let l = o(), { index: u, histories: m, addHistory: h, popHistories: g } = t.history.getState(), _ = (() => {
+				if (c?.until != null) {
+					let e = x(c.until, u, m);
 					return e < 0 ? 0 : e;
 				}
-				return Math.min(S(s?.skip, 0), Math.max(0, a));
-			})(), { setStatus: h, setTransitionTaskId: g } = t.navigate.getState();
-			h("PUSHING"), g(f);
-			let { pathname: _, toPathname: v } = n(e, o ?? {}), y = {
-				id: f,
-				pathname: v,
-				params: o ?? {},
-				transitionName: u,
-				layoutId: d
-			};
-			return m === 0 ? (r.pushState({
-				id: f,
-				index: a + 1,
+				return Math.min(S(c?.skip, 0), Math.max(0, u));
+			})(), { setStatus: v, setTransitionTaskId: y } = t.navigate.getState();
+			v("PUSHING"), y(p);
+			let { pathname: b, toPathname: w } = n(e, s ?? {}), T = {
+				id: p,
+				pathname: w,
+				params: s ?? {},
+				transitionName: d,
+				layoutId: f
+			}, E = l?.index ?? m[u]?.frameIndex ?? u;
+			if (_ === 0) return r.pushState({
+				id: p,
+				index: E + 1,
 				status: "PUSHING",
-				params: o,
-				transitionName: u,
-				layoutId: d
-			}, _), l(y), () => {
-				h("COMPLETED");
-			}) : (l(y), await C(r, i, m, () => {
+				params: s,
+				transitionName: d,
+				layoutId: f
+			}, b), h({
+				...T,
+				frameIndex: E + 1
+			}), () => {
+				v("COMPLETED");
+			};
+			let D = m[u - _]?.frameIndex ?? u - _;
+			return h({
+				...T,
+				frameIndex: D + 1
+			}), await C(r, i, _, () => {
 				r.pushState({
-					id: f,
-					index: t.history.getState().index - m,
+					id: p,
+					index: D + 1,
 					status: "PUSHING",
-					params: o,
-					transitionName: u,
-					layoutId: d
-				}, _);
+					params: s,
+					transitionName: d,
+					layoutId: f
+				}, b);
 			}), async () => {
-				p(m), h("COMPLETED");
-			});
+				g(_), v("COMPLETED");
+			};
 		}, {
-			id: f,
+			id: p,
 			control: { manual: !0 }
 		})).result?.();
-	}, s = async (e, o, s) => {
-		let { status: c } = t.navigate.getState();
-		if (c !== "COMPLETED" && c !== "IDLE") return;
-		let l = t.transition.getState().defaultTransitionName, { transitionName: u = l, layoutId: d = null } = s ?? {}, f = a.generateTaskId();
+	}, c = async (e, s, c) => {
+		let { status: l } = t.navigate.getState();
+		if (l !== "COMPLETED" && l !== "IDLE") return;
+		let u = t.transition.getState().defaultTransitionName, { transitionName: d = u, layoutId: f = null } = c ?? {}, p = a.generateTaskId();
 		(await a.addTask(async (a) => {
-			let { index: c, histories: l, addHistory: p, replaceHistory: m, popHistories: h } = t.history.getState(), g = (() => {
-				if (s?.until != null) {
-					let e = x(s.until, c, l);
+			if (t.life && !t.life.alive) {
+				a.abort();
+				return;
+			}
+			let l = o(), { index: u, histories: m, addHistory: h, replaceHistory: g, popHistories: _ } = t.history.getState(), v = (() => {
+				if (c?.until != null) {
+					let e = x(c.until, u, m);
 					return e < 0 ? 0 : e + 1;
 				}
-				return Math.min(S(s?.skip, 0) + 1, c + 1);
+				return Math.min(S(c?.skip, 0) + 1, u + 1);
 			})();
-			if (g <= 0) {
+			if (v <= 0) {
 				a.abort();
 				return;
 			}
-			let { setStatus: _, setTransitionTaskId: v } = t.navigate.getState();
-			_("REPLACING"), v(f);
-			let { pathname: y, toPathname: b } = n(e, o ?? {}), w = {
-				id: f,
-				pathname: b,
-				params: o ?? {},
-				transitionName: u,
-				layoutId: d
-			};
-			return g === 1 ? (r.replaceState({
-				id: f,
-				index: c,
+			let { setStatus: y, setTransitionTaskId: b } = t.navigate.getState();
+			y("REPLACING"), b(p);
+			let { pathname: w, toPathname: T } = n(e, s ?? {}), E = {
+				id: p,
+				pathname: T,
+				params: s ?? {},
+				transitionName: d,
+				layoutId: f
+			}, D = l?.index ?? m[u]?.frameIndex ?? u;
+			if (v === 1) return r.replaceState({
+				id: p,
+				index: D,
 				status: "REPLACING",
-				params: o,
-				transitionName: u,
-				layoutId: d
-			}, y), p(w), async () => {
-				m(c), _("COMPLETED");
-			}) : (h(g - 1), p(w), g <= c ? await C(r, i, g, () => {
+				params: s,
+				transitionName: d,
+				layoutId: f
+			}, w), h({
+				...E,
+				frameIndex: D
+			}), async () => {
+				g(u), y("COMPLETED");
+			};
+			let O = v <= u ? (m[u - v]?.frameIndex ?? u - v) + 1 : m[0]?.frameIndex ?? 0;
+			return _(v - 1), h({
+				...E,
+				frameIndex: O
+			}), v <= u ? await C(r, i, v, () => {
 				r.pushState({
-					id: f,
-					index: t.history.getState().index - 1,
+					id: p,
+					index: O,
 					status: "REPLACING",
-					params: o,
-					transitionName: u,
-					layoutId: d
-				}, y);
-			}) : await C(r, i, c, () => {
+					params: s,
+					transitionName: d,
+					layoutId: f
+				}, w);
+			}) : await C(r, i, u, () => {
 				r.replaceState({
-					id: f,
-					index: 0,
+					id: p,
+					index: O,
 					status: "REPLACING",
-					params: o,
-					transitionName: u,
-					layoutId: d
-				}, y);
+					params: s,
+					transitionName: d,
+					layoutId: f
+				}, w);
 			}), async () => {
-				m(t.history.getState().index - 1), _("COMPLETED");
-			});
+				g(t.history.getState().index - 1), y("COMPLETED");
+			};
 		}, {
-			id: f,
+			id: p,
 			control: { manual: !0 }
 		})).result?.();
-	}, c = async (e, n) => {
-		let o = a.generateTaskId();
+	}, l = async (e, n) => {
+		let s = a.generateTaskId();
 		(await a.addTask(async (a) => {
-			let { index: s, histories: c, popHistory: l, popHistories: u, setPendingIndex: d, setTransitionName: f } = t.history.getState();
-			if (s <= 0) {
+			if (t.life && !t.life.alive) {
+				a.abort();
+				return;
+			}
+			o();
+			let { index: c, histories: l, popHistory: u, popHistories: d, setPendingIndex: f, setTransitionName: p } = t.history.getState();
+			if (c <= 0) {
 				a.abort();
 				return;
 			}
-			let p = Math.min(e(s, c), s);
-			if (p <= 0) {
+			let m = Math.min(e(c, l), c);
+			if (m <= 0) {
 				a.abort();
 				return;
 			}
-			d(s - p);
-			let { setStatus: m, setTransitionTaskId: h } = t.navigate.getState();
-			return n && f(s, n), m("POPPING"), h(o), u(p - 1), i(), p === 1 ? r.back() : r.go(-p), async () => {
-				l(t.history.getState().index), m("COMPLETED");
+			f(c - m);
+			let { setStatus: h, setTransitionTaskId: g } = t.navigate.getState();
+			return n && p(c, 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,
+			id: s,
 			control: { manual: !0 }
 		})).result?.();
 	};
 	return {
-		push: o,
-		replace: s,
+		push: s,
+		replace: c,
 		pop: async (e) => {
-			await c((t, n) => {
+			await l((t, n) => {
 				if (e?.until != null) {
 					let r = x(e.until, t, n);
 					return r < 0 ? 0 : r;
@@ -571,14 +643,14 @@ function w(e) {
 }
 //#endregion
 //#region src/navigate/createStepController.ts
-var ee = (e) => {
+var T = (e) => {
 	let t = e;
 	return t?.step ? t.params ?? {} : null;
-}, te = (e, t) => {
+}, E = (e, t) => {
 	let n = new URLSearchParams(Object.fromEntries(Object.entries(t).map(([e, t]) => [e, String(t)]))).toString();
 	return n ? `${e}?${n}` : e;
 };
-function ne(e) {
+function D(e) {
 	let { stores: t, driver: n, markSelfInduced: r, buildStepPathname: i, applyParams: o } = e;
 	return {
 		pushStep: async (e) => {
@@ -633,7 +705,7 @@ function ne(e) {
 		}
 	};
 }
-function re(e, t) {
+function O(e, t) {
 	return e.subscribe((e) => {
 		let n = e.state;
 		n?.step && a.addTask(async () => {
@@ -643,7 +715,7 @@ function re(e, t) {
 }
 //#endregion
 //#region src/transition/store.ts
-function T(t = "cupertino") {
+function ee(t = "cupertino") {
 	return e((e) => ({
 		defaultTransitionName: t,
 		setDefaultTransitionName: (t) => e({ defaultTransitionName: t })
@@ -651,7 +723,7 @@ function T(t = "cupertino") {
 }
 //#endregion
 //#region src/screen/store.ts
-function E() {
+function k() {
 	return e((e) => ({
 		dragStatus: "IDLE",
 		replaceTransitionStatus: "IDLE",
@@ -682,40 +754,44 @@ function E() {
 }
 //#endregion
 //#region src/core/createRouterScope.ts
-var ie = {
+var te = {
 	mark: () => {},
 	consume: () => !1
 };
-function ae(e) {
-	let { routePaths: t, pathname: n, search: r, defaultTransitionName: i, memory: a, browserDriver: s } = e, c = l(t, n, r, i);
-	if (e.hostedScope) return e.hostedScope.history.getState().index === -1 && e.hostedScope.history.setState({
+function ne(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()?.index ?? 0 : 0, f = {
+		...c,
+		frameIndex: d
+	};
+	if (e.hostedScope) return e.hostedScope.life.alive = !0, e.hostedScope.history.getState().index === -1 && e.hostedScope.history.setState({
 		index: 0,
-		histories: [c]
+		histories: [f]
 	}), e.hostedScope;
-	let u = a ? y({
+	let p = a ? y({
 		state: {
-			id: c.id,
+			id: f.id,
 			index: 0,
 			status: "IDLE",
-			params: c.params,
-			transitionName: c.transitionName,
-			layoutId: c.layoutId
+			params: f.params,
+			transitionName: f.transitionName,
+			layoutId: f.layoutId
 		},
-		url: c.pathname
-	}) : s, d = a ? ie : m();
+		url: f.pathname
+	}) : s, h = a ? te : m();
 	return {
-		history: o([c], 0),
+		history: o([f], 0),
 		navigate: b(),
-		transition: T(i),
-		screen: E(),
-		driver: u,
-		markSelfInduced: d.mark,
-		consume: d.consume
+		transition: ee(i),
+		screen: k(),
+		driver: p,
+		markSelfInduced: h.mark,
+		consume: h.consume,
+		life: { alive: !0 }
 	};
 }
 //#endregion
 //#region src/screen/createScreenSelector.ts
-function oe(e, t) {
+function re(e, t) {
 	return e.map((n, r) => ({
 		...n,
 		isActive: r === t,
@@ -728,13 +804,13 @@ function oe(e, t) {
 }
 //#endregion
 //#region src/screen/computeScreenFreeze.ts
-function se(e) {
+function ie(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;
 }
 //#endregion
 //#region src/transition/createTransition.ts
-function D({ name: e, initial: t, idle: n, enter: r, enterBack: i, exit: a, exitBack: o, options: s }) {
+function A({ name: e, initial: t, idle: n, enter: r, enterBack: i, exit: a, exitBack: o, options: s }) {
 	return {
 		name: e,
 		initial: t,
@@ -755,7 +831,7 @@ function D({ name: e, initial: t, idle: n, enter: r, enterBack: i, exit: a, exit
 }
 //#endregion
 //#region src/transition/createRawTransition.ts
-function ce({ 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 ae({ 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,
@@ -776,10 +852,10 @@ function ce({ name: e, initial: t, idle: n, pushOnEnter: r, pushOnExit: i, repla
 }
 //#endregion
 //#region src/transition/cupertino.ts
-var le = (e, t, n) => {
+var oe = (e, t, n) => {
 	let [r, i] = t, [a, o] = n;
 	return i === r ? a : a + (e - r) / (i - r) * (o - a);
-}, ue = D({
+}, se = A({
 	name: "cupertino",
 	initial: { x: "100%" },
 	idle: {
@@ -839,7 +915,7 @@ var le = (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 = le(s, [0, window.innerWidth], [0, 100]);
+			let { offset: o } = t, s = o.x, c = oe(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 }) => {
@@ -863,10 +939,10 @@ var le = (e, t, n) => {
 			})]), c;
 		}
 	}
-}), de = (e, t, n) => {
+}), ce = (e, t, n) => {
 	let [r, i] = t, [a, o] = n;
 	return i === r ? a : a + (e - r) / (i - r) * (o - a);
-}, fe = D({
+}, j = A({
 	name: "layout",
 	initial: { opacity: .97 },
 	idle: {
@@ -894,7 +970,7 @@ var le = (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 = de(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 = ce(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
@@ -911,7 +987,7 @@ var le = (e, t, n) => {
 			}, { duration: .3 })]), c;
 		}
 	}
-}), O = D({
+}), le = A({
 	name: "material",
 	initial: { y: "100%" },
 	idle: {
@@ -1019,7 +1095,7 @@ var le = (e, t, n) => {
 			})]), c;
 		}
 	}
-}), pe = D({
+}), ue = A({
 	name: "none",
 	initial: {},
 	idle: {
@@ -1042,20 +1118,20 @@ var le = (e, t, n) => {
 		value: {},
 		options: { duration: 0 }
 	}
-}), k = new Map([
-	["none", pe],
-	["cupertino", ue],
-	["material", O],
-	["layout", fe]
+}), M = new Map([
+	["none", ue],
+	["cupertino", se],
+	["material", le],
+	["layout", j]
 ]);
 //#endregion
 //#region src/transition/resolveTransition.ts
-function A(e) {
-	return k.get(e) ?? k.get("none");
+function de(e) {
+	return M.get(e) ?? M.get("none");
 }
 //#endregion
 //#region src/transition/decorator/createDecorator.ts
-function me({ name: e, initial: t, idle: n, enter: r, exit: i, options: a }) {
+function N({ name: e, initial: t, idle: n, enter: r, exit: i, options: a }) {
 	return {
 		name: e,
 		initial: t,
@@ -1076,7 +1152,7 @@ function me({ name: e, initial: t, idle: n, enter: r, exit: i, options: a }) {
 }
 //#endregion
 //#region src/transition/decorator/createRawDecorator.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 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 }) {
 	return {
 		name: e,
 		initial: t,
@@ -1097,30 +1173,30 @@ function he({ name: e, initial: t, idle: n, pushOnEnter: r, pushOnExit: i, repla
 }
 //#endregion
 //#region src/transition/decorator/overlay.ts
-var j = "rgba(0, 0, 0, 0.3)", M = me({
+var P = "rgba(0, 0, 0, 0.3)", pe = N({
 	name: "overlay",
 	initial: {
 		opacity: 0,
-		backgroundColor: j
+		backgroundColor: P
 	},
 	idle: {
 		value: {
 			opacity: 0,
-			backgroundColor: j
+			backgroundColor: P
 		},
 		options: { duration: 0 }
 	},
 	enter: {
 		value: {
 			opacity: 1,
-			backgroundColor: j
+			backgroundColor: P
 		},
 		options: { duration: .7 }
 	},
 	exit: {
 		value: {
 			opacity: 0,
-			backgroundColor: j
+			backgroundColor: P
 		},
 		options: { duration: .6 }
 	},
@@ -1129,10 +1205,10 @@ var j = "rgba(0, 0, 0, 0.3)", M = me({
 		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 })
 	}
-}), N = new Map([["overlay", M]]);
+}), F = new Map([["overlay", pe]]);
 //#endregion
 //#region src/transition/partTransition/createPartTransition.ts
-function ge({ name: e, initial: t, idle: n, enter: r, exit: i, options: a }) {
+function me({ name: e, initial: t, idle: n, enter: r, exit: i, options: a }) {
 	return {
 		name: e,
 		initial: t,
@@ -1153,7 +1229,7 @@ function ge({ name: e, initial: t, idle: n, enter: r, exit: i, options: a }) {
 }
 //#endregion
 //#region src/transition/partTransition/createRawPartTransition.ts
-function _e({ 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 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 }) {
 	return {
 		name: e,
 		initial: t,
@@ -1174,7 +1250,7 @@ function _e({ name: e, initial: t, idle: n, pushOnEnter: r, pushOnExit: i, repla
 }
 //#endregion
 //#region src/transition/partTransition/partTransition.ts
-var P = /* @__PURE__ */ new Map(), F = {
+var I = /* @__PURE__ */ new Map(), L = {
 	"IDLE-true": "self",
 	"IDLE-false": "self",
 	"PUSHING-true": "initial",
@@ -1185,7 +1261,7 @@ var P = /* @__PURE__ */ new Map(), F = {
 	"POPPING-false": "PUSHING-false",
 	"COMPLETED-true": "self",
 	"COMPLETED-false": "self"
-}, ve = Object.keys(F), ye = ve, be = (e) => e.replace(/[^a-zA-Z0-9_-]/g, "_"), xe = (e) => typeof e == "object" && !!e && !Array.isArray(e), Se = 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(".")), Ce = (e, t) => t.startsWith("--") || Se.has(t) ? `${e}` : t === "rotate" || t === "rotateX" || t === "rotateY" || t === "rotateZ" ? `${e}deg` : `${e}px`, we = (e, t) => typeof t == "number" ? Ce(t, e) : typeof t == "string" ? t : "", Te = (e) => e.replace(/[A-Z]/g, (e) => `-${e.toLowerCase()}`), Ee = new Set([
+}, 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([
 	"x",
 	"y",
 	"z",
@@ -1196,7 +1272,7 @@ var P = /* @__PURE__ */ new Map(), F = {
 	"rotateX",
 	"rotateY",
 	"rotateZ"
-]), De = /^-?0(\.0+)?(px|%|em|rem|vh|vw|vmin|vmax)?$/, Oe = /^-?0(\.0+)?(deg|rad|grad|turn)?$/, ke = /^1(\.0+)?$/, Ae = (e, t) => e === "scale" || e === "scaleX" || e === "scaleY" ? t === 1 ? !0 : typeof t == "string" ? ke.test(t.trim()) : !1 : e === "rotate" || e === "rotateX" || e === "rotateY" || e === "rotateZ" ? t === 0 ? !0 : typeof t == "string" ? Oe.test(t.trim()) : !1 : t === 0 ? !0 : typeof t == "string" ? De.test(t.trim()) : !1, je = (e, t) => {
+]), 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) => {
 	switch (e) {
 		case "x": return `translateX(${t})`;
 		case "y": return `translateY(${t})`;
@@ -1210,23 +1286,23 @@ var P = /* @__PURE__ */ new Map(), F = {
 		case "rotateY": return `rotateY(${t})`;
 		default: return "";
 	}
-}, Me = (e) => {
+}, Ae = (e) => {
 	let t = /* @__PURE__ */ new Set(), n = !1, r = (e) => {
-		if (xe(e)) for (let r of Object.keys(e)) {
+		if (ye(e)) for (let r of Object.keys(e)) {
 			let i = e[r];
-			we(r, i) !== "" && (Ee.has(r) ? n = !0 : t.add(Te(r)));
+			Se(r, i) !== "" && (we.has(r) ? n = !0 : t.add(Ce(r)));
 		}
 	};
 	r(e.initial);
 	for (let t of Object.values(e.variants)) r(t.value);
 	return n && t.add("transform"), Array.from(t);
-}, I = (e) => {
-	if (!xe(e)) return [];
+}, R = (e) => {
+	if (!ye(e)) return [];
 	let t = [], n = !0, r = [];
 	for (let i of Object.keys(e)) {
-		let a = e[i], o = we(i, a);
-		o !== "" && (Ee.has(i) ? (t.push(je(i, o)), Ae(i, a) || (n = !1)) : r.push({
-			property: Te(i),
+		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),
 			value: o
 		}));
 	}
@@ -1234,7 +1310,7 @@ var P = /* @__PURE__ */ new Map(), F = {
 		property: "transform",
 		value: n ? "none" : t.join(" ")
 	}), r;
-}, L = (e) => e.map((e) => `  ${e.property}: ${e.value};`).join("\n"), R = (e) => Array.isArray(e) ? e.length === 4 && e.every((e) => typeof e == "number") ? `cubic-bezier(${e.join(", ")})` : "linear" : typeof e == "string" ? {
+}, 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" ? {
 	linear: "linear",
 	easeIn: "ease-in",
 	easeOut: "ease-out",
@@ -1244,11 +1320,11 @@ var P = /* @__PURE__ */ new Map(), F = {
 	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", z = (e) => {
+}[e] ?? "ease" : "ease", V = (e) => {
 	if (!e) return 0;
 	let t = e.duration;
 	return typeof t == "number" && t >= 0 ? t : 0;
-}, B = (e) => e && typeof e.delay == "number" && e.delay > 0 ? e.delay : 0, V = (e, t) => {
+}, je = (e) => e && typeof e.delay == "number" && e.delay > 0 ? e.delay : 0, Me = (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) => {
@@ -1260,17 +1336,17 @@ var P = /* @__PURE__ */ new Map(), F = {
 }, Fe = (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}-${be(t)}-${n}`, U = (e, t, n, r, i, a) => {
-	let o = I(r), s = I(i.value), c = z(i.options), l = B(i.options), u = R(i.options?.ease), d = a(t, n), f = e === "screen" ? `${d},\n${Pe(t, n)}` : d;
+}, 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;
 	if (s.length === 0 && o.length === 0) return "";
-	if (c <= 0 && l <= 0) return s.length === 0 ? "" : `${f} {\n${L(s)}\n  animation: none;\n}`;
+	if (c <= 0 && l <= 0) return s.length === 0 ? "" : `${f} {\n${z(s)}\n  animation: none;\n}`;
 	let p = H(e, t, n), m = [
 		`@keyframes ${p} {`,
 		"  from {",
-		L(o).replace(/^/gm, "  "),
+		z(o).replace(/^/gm, "  "),
 		"  }",
 		"  to {",
-		L(s).replace(/^/gm, "  "),
+		z(s).replace(/^/gm, "  "),
 		"  }",
 		"}"
 	].join("\n"), h = [
@@ -1280,33 +1356,33 @@ var P = /* @__PURE__ */ new Map(), F = {
 		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${L(s)}\n}` : ""}`;
+	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) => {
 	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 = I(r.value);
-	return i.length === 0 ? "" : `${e(t, n)} {\n${L(i)}\n}`;
+	let i = R(r.value);
+	return i.length === 0 ? "" : `${e(t, n)} {\n${z(i)}\n}`;
 }, Le = (e, t, n = []) => {
 	let r = [];
 	for (let t of e) {
 		let e = t.name;
-		for (let n of ve) {
-			let i = t.variants[n], a = F[n];
+		for (let n of ge) {
+			let i = t.variants[n], a = L[n];
 			if (a === "self") {
-				r.push(W(V, e, n, i));
+				r.push(W(Me, e, n, i));
 				continue;
 			}
 			let o = a === "initial" ? t.initial : t.variants[a].value;
-			r.push(U("screen", e, n, o, i, V));
+			r.push(U("screen", e, n, o, i, Me));
 		}
 	}
 	for (let e of t) {
 		let t = e.name;
-		for (let n of ye) {
-			let i = e.variants[n], a = F[n];
+		for (let n of _e) {
+			let i = e.variants[n], a = L[n];
 			if (a === "self") {
 				r.push(W(Ne, t, n, i));
 				continue;
@@ -1317,8 +1393,8 @@ var P = /* @__PURE__ */ new Map(), F = {
 	}
 	for (let e of n) {
 		let t = e.name;
-		for (let n of ye) {
-			let i = e.variants[n], a = F[n];
+		for (let n of _e) {
+			let i = e.variants[n], a = L[n];
 			if (a === "self") {
 				r.push(W(Fe, t, n, i));
 				continue;
@@ -1336,28 +1412,28 @@ var P = /* @__PURE__ */ new Map(), F = {
 	"  animation-play-state: paused !important;",
 	"}"
 ].join("\n"), ze = (e, t) => {
-	let n = F[t];
+	let n = L[t];
 	if (n === "self") return !1;
-	let r = e.variants[t], i = z(r.options), a = B(r.options);
+	let r = e.variants[t], i = V(r.options), a = je(r.options);
 	if (i <= 0 && a <= 0) return !1;
-	let o = I(n === "initial" ? e.initial : e.variants[n].value), s = I(r.value);
+	let o = R(n === "initial" ? e.initial : e.variants[n].value), s = R(r.value);
 	return o.length > 0 || s.length > 0;
 }, Be = "data-flemo";
 function G() {
 	if (u()) return;
-	let e = Le(k.values(), N.values(), P.values()), t = document.head.querySelector(`style[${Be}]`);
+	let e = Le(M.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);
 }
 //#endregion
 //#region src/transition/registerTransitionDefinitions.ts
 function Ve(e, t, n = []) {
-	for (let t of e) k.set(t.name, t);
-	for (let e of t) N.set(e.name, e);
-	for (let e of n) P.set(e.name, e);
+	for (let t of e) M.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) k.delete(t.name);
-		for (let e of t) N.delete(e.name);
-		for (let e of n) P.delete(e.name);
+		for (let t of e) M.delete(t.name);
+		for (let e of t) F.delete(e.name);
+		for (let e of n) I.delete(e.name);
 		G();
 	};
 }
@@ -1389,9 +1465,9 @@ 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 = I(t);
+	let r = e, i = R(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 = R(n.ease);
+	let a = typeof n.duration == "number" ? n.duration : 0, o = typeof n.delay == "number" && n.delay > 0 ? n.delay : 0, s = B(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);
@@ -1426,7 +1502,7 @@ function Ge(e) {
 		let l = () => {
 			let t = e.getTransitionTaskId();
 			t && a.resolveTask(t);
-		}, u = A(r), d = `${o}-true`;
+		}, u = de(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) => {
 			e.target === c && e.animationName === f && (c.removeEventListener("animationend", p), l());
@@ -1543,7 +1619,7 @@ function Je(e) {
 			current: i,
 			prev: s
 		};
-		let c = Me(e.getTransition()).join(", ");
+		let c = Ae(e.getTransition()).join(", ");
 		for (let e of i) e.style.willChange = c;
 		for (let e of s) e.style.willChange = c;
 	}, b = () => {
@@ -1561,7 +1637,7 @@ function Je(e) {
 		};
 	}, S = (e, t, n) => {
 		let r = (r, i) => {
-			let a = P.get(r.getAttribute("data-flemo-part-name"));
+			let a = I.get(r.getAttribute("data-flemo-part-name"));
 			if (!a) return;
 			let o = {
 				animate: J,
@@ -1608,7 +1684,7 @@ function Je(e) {
 				}), S("start", e, 0);
 			}
 		}) ? e.setDragStatus("PENDING") : (e.setDragStatus("IDLE"), s = !1, b());
-	}, ee = (r) => {
+	}, T = (r) => {
 		let i = e.getTransition();
 		if (!i.swipeDirection || !s || e.getViewportScrollHeight() > 10) return;
 		_(r);
@@ -1625,7 +1701,7 @@ function Je(e) {
 				}), S("swipe", e, t);
 			}
 		});
-	}, te = async (a) => {
+	}, E = async (a) => {
 		let o = e.getTransition();
 		if (!o.swipeDirection || !s) return;
 		s = !1;
@@ -1671,7 +1747,7 @@ function Je(e) {
 		pointerMove: (t) => {
 			if (e.getViewportScrollHeight() > 10) return;
 			if (s) {
-				ee(t);
+				T(t);
 				return;
 			}
 			let n = e.getTransition().swipeDirection, r = !f.element && !p.element;
@@ -1685,7 +1761,7 @@ function Je(e) {
 			}
 		},
 		pointerUp: (e) => {
-			a = !1, o = !1, s && te(e);
+			a = !1, o = !1, s && E(e);
 		},
 		shouldPreventTouch: () => o
 	};
@@ -1791,4 +1867,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, te as appendParamsQuery, G as applyTransitionStyles, st as buildRoutePath, $ as canProgrammaticallyScroll, q as clearInlineAnimation, Me as collectAnimatedProperties, Le as compileTransitionStyles, Ye as computeBarRiding, se as computeScreenFreeze, _ as consumeSelfInducedPop, p as createBrowserHistoryDriver, me as createDecorator, o as createHistoryStore, v as createHistorySync, y as createMemoryHistoryDriver, b as createNavigateStore, w as createNavigationController, ge as createPartTransition, he as createRawDecorator, _e as createRawPartTransition, ce as createRawTransition, ae as createRouterScope, oe as createScreenSelector, E as createScreenStore, m as createSelfPopGuard, ne as createStepController, Je as createSwipeController, D as createTransition, Ge as createTransitionEngine, T as createTransitionStore, ue as cupertino, N as decoratorMap, et as eagerlyDecodeImages, R as easingToCss, d as ensureWindowHistoryState, He as enteringInitialStyle, Z as findScrollable, s as getMatchedPathPattern, c as getParams, ot as isOpaqueColor, u as isServer, fe as layout, g as markSelfInducedPop, at as matchesPathname, O as material, pe as none, nt as observeBarHeight, it as observeViewportScrollHeight, Q as overflowsAxis, M as overlay, P as partTransitionMap, ee as readStepParams, Ve as registerTransitionDefinitions, A as resolveTransition, tt as scheduleAnimHoldRelease, l as seedInitialHistory, re as subscribeStepParamsRestore, I as targetToDecls, k as transitionMap, ze as variantHasAnimation };
+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, ie as computeScreenFreeze, _ as consumeSelfInducedPop, p as createBrowserHistoryDriver, N 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, ae as createRawTransition, ne as createRouterScope, re as createScreenSelector, k as createScreenStore, m as createSelfPopGuard, D as createStepController, Je as createSwipeController, A as createTransition, Ge as createTransitionEngine, ee as createTransitionStore, se 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, j as layout, g as markSelfInducedPop, at as matchesPathname, le as material, ue as none, nt as observeBarHeight, it as observeViewportScrollHeight, Q as overflowsAxis, pe as overlay, I as partTransitionMap, T as readStepParams, Ve as registerTransitionDefinitions, de as resolveTransition, tt as scheduleAnimHoldRelease, l as seedInitialHistory, O as subscribeStepParamsRestore, R as targetToDecls, M as transitionMap, ze as variantHasAnimation };

package/dist/navigate/createNavigationController.d.ts

@@ -19,6 +19,9 @@ export interface NavigationControllerDeps {
         history: HistoryStoreApi;
         navigate: NavigateStoreApi;
         transition: TransitionStoreApi;
+        life?: {
+            alive: boolean;
+        };
     };
     buildPathname: (path: string, params: object) => {
         pathname: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flemo/core",
-  "version": "1.10.0",
+  "version": "1.11.0",
   "description": "Framework-agnostic primitives for flemo: history, navigation, transitions, task manager.",
   "main": "./dist/index.mjs",
   "module": "./dist/index.mjs",