@tanstack/router-core 1.168.8 → 1.168.10

package/dist/esm/stores.js

@@ -1,21 +1,21 @@
-import { arraysEqual } from "./utils.js";
+import { arraysEqual, functionalUpdate } from "./utils.js";
 import { createLRUCache } from "./lru-cache.js";
 //#region src/stores.ts
 /** SSR non-reactive createMutableStore */
 function createNonReactiveMutableStore(initialValue) {
 	let value = initialValue;
 	return {
-		get state() {
+		get() {
 			return value;
 		},
-		setState(updater) {
-			value = updater(value);
+		set(nextOrUpdater) {
+			value = functionalUpdate(nextOrUpdater, value);
 		}
 	};
 }
 /** SSR non-reactive createReadonlyStore */
 function createNonReactiveReadonlyStore(read) {
-	return { get state() {
+	return { get() {
 		return read();
 	} };
 }
@@ -35,38 +35,38 @@ function createRouterStores(initialState, config) {
 	const matchesId = createMutableStore([]);
 	const pendingMatchesId = createMutableStore([]);
 	const cachedMatchesId = createMutableStore([]);
-	const activeMatchesSnapshot = createReadonlyStore(() => readPoolMatches(activeMatchStoresById, matchesId.state));
-	const pendingMatchesSnapshot = createReadonlyStore(() => readPoolMatches(pendingMatchStoresById, pendingMatchesId.state));
-	const cachedMatchesSnapshot = createReadonlyStore(() => readPoolMatches(cachedMatchStoresById, cachedMatchesId.state));
-	const firstMatchId = createReadonlyStore(() => matchesId.state[0]);
-	const hasPendingMatches = createReadonlyStore(() => matchesId.state.some((matchId) => {
-		return activeMatchStoresById.get(matchId)?.state.status === "pending";
+	const activeMatchesSnapshot = createReadonlyStore(() => readPoolMatches(activeMatchStoresById, matchesId.get()));
+	const pendingMatchesSnapshot = createReadonlyStore(() => readPoolMatches(pendingMatchStoresById, pendingMatchesId.get()));
+	const cachedMatchesSnapshot = createReadonlyStore(() => readPoolMatches(cachedMatchStoresById, cachedMatchesId.get()));
+	const firstMatchId = createReadonlyStore(() => matchesId.get()[0]);
+	const hasPendingMatches = createReadonlyStore(() => matchesId.get().some((matchId) => {
+		return activeMatchStoresById.get(matchId)?.get().status === "pending";
 	}));
 	const matchRouteReactivity = createReadonlyStore(() => ({
-		locationHref: location.state.href,
-		resolvedLocationHref: resolvedLocation.state?.href,
-		status: status.state
+		locationHref: location.get().href,
+		resolvedLocationHref: resolvedLocation.get()?.href,
+		status: status.get()
 	}));
 	const __store = createReadonlyStore(() => ({
-		status: status.state,
-		loadedAt: loadedAt.state,
-		isLoading: isLoading.state,
-		isTransitioning: isTransitioning.state,
-		matches: activeMatchesSnapshot.state,
-		location: location.state,
-		resolvedLocation: resolvedLocation.state,
-		statusCode: statusCode.state,
-		redirect: redirect.state
+		status: status.get(),
+		loadedAt: loadedAt.get(),
+		isLoading: isLoading.get(),
+		isTransitioning: isTransitioning.get(),
+		matches: activeMatchesSnapshot.get(),
+		location: location.get(),
+		resolvedLocation: resolvedLocation.get(),
+		statusCode: statusCode.get(),
+		redirect: redirect.get()
 	}));
 	const matchStoreByRouteIdCache = createLRUCache(64);
 	function getMatchStoreByRouteId(routeId) {
 		let cached = matchStoreByRouteIdCache.get(routeId);
 		if (!cached) {
 			cached = createReadonlyStore(() => {
-				const ids = matchesId.state;
+				const ids = matchesId.get();
 				for (const id of ids) {
 					const matchStore = activeMatchStoresById.get(id);
-					if (matchStore && matchStore.routeId === routeId) return matchStore.state;
+					if (matchStore && matchStore.routeId === routeId) return matchStore.get();
 				}
 			});
 			matchStoreByRouteIdCache.set(routeId, cached);
@@ -117,7 +117,7 @@ function readPoolMatches(pool, ids) {
 	const matches = [];
 	for (const id of ids) {
 		const matchStore = pool.get(id);
-		if (matchStore) matches.push(matchStore.state);
+		if (matchStore) matches.push(matchStore.get());
 	}
 	return matches;
 }
@@ -135,9 +135,9 @@ function reconcileMatchPool(nextMatches, pool, idStore, createMutableStore, batc
 				continue;
 			}
 			existing.routeId = nextMatch.routeId;
-			if (existing.state !== nextMatch) existing.setState(() => nextMatch);
+			if (existing.get() !== nextMatch) existing.set(nextMatch);
 		}
-		if (!arraysEqual(idStore.state, nextIds)) idStore.setState(() => nextIds);
+		if (!arraysEqual(idStore.get(), nextIds)) idStore.set(nextIds);
 	});
 }
 //#endregion

package/dist/esm/stores.js.map

@@ -1 +1 @@
-{"version":3,"file":"stores.js","names":[],"sources":["../../src/stores.ts"],"sourcesContent":["import { createLRUCache } from './lru-cache'\nimport { arraysEqual } from './utils'\n\nimport type { AnyRoute } from './route'\nimport type { RouterState } from './router'\nimport type { FullSearchSchema } from './routeInfo'\nimport type { ParsedLocation } from './location'\nimport type { AnyRedirect } from './redirect'\nimport type { AnyRouteMatch } from './Matches'\n\nexport interface RouterReadableStore<TValue> {\n  readonly state: TValue\n}\n\nexport interface RouterWritableStore<\n  TValue,\n> extends RouterReadableStore<TValue> {\n  setState: (updater: (prev: TValue) => TValue) => void\n}\n\nexport type RouterBatchFn = (fn: () => void) => void\n\nexport type MutableStoreFactory = <TValue>(\n  initialValue: TValue,\n) => RouterWritableStore<TValue>\n\nexport type ReadonlyStoreFactory = <TValue>(\n  read: () => TValue,\n) => RouterReadableStore<TValue>\n\nexport type GetStoreConfig = (opts: { isServer?: boolean }) => StoreConfig\n\nexport type StoreConfig = {\n  createMutableStore: MutableStoreFactory\n  createReadonlyStore: ReadonlyStoreFactory\n  batch: RouterBatchFn\n  init?: (stores: RouterStores<AnyRoute>) => void\n}\n\ntype MatchStore = RouterWritableStore<AnyRouteMatch> & {\n  routeId?: string\n}\ntype ReadableStore<TValue> = RouterReadableStore<TValue>\n\n/** SSR non-reactive createMutableStore */\nexport function createNonReactiveMutableStore<TValue>(\n  initialValue: TValue,\n): RouterWritableStore<TValue> {\n  let value = initialValue\n\n  return {\n    get state() {\n      return value\n    },\n    setState(updater: (prev: TValue) => TValue) {\n      value = updater(value)\n    },\n  }\n}\n\n/** SSR non-reactive createReadonlyStore */\nexport function createNonReactiveReadonlyStore<TValue>(\n  read: () => TValue,\n): RouterReadableStore<TValue> {\n  return {\n    get state() {\n      return read()\n    },\n  }\n}\n\nexport interface RouterStores<in out TRouteTree extends AnyRoute> {\n  status: RouterWritableStore<RouterState<TRouteTree>['status']>\n  loadedAt: RouterWritableStore<number>\n  isLoading: RouterWritableStore<boolean>\n  isTransitioning: RouterWritableStore<boolean>\n  location: RouterWritableStore<ParsedLocation<FullSearchSchema<TRouteTree>>>\n  resolvedLocation: RouterWritableStore<\n    ParsedLocation<FullSearchSchema<TRouteTree>> | undefined\n  >\n  statusCode: RouterWritableStore<number>\n  redirect: RouterWritableStore<AnyRedirect | undefined>\n  matchesId: RouterWritableStore<Array<string>>\n  pendingMatchesId: RouterWritableStore<Array<string>>\n  /** @internal */\n  cachedMatchesId: RouterWritableStore<Array<string>>\n  activeMatchesSnapshot: ReadableStore<Array<AnyRouteMatch>>\n  pendingMatchesSnapshot: ReadableStore<Array<AnyRouteMatch>>\n  cachedMatchesSnapshot: ReadableStore<Array<AnyRouteMatch>>\n  firstMatchId: ReadableStore<string | undefined>\n  hasPendingMatches: ReadableStore<boolean>\n  matchRouteReactivity: ReadableStore<{\n    locationHref: string\n    resolvedLocationHref: string | undefined\n    status: RouterState<TRouteTree>['status']\n  }>\n  __store: RouterReadableStore<RouterState<TRouteTree>>\n\n  activeMatchStoresById: Map<string, MatchStore>\n  pendingMatchStoresById: Map<string, MatchStore>\n  cachedMatchStoresById: Map<string, MatchStore>\n\n  /**\n   * Get a computed store that resolves a routeId to its current match state.\n   * Returns the same cached store instance for repeated calls with the same key.\n   * The computed depends on matchesId + the individual match store, so\n   * subscribers are only notified when the resolved match state changes.\n   */\n  getMatchStoreByRouteId: (\n    routeId: string,\n  ) => RouterReadableStore<AnyRouteMatch | undefined>\n\n  setActiveMatches: (nextMatches: Array<AnyRouteMatch>) => void\n  setPendingMatches: (nextMatches: Array<AnyRouteMatch>) => void\n  setCachedMatches: (nextMatches: Array<AnyRouteMatch>) => void\n}\n\nexport function createRouterStores<TRouteTree extends AnyRoute>(\n  initialState: RouterState<TRouteTree>,\n  config: StoreConfig,\n): RouterStores<TRouteTree> {\n  const { createMutableStore, createReadonlyStore, batch, init } = config\n\n  // non reactive utilities\n  const activeMatchStoresById = new Map<string, MatchStore>()\n  const pendingMatchStoresById = new Map<string, MatchStore>()\n  const cachedMatchStoresById = new Map<string, MatchStore>()\n\n  // atoms\n  const status = createMutableStore(initialState.status)\n  const loadedAt = createMutableStore(initialState.loadedAt)\n  const isLoading = createMutableStore(initialState.isLoading)\n  const isTransitioning = createMutableStore(initialState.isTransitioning)\n  const location = createMutableStore(initialState.location)\n  const resolvedLocation = createMutableStore(initialState.resolvedLocation)\n  const statusCode = createMutableStore(initialState.statusCode)\n  const redirect = createMutableStore(initialState.redirect)\n  const matchesId = createMutableStore<Array<string>>([])\n  const pendingMatchesId = createMutableStore<Array<string>>([])\n  const cachedMatchesId = createMutableStore<Array<string>>([])\n\n  // 1st order derived stores\n  const activeMatchesSnapshot = createReadonlyStore(() =>\n    readPoolMatches(activeMatchStoresById, matchesId.state),\n  )\n  const pendingMatchesSnapshot = createReadonlyStore(() =>\n    readPoolMatches(pendingMatchStoresById, pendingMatchesId.state),\n  )\n  const cachedMatchesSnapshot = createReadonlyStore(() =>\n    readPoolMatches(cachedMatchStoresById, cachedMatchesId.state),\n  )\n  const firstMatchId = createReadonlyStore(() => matchesId.state[0])\n  const hasPendingMatches = createReadonlyStore(() =>\n    matchesId.state.some((matchId) => {\n      const store = activeMatchStoresById.get(matchId)\n      return store?.state.status === 'pending'\n    }),\n  )\n  const matchRouteReactivity = createReadonlyStore(() => ({\n    locationHref: location.state.href,\n    resolvedLocationHref: resolvedLocation.state?.href,\n    status: status.state,\n  }))\n\n  // compatibility \"big\" state store\n  const __store = createReadonlyStore(() => ({\n    status: status.state,\n    loadedAt: loadedAt.state,\n    isLoading: isLoading.state,\n    isTransitioning: isTransitioning.state,\n    matches: activeMatchesSnapshot.state,\n    location: location.state,\n    resolvedLocation: resolvedLocation.state,\n    statusCode: statusCode.state,\n    redirect: redirect.state,\n  }))\n\n  // Per-routeId computed store cache.\n  // Each entry resolves routeId → match state through the signal graph,\n  // giving consumers a single store to subscribe to instead of the\n  // two-level byRouteId → matchStore pattern.\n  //\n  // 64 max size is arbitrary, this is only for active matches anyway so\n  // it should be plenty. And we already have a 32 limit due to route\n  // matching bitmask anyway.\n  const matchStoreByRouteIdCache = createLRUCache<\n    string,\n    RouterReadableStore<AnyRouteMatch | undefined>\n  >(64)\n\n  function getMatchStoreByRouteId(\n    routeId: string,\n  ): RouterReadableStore<AnyRouteMatch | undefined> {\n    let cached = matchStoreByRouteIdCache.get(routeId)\n    if (!cached) {\n      cached = createReadonlyStore(() => {\n        // Reading matchesId.state tracks it as a dependency.\n        // When matchesId changes (navigation), this computed re-evaluates.\n        const ids = matchesId.state\n        for (const id of ids) {\n          const matchStore = activeMatchStoresById.get(id)\n          if (matchStore && matchStore.routeId === routeId) {\n            // Reading matchStore.state tracks it as a dependency.\n            // When the match store's state changes, this re-evaluates.\n            return matchStore.state\n          }\n        }\n        return undefined\n      })\n      matchStoreByRouteIdCache.set(routeId, cached)\n    }\n    return cached\n  }\n\n  const store = {\n    // atoms\n    status,\n    loadedAt,\n    isLoading,\n    isTransitioning,\n    location,\n    resolvedLocation,\n    statusCode,\n    redirect,\n    matchesId,\n    pendingMatchesId,\n    cachedMatchesId,\n\n    // derived\n    activeMatchesSnapshot,\n    pendingMatchesSnapshot,\n    cachedMatchesSnapshot,\n    firstMatchId,\n    hasPendingMatches,\n    matchRouteReactivity,\n\n    // non-reactive state\n    activeMatchStoresById,\n    pendingMatchStoresById,\n    cachedMatchStoresById,\n\n    // compatibility \"big\" state\n    __store,\n\n    // per-key computed stores\n    getMatchStoreByRouteId,\n\n    // methods\n    setActiveMatches,\n    setPendingMatches,\n    setCachedMatches,\n  }\n\n  // initialize the active matches\n  setActiveMatches(initialState.matches as Array<AnyRouteMatch>)\n  init?.(store)\n\n  // setters to update non-reactive utilities in sync with the reactive stores\n  function setActiveMatches(nextMatches: Array<AnyRouteMatch>) {\n    reconcileMatchPool(\n      nextMatches,\n      activeMatchStoresById,\n      matchesId,\n      createMutableStore,\n      batch,\n    )\n  }\n\n  function setPendingMatches(nextMatches: Array<AnyRouteMatch>) {\n    reconcileMatchPool(\n      nextMatches,\n      pendingMatchStoresById,\n      pendingMatchesId,\n      createMutableStore,\n      batch,\n    )\n  }\n\n  function setCachedMatches(nextMatches: Array<AnyRouteMatch>) {\n    reconcileMatchPool(\n      nextMatches,\n      cachedMatchStoresById,\n      cachedMatchesId,\n      createMutableStore,\n      batch,\n    )\n  }\n\n  return store\n}\n\nfunction readPoolMatches(\n  pool: Map<string, MatchStore>,\n  ids: Array<string>,\n): Array<AnyRouteMatch> {\n  const matches: Array<AnyRouteMatch> = []\n  for (const id of ids) {\n    const matchStore = pool.get(id)\n    if (matchStore) {\n      matches.push(matchStore.state)\n    }\n  }\n  return matches\n}\n\nfunction reconcileMatchPool(\n  nextMatches: Array<AnyRouteMatch>,\n  pool: Map<string, MatchStore>,\n  idStore: RouterWritableStore<Array<string>>,\n  createMutableStore: MutableStoreFactory,\n  batch: RouterBatchFn,\n): void {\n  const nextIds = nextMatches.map((d) => d.id)\n  const nextIdSet = new Set(nextIds)\n\n  batch(() => {\n    for (const id of pool.keys()) {\n      if (!nextIdSet.has(id)) {\n        pool.delete(id)\n      }\n    }\n\n    for (const nextMatch of nextMatches) {\n      const existing = pool.get(nextMatch.id)\n      if (!existing) {\n        const matchStore = createMutableStore(nextMatch) as MatchStore\n        matchStore.routeId = nextMatch.routeId\n        pool.set(nextMatch.id, matchStore)\n        continue\n      }\n\n      existing.routeId = nextMatch.routeId\n      if (existing.state !== nextMatch) {\n        existing.setState(() => nextMatch)\n      }\n    }\n\n    if (!arraysEqual(idStore.state, nextIds)) {\n      idStore.setState(() => nextIds)\n    }\n  })\n}\n"],"mappings":";;;;AA6CA,SAAgB,8BACd,cAC6B;CAC7B,IAAI,QAAQ;AAEZ,QAAO;EACL,IAAI,QAAQ;AACV,UAAO;;EAET,SAAS,SAAmC;AAC1C,WAAQ,QAAQ,MAAM;;EAEzB;;;AAIH,SAAgB,+BACd,MAC6B;AAC7B,QAAO,EACL,IAAI,QAAQ;AACV,SAAO,MAAM;IAEhB;;AAiDH,SAAgB,mBACd,cACA,QAC0B;CAC1B,MAAM,EAAE,oBAAoB,qBAAqB,OAAO,SAAS;CAGjE,MAAM,wCAAwB,IAAI,KAAyB;CAC3D,MAAM,yCAAyB,IAAI,KAAyB;CAC5D,MAAM,wCAAwB,IAAI,KAAyB;CAG3D,MAAM,SAAS,mBAAmB,aAAa,OAAO;CACtD,MAAM,WAAW,mBAAmB,aAAa,SAAS;CAC1D,MAAM,YAAY,mBAAmB,aAAa,UAAU;CAC5D,MAAM,kBAAkB,mBAAmB,aAAa,gBAAgB;CACxE,MAAM,WAAW,mBAAmB,aAAa,SAAS;CAC1D,MAAM,mBAAmB,mBAAmB,aAAa,iBAAiB;CAC1E,MAAM,aAAa,mBAAmB,aAAa,WAAW;CAC9D,MAAM,WAAW,mBAAmB,aAAa,SAAS;CAC1D,MAAM,YAAY,mBAAkC,EAAE,CAAC;CACvD,MAAM,mBAAmB,mBAAkC,EAAE,CAAC;CAC9D,MAAM,kBAAkB,mBAAkC,EAAE,CAAC;CAG7D,MAAM,wBAAwB,0BAC5B,gBAAgB,uBAAuB,UAAU,MAAM,CACxD;CACD,MAAM,yBAAyB,0BAC7B,gBAAgB,wBAAwB,iBAAiB,MAAM,CAChE;CACD,MAAM,wBAAwB,0BAC5B,gBAAgB,uBAAuB,gBAAgB,MAAM,CAC9D;CACD,MAAM,eAAe,0BAA0B,UAAU,MAAM,GAAG;CAClE,MAAM,oBAAoB,0BACxB,UAAU,MAAM,MAAM,YAAY;AAEhC,SADc,sBAAsB,IAAI,QAAQ,EAClC,MAAM,WAAW;GAC/B,CACH;CACD,MAAM,uBAAuB,2BAA2B;EACtD,cAAc,SAAS,MAAM;EAC7B,sBAAsB,iBAAiB,OAAO;EAC9C,QAAQ,OAAO;EAChB,EAAE;CAGH,MAAM,UAAU,2BAA2B;EACzC,QAAQ,OAAO;EACf,UAAU,SAAS;EACnB,WAAW,UAAU;EACrB,iBAAiB,gBAAgB;EACjC,SAAS,sBAAsB;EAC/B,UAAU,SAAS;EACnB,kBAAkB,iBAAiB;EACnC,YAAY,WAAW;EACvB,UAAU,SAAS;EACpB,EAAE;CAUH,MAAM,2BAA2B,eAG/B,GAAG;CAEL,SAAS,uBACP,SACgD;EAChD,IAAI,SAAS,yBAAyB,IAAI,QAAQ;AAClD,MAAI,CAAC,QAAQ;AACX,YAAS,0BAA0B;IAGjC,MAAM,MAAM,UAAU;AACtB,SAAK,MAAM,MAAM,KAAK;KACpB,MAAM,aAAa,sBAAsB,IAAI,GAAG;AAChD,SAAI,cAAc,WAAW,YAAY,QAGvC,QAAO,WAAW;;KAItB;AACF,4BAAyB,IAAI,SAAS,OAAO;;AAE/C,SAAO;;CAGT,MAAM,QAAQ;EAEZ;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAGA;EACA;EACA;EACA;EACA;EACA;EAGA;EACA;EACA;EAGA;EAGA;EAGA;EACA;EACA;EACD;AAGD,kBAAiB,aAAa,QAAgC;AAC9D,QAAO,MAAM;CAGb,SAAS,iBAAiB,aAAmC;AAC3D,qBACE,aACA,uBACA,WACA,oBACA,MACD;;CAGH,SAAS,kBAAkB,aAAmC;AAC5D,qBACE,aACA,wBACA,kBACA,oBACA,MACD;;CAGH,SAAS,iBAAiB,aAAmC;AAC3D,qBACE,aACA,uBACA,iBACA,oBACA,MACD;;AAGH,QAAO;;AAGT,SAAS,gBACP,MACA,KACsB;CACtB,MAAM,UAAgC,EAAE;AACxC,MAAK,MAAM,MAAM,KAAK;EACpB,MAAM,aAAa,KAAK,IAAI,GAAG;AAC/B,MAAI,WACF,SAAQ,KAAK,WAAW,MAAM;;AAGlC,QAAO;;AAGT,SAAS,mBACP,aACA,MACA,SACA,oBACA,OACM;CACN,MAAM,UAAU,YAAY,KAAK,MAAM,EAAE,GAAG;CAC5C,MAAM,YAAY,IAAI,IAAI,QAAQ;AAElC,aAAY;AACV,OAAK,MAAM,MAAM,KAAK,MAAM,CAC1B,KAAI,CAAC,UAAU,IAAI,GAAG,CACpB,MAAK,OAAO,GAAG;AAInB,OAAK,MAAM,aAAa,aAAa;GACnC,MAAM,WAAW,KAAK,IAAI,UAAU,GAAG;AACvC,OAAI,CAAC,UAAU;IACb,MAAM,aAAa,mBAAmB,UAAU;AAChD,eAAW,UAAU,UAAU;AAC/B,SAAK,IAAI,UAAU,IAAI,WAAW;AAClC;;AAGF,YAAS,UAAU,UAAU;AAC7B,OAAI,SAAS,UAAU,UACrB,UAAS,eAAe,UAAU;;AAItC,MAAI,CAAC,YAAY,QAAQ,OAAO,QAAQ,CACtC,SAAQ,eAAe,QAAQ;GAEjC"}
+{"version":3,"file":"stores.js","names":[],"sources":["../../src/stores.ts"],"sourcesContent":["import { createLRUCache } from './lru-cache'\nimport { arraysEqual, functionalUpdate } from './utils'\n\nimport type { AnyRoute } from './route'\nimport type { RouterState } from './router'\nimport type { FullSearchSchema } from './routeInfo'\nimport type { ParsedLocation } from './location'\nimport type { AnyRedirect } from './redirect'\nimport type { AnyRouteMatch } from './Matches'\n\nexport interface RouterReadableStore<TValue> {\n  get: () => TValue\n}\n\nexport interface RouterWritableStore<\n  TValue,\n> extends RouterReadableStore<TValue> {\n  set: ((updater: (prev: TValue) => TValue) => void) & ((value: TValue) => void)\n}\n\nexport type RouterBatchFn = (fn: () => void) => void\n\nexport type MutableStoreFactory = <TValue>(\n  initialValue: TValue,\n) => RouterWritableStore<TValue>\n\nexport type ReadonlyStoreFactory = <TValue>(\n  read: () => TValue,\n) => RouterReadableStore<TValue>\n\nexport type GetStoreConfig = (opts: { isServer?: boolean }) => StoreConfig\n\nexport type StoreConfig = {\n  createMutableStore: MutableStoreFactory\n  createReadonlyStore: ReadonlyStoreFactory\n  batch: RouterBatchFn\n  init?: (stores: RouterStores<AnyRoute>) => void\n}\n\ntype MatchStore = RouterWritableStore<AnyRouteMatch> & {\n  routeId?: string\n}\ntype ReadableStore<TValue> = RouterReadableStore<TValue>\n\n/** SSR non-reactive createMutableStore */\nexport function createNonReactiveMutableStore<TValue>(\n  initialValue: TValue,\n): RouterWritableStore<TValue> {\n  let value = initialValue\n\n  return {\n    get() {\n      return value\n    },\n    set(nextOrUpdater: TValue | ((prev: TValue) => TValue)) {\n      value = functionalUpdate(nextOrUpdater, value)\n    },\n  }\n}\n\n/** SSR non-reactive createReadonlyStore */\nexport function createNonReactiveReadonlyStore<TValue>(\n  read: () => TValue,\n): RouterReadableStore<TValue> {\n  return {\n    get() {\n      return read()\n    },\n  }\n}\n\nexport interface RouterStores<in out TRouteTree extends AnyRoute> {\n  status: RouterWritableStore<RouterState<TRouteTree>['status']>\n  loadedAt: RouterWritableStore<number>\n  isLoading: RouterWritableStore<boolean>\n  isTransitioning: RouterWritableStore<boolean>\n  location: RouterWritableStore<ParsedLocation<FullSearchSchema<TRouteTree>>>\n  resolvedLocation: RouterWritableStore<\n    ParsedLocation<FullSearchSchema<TRouteTree>> | undefined\n  >\n  statusCode: RouterWritableStore<number>\n  redirect: RouterWritableStore<AnyRedirect | undefined>\n  matchesId: RouterWritableStore<Array<string>>\n  pendingMatchesId: RouterWritableStore<Array<string>>\n  /** @internal */\n  cachedMatchesId: RouterWritableStore<Array<string>>\n  activeMatchesSnapshot: ReadableStore<Array<AnyRouteMatch>>\n  pendingMatchesSnapshot: ReadableStore<Array<AnyRouteMatch>>\n  cachedMatchesSnapshot: ReadableStore<Array<AnyRouteMatch>>\n  firstMatchId: ReadableStore<string | undefined>\n  hasPendingMatches: ReadableStore<boolean>\n  matchRouteReactivity: ReadableStore<{\n    locationHref: string\n    resolvedLocationHref: string | undefined\n    status: RouterState<TRouteTree>['status']\n  }>\n  __store: RouterReadableStore<RouterState<TRouteTree>>\n\n  activeMatchStoresById: Map<string, MatchStore>\n  pendingMatchStoresById: Map<string, MatchStore>\n  cachedMatchStoresById: Map<string, MatchStore>\n\n  /**\n   * Get a computed store that resolves a routeId to its current match state.\n   * Returns the same cached store instance for repeated calls with the same key.\n   * The computed depends on matchesId + the individual match store, so\n   * subscribers are only notified when the resolved match state changes.\n   */\n  getMatchStoreByRouteId: (\n    routeId: string,\n  ) => RouterReadableStore<AnyRouteMatch | undefined>\n\n  setActiveMatches: (nextMatches: Array<AnyRouteMatch>) => void\n  setPendingMatches: (nextMatches: Array<AnyRouteMatch>) => void\n  setCachedMatches: (nextMatches: Array<AnyRouteMatch>) => void\n}\n\nexport function createRouterStores<TRouteTree extends AnyRoute>(\n  initialState: RouterState<TRouteTree>,\n  config: StoreConfig,\n): RouterStores<TRouteTree> {\n  const { createMutableStore, createReadonlyStore, batch, init } = config\n\n  // non reactive utilities\n  const activeMatchStoresById = new Map<string, MatchStore>()\n  const pendingMatchStoresById = new Map<string, MatchStore>()\n  const cachedMatchStoresById = new Map<string, MatchStore>()\n\n  // atoms\n  const status = createMutableStore(initialState.status)\n  const loadedAt = createMutableStore(initialState.loadedAt)\n  const isLoading = createMutableStore(initialState.isLoading)\n  const isTransitioning = createMutableStore(initialState.isTransitioning)\n  const location = createMutableStore(initialState.location)\n  const resolvedLocation = createMutableStore(initialState.resolvedLocation)\n  const statusCode = createMutableStore(initialState.statusCode)\n  const redirect = createMutableStore(initialState.redirect)\n  const matchesId = createMutableStore<Array<string>>([])\n  const pendingMatchesId = createMutableStore<Array<string>>([])\n  const cachedMatchesId = createMutableStore<Array<string>>([])\n\n  // 1st order derived stores\n  const activeMatchesSnapshot = createReadonlyStore(() =>\n    readPoolMatches(activeMatchStoresById, matchesId.get()),\n  )\n  const pendingMatchesSnapshot = createReadonlyStore(() =>\n    readPoolMatches(pendingMatchStoresById, pendingMatchesId.get()),\n  )\n  const cachedMatchesSnapshot = createReadonlyStore(() =>\n    readPoolMatches(cachedMatchStoresById, cachedMatchesId.get()),\n  )\n  const firstMatchId = createReadonlyStore(() => matchesId.get()[0])\n  const hasPendingMatches = createReadonlyStore(() =>\n    matchesId.get().some((matchId) => {\n      const store = activeMatchStoresById.get(matchId)\n      return store?.get().status === 'pending'\n    }),\n  )\n  const matchRouteReactivity = createReadonlyStore(() => ({\n    locationHref: location.get().href,\n    resolvedLocationHref: resolvedLocation.get()?.href,\n    status: status.get(),\n  }))\n\n  // compatibility \"big\" state store\n  const __store = createReadonlyStore(() => ({\n    status: status.get(),\n    loadedAt: loadedAt.get(),\n    isLoading: isLoading.get(),\n    isTransitioning: isTransitioning.get(),\n    matches: activeMatchesSnapshot.get(),\n    location: location.get(),\n    resolvedLocation: resolvedLocation.get(),\n    statusCode: statusCode.get(),\n    redirect: redirect.get(),\n  }))\n\n  // Per-routeId computed store cache.\n  // Each entry resolves routeId → match state through the signal graph,\n  // giving consumers a single store to subscribe to instead of the\n  // two-level byRouteId → matchStore pattern.\n  //\n  // 64 max size is arbitrary, this is only for active matches anyway so\n  // it should be plenty. And we already have a 32 limit due to route\n  // matching bitmask anyway.\n  const matchStoreByRouteIdCache = createLRUCache<\n    string,\n    RouterReadableStore<AnyRouteMatch | undefined>\n  >(64)\n\n  function getMatchStoreByRouteId(\n    routeId: string,\n  ): RouterReadableStore<AnyRouteMatch | undefined> {\n    let cached = matchStoreByRouteIdCache.get(routeId)\n    if (!cached) {\n      cached = createReadonlyStore(() => {\n        // Reading matchesId.get() tracks it as a dependency.\n        // When matchesId changes (navigation), this computed re-evaluates.\n        const ids = matchesId.get()\n        for (const id of ids) {\n          const matchStore = activeMatchStoresById.get(id)\n          if (matchStore && matchStore.routeId === routeId) {\n            // Reading matchStore.get() tracks it as a dependency.\n            // When the match store's state changes, this re-evaluates.\n            return matchStore.get()\n          }\n        }\n        return undefined\n      })\n      matchStoreByRouteIdCache.set(routeId, cached)\n    }\n    return cached\n  }\n\n  const store = {\n    // atoms\n    status,\n    loadedAt,\n    isLoading,\n    isTransitioning,\n    location,\n    resolvedLocation,\n    statusCode,\n    redirect,\n    matchesId,\n    pendingMatchesId,\n    cachedMatchesId,\n\n    // derived\n    activeMatchesSnapshot,\n    pendingMatchesSnapshot,\n    cachedMatchesSnapshot,\n    firstMatchId,\n    hasPendingMatches,\n    matchRouteReactivity,\n\n    // non-reactive state\n    activeMatchStoresById,\n    pendingMatchStoresById,\n    cachedMatchStoresById,\n\n    // compatibility \"big\" state\n    __store,\n\n    // per-key computed stores\n    getMatchStoreByRouteId,\n\n    // methods\n    setActiveMatches,\n    setPendingMatches,\n    setCachedMatches,\n  }\n\n  // initialize the active matches\n  setActiveMatches(initialState.matches as Array<AnyRouteMatch>)\n  init?.(store)\n\n  // setters to update non-reactive utilities in sync with the reactive stores\n  function setActiveMatches(nextMatches: Array<AnyRouteMatch>) {\n    reconcileMatchPool(\n      nextMatches,\n      activeMatchStoresById,\n      matchesId,\n      createMutableStore,\n      batch,\n    )\n  }\n\n  function setPendingMatches(nextMatches: Array<AnyRouteMatch>) {\n    reconcileMatchPool(\n      nextMatches,\n      pendingMatchStoresById,\n      pendingMatchesId,\n      createMutableStore,\n      batch,\n    )\n  }\n\n  function setCachedMatches(nextMatches: Array<AnyRouteMatch>) {\n    reconcileMatchPool(\n      nextMatches,\n      cachedMatchStoresById,\n      cachedMatchesId,\n      createMutableStore,\n      batch,\n    )\n  }\n\n  return store\n}\n\nfunction readPoolMatches(\n  pool: Map<string, MatchStore>,\n  ids: Array<string>,\n): Array<AnyRouteMatch> {\n  const matches: Array<AnyRouteMatch> = []\n  for (const id of ids) {\n    const matchStore = pool.get(id)\n    if (matchStore) {\n      matches.push(matchStore.get())\n    }\n  }\n  return matches\n}\n\nfunction reconcileMatchPool(\n  nextMatches: Array<AnyRouteMatch>,\n  pool: Map<string, MatchStore>,\n  idStore: RouterWritableStore<Array<string>>,\n  createMutableStore: MutableStoreFactory,\n  batch: RouterBatchFn,\n): void {\n  const nextIds = nextMatches.map((d) => d.id)\n  const nextIdSet = new Set(nextIds)\n\n  batch(() => {\n    for (const id of pool.keys()) {\n      if (!nextIdSet.has(id)) {\n        pool.delete(id)\n      }\n    }\n\n    for (const nextMatch of nextMatches) {\n      const existing = pool.get(nextMatch.id)\n      if (!existing) {\n        const matchStore = createMutableStore(nextMatch) as MatchStore\n        matchStore.routeId = nextMatch.routeId\n        pool.set(nextMatch.id, matchStore)\n        continue\n      }\n\n      existing.routeId = nextMatch.routeId\n      if (existing.get() !== nextMatch) {\n        existing.set(nextMatch)\n      }\n    }\n\n    if (!arraysEqual(idStore.get(), nextIds)) {\n      idStore.set(nextIds)\n    }\n  })\n}\n"],"mappings":";;;;AA6CA,SAAgB,8BACd,cAC6B;CAC7B,IAAI,QAAQ;AAEZ,QAAO;EACL,MAAM;AACJ,UAAO;;EAET,IAAI,eAAoD;AACtD,WAAQ,iBAAiB,eAAe,MAAM;;EAEjD;;;AAIH,SAAgB,+BACd,MAC6B;AAC7B,QAAO,EACL,MAAM;AACJ,SAAO,MAAM;IAEhB;;AAiDH,SAAgB,mBACd,cACA,QAC0B;CAC1B,MAAM,EAAE,oBAAoB,qBAAqB,OAAO,SAAS;CAGjE,MAAM,wCAAwB,IAAI,KAAyB;CAC3D,MAAM,yCAAyB,IAAI,KAAyB;CAC5D,MAAM,wCAAwB,IAAI,KAAyB;CAG3D,MAAM,SAAS,mBAAmB,aAAa,OAAO;CACtD,MAAM,WAAW,mBAAmB,aAAa,SAAS;CAC1D,MAAM,YAAY,mBAAmB,aAAa,UAAU;CAC5D,MAAM,kBAAkB,mBAAmB,aAAa,gBAAgB;CACxE,MAAM,WAAW,mBAAmB,aAAa,SAAS;CAC1D,MAAM,mBAAmB,mBAAmB,aAAa,iBAAiB;CAC1E,MAAM,aAAa,mBAAmB,aAAa,WAAW;CAC9D,MAAM,WAAW,mBAAmB,aAAa,SAAS;CAC1D,MAAM,YAAY,mBAAkC,EAAE,CAAC;CACvD,MAAM,mBAAmB,mBAAkC,EAAE,CAAC;CAC9D,MAAM,kBAAkB,mBAAkC,EAAE,CAAC;CAG7D,MAAM,wBAAwB,0BAC5B,gBAAgB,uBAAuB,UAAU,KAAK,CAAC,CACxD;CACD,MAAM,yBAAyB,0BAC7B,gBAAgB,wBAAwB,iBAAiB,KAAK,CAAC,CAChE;CACD,MAAM,wBAAwB,0BAC5B,gBAAgB,uBAAuB,gBAAgB,KAAK,CAAC,CAC9D;CACD,MAAM,eAAe,0BAA0B,UAAU,KAAK,CAAC,GAAG;CAClE,MAAM,oBAAoB,0BACxB,UAAU,KAAK,CAAC,MAAM,YAAY;AAEhC,SADc,sBAAsB,IAAI,QAAQ,EAClC,KAAK,CAAC,WAAW;GAC/B,CACH;CACD,MAAM,uBAAuB,2BAA2B;EACtD,cAAc,SAAS,KAAK,CAAC;EAC7B,sBAAsB,iBAAiB,KAAK,EAAE;EAC9C,QAAQ,OAAO,KAAK;EACrB,EAAE;CAGH,MAAM,UAAU,2BAA2B;EACzC,QAAQ,OAAO,KAAK;EACpB,UAAU,SAAS,KAAK;EACxB,WAAW,UAAU,KAAK;EAC1B,iBAAiB,gBAAgB,KAAK;EACtC,SAAS,sBAAsB,KAAK;EACpC,UAAU,SAAS,KAAK;EACxB,kBAAkB,iBAAiB,KAAK;EACxC,YAAY,WAAW,KAAK;EAC5B,UAAU,SAAS,KAAK;EACzB,EAAE;CAUH,MAAM,2BAA2B,eAG/B,GAAG;CAEL,SAAS,uBACP,SACgD;EAChD,IAAI,SAAS,yBAAyB,IAAI,QAAQ;AAClD,MAAI,CAAC,QAAQ;AACX,YAAS,0BAA0B;IAGjC,MAAM,MAAM,UAAU,KAAK;AAC3B,SAAK,MAAM,MAAM,KAAK;KACpB,MAAM,aAAa,sBAAsB,IAAI,GAAG;AAChD,SAAI,cAAc,WAAW,YAAY,QAGvC,QAAO,WAAW,KAAK;;KAI3B;AACF,4BAAyB,IAAI,SAAS,OAAO;;AAE/C,SAAO;;CAGT,MAAM,QAAQ;EAEZ;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAGA;EACA;EACA;EACA;EACA;EACA;EAGA;EACA;EACA;EAGA;EAGA;EAGA;EACA;EACA;EACD;AAGD,kBAAiB,aAAa,QAAgC;AAC9D,QAAO,MAAM;CAGb,SAAS,iBAAiB,aAAmC;AAC3D,qBACE,aACA,uBACA,WACA,oBACA,MACD;;CAGH,SAAS,kBAAkB,aAAmC;AAC5D,qBACE,aACA,wBACA,kBACA,oBACA,MACD;;CAGH,SAAS,iBAAiB,aAAmC;AAC3D,qBACE,aACA,uBACA,iBACA,oBACA,MACD;;AAGH,QAAO;;AAGT,SAAS,gBACP,MACA,KACsB;CACtB,MAAM,UAAgC,EAAE;AACxC,MAAK,MAAM,MAAM,KAAK;EACpB,MAAM,aAAa,KAAK,IAAI,GAAG;AAC/B,MAAI,WACF,SAAQ,KAAK,WAAW,KAAK,CAAC;;AAGlC,QAAO;;AAGT,SAAS,mBACP,aACA,MACA,SACA,oBACA,OACM;CACN,MAAM,UAAU,YAAY,KAAK,MAAM,EAAE,GAAG;CAC5C,MAAM,YAAY,IAAI,IAAI,QAAQ;AAElC,aAAY;AACV,OAAK,MAAM,MAAM,KAAK,MAAM,CAC1B,KAAI,CAAC,UAAU,IAAI,GAAG,CACpB,MAAK,OAAO,GAAG;AAInB,OAAK,MAAM,aAAa,aAAa;GACnC,MAAM,WAAW,KAAK,IAAI,UAAU,GAAG;AACvC,OAAI,CAAC,UAAU;IACb,MAAM,aAAa,mBAAmB,UAAU;AAChD,eAAW,UAAU,UAAU;AAC/B,SAAK,IAAI,UAAU,IAAI,WAAW;AAClC;;AAGF,YAAS,UAAU,UAAU;AAC7B,OAAI,SAAS,KAAK,KAAK,UACrB,UAAS,IAAI,UAAU;;AAI3B,MAAI,CAAC,YAAY,QAAQ,KAAK,EAAE,QAAQ,CACtC,SAAQ,IAAI,QAAQ;GAEtB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/router-core",
-  "version": "1.168.8",
+  "version": "1.168.10",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -168,8 +168,8 @@
   },
   "dependencies": {
     "cookie-es": "^2.0.0",
-    "seroval": "^1.4.2",
-    "seroval-plugins": "^1.4.2",
+    "seroval": "^1.5.0",
+    "seroval-plugins": "^1.5.0",
     "@tanstack/history": "1.161.6"
   },
   "devDependencies": {

package/src/hash-scroll.ts

@@ -7,7 +7,7 @@ import type { AnyRouter } from './router'
  */
 export function handleHashScroll(router: AnyRouter) {
   if (typeof document !== 'undefined' && (document as any).querySelector) {
-    const location = router.stores.location.state
+    const location = router.stores.location.get()
     const hashScrollIntoViewOptions =
       location.state.__hashScrollIntoViewOptions ?? true
 

package/src/index.ts

@@ -435,7 +435,6 @@ export type {
   AnySerializationAdapter,
   SerializationAdapter,
   ValidateSerializableInput,
-  ValidateSerializableInputResult,
   SerializerExtensions,
   ValidateSerializable,
   RegisteredSerializableInput,
@@ -444,6 +443,7 @@ export type {
   Serializable,
   TSR_SERIALIZABLE,
   TsrSerializable,
+  SerializationError,
 } from './ssr/serializer/transformer'
 
 export {

package/src/load-matches.ts

@@ -45,8 +45,8 @@ const triggerOnReady = (inner: InnerLoadContext): void | Promise<void> => {
 }
 
 const hasForcePendingActiveMatch = (router: AnyRouter): boolean => {
-  return router.stores.matchesId.state.some((matchId) => {
-    return router.stores.activeMatchStoresById.get(matchId)?.state._forcePending
+  return router.stores.matchesId.get().some((matchId) => {
+    return router.stores.activeMatchStoresById.get(matchId)?.get()._forcePending
   })
 }
 
@@ -879,7 +879,7 @@ const loadRouteMatch = async (
     }
   } else {
     const prevMatch = inner.router.getMatch(matchId)! // This is where all of the stale-while-revalidate magic happens
-    const activeIdAtIndex = inner.router.stores.matchesId.state[index]
+    const activeIdAtIndex = inner.router.stores.matchesId.get()[index]
     const activeAtIndex =
       (activeIdAtIndex &&
         inner.router.stores.activeMatchStoresById.get(activeIdAtIndex)) ||
@@ -887,9 +887,9 @@ const loadRouteMatch = async (
     const previousRouteMatchId =
       activeAtIndex?.routeId === routeId
         ? activeIdAtIndex
-        : inner.router.stores.activeMatchesSnapshot.state.find(
-            (d) => d.routeId === routeId,
-          )?.id
+        : inner.router.stores.activeMatchesSnapshot
+            .get()
+            .find((d) => d.routeId === routeId)?.id
     const preload = resolvePreload(inner, matchId)
 
     // there is a loaderPromise, so we are in the middle of a load

package/src/router.ts

@@ -799,7 +799,9 @@ export interface ServerSsr {
   setRenderFinished: () => void
   cleanup: () => void
   onSerializationFinished: (listener: () => void) => void
-  dehydrate: () => Promise<void>
+  dehydrate: (opts?: {
+    requestAssets?: Array<RouterManagedTag>
+  }) => Promise<void>
   takeBufferedScripts: () => RouterManagedTag | undefined
   /**
    * Takes any buffered HTML that was injected.
@@ -1167,7 +1169,7 @@ export class RouterCore<
     }
 
     if (needsLocationUpdate && this.stores) {
-      this.stores.location.setState(() => this.latestLocation)
+      this.stores.location.set(this.latestLocation)
     }
 
     if (
@@ -1182,7 +1184,7 @@ export class RouterCore<
   }
 
   get state(): RouterState<TRouteTree> {
-    return this.stores.__store.state
+    return this.stores.__store.get()
   }
 
   updateLatestLocation = () => {
@@ -1420,7 +1422,7 @@ export class RouterCore<
     const previousActiveMatchesByRouteId = new Map<string, AnyRouteMatch>()
     for (const store of this.stores.activeMatchStoresById.values()) {
       if (store.routeId) {
-        previousActiveMatchesByRouteId.set(store.routeId, store.state)
+        previousActiveMatchesByRouteId.set(store.routeId, store.get())
       }
     }
 
@@ -1713,10 +1715,10 @@ export class RouterCore<
     }
 
     // Determine params: reuse from state if possible, otherwise parse
-    const lastStateMatchId = last(this.stores.matchesId.state)
+    const lastStateMatchId = last(this.stores.matchesId.get())
     const lastStateMatch =
       lastStateMatchId &&
-      this.stores.activeMatchStoresById.get(lastStateMatchId)?.state
+      this.stores.activeMatchStoresById.get(lastStateMatchId)?.get()
     const canReuseParams =
       lastStateMatch &&
       lastStateMatch.routeId === lastRoute.id &&
@@ -1765,16 +1767,16 @@ export class RouterCore<
   }
 
   cancelMatches = () => {
-    this.stores.pendingMatchesId.state.forEach((matchId) => {
+    this.stores.pendingMatchesId.get().forEach((matchId) => {
       this.cancelMatch(matchId)
     })
 
-    this.stores.matchesId.state.forEach((matchId) => {
+    this.stores.matchesId.get().forEach((matchId) => {
       if (this.stores.pendingMatchStoresById.has(matchId)) {
         return
       }
 
-      const match = this.stores.activeMatchStoresById.get(matchId)?.state
+      const match = this.stores.activeMatchStoresById.get(matchId)?.get()
       if (!match) {
         return
       }
@@ -2354,16 +2356,16 @@ export class RouterCore<
     // Match the routes
     const pendingMatches = this.matchRoutes(this.latestLocation)
 
-    const nextCachedMatches = this.stores.cachedMatchesSnapshot.state.filter(
-      (d) => !pendingMatches.some((e) => e.id === d.id),
-    )
+    const nextCachedMatches = this.stores.cachedMatchesSnapshot
+      .get()
+      .filter((d) => !pendingMatches.some((e) => e.id === d.id))
 
     // Ingest the new matches
     this.batch(() => {
-      this.stores.status.setState(() => 'pending')
-      this.stores.statusCode.setState(() => 200)
-      this.stores.isLoading.setState(() => true)
-      this.stores.location.setState(() => this.latestLocation)
+      this.stores.status.set('pending')
+      this.stores.statusCode.set(200)
+      this.stores.isLoading.set(true)
+      this.stores.location.set(this.latestLocation)
       this.stores.setPendingMatches(pendingMatches)
       // If a cached match moved to pending matches, remove it from cached matches
       this.stores.setCachedMatches(nextCachedMatches)
@@ -2375,7 +2377,7 @@ export class RouterCore<
     let notFound: NotFoundError | undefined
     let loadPromise: Promise<void>
     const previousLocation =
-      this.stores.resolvedLocation.state ?? this.stores.location.state
+      this.stores.resolvedLocation.get() ?? this.stores.location.get()
 
     // eslint-disable-next-line prefer-const
     loadPromise = new Promise<void>((resolve) => {
@@ -2383,10 +2385,10 @@ export class RouterCore<
         try {
           this.beforeLoad()
           const next = this.latestLocation
-          const prevLocation = this.stores.resolvedLocation.state
+          const prevLocation = this.stores.resolvedLocation.get()
           const locationChangeInfo = getLocationChangeInfo(next, prevLocation)
 
-          if (!this.stores.redirect.state) {
+          if (!this.stores.redirect.get()) {
             this.emit({
               type: 'onBeforeNavigate',
               ...locationChangeInfo,
@@ -2402,7 +2404,7 @@ export class RouterCore<
             router: this,
             sync: opts?.sync,
             forceStaleReload: previousLocation.href === next.href,
-            matches: this.stores.pendingMatchesSnapshot.state,
+            matches: this.stores.pendingMatchesSnapshot.get(),
             location: next,
             updateMatch: this.updateMatch,
             // eslint-disable-next-line @typescript-eslint/require-await
@@ -2427,10 +2429,10 @@ export class RouterCore<
 
                   this.batch(() => {
                     const pendingMatches =
-                      this.stores.pendingMatchesSnapshot.state
+                      this.stores.pendingMatchesSnapshot.get()
                     const mountPending = pendingMatches.length
                     const currentMatches =
-                      this.stores.activeMatchesSnapshot.state
+                      this.stores.activeMatchesSnapshot.get()
 
                     exitingMatches = mountPending
                       ? currentMatches.filter(
@@ -2466,8 +2468,8 @@ export class RouterCore<
                         )
                       : currentMatches
 
-                    this.stores.isLoading.setState(() => false)
-                    this.stores.loadedAt.setState(() => Date.now())
+                    this.stores.isLoading.set(false)
+                    this.stores.loadedAt.set(Date.now())
                     /**
                      * When committing new matches, cache any exiting matches that are still usable.
                      * Routes that resolved with `status: 'error'` or `status: 'notFound'` are
@@ -2478,7 +2480,7 @@ export class RouterCore<
                       this.stores.setActiveMatches(pendingMatches)
                       this.stores.setPendingMatches([])
                       this.stores.setCachedMatches([
-                        ...this.stores.cachedMatchesSnapshot.state,
+                        ...this.stores.cachedMatchesSnapshot.get(),
                         ...exitingMatches!.filter(
                           (d) =>
                             d.status !== 'error' &&
@@ -2525,15 +2527,15 @@ export class RouterCore<
             ? redirect.status
             : notFound
               ? 404
-              : this.stores.activeMatchesSnapshot.state.some(
-                    (d) => d.status === 'error',
-                  )
+              : this.stores.activeMatchesSnapshot
+                    .get()
+                    .some((d) => d.status === 'error')
                 ? 500
                 : 200
 
           this.batch(() => {
-            this.stores.statusCode.setState(() => nextStatusCode)
-            this.stores.redirect.setState(() => redirect)
+            this.stores.statusCode.set(nextStatusCode)
+            this.stores.redirect.set(redirect)
           })
         }
 
@@ -2562,12 +2564,12 @@ export class RouterCore<
     if (this.hasNotFoundMatch()) {
       newStatusCode = 404
     } else if (
-      this.stores.activeMatchesSnapshot.state.some((d) => d.status === 'error')
+      this.stores.activeMatchesSnapshot.get().some((d) => d.status === 'error')
     ) {
       newStatusCode = 500
     }
     if (newStatusCode !== undefined) {
-      this.stores.statusCode.setState(() => newStatusCode)
+      this.stores.statusCode.set(newStatusCode)
     }
   }
 
@@ -2596,7 +2598,7 @@ export class RouterCore<
         this.isViewTransitionTypesSupported
       ) {
         const next = this.latestLocation
-        const prevLocation = this.stores.resolvedLocation.state
+        const prevLocation = this.stores.resolvedLocation.get()
 
         const resolvedViewTransitionTypes =
           typeof shouldViewTransition.types === 'function'
@@ -2628,28 +2630,28 @@ export class RouterCore<
     this.startTransition(() => {
       const pendingMatch = this.stores.pendingMatchStoresById.get(id)
       if (pendingMatch) {
-        pendingMatch.setState(updater)
+        pendingMatch.set(updater)
         return
       }
 
       const activeMatch = this.stores.activeMatchStoresById.get(id)
       if (activeMatch) {
-        activeMatch.setState(updater)
+        activeMatch.set(updater)
         return
       }
 
       const cachedMatch = this.stores.cachedMatchStoresById.get(id)
       if (cachedMatch) {
-        const next = updater(cachedMatch.state)
+        const next = updater(cachedMatch.get())
         if (next.status === 'redirected') {
           const deleted = this.stores.cachedMatchStoresById.delete(id)
           if (deleted) {
-            this.stores.cachedMatchesId.setState((prev) =>
+            this.stores.cachedMatchesId.set((prev) =>
               prev.filter((matchId) => matchId !== id),
             )
           }
         } else {
-          cachedMatch.setState(() => next)
+          cachedMatch.set(next)
         }
       }
     })
@@ -2657,9 +2659,9 @@ export class RouterCore<
 
   getMatch: GetMatchFn = (matchId: string): AnyRouteMatch | undefined => {
     return (
-      this.stores.cachedMatchStoresById.get(matchId)?.state ??
-      this.stores.pendingMatchStoresById.get(matchId)?.state ??
-      this.stores.activeMatchStoresById.get(matchId)?.state
+      this.stores.cachedMatchStoresById.get(matchId)?.get() ??
+      this.stores.pendingMatchStoresById.get(matchId)?.get() ??
+      this.stores.activeMatchStoresById.get(matchId)?.get()
     )
   }
 
@@ -2697,13 +2699,13 @@ export class RouterCore<
 
     this.batch(() => {
       this.stores.setActiveMatches(
-        this.stores.activeMatchesSnapshot.state.map(invalidate),
+        this.stores.activeMatchesSnapshot.get().map(invalidate),
       )
       this.stores.setCachedMatches(
-        this.stores.cachedMatchesSnapshot.state.map(invalidate),
+        this.stores.cachedMatchesSnapshot.get().map(invalidate),
       )
       this.stores.setPendingMatches(
-        this.stores.pendingMatchesSnapshot.state.map(invalidate),
+        this.stores.pendingMatchesSnapshot.get().map(invalidate),
       )
     })
 
@@ -2763,9 +2765,9 @@ export class RouterCore<
     const filter = opts?.filter
     if (filter !== undefined) {
       this.stores.setCachedMatches(
-        this.stores.cachedMatchesSnapshot.state.filter(
-          (m) => !filter(m as MakeRouteMatchUnion<this>),
-        ),
+        this.stores.cachedMatchesSnapshot
+          .get()
+          .filter((m) => !filter(m as MakeRouteMatchUnion<this>)),
       )
     } else {
       this.stores.setCachedMatches([])
@@ -2816,13 +2818,13 @@ export class RouterCore<
     })
 
     const activeMatchIds = new Set([
-      ...this.stores.matchesId.state,
-      ...this.stores.pendingMatchesId.state,
+      ...this.stores.matchesId.get(),
+      ...this.stores.pendingMatchesId.get(),
     ])
 
     const loadedMatchIds = new Set([
       ...activeMatchIds,
-      ...this.stores.cachedMatchesId.state,
+      ...this.stores.cachedMatchesId.get(),
     ])
 
     // If the matches are already loaded, we need to add them to the cached matches.
@@ -2830,7 +2832,7 @@ export class RouterCore<
       (match) => !loadedMatchIds.has(match.id),
     )
     if (matchesToCache.length) {
-      const cachedMatches = this.stores.cachedMatchesSnapshot.state
+      const cachedMatches = this.stores.cachedMatchesSnapshot.get()
       this.stores.setCachedMatches([...cachedMatches, ...matchesToCache])
     }
 
@@ -2886,16 +2888,16 @@ export class RouterCore<
     }
     const next = this.buildLocation(matchLocation as any)
 
-    if (opts?.pending && this.stores.status.state !== 'pending') {
+    if (opts?.pending && this.stores.status.get() !== 'pending') {
       return false
     }
 
     const pending =
-      opts?.pending === undefined ? !this.stores.isLoading.state : opts.pending
+      opts?.pending === undefined ? !this.stores.isLoading.get() : opts.pending
 
     const baseLocation = pending
       ? this.latestLocation
-      : this.stores.resolvedLocation.state || this.stores.location.state
+      : this.stores.resolvedLocation.get() || this.stores.location.get()
 
     const match = findSingleMatch(
       next.pathname,
@@ -2931,9 +2933,9 @@ export class RouterCore<
   serverSsr?: ServerSsr
 
   hasNotFoundMatch = () => {
-    return this.stores.activeMatchesSnapshot.state.some(
-      (d) => d.status === 'notFound' || d.globalNotFound,
-    )
+    return this.stores.activeMatchesSnapshot
+      .get()
+      .some((d) => d.status === 'notFound' || d.globalNotFound)
   }
 }
 

package/src/scroll-restoration.ts

@@ -233,7 +233,7 @@ export function setupScrollRestoration(router: AnyRouter, force?: boolean) {
   window.addEventListener('pagehide', () => {
     snapshotCurrentScrollTargets(
       getKey(
-        router.stores.resolvedLocation.state ?? router.stores.location.state,
+        router.stores.resolvedLocation.get() ?? router.stores.location.get(),
       ),
     )
     cache.persist()

package/src/ssr/createRequestHandler.ts

@@ -78,13 +78,12 @@ export function createRequestHandler<TRouter extends AnyRouter>({
 }
 
 function getRequestHeaders(opts: { router: AnyRouter }): Headers {
-  const matchHeaders =
-    opts.router.stores.activeMatchesSnapshot.state.map<AnyHeaders>(
-      (match) => match.headers,
-    )
+  const matchHeaders = opts.router.stores.activeMatchesSnapshot
+    .get()
+    .map<AnyHeaders>((match) => match.headers)
 
   // Handle Redirects
-  const redirect = opts.router.stores.redirect.state
+  const redirect = opts.router.stores.redirect.get()
   if (redirect) {
     matchHeaders.push(redirect.headers)
   }