@octanejs/tanstack-router 0.1.52 → 0.1.53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@octanejs/tanstack-router",
-  "version": "0.1.52",
+  "version": "0.1.53",
   "license": "MIT",
   "type": "module",
   "engines": {
@@ -62,12 +62,12 @@
   },
   "devDependencies": {
     "@tanstack/react-router": "1.170.18",
-    "@tsrx/react": "^0.2.63",
+    "@tsrx/react": "^0.2.67",
     "esbuild": "^0.28.1",
     "react": "^19.2.7",
     "react-dom": "^19.2.7",
     "vitest": "^4.1.10",
-    "octane": "0.2.3"
+    "octane": "0.2.4"
   },
   "scripts": {
     "test": "vitest run"

package/src/useStore.ts

@@ -45,21 +45,35 @@ export function useStore(...args: any[]): any {
 		subSlot(slot, 'us:cb'),
 	);
 
-	// Memoize selector output: same store input → same output; structurally-equal
-	// output keeps its previous reference (so useSyncExternalStore doesn't loop).
-	const cache = useRef<{ in: unknown; out: unknown } | null>(null, subSlot(slot, 'us:cache'));
-	const getSnapshot = (): unknown => {
+	// A cached snapshot belongs to its atom, selector, and comparator as well as
+	// its input. Route parameters captured by a new selector must be re-evaluated
+	// even when the atom has already published the current match-id list.
+	// Structurally-equal output keeps its previous reference so
+	// useSyncExternalStore does not loop on allocating selectors.
+	const cache = useRef<{
+		atom: Atom<unknown>;
+		in: unknown;
+		selector: typeof selector;
+		compare: typeof compare;
+		out: unknown;
+	} | null>(null, subSlot(slot, 'us:cache'));
+	function getSnapshot(): unknown {
 		const input = atom.get();
 		const prev = cache.current;
-		if (prev && Object.is(prev.in, input)) return prev.out;
-		const next = selector(input);
-		if (prev && compare(prev.out, next)) {
-			cache.current = { in: input, out: prev.out };
+		if (
+			prev &&
+			prev.atom === atom &&
+			prev.selector === selector &&
+			prev.compare === compare &&
+			Object.is(prev.in, input)
+		) {
 			return prev.out;
 		}
-		cache.current = { in: input, out: next };
-		return next;
-	};
+		const next = selector(input);
+		const out = prev && compare(prev.out, next) ? prev.out : next;
+		cache.current = { atom, in: input, selector, compare, out };
+		return out;
+	}
 
 	return useSyncExternalStore(subscribe, getSnapshot, getSnapshot, subSlot(slot, 'us:uses'));
 }