@tanstack/solid-router 1.167.4 → 1.168.0

package/dist/cjs/matchContext.cjs

@@ -1,11 +1,13 @@
 const require_runtime = require("./_virtual/_rolldown/runtime.cjs");
 let solid_js = require("solid-js");
 solid_js = require_runtime.__toESM(solid_js);
-//#region src/matchContext.tsx
-var matchContext = solid_js.createContext(() => void 0);
-var dummyMatchContext = solid_js.createContext(() => void 0);
+var nearestMatchContext = solid_js.createContext({
+	matchId: () => void 0,
+	routeId: () => void 0,
+	match: () => void 0,
+	hasPending: () => false
+});
 //#endregion
-exports.dummyMatchContext = dummyMatchContext;
-exports.matchContext = matchContext;
+exports.nearestMatchContext = nearestMatchContext;
 
 //# sourceMappingURL=matchContext.cjs.map

package/dist/cjs/matchContext.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"matchContext.cjs","names":["Solid","matchContext","createContext","Accessor","undefined","dummyMatchContext"],"sources":["../../src/matchContext.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\n\nexport const matchContext = Solid.createContext<\n  Solid.Accessor<string | undefined>\n>(() => undefined)\n\n// N.B. this only exists so we can conditionally call useContext on it when we are not interested in the nearest match\nexport const dummyMatchContext = Solid.createContext<\n  Solid.Accessor<string | undefined>\n>(() => undefined)\n"],"mappings":";;;;AAEA,IAAaC,eAAeD,SAAME,oBAE1BE,KAAAA,EAAU;AAGlB,IAAaC,oBAAoBL,SAAME,oBAE/BE,KAAAA,EAAU"}
+{"version":3,"file":"matchContext.cjs","names":["Solid","AnyRouteMatch","NearestMatchContextValue","matchId","Accessor","routeId","match","hasPending","defaultNearestMatchContext","undefined","nearestMatchContext","createContext"],"sources":["../../src/matchContext.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport type { AnyRouteMatch } from '@tanstack/router-core'\n\nexport type NearestMatchContextValue = {\n  matchId: Solid.Accessor<string | undefined>\n  routeId: Solid.Accessor<string | undefined>\n  match: Solid.Accessor<AnyRouteMatch | undefined>\n  hasPending: Solid.Accessor<boolean>\n}\n\nconst defaultNearestMatchContext: NearestMatchContextValue = {\n  matchId: () => undefined,\n  routeId: () => undefined,\n  match: () => undefined,\n  hasPending: () => false,\n}\n\nexport const nearestMatchContext =\n  Solid.createContext<NearestMatchContextValue>(defaultNearestMatchContext)\n"],"mappings":";;;AAiBA,IAAaU,sBACXV,SAAMW,cARqD;CAC3DR,eAAeM,KAAAA;CACfJ,eAAeI,KAAAA;CACfH,aAAaG,KAAAA;CACbF,kBAAkB;CACnB,CAG0E"}

package/dist/cjs/matchContext.d.cts

@@ -1,3 +1,9 @@
+import { AnyRouteMatch } from '@tanstack/router-core';
 import * as Solid from 'solid-js';
-export declare const matchContext: Solid.Context<Solid.Accessor<string | undefined>>;
-export declare const dummyMatchContext: Solid.Context<Solid.Accessor<string | undefined>>;
+export type NearestMatchContextValue = {
+    matchId: Solid.Accessor<string | undefined>;
+    routeId: Solid.Accessor<string | undefined>;
+    match: Solid.Accessor<AnyRouteMatch | undefined>;
+    hasPending: Solid.Accessor<boolean>;
+};
+export declare const nearestMatchContext: Solid.Context<NearestMatchContextValue>;

package/dist/cjs/not-found.cjs

@@ -1,14 +1,18 @@
-require("./_virtual/_rolldown/runtime.cjs");
+const require_runtime = require("./_virtual/_rolldown/runtime.cjs");
 const require_CatchBoundary = require("./CatchBoundary.cjs");
-const require_useRouterState = require("./useRouterState.cjs");
+const require_useRouter = require("./useRouter.cjs");
 let _tanstack_router_core = require("@tanstack/router-core");
 let solid_js_web = require("solid-js/web");
+let solid_js = require("solid-js");
+solid_js = require_runtime.__toESM(solid_js);
 //#region src/not-found.tsx
 var _tmpl$ = /* @__PURE__ */ (0, solid_js_web.template)(`<p>Not Found`);
 function CatchNotFound(props) {
-	const resetKey = require_useRouterState.useRouterState({ select: (s) => `not-found-${s.location.pathname}-${s.status}` });
+	const router = require_useRouter.useRouter();
+	const pathname = solid_js.createMemo(() => router.stores.location.state.pathname);
+	const status = solid_js.createMemo(() => router.stores.status.state);
 	return (0, solid_js_web.createComponent)(require_CatchBoundary.CatchBoundary, {
-		getResetKey: () => resetKey(),
+		getResetKey: () => `not-found-${pathname()}-${status()}`,
 		onCatch: (error) => {
 			if ((0, _tanstack_router_core.isNotFound)(error)) props.onCatch?.(error);
 			else throw error;

package/dist/cjs/not-found.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"not-found.cjs","names":["isNotFound","CatchBoundary","useRouterState","Solid","NotFoundError","CatchNotFound","props","fallback","error","JSX","Element","onCatch","Error","children","resetKey","select","s","location","pathname","status","_$createComponent","getResetKey","errorComponent","DefaultGlobalNotFound","_tmpl$"],"sources":["../../src/not-found.tsx"],"sourcesContent":["import { isNotFound } from '@tanstack/router-core'\nimport { CatchBoundary } from './CatchBoundary'\nimport { useRouterState } from './useRouterState'\nimport type * as Solid from 'solid-js'\nimport type { NotFoundError } from '@tanstack/router-core'\n\nexport function CatchNotFound(props: {\n  fallback?: (error: NotFoundError) => Solid.JSX.Element\n  onCatch?: (error: Error) => void\n  children: Solid.JSX.Element\n}) {\n  // TODO: Some way for the user to programmatically reset the not-found boundary?\n  const resetKey = useRouterState({\n    select: (s) => `not-found-${s.location.pathname}-${s.status}`,\n  })\n\n  return (\n    <CatchBoundary\n      getResetKey={() => resetKey()}\n      onCatch={(error) => {\n        if (isNotFound(error)) {\n          props.onCatch?.(error)\n        } else {\n          throw error\n        }\n      }}\n      errorComponent={({ error }) => {\n        if (isNotFound(error)) {\n          return props.fallback?.(error)\n        } else {\n          throw error\n        }\n      }}\n    >\n      {props.children}\n    </CatchBoundary>\n  )\n}\n\nexport function DefaultGlobalNotFound() {\n  return <p>Not Found</p>\n}\n"],"mappings":";;;;;;;AAMA,SAAgBK,cAAcC,OAI3B;CAED,MAAMQ,WAAWZ,uBAAAA,eAAe,EAC9Ba,SAASC,MAAM,aAAaA,EAAEC,SAASC,SAAQ,GAAIF,EAAEG,UACtD,CAAC;AAEF,SAAA,GAAA,aAAA,iBACGlB,sBAAAA,eAAa;EACZoB,mBAAmBP,UAAU;EAC7BH,UAAUH,UAAU;AAClB,QAAA,GAAA,sBAAA,YAAeA,MAAM,CACnBF,OAAMK,UAAUH,MAAM;OAEtB,OAAMA;;EAGVc,iBAAiB,EAAEd,YAAY;AAC7B,QAAA,GAAA,sBAAA,YAAeA,MAAM,CACnB,QAAOF,MAAMC,WAAWC,MAAM;OAE9B,OAAMA;;EAET,IAAAK,WAAA;AAAA,UAEAP,MAAMO;;EAAQ,CAAA;;AAKrB,SAAgBU,wBAAwB;AACtC,QAAAC,QAAA"}
+{"version":3,"file":"not-found.cjs","names":["isNotFound","Solid","CatchBoundary","useRouter","NotFoundError","CatchNotFound","props","fallback","error","JSX","Element","onCatch","Error","children","router","pathname","createMemo","stores","location","state","status","_$createComponent","getResetKey","errorComponent","DefaultGlobalNotFound","_tmpl$"],"sources":["../../src/not-found.tsx"],"sourcesContent":["import { isNotFound } from '@tanstack/router-core'\nimport * as Solid from 'solid-js'\nimport { CatchBoundary } from './CatchBoundary'\nimport { useRouter } from './useRouter'\nimport type { NotFoundError } from '@tanstack/router-core'\n\nexport function CatchNotFound(props: {\n  fallback?: (error: NotFoundError) => Solid.JSX.Element\n  onCatch?: (error: Error) => void\n  children: Solid.JSX.Element\n}) {\n  const router = useRouter()\n  // TODO: Some way for the user to programmatically reset the not-found boundary?\n  const pathname = Solid.createMemo(() => router.stores.location.state.pathname)\n  const status = Solid.createMemo(() => router.stores.status.state)\n\n  return (\n    <CatchBoundary\n      getResetKey={() => `not-found-${pathname()}-${status()}`}\n      onCatch={(error) => {\n        if (isNotFound(error)) {\n          props.onCatch?.(error)\n        } else {\n          throw error\n        }\n      }}\n      errorComponent={({ error }) => {\n        if (isNotFound(error)) {\n          return props.fallback?.(error)\n        } else {\n          throw error\n        }\n      }}\n    >\n      {props.children}\n    </CatchBoundary>\n  )\n}\n\nexport function DefaultGlobalNotFound() {\n  return <p>Not Found</p>\n}\n"],"mappings":";;;;;;;;;AAMA,SAAgBK,cAAcC,OAI3B;CACD,MAAMQ,SAASX,kBAAAA,WAAW;CAE1B,MAAMY,WAAWd,SAAMe,iBAAiBF,OAAOG,OAAOC,SAASC,MAAMJ,SAAS;CAC9E,MAAMK,SAASnB,SAAMe,iBAAiBF,OAAOG,OAAOG,OAAOD,MAAM;AAEjE,SAAA,GAAA,aAAA,iBACGjB,sBAAAA,eAAa;EACZoB,mBAAmB,aAAaP,UAAU,CAAA,GAAIK,QAAQ;EACtDT,UAAUH,UAAU;AAClB,QAAA,GAAA,sBAAA,YAAeA,MAAM,CACnBF,OAAMK,UAAUH,MAAM;OAEtB,OAAMA;;EAGVe,iBAAiB,EAAEf,YAAY;AAC7B,QAAA,GAAA,sBAAA,YAAeA,MAAM,CACnB,QAAOF,MAAMC,WAAWC,MAAM;OAE9B,OAAMA;;EAET,IAAAK,WAAA;AAAA,UAEAP,MAAMO;;EAAQ,CAAA;;AAKrB,SAAgBW,wBAAwB;AACtC,QAAAC,QAAA"}

package/dist/cjs/not-found.d.cts

@@ -1,5 +1,5 @@
 import { NotFoundError } from '@tanstack/router-core';
-import type * as Solid from 'solid-js';
+import * as Solid from 'solid-js';
 export declare function CatchNotFound(props: {
     fallback?: (error: NotFoundError) => Solid.JSX.Element;
     onCatch?: (error: Error) => void;

package/dist/cjs/router.cjs

@@ -1,5 +1,6 @@
 require("./_virtual/_rolldown/runtime.cjs");
 const require_fileRoute = require("./fileRoute.cjs");
+const require_routerStores = require("./routerStores.cjs");
 let _tanstack_router_core = require("@tanstack/router-core");
 //#region src/router.ts
 var createRouter = (options) => {
@@ -7,7 +8,7 @@ var createRouter = (options) => {
 };
 var Router = class extends _tanstack_router_core.RouterCore {
 	constructor(options) {
-		super(options);
+		super(options, require_routerStores.getStoreFactory);
 	}
 };
 if (typeof globalThis !== "undefined") {

package/dist/cjs/router.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"router.cjs","names":[],"sources":["../../src/router.ts"],"sourcesContent":["import { RouterCore } from '@tanstack/router-core'\nimport { createFileRoute, createLazyFileRoute } from './fileRoute'\nimport type { RouterHistory } from '@tanstack/history'\nimport type {\n  AnyRoute,\n  CreateRouterFn,\n  RouterConstructorOptions,\n  TrailingSlashOption,\n} from '@tanstack/router-core'\nimport type {\n  ErrorRouteComponent,\n  NotFoundRouteComponent,\n  RouteComponent,\n} from './route'\nimport type { JSX } from 'solid-js'\n\ndeclare module '@tanstack/router-core' {\n  export interface RouterOptionsExtensions {\n    /**\n     * The default `component` a route should use if no component is provided.\n     *\n     * @default Outlet\n     * @link [API Docs](https://tanstack.com/router/latest/docs/framework/solid/api/router/RouterOptionsType#defaultcomponent-property)\n     */\n    defaultComponent?: RouteComponent\n    /**\n     * The default `errorComponent` a route should use if no error component is provided.\n     *\n     * @default ErrorComponent\n     * @link [API Docs](https://tanstack.com/router/latest/docs/framework/solid/api/router/RouterOptionsType#defaulterrorcomponent-property)\n     * @link [Guide](https://tanstack.com/router/latest/docs/framework/solid/guide/data-loading#handling-errors-with-routeoptionserrorcomponent)\n     */\n    defaultErrorComponent?: ErrorRouteComponent\n    /**\n     * The default `pendingComponent` a route should use if no pending component is provided.\n     *\n     * @link [API Docs](https://tanstack.com/router/latest/docs/framework/solid/api/router/RouterOptionsType#defaultpendingcomponent-property)\n     * @link [Guide](https://tanstack.com/router/latest/docs/framework/solid/guide/data-loading#showing-a-pending-component)\n     */\n    defaultPendingComponent?: RouteComponent\n    /**\n     * The default `notFoundComponent` a route should use if no notFound component is provided.\n     *\n     * @default NotFound\n     * @link [API Docs](https://tanstack.com/router/latest/docs/framework/solid/api/router/RouterOptionsType#defaultnotfoundcomponent-property)\n     * @link [Guide](https://tanstack.com/router/latest/docs/framework/solid/guide/not-found-errors#default-router-wide-not-found-handling)\n     */\n    defaultNotFoundComponent?: NotFoundRouteComponent\n    /**\n     * A component that will be used to wrap the entire router.\n     *\n     * This is useful for providing a context to the entire router.\n     *\n     * @link [API Docs](https://tanstack.com/router/latest/docs/framework/solid/api/router/RouterOptionsType#wrap-property)\n     */\n    Wrap?: (props: { children: any }) => JSX.Element\n    /**\n     * A component that will be used to wrap the inner contents of the router.\n     *\n     * This is useful for providing a context to the inner contents of the router where you also need access to the router context and hooks.\n     *\n     * @link [API Docs](https://tanstack.com/router/latest/docs/framework/solid/api/router/RouterOptionsType#innerwrap-property)\n     */\n    InnerWrap?: (props: { children: any }) => JSX.Element\n\n    /**\n     * The default `onCatch` handler for errors caught by the Router ErrorBoundary\n     *\n     * @link [API Docs](https://tanstack.com/router/latest/docs/framework/react/api/router/RouterOptionsType#defaultoncatch-property)\n     * @link [Guide](https://tanstack.com/router/latest/docs/framework/react/guide/data-loading#handling-errors-with-routeoptionsoncatch)\n     */\n    defaultOnCatch?: (error: Error) => void\n  }\n}\n\nexport const createRouter: CreateRouterFn = (options) => {\n  return new Router(options)\n}\n\nexport class Router<\n  in out TRouteTree extends AnyRoute,\n  in out TTrailingSlashOption extends TrailingSlashOption = 'never',\n  in out TDefaultStructuralSharingOption extends boolean = false,\n  in out TRouterHistory extends RouterHistory = RouterHistory,\n  in out TDehydrated extends Record<string, any> = Record<string, any>,\n> extends RouterCore<\n  TRouteTree,\n  TTrailingSlashOption,\n  TDefaultStructuralSharingOption,\n  TRouterHistory,\n  TDehydrated\n> {\n  constructor(\n    options: RouterConstructorOptions<\n      TRouteTree,\n      TTrailingSlashOption,\n      TDefaultStructuralSharingOption,\n      TRouterHistory,\n      TDehydrated\n    >,\n  ) {\n    super(options)\n  }\n}\n\nif (typeof globalThis !== 'undefined') {\n  ;(globalThis as any).createFileRoute = createFileRoute\n  ;(globalThis as any).createLazyFileRoute = createLazyFileRoute\n} else if (typeof window !== 'undefined') {\n  ;(window as any).createFileRoute = createFileRoute\n  ;(window as any).createLazyFileRoute = createLazyFileRoute\n}\n"],"mappings":";;;;AA2EA,IAAa,gBAAgC,YAAY;AACvD,QAAO,IAAI,OAAO,QAAQ;;AAG5B,IAAa,SAAb,cAMU,sBAAA,WAMR;CACA,YACE,SAOA;AACA,QAAM,QAAQ;;;AAIlB,IAAI,OAAO,eAAe,aAAa;AACnC,YAAmB,kBAAkB,kBAAA;AACrC,YAAmB,sBAAsB,kBAAA;WAClC,OAAO,WAAW,aAAa;AACtC,QAAe,kBAAkB,kBAAA;AACjC,QAAe,sBAAsB,kBAAA"}
+{"version":3,"file":"router.cjs","names":[],"sources":["../../src/router.ts"],"sourcesContent":["import { RouterCore } from '@tanstack/router-core'\nimport { createFileRoute, createLazyFileRoute } from './fileRoute'\nimport { getStoreFactory } from './routerStores'\nimport type { RouterHistory } from '@tanstack/history'\nimport type {\n  AnyRoute,\n  CreateRouterFn,\n  RouterConstructorOptions,\n  TrailingSlashOption,\n} from '@tanstack/router-core'\nimport type {\n  ErrorRouteComponent,\n  NotFoundRouteComponent,\n  RouteComponent,\n} from './route'\nimport type { JSX } from 'solid-js'\n\ndeclare module '@tanstack/router-core' {\n  export interface RouterOptionsExtensions {\n    /**\n     * The default `component` a route should use if no component is provided.\n     *\n     * @default Outlet\n     * @link [API Docs](https://tanstack.com/router/latest/docs/framework/solid/api/router/RouterOptionsType#defaultcomponent-property)\n     */\n    defaultComponent?: RouteComponent\n    /**\n     * The default `errorComponent` a route should use if no error component is provided.\n     *\n     * @default ErrorComponent\n     * @link [API Docs](https://tanstack.com/router/latest/docs/framework/solid/api/router/RouterOptionsType#defaulterrorcomponent-property)\n     * @link [Guide](https://tanstack.com/router/latest/docs/framework/solid/guide/data-loading#handling-errors-with-routeoptionserrorcomponent)\n     */\n    defaultErrorComponent?: ErrorRouteComponent\n    /**\n     * The default `pendingComponent` a route should use if no pending component is provided.\n     *\n     * @link [API Docs](https://tanstack.com/router/latest/docs/framework/solid/api/router/RouterOptionsType#defaultpendingcomponent-property)\n     * @link [Guide](https://tanstack.com/router/latest/docs/framework/solid/guide/data-loading#showing-a-pending-component)\n     */\n    defaultPendingComponent?: RouteComponent\n    /**\n     * The default `notFoundComponent` a route should use if no notFound component is provided.\n     *\n     * @default NotFound\n     * @link [API Docs](https://tanstack.com/router/latest/docs/framework/solid/api/router/RouterOptionsType#defaultnotfoundcomponent-property)\n     * @link [Guide](https://tanstack.com/router/latest/docs/framework/solid/guide/not-found-errors#default-router-wide-not-found-handling)\n     */\n    defaultNotFoundComponent?: NotFoundRouteComponent\n    /**\n     * A component that will be used to wrap the entire router.\n     *\n     * This is useful for providing a context to the entire router.\n     *\n     * @link [API Docs](https://tanstack.com/router/latest/docs/framework/solid/api/router/RouterOptionsType#wrap-property)\n     */\n    Wrap?: (props: { children: any }) => JSX.Element\n    /**\n     * A component that will be used to wrap the inner contents of the router.\n     *\n     * This is useful for providing a context to the inner contents of the router where you also need access to the router context and hooks.\n     *\n     * @link [API Docs](https://tanstack.com/router/latest/docs/framework/solid/api/router/RouterOptionsType#innerwrap-property)\n     */\n    InnerWrap?: (props: { children: any }) => JSX.Element\n\n    /**\n     * The default `onCatch` handler for errors caught by the Router ErrorBoundary\n     *\n     * @link [API Docs](https://tanstack.com/router/latest/docs/framework/react/api/router/RouterOptionsType#defaultoncatch-property)\n     * @link [Guide](https://tanstack.com/router/latest/docs/framework/react/guide/data-loading#handling-errors-with-routeoptionsoncatch)\n     */\n    defaultOnCatch?: (error: Error) => void\n  }\n}\n\nexport const createRouter: CreateRouterFn = (options) => {\n  return new Router(options)\n}\n\nexport class Router<\n  in out TRouteTree extends AnyRoute,\n  in out TTrailingSlashOption extends TrailingSlashOption = 'never',\n  in out TDefaultStructuralSharingOption extends boolean = false,\n  in out TRouterHistory extends RouterHistory = RouterHistory,\n  in out TDehydrated extends Record<string, any> = Record<string, any>,\n> extends RouterCore<\n  TRouteTree,\n  TTrailingSlashOption,\n  TDefaultStructuralSharingOption,\n  TRouterHistory,\n  TDehydrated\n> {\n  constructor(\n    options: RouterConstructorOptions<\n      TRouteTree,\n      TTrailingSlashOption,\n      TDefaultStructuralSharingOption,\n      TRouterHistory,\n      TDehydrated\n    >,\n  ) {\n    super(options, getStoreFactory)\n  }\n}\n\nif (typeof globalThis !== 'undefined') {\n  ;(globalThis as any).createFileRoute = createFileRoute\n  ;(globalThis as any).createLazyFileRoute = createLazyFileRoute\n} else if (typeof window !== 'undefined') {\n  ;(window as any).createFileRoute = createFileRoute\n  ;(window as any).createLazyFileRoute = createLazyFileRoute\n}\n"],"mappings":";;;;;AA4EA,IAAa,gBAAgC,YAAY;AACvD,QAAO,IAAI,OAAO,QAAQ;;AAG5B,IAAa,SAAb,cAMU,sBAAA,WAMR;CACA,YACE,SAOA;AACA,QAAM,SAAS,qBAAA,gBAAgB;;;AAInC,IAAI,OAAO,eAAe,aAAa;AACnC,YAAmB,kBAAkB,kBAAA;AACrC,YAAmB,sBAAsB,kBAAA;WAClC,OAAO,WAAW,aAAa;AACtC,QAAe,kBAAkB,kBAAA;AACjC,QAAe,sBAAsB,kBAAA"}

package/dist/cjs/routerStores.cjs

@@ -0,0 +1,67 @@
+const require_runtime = require("./_virtual/_rolldown/runtime.cjs");
+let _tanstack_router_core = require("@tanstack/router-core");
+let solid_js = require("solid-js");
+solid_js = require_runtime.__toESM(solid_js);
+let _tanstack_router_core_isServer = require("@tanstack/router-core/isServer");
+//#region src/routerStores.ts
+function initRouterStores(stores, createReadonlyStore) {
+	stores.childMatchIdByRouteId = createReadonlyStore(() => {
+		const ids = stores.matchesId.state;
+		const obj = {};
+		for (let i = 0; i < ids.length - 1; i++) {
+			const parentStore = stores.activeMatchStoresById.get(ids[i]);
+			if (parentStore?.routeId) obj[parentStore.routeId] = ids[i + 1];
+		}
+		return obj;
+	});
+	stores.pendingRouteIds = createReadonlyStore(() => {
+		const ids = stores.pendingMatchesId.state;
+		const obj = {};
+		for (const id of ids) {
+			const store = stores.pendingMatchStoresById.get(id);
+			if (store?.routeId) obj[store.routeId] = true;
+		}
+		return obj;
+	});
+}
+function createSolidMutableStore(initialValue) {
+	const [signal, setSignal] = solid_js.createSignal(initialValue);
+	return {
+		get state() {
+			return signal();
+		},
+		setState: setSignal
+	};
+}
+var finalizationRegistry = null;
+if (typeof globalThis !== "undefined" && "FinalizationRegistry" in globalThis) finalizationRegistry = new FinalizationRegistry((cb) => cb());
+function createSolidReadonlyStore(read) {
+	let dispose;
+	const memo = solid_js.createRoot((d) => {
+		dispose = d;
+		return solid_js.createMemo(read);
+	});
+	const store = { get state() {
+		return memo();
+	} };
+	finalizationRegistry?.register(store, dispose);
+	return store;
+}
+var getStoreFactory = (opts) => {
+	if (_tanstack_router_core_isServer.isServer ?? opts.isServer) return {
+		createMutableStore: _tanstack_router_core.createNonReactiveMutableStore,
+		createReadonlyStore: _tanstack_router_core.createNonReactiveReadonlyStore,
+		batch: (fn) => fn(),
+		init: (stores) => initRouterStores(stores, _tanstack_router_core.createNonReactiveReadonlyStore)
+	};
+	return {
+		createMutableStore: createSolidMutableStore,
+		createReadonlyStore: createSolidReadonlyStore,
+		batch: solid_js.batch,
+		init: (stores) => initRouterStores(stores, createSolidReadonlyStore)
+	};
+};
+//#endregion
+exports.getStoreFactory = getStoreFactory;
+
+//# sourceMappingURL=routerStores.cjs.map

package/dist/cjs/routerStores.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"routerStores.cjs","names":[],"sources":["../../src/routerStores.ts"],"sourcesContent":["import * as Solid from 'solid-js'\nimport {\n  createNonReactiveMutableStore,\n  createNonReactiveReadonlyStore,\n} from '@tanstack/router-core'\nimport { isServer } from '@tanstack/router-core/isServer'\nimport type {\n  AnyRoute,\n  GetStoreConfig,\n  RouterReadableStore,\n  RouterStores,\n  RouterWritableStore,\n} from '@tanstack/router-core'\n\ndeclare module '@tanstack/router-core' {\n  export interface RouterStores<in out TRouteTree extends AnyRoute> {\n    /** Maps each active routeId to the matchId of its child in the match tree. */\n    childMatchIdByRouteId: RouterReadableStore<Record<string, string>>\n    /** Maps each pending routeId to true for quick lookup. */\n    pendingRouteIds: RouterReadableStore<Record<string, boolean>>\n  }\n}\n\nfunction initRouterStores(\n  stores: RouterStores<AnyRoute>,\n  createReadonlyStore: <TValue>(\n    read: () => TValue,\n  ) => RouterReadableStore<TValue>,\n) {\n  stores.childMatchIdByRouteId = createReadonlyStore(() => {\n    const ids = stores.matchesId.state\n    const obj: Record<string, string> = {}\n    for (let i = 0; i < ids.length - 1; i++) {\n      const parentStore = stores.activeMatchStoresById.get(ids[i]!)\n      if (parentStore?.routeId) {\n        obj[parentStore.routeId] = ids[i + 1]!\n      }\n    }\n    return obj\n  })\n\n  stores.pendingRouteIds = createReadonlyStore(() => {\n    const ids = stores.pendingMatchesId.state\n    const obj: Record<string, boolean> = {}\n    for (const id of ids) {\n      const store = stores.pendingMatchStoresById.get(id)\n      if (store?.routeId) {\n        obj[store.routeId] = true\n      }\n    }\n    return obj\n  })\n}\n\nfunction createSolidMutableStore<TValue>(\n  initialValue: TValue,\n): RouterWritableStore<TValue> {\n  const [signal, setSignal] = Solid.createSignal(initialValue)\n\n  return {\n    get state() {\n      return signal()\n    },\n    setState: setSignal,\n  }\n}\n\nlet finalizationRegistry: FinalizationRegistry<() => void> | null = null\nif (typeof globalThis !== 'undefined' && 'FinalizationRegistry' in globalThis) {\n  finalizationRegistry = new FinalizationRegistry((cb) => cb())\n}\n\nfunction createSolidReadonlyStore<TValue>(\n  read: () => TValue,\n): RouterReadableStore<TValue> {\n  let dispose!: () => void\n  const memo = Solid.createRoot((d) => {\n    dispose = d\n    return Solid.createMemo(read)\n  })\n  const store = {\n    get state() {\n      return memo()\n    },\n  }\n  finalizationRegistry?.register(store, dispose)\n  return store\n}\n\nexport const getStoreFactory: GetStoreConfig = (opts) => {\n  if (isServer ?? opts.isServer) {\n    return {\n      createMutableStore: createNonReactiveMutableStore,\n      createReadonlyStore: createNonReactiveReadonlyStore,\n      batch: (fn) => fn(),\n      init: (stores) =>\n        initRouterStores(stores, createNonReactiveReadonlyStore),\n    }\n  }\n\n  return {\n    createMutableStore: createSolidMutableStore,\n    createReadonlyStore: createSolidReadonlyStore,\n    batch: Solid.batch,\n    init: (stores) => initRouterStores(stores, createSolidReadonlyStore),\n  }\n}\n"],"mappings":";;;;;;AAuBA,SAAS,iBACP,QACA,qBAGA;AACA,QAAO,wBAAwB,0BAA0B;EACvD,MAAM,MAAM,OAAO,UAAU;EAC7B,MAAM,MAA8B,EAAE;AACtC,OAAK,IAAI,IAAI,GAAG,IAAI,IAAI,SAAS,GAAG,KAAK;GACvC,MAAM,cAAc,OAAO,sBAAsB,IAAI,IAAI,GAAI;AAC7D,OAAI,aAAa,QACf,KAAI,YAAY,WAAW,IAAI,IAAI;;AAGvC,SAAO;GACP;AAEF,QAAO,kBAAkB,0BAA0B;EACjD,MAAM,MAAM,OAAO,iBAAiB;EACpC,MAAM,MAA+B,EAAE;AACvC,OAAK,MAAM,MAAM,KAAK;GACpB,MAAM,QAAQ,OAAO,uBAAuB,IAAI,GAAG;AACnD,OAAI,OAAO,QACT,KAAI,MAAM,WAAW;;AAGzB,SAAO;GACP;;AAGJ,SAAS,wBACP,cAC6B;CAC7B,MAAM,CAAC,QAAQ,aAAa,SAAM,aAAa,aAAa;AAE5D,QAAO;EACL,IAAI,QAAQ;AACV,UAAO,QAAQ;;EAEjB,UAAU;EACX;;AAGH,IAAI,uBAAgE;AACpE,IAAI,OAAO,eAAe,eAAe,0BAA0B,WACjE,wBAAuB,IAAI,sBAAsB,OAAO,IAAI,CAAC;AAG/D,SAAS,yBACP,MAC6B;CAC7B,IAAI;CACJ,MAAM,OAAO,SAAM,YAAY,MAAM;AACnC,YAAU;AACV,SAAO,SAAM,WAAW,KAAK;GAC7B;CACF,MAAM,QAAQ,EACZ,IAAI,QAAQ;AACV,SAAO,MAAM;IAEhB;AACD,uBAAsB,SAAS,OAAO,QAAQ;AAC9C,QAAO;;AAGT,IAAa,mBAAmC,SAAS;AACvD,KAAI,+BAAA,YAAY,KAAK,SACnB,QAAO;EACL,oBAAoB,sBAAA;EACpB,qBAAqB,sBAAA;EACrB,QAAQ,OAAO,IAAI;EACnB,OAAO,WACL,iBAAiB,QAAQ,sBAAA,+BAA+B;EAC3D;AAGH,QAAO;EACL,oBAAoB;EACpB,qBAAqB;EACrB,OAAO,SAAM;EACb,OAAO,WAAW,iBAAiB,QAAQ,yBAAyB;EACrE"}

package/dist/cjs/routerStores.d.cts

@@ -0,0 +1,10 @@
+import { AnyRoute, GetStoreConfig, RouterReadableStore } from '@tanstack/router-core';
+declare module '@tanstack/router-core' {
+    interface RouterStores<in out TRouteTree extends AnyRoute> {
+        /** Maps each active routeId to the matchId of its child in the match tree. */
+        childMatchIdByRouteId: RouterReadableStore<Record<string, string>>;
+        /** Maps each pending routeId to true for quick lookup. */
+        pendingRouteIds: RouterReadableStore<Record<string, boolean>>;
+    }
+}
+export declare const getStoreFactory: GetStoreConfig;

package/dist/cjs/ssr/RouterClient.cjs

@@ -8,7 +8,7 @@ let _tanstack_router_core_ssr_client = require("@tanstack/router-core/ssr/client
 var hydrationPromise;
 var Dummy = (props) => (0, solid_js_web.memo)(() => props.children);
 function RouterClient(props) {
-	if (!hydrationPromise) if (!props.router.state.matches.length) hydrationPromise = (0, _tanstack_router_core_ssr_client.hydrate)(props.router);
+	if (!hydrationPromise) if (!props.router.stores.matchesId.state.length) hydrationPromise = (0, _tanstack_router_core_ssr_client.hydrate)(props.router);
 	else hydrationPromise = Promise.resolve();
 	return (0, solid_js_web.createComponent)(require_awaited.Await, {
 		promise: hydrationPromise,

package/dist/cjs/ssr/RouterClient.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"RouterClient.cjs","names":["hydrate","Await","HeadContent","RouterProvider","AnyRouter","JSXElement","hydrationPromise","Promise","Array","Dummy","props","children","_$memo","RouterClient","router","state","matches","length","resolve","_$createComponent","promise","InnerWrap"],"sources":["../../../src/ssr/RouterClient.tsx"],"sourcesContent":["import { hydrate } from '@tanstack/router-core/ssr/client'\nimport { Await } from '../awaited'\nimport { HeadContent } from '../HeadContent'\nimport { RouterProvider } from '../RouterProvider'\nimport type { AnyRouter } from '@tanstack/router-core'\nimport type { JSXElement } from 'solid-js'\n\nlet hydrationPromise: Promise<void | Array<Array<void>>> | undefined\n\nconst Dummy = (props: { children?: JSXElement }) => <>{props.children}</>\n\nexport function RouterClient(props: { router: AnyRouter }) {\n  if (!hydrationPromise) {\n    if (!props.router.state.matches.length) {\n      hydrationPromise = hydrate(props.router)\n    } else {\n      hydrationPromise = Promise.resolve()\n    }\n  }\n  return (\n    <Await\n      promise={hydrationPromise}\n      children={() => (\n        <Dummy>\n          <Dummy>\n            <RouterProvider\n              router={props.router}\n              InnerWrap={(props) => (\n                <Dummy>\n                  <Dummy>\n                    <HeadContent />\n                    {props.children}\n                  </Dummy>\n                  <Dummy />\n                </Dummy>\n              )}\n            />\n          </Dummy>\n        </Dummy>\n      )}\n    />\n  )\n}\n"],"mappings":";;;;;;;AAOA,IAAIM;AAEJ,IAAMG,SAASC,WAAAA,GAAAA,aAAAA,YAAwCA,MAAMC,SAAY;AAEzE,SAAgBE,aAAaH,OAA8B;AACzD,KAAI,CAACJ,iBACH,KAAI,CAACI,MAAMI,OAAOC,MAAMC,QAAQC,OAC9BX,qBAAAA,GAAAA,iCAAAA,SAA2BI,MAAMI,OAAO;KAExCR,oBAAmBC,QAAQW,SAAS;AAGxC,SAAA,GAAA,aAAA,iBACGjB,gBAAAA,OAAK;EACJmB,SAASd;EACTK,iBAAAA,GAAAA,aAAAA,iBACGF,OAAK,EAAA,IAAAE,WAAA;AAAA,WAAA,GAAA,aAAA,iBACHF,OAAK,EAAA,IAAAE,WAAA;AAAA,YAAA,GAAA,aAAA,iBACHR,uBAAAA,gBAAc;KAAA,IACbW,SAAM;AAAA,aAAEJ,MAAMI;;KACdO,YAAYX,WAAAA,GAAAA,aAAAA,iBACTD,OAAK,EAAA,IAAAE,WAAA;AAAA,aAAA,EAAA,GAAA,aAAA,iBACHF,OAAK,EAAA,IAAAE,WAAA;AAAA,cAAA,EAAA,GAAA,aAAA,iBACHT,oBAAAA,aAAW,EAAA,CAAA,GAAA,GAAA,aAAA,YACXQ,MAAMC,SAAQ,CAAA;SAAA,CAAA,GAAA,GAAA,aAAA,iBAEhBF,OAAK,EAAA,CAAA,CAAA;QAAA,CAAA;KAET,CAAA;MAAA,CAAA;KAAA,CAAA;EAIR,CAAA"}
+{"version":3,"file":"RouterClient.cjs","names":["hydrate","Await","HeadContent","RouterProvider","AnyRouter","JSXElement","hydrationPromise","Promise","Array","Dummy","props","children","_$memo","RouterClient","router","stores","matchesId","state","length","resolve","_$createComponent","promise","InnerWrap"],"sources":["../../../src/ssr/RouterClient.tsx"],"sourcesContent":["import { hydrate } from '@tanstack/router-core/ssr/client'\nimport { Await } from '../awaited'\nimport { HeadContent } from '../HeadContent'\nimport { RouterProvider } from '../RouterProvider'\nimport type { AnyRouter } from '@tanstack/router-core'\nimport type { JSXElement } from 'solid-js'\n\nlet hydrationPromise: Promise<void | Array<Array<void>>> | undefined\n\nconst Dummy = (props: { children?: JSXElement }) => <>{props.children}</>\n\nexport function RouterClient(props: { router: AnyRouter }) {\n  if (!hydrationPromise) {\n    if (!props.router.stores.matchesId.state.length) {\n      hydrationPromise = hydrate(props.router)\n    } else {\n      hydrationPromise = Promise.resolve()\n    }\n  }\n  return (\n    <Await\n      promise={hydrationPromise}\n      children={() => (\n        <Dummy>\n          <Dummy>\n            <RouterProvider\n              router={props.router}\n              InnerWrap={(props) => (\n                <Dummy>\n                  <Dummy>\n                    <HeadContent />\n                    {props.children}\n                  </Dummy>\n                  <Dummy />\n                </Dummy>\n              )}\n            />\n          </Dummy>\n        </Dummy>\n      )}\n    />\n  )\n}\n"],"mappings":";;;;;;;AAOA,IAAIM;AAEJ,IAAMG,SAASC,WAAAA,GAAAA,aAAAA,YAAwCA,MAAMC,SAAY;AAEzE,SAAgBE,aAAaH,OAA8B;AACzD,KAAI,CAACJ,iBACH,KAAI,CAACI,MAAMI,OAAOC,OAAOC,UAAUC,MAAMC,OACvCZ,qBAAAA,GAAAA,iCAAAA,SAA2BI,MAAMI,OAAO;KAExCR,oBAAmBC,QAAQY,SAAS;AAGxC,SAAA,GAAA,aAAA,iBACGlB,gBAAAA,OAAK;EACJoB,SAASf;EACTK,iBAAAA,GAAAA,aAAAA,iBACGF,OAAK,EAAA,IAAAE,WAAA;AAAA,WAAA,GAAA,aAAA,iBACHF,OAAK,EAAA,IAAAE,WAAA;AAAA,YAAA,GAAA,aAAA,iBACHR,uBAAAA,gBAAc;KAAA,IACbW,SAAM;AAAA,aAAEJ,MAAMI;;KACdQ,YAAYZ,WAAAA,GAAAA,aAAAA,iBACTD,OAAK,EAAA,IAAAE,WAAA;AAAA,aAAA,EAAA,GAAA,aAAA,iBACHF,OAAK,EAAA,IAAAE,WAAA;AAAA,cAAA,EAAA,GAAA,aAAA,iBACHT,oBAAAA,aAAW,EAAA,CAAA,GAAA,GAAA,aAAA,YACXQ,MAAMC,SAAQ,CAAA;SAAA,CAAA,GAAA,GAAA,aAAA,iBAEhBF,OAAK,EAAA,CAAA,CAAA;QAAA,CAAA;KAET,CAAA;MAAA,CAAA;KAAA,CAAA;EAIR,CAAA"}

package/dist/cjs/ssr/renderRouterToStream.cjs

@@ -19,7 +19,7 @@ var renderRouterToStream = async ({ request, router, responseHeaders, children }
 	stream.pipeTo(writable);
 	const responseStream = (0, _tanstack_router_core_ssr_server.transformReadableStreamWithRouter)(router, readable);
 	return new Response(responseStream, {
-		status: router.state.statusCode,
+		status: router.stores.statusCode.state,
 		headers: responseHeaders
 	});
 };

package/dist/cjs/ssr/renderRouterToStream.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"renderRouterToStream.cjs","names":["Solid","isbot","transformReadableStreamWithRouter","makeSsrSerovalPlugin","JSXElement","ReadableStream","AnyRouter","renderRouterToStream","request","router","responseHeaders","children","Request","Headers","writable","readable","TransformStream","docType","ssr","serializationAdapters","options","serovalPlugins","map","adapter","plugin","didRun","stream","renderToStream","_$memo","nonce","plugins","headers","get","pipeTo","responseStream","Response","status","state","statusCode"],"sources":["../../../src/ssr/renderRouterToStream.tsx"],"sourcesContent":["import * as Solid from 'solid-js/web'\nimport { isbot } from 'isbot'\nimport { transformReadableStreamWithRouter } from '@tanstack/router-core/ssr/server'\nimport { makeSsrSerovalPlugin } from '@tanstack/router-core'\nimport type { JSXElement } from 'solid-js'\nimport type { ReadableStream } from 'node:stream/web'\nimport type { AnyRouter } from '@tanstack/router-core'\n\nexport const renderRouterToStream = async ({\n  request,\n  router,\n  responseHeaders,\n  children,\n}: {\n  request: Request\n  router: AnyRouter\n  responseHeaders: Headers\n  children: () => JSXElement\n}) => {\n  const { writable, readable } = new TransformStream()\n\n  const docType = Solid.ssr('<!DOCTYPE html>')\n\n  const serializationAdapters =\n    (router.options as any)?.serializationAdapters ||\n    (router.options.ssr as any)?.serializationAdapters\n  const serovalPlugins = serializationAdapters?.map((adapter: any) => {\n    const plugin = makeSsrSerovalPlugin(adapter, { didRun: false })\n    return plugin\n  })\n\n  const stream = Solid.renderToStream(\n    () => (\n      <>\n        {docType}\n        {children()}\n      </>\n    ),\n    {\n      nonce: router.options.ssr?.nonce,\n      plugins: serovalPlugins,\n    } as any,\n  )\n\n  if (isbot(request.headers.get('User-Agent'))) {\n    await stream\n  }\n  stream.pipeTo(writable)\n\n  const responseStream = transformReadableStreamWithRouter(\n    router,\n    readable as unknown as ReadableStream,\n  )\n  return new Response(responseStream as any, {\n    status: router.state.statusCode,\n    headers: responseHeaders,\n  })\n}\n"],"mappings":";;;;;;;AAQA,IAAaO,uBAAuB,OAAO,EACzCC,SACAC,QACAC,iBACAC,eAMI;CACJ,MAAM,EAAEG,UAAUC,aAAa,IAAIC,iBAAiB;CAEpD,MAAMC,UAAUjB,aAAMkB,IAAI,kBAAkB;CAK5C,MAAMG,kBAFHZ,OAAOW,SAAiBD,yBACxBV,OAAOW,QAAQF,KAAaC,wBACeG,KAAKC,YAAiB;AAElE,UAAA,GAAA,sBAAA,sBADoCA,SAAS,EAAEE,QAAQ,OAAO,CAAC;GAE/D;CAEF,MAAMC,SAAS1B,aAAM2B,qBACnB,CAEKV,UAAAA,GAAAA,aAAAA,MACAN,SAAQ,CAEZ,EACD;EACEkB,OAAOpB,OAAOW,QAAQF,KAAKW;EAC3BC,SAAST;EACV,CACF;AAED,MAAA,GAAA,MAAA,OAAUb,QAAQuB,QAAQC,IAAI,aAAa,CAAC,CAC1C,OAAMN;AAERA,QAAOO,OAAOnB,SAAS;CAEvB,MAAMoB,kBAAAA,GAAAA,iCAAAA,mCACJzB,QACAM,SACD;AACD,QAAO,IAAIoB,SAASD,gBAAuB;EACzCE,QAAQ3B,OAAO4B,MAAMC;EACrBP,SAASrB;EACV,CAAC"}
+{"version":3,"file":"renderRouterToStream.cjs","names":["Solid","isbot","transformReadableStreamWithRouter","makeSsrSerovalPlugin","JSXElement","ReadableStream","AnyRouter","renderRouterToStream","request","router","responseHeaders","children","Request","Headers","writable","readable","TransformStream","docType","ssr","serializationAdapters","options","serovalPlugins","map","adapter","plugin","didRun","stream","renderToStream","_$memo","nonce","plugins","headers","get","pipeTo","responseStream","Response","status","stores","statusCode","state"],"sources":["../../../src/ssr/renderRouterToStream.tsx"],"sourcesContent":["import * as Solid from 'solid-js/web'\nimport { isbot } from 'isbot'\nimport { transformReadableStreamWithRouter } from '@tanstack/router-core/ssr/server'\nimport { makeSsrSerovalPlugin } from '@tanstack/router-core'\nimport type { JSXElement } from 'solid-js'\nimport type { ReadableStream } from 'node:stream/web'\nimport type { AnyRouter } from '@tanstack/router-core'\n\nexport const renderRouterToStream = async ({\n  request,\n  router,\n  responseHeaders,\n  children,\n}: {\n  request: Request\n  router: AnyRouter\n  responseHeaders: Headers\n  children: () => JSXElement\n}) => {\n  const { writable, readable } = new TransformStream()\n\n  const docType = Solid.ssr('<!DOCTYPE html>')\n\n  const serializationAdapters =\n    (router.options as any)?.serializationAdapters ||\n    (router.options.ssr as any)?.serializationAdapters\n  const serovalPlugins = serializationAdapters?.map((adapter: any) => {\n    const plugin = makeSsrSerovalPlugin(adapter, { didRun: false })\n    return plugin\n  })\n\n  const stream = Solid.renderToStream(\n    () => (\n      <>\n        {docType}\n        {children()}\n      </>\n    ),\n    {\n      nonce: router.options.ssr?.nonce,\n      plugins: serovalPlugins,\n    } as any,\n  )\n\n  if (isbot(request.headers.get('User-Agent'))) {\n    await stream\n  }\n  stream.pipeTo(writable)\n\n  const responseStream = transformReadableStreamWithRouter(\n    router,\n    readable as unknown as ReadableStream,\n  )\n  return new Response(responseStream as any, {\n    status: router.stores.statusCode.state,\n    headers: responseHeaders,\n  })\n}\n"],"mappings":";;;;;;;AAQA,IAAaO,uBAAuB,OAAO,EACzCC,SACAC,QACAC,iBACAC,eAMI;CACJ,MAAM,EAAEG,UAAUC,aAAa,IAAIC,iBAAiB;CAEpD,MAAMC,UAAUjB,aAAMkB,IAAI,kBAAkB;CAK5C,MAAMG,kBAFHZ,OAAOW,SAAiBD,yBACxBV,OAAOW,QAAQF,KAAaC,wBACeG,KAAKC,YAAiB;AAElE,UAAA,GAAA,sBAAA,sBADoCA,SAAS,EAAEE,QAAQ,OAAO,CAAC;GAE/D;CAEF,MAAMC,SAAS1B,aAAM2B,qBACnB,CAEKV,UAAAA,GAAAA,aAAAA,MACAN,SAAQ,CAEZ,EACD;EACEkB,OAAOpB,OAAOW,QAAQF,KAAKW;EAC3BC,SAAST;EACV,CACF;AAED,MAAA,GAAA,MAAA,OAAUb,QAAQuB,QAAQC,IAAI,aAAa,CAAC,CAC1C,OAAMN;AAERA,QAAOO,OAAOnB,SAAS;CAEvB,MAAMoB,kBAAAA,GAAAA,iCAAAA,mCACJzB,QACAM,SACD;AACD,QAAO,IAAIoB,SAASD,gBAAuB;EACzCE,QAAQ3B,OAAO4B,OAAOC,WAAWC;EACjCR,SAASrB;EACV,CAAC"}

package/dist/cjs/ssr/renderRouterToString.cjs

@@ -3,7 +3,7 @@ let _tanstack_router_core = require("@tanstack/router-core");
 let solid_js_web = require("solid-js/web");
 solid_js_web = require_runtime.__toESM(solid_js_web);
 //#region src/ssr/renderRouterToString.tsx
-var renderRouterToString = async ({ router, responseHeaders, children }) => {
+var renderRouterToString = ({ router, responseHeaders, children }) => {
 	try {
 		const serovalPlugins = (router.options?.serializationAdapters || router.options.ssr?.serializationAdapters)?.map((adapter) => {
 			return (0, _tanstack_router_core.makeSsrSerovalPlugin)(adapter, { didRun: false });
@@ -16,7 +16,7 @@ var renderRouterToString = async ({ router, responseHeaders, children }) => {
 		const injectedHtml = router.serverSsr.takeBufferedHtml();
 		if (injectedHtml) html = html.replace(`</body>`, () => `${injectedHtml}</body>`);
 		return new Response(`<!DOCTYPE html>${html}`, {
-			status: router.state.statusCode,
+			status: router.stores.statusCode.state,
 			headers: responseHeaders
 		});
 	} catch (error) {

package/dist/cjs/ssr/renderRouterToString.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"renderRouterToString.cjs","names":["Solid","makeSsrSerovalPlugin","AnyRouter","JSXElement","renderRouterToString","router","responseHeaders","children","Headers","serializationAdapters","options","ssr","serovalPlugins","map","adapter","plugin","didRun","html","renderToString","nonce","plugins","serverSsr","setRenderFinished","injectedHtml","takeBufferedHtml","replace","Response","status","state","statusCode","headers","error","console","cleanup"],"sources":["../../../src/ssr/renderRouterToString.tsx"],"sourcesContent":["import * as Solid from 'solid-js/web'\nimport { makeSsrSerovalPlugin } from '@tanstack/router-core'\nimport type { AnyRouter } from '@tanstack/router-core'\nimport type { JSXElement } from 'solid-js'\n\nexport const renderRouterToString = async ({\n  router,\n  responseHeaders,\n  children,\n}: {\n  router: AnyRouter\n  responseHeaders: Headers\n  children: () => JSXElement\n}) => {\n  try {\n    const serializationAdapters =\n      (router.options as any)?.serializationAdapters ||\n      (router.options.ssr as any)?.serializationAdapters\n    const serovalPlugins = serializationAdapters?.map((adapter: any) => {\n      const plugin = makeSsrSerovalPlugin(adapter, { didRun: false })\n      return plugin\n    })\n\n    let html = Solid.renderToString(children, {\n      nonce: router.options.ssr?.nonce,\n      plugins: serovalPlugins,\n    } as any)\n    router.serverSsr!.setRenderFinished()\n\n    const injectedHtml = router.serverSsr!.takeBufferedHtml()\n    if (injectedHtml) {\n      html = html.replace(`</body>`, () => `${injectedHtml}</body>`)\n    }\n    return new Response(`<!DOCTYPE html>${html}`, {\n      status: router.state.statusCode,\n      headers: responseHeaders,\n    })\n  } catch (error) {\n    console.error('Render to string error:', error)\n    return new Response('Internal Server Error', {\n      status: 500,\n      headers: responseHeaders,\n    })\n  } finally {\n    router.serverSsr?.cleanup()\n  }\n}\n"],"mappings":";;;;;AAKA,IAAaI,uBAAuB,OAAO,EACzCC,QACAC,iBACAC,eAKI;AACJ,KAAI;EAIF,MAAMK,kBAFHP,OAAOK,SAAiBD,yBACxBJ,OAAOK,QAAQC,KAAaF,wBACeI,KAAKC,YAAiB;AAElE,WAAA,GAAA,sBAAA,sBADoCA,SAAS,EAAEE,QAAQ,OAAO,CAAC;IAE/D;EAEF,IAAIC,OAAOjB,aAAMkB,eAAeX,UAAU;GACxCY,OAAOd,OAAOK,QAAQC,KAAKQ;GAC3BC,SAASR;GACV,CAAQ;AACTP,SAAOgB,UAAWC,mBAAmB;EAErC,MAAMC,eAAelB,OAAOgB,UAAWG,kBAAkB;AACzD,MAAID,aACFN,QAAOA,KAAKQ,QAAQ,iBAAiB,GAAGF,aAAY,SAAU;AAEhE,SAAO,IAAIG,SAAS,kBAAkBT,QAAQ;GAC5CU,QAAQtB,OAAOuB,MAAMC;GACrBC,SAASxB;GACV,CAAC;UACKyB,OAAO;AACdC,UAAQD,MAAM,2BAA2BA,MAAM;AAC/C,SAAO,IAAIL,SAAS,yBAAyB;GAC3CC,QAAQ;GACRG,SAASxB;GACV,CAAC;WACM;AACRD,SAAOgB,WAAWY,SAAS"}
+{"version":3,"file":"renderRouterToString.cjs","names":["Solid","makeSsrSerovalPlugin","AnyRouter","JSXElement","renderRouterToString","router","responseHeaders","children","Headers","serializationAdapters","options","ssr","serovalPlugins","map","adapter","plugin","didRun","html","renderToString","nonce","plugins","serverSsr","setRenderFinished","injectedHtml","takeBufferedHtml","replace","Response","status","stores","statusCode","state","headers","error","console","cleanup"],"sources":["../../../src/ssr/renderRouterToString.tsx"],"sourcesContent":["import * as Solid from 'solid-js/web'\nimport { makeSsrSerovalPlugin } from '@tanstack/router-core'\nimport type { AnyRouter } from '@tanstack/router-core'\nimport type { JSXElement } from 'solid-js'\n\nexport const renderRouterToString = ({\n  router,\n  responseHeaders,\n  children,\n}: {\n  router: AnyRouter\n  responseHeaders: Headers\n  children: () => JSXElement\n}) => {\n  try {\n    const serializationAdapters =\n      (router.options as any)?.serializationAdapters ||\n      (router.options.ssr as any)?.serializationAdapters\n    const serovalPlugins = serializationAdapters?.map((adapter: any) => {\n      const plugin = makeSsrSerovalPlugin(adapter, { didRun: false })\n      return plugin\n    })\n\n    let html = Solid.renderToString(children, {\n      nonce: router.options.ssr?.nonce,\n      plugins: serovalPlugins,\n    } as any)\n    router.serverSsr!.setRenderFinished()\n\n    const injectedHtml = router.serverSsr!.takeBufferedHtml()\n    if (injectedHtml) {\n      html = html.replace(`</body>`, () => `${injectedHtml}</body>`)\n    }\n    return new Response(`<!DOCTYPE html>${html}`, {\n      status: router.stores.statusCode.state,\n      headers: responseHeaders,\n    })\n  } catch (error) {\n    console.error('Render to string error:', error)\n    return new Response('Internal Server Error', {\n      status: 500,\n      headers: responseHeaders,\n    })\n  } finally {\n    router.serverSsr?.cleanup()\n  }\n}\n"],"mappings":";;;;;AAKA,IAAaI,wBAAwB,EACnCC,QACAC,iBACAC,eAKI;AACJ,KAAI;EAIF,MAAMK,kBAFHP,OAAOK,SAAiBD,yBACxBJ,OAAOK,QAAQC,KAAaF,wBACeI,KAAKC,YAAiB;AAElE,WAAA,GAAA,sBAAA,sBADoCA,SAAS,EAAEE,QAAQ,OAAO,CAAC;IAE/D;EAEF,IAAIC,OAAOjB,aAAMkB,eAAeX,UAAU;GACxCY,OAAOd,OAAOK,QAAQC,KAAKQ;GAC3BC,SAASR;GACV,CAAQ;AACTP,SAAOgB,UAAWC,mBAAmB;EAErC,MAAMC,eAAelB,OAAOgB,UAAWG,kBAAkB;AACzD,MAAID,aACFN,QAAOA,KAAKQ,QAAQ,iBAAiB,GAAGF,aAAY,SAAU;AAEhE,SAAO,IAAIG,SAAS,kBAAkBT,QAAQ;GAC5CU,QAAQtB,OAAOuB,OAAOC,WAAWC;GACjCC,SAASzB;GACV,CAAC;UACK0B,OAAO;AACdC,UAAQD,MAAM,2BAA2BA,MAAM;AAC/C,SAAO,IAAIN,SAAS,yBAAyB;GAC3CC,QAAQ;GACRI,SAASzB;GACV,CAAC;WACM;AACRD,SAAOgB,WAAWa,SAAS"}

package/dist/cjs/ssr/renderRouterToString.d.cts

@@ -4,4 +4,4 @@ export declare const renderRouterToString: ({ router, responseHeaders, children,
     router: AnyRouter;
     responseHeaders: Headers;
     children: () => JSXElement;
-}) => Promise<Response>;
+}) => Response;

package/dist/cjs/useCanGoBack.cjs

@@ -1,7 +1,11 @@
-const require_useRouterState = require("./useRouterState.cjs");
+const require_runtime = require("./_virtual/_rolldown/runtime.cjs");
+const require_useRouter = require("./useRouter.cjs");
+let solid_js = require("solid-js");
+solid_js = require_runtime.__toESM(solid_js);
 //#region src/useCanGoBack.ts
 function useCanGoBack() {
-	return require_useRouterState.useRouterState({ select: (s) => s.location.state.__TSR_index !== 0 });
+	const router = require_useRouter.useRouter();
+	return solid_js.createMemo(() => router.stores.location.state.state.__TSR_index !== 0);
 }
 //#endregion
 exports.useCanGoBack = useCanGoBack;

package/dist/cjs/useCanGoBack.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"useCanGoBack.cjs","names":[],"sources":["../../src/useCanGoBack.ts"],"sourcesContent":["import { useRouterState } from './useRouterState'\n\nexport function useCanGoBack() {\n  return useRouterState({ select: (s) => s.location.state.__TSR_index !== 0 })\n}\n"],"mappings":";;AAEA,SAAgB,eAAe;AAC7B,QAAO,uBAAA,eAAe,EAAE,SAAS,MAAM,EAAE,SAAS,MAAM,gBAAgB,GAAG,CAAC"}
+{"version":3,"file":"useCanGoBack.cjs","names":[],"sources":["../../src/useCanGoBack.ts"],"sourcesContent":["import * as Solid from 'solid-js'\nimport { useRouter } from './useRouter'\n\nexport function useCanGoBack() {\n  const router = useRouter()\n  return Solid.createMemo(\n    () => router.stores.location.state.state.__TSR_index !== 0,\n  )\n}\n"],"mappings":";;;;;AAGA,SAAgB,eAAe;CAC7B,MAAM,SAAS,kBAAA,WAAW;AAC1B,QAAO,SAAM,iBACL,OAAO,OAAO,SAAS,MAAM,MAAM,gBAAgB,EAC1D"}

package/dist/cjs/useCanGoBack.d.cts

@@ -1 +1,2 @@
-export declare function useCanGoBack(): import('solid-js').Accessor<boolean>;
+import * as Solid from 'solid-js';
+export declare function useCanGoBack(): Solid.Accessor<boolean>;

package/dist/cjs/useLoaderDeps.cjs

@@ -1,11 +1,10 @@
 const require_useMatch = require("./useMatch.cjs");
 //#region src/useLoaderDeps.tsx
 function useLoaderDeps(opts) {
-	const { select, ...rest } = opts;
 	return require_useMatch.useMatch({
-		...rest,
+		...opts,
 		select: (s) => {
-			return select ? select(s.loaderDeps) : s.loaderDeps;
+			return opts.select ? opts.select(s.loaderDeps) : s.loaderDeps;
 		}
 	});
 }

package/dist/cjs/useLoaderDeps.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"useLoaderDeps.cjs","names":["useMatch","Accessor","AnyRouter","RegisteredRouter","ResolveUseLoaderDeps","StrictOrFrom","UseLoaderDepsResult","UseLoaderDepsBaseOptions","select","deps","TRouter","TFrom","TSelected","UseLoaderDepsOptions","UseLoaderDepsRoute","opts","TId","useLoaderDeps","rest","s","loaderDeps"],"sources":["../../src/useLoaderDeps.tsx"],"sourcesContent":["import { useMatch } from './useMatch'\nimport type { Accessor } from 'solid-js'\nimport type {\n  AnyRouter,\n  RegisteredRouter,\n  ResolveUseLoaderDeps,\n  StrictOrFrom,\n  UseLoaderDepsResult,\n} from '@tanstack/router-core'\n\nexport interface UseLoaderDepsBaseOptions<\n  TRouter extends AnyRouter,\n  TFrom,\n  TSelected,\n> {\n  select?: (deps: ResolveUseLoaderDeps<TRouter, TFrom>) => TSelected\n}\n\nexport type UseLoaderDepsOptions<\n  TRouter extends AnyRouter,\n  TFrom extends string | undefined,\n  TSelected,\n> = StrictOrFrom<TRouter, TFrom> &\n  UseLoaderDepsBaseOptions<TRouter, TFrom, TSelected>\n\nexport type UseLoaderDepsRoute<out TId> = <\n  TRouter extends AnyRouter = RegisteredRouter,\n  TSelected = unknown,\n>(\n  opts?: UseLoaderDepsBaseOptions<TRouter, TId, TSelected>,\n) => Accessor<UseLoaderDepsResult<TRouter, TId, TSelected>>\n\nexport function useLoaderDeps<\n  TRouter extends AnyRouter = RegisteredRouter,\n  const TFrom extends string | undefined = undefined,\n  TSelected = unknown,\n>(\n  opts: UseLoaderDepsOptions<TRouter, TFrom, TSelected>,\n): Accessor<UseLoaderDepsResult<TRouter, TFrom, TSelected>> {\n  const { select, ...rest } = opts\n  return useMatch({\n    ...rest,\n    select: (s) => {\n      return select ? select(s.loaderDeps) : s.loaderDeps\n    },\n  }) as Accessor<UseLoaderDepsResult<TRouter, TFrom, TSelected>>\n}\n"],"mappings":";;AAgCA,SAAgBiB,cAKdF,MAC0D;CAC1D,MAAM,EAAEP,QAAQ,GAAGU,SAASH;AAC5B,QAAOf,iBAAAA,SAAS;EACd,GAAGkB;EACHV,SAASW,MAAM;AACb,UAAOX,SAASA,OAAOW,EAAEC,WAAW,GAAGD,EAAEC;;EAE5C,CAAC"}
+{"version":3,"file":"useLoaderDeps.cjs","names":["useMatch","Accessor","AnyRouter","RegisteredRouter","ResolveUseLoaderDeps","StrictOrFrom","UseLoaderDepsResult","UseLoaderDepsBaseOptions","select","deps","TRouter","TFrom","TSelected","UseLoaderDepsOptions","UseLoaderDepsRoute","opts","TId","useLoaderDeps","s","loaderDeps"],"sources":["../../src/useLoaderDeps.tsx"],"sourcesContent":["import { useMatch } from './useMatch'\nimport type { Accessor } from 'solid-js'\nimport type {\n  AnyRouter,\n  RegisteredRouter,\n  ResolveUseLoaderDeps,\n  StrictOrFrom,\n  UseLoaderDepsResult,\n} from '@tanstack/router-core'\n\nexport interface UseLoaderDepsBaseOptions<\n  TRouter extends AnyRouter,\n  TFrom,\n  TSelected,\n> {\n  select?: (deps: ResolveUseLoaderDeps<TRouter, TFrom>) => TSelected\n}\n\nexport type UseLoaderDepsOptions<\n  TRouter extends AnyRouter,\n  TFrom extends string | undefined,\n  TSelected,\n> = StrictOrFrom<TRouter, TFrom> &\n  UseLoaderDepsBaseOptions<TRouter, TFrom, TSelected>\n\nexport type UseLoaderDepsRoute<out TId> = <\n  TRouter extends AnyRouter = RegisteredRouter,\n  TSelected = unknown,\n>(\n  opts?: UseLoaderDepsBaseOptions<TRouter, TId, TSelected>,\n) => Accessor<UseLoaderDepsResult<TRouter, TId, TSelected>>\n\nexport function useLoaderDeps<\n  TRouter extends AnyRouter = RegisteredRouter,\n  const TFrom extends string | undefined = undefined,\n  TSelected = unknown,\n>(\n  opts: UseLoaderDepsOptions<TRouter, TFrom, TSelected>,\n): Accessor<UseLoaderDepsResult<TRouter, TFrom, TSelected>> {\n  return useMatch({\n    ...opts,\n    select: (s) => {\n      return opts.select ? opts.select(s.loaderDeps) : s.loaderDeps\n    },\n  }) as Accessor<UseLoaderDepsResult<TRouter, TFrom, TSelected>>\n}\n"],"mappings":";;AAgCA,SAAgBiB,cAKdF,MAC0D;AAC1D,QAAOf,iBAAAA,SAAS;EACd,GAAGe;EACHP,SAASU,MAAM;AACb,UAAOH,KAAKP,SAASO,KAAKP,OAAOU,EAAEC,WAAW,GAAGD,EAAEC;;EAEtD,CAAC"}

package/dist/cjs/useLocation.cjs

@@ -1,7 +1,18 @@
-const require_useRouterState = require("./useRouterState.cjs");
+const require_runtime = require("./_virtual/_rolldown/runtime.cjs");
+const require_useRouter = require("./useRouter.cjs");
+let _tanstack_router_core = require("@tanstack/router-core");
+let solid_js = require("solid-js");
+solid_js = require_runtime.__toESM(solid_js);
 //#region src/useLocation.tsx
 function useLocation(opts) {
-	return require_useRouterState.useRouterState({ select: (state) => opts?.select ? opts.select(state.location) : state.location });
+	const router = require_useRouter.useRouter();
+	if (!opts?.select) return (() => router.stores.location.state);
+	const select = opts.select;
+	return solid_js.createMemo((prev) => {
+		const res = select(router.stores.location.state);
+		if (prev === void 0) return res;
+		return (0, _tanstack_router_core.replaceEqualDeep)(prev, res);
+	});
 }
 //#endregion
 exports.useLocation = useLocation;

package/dist/cjs/useLocation.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"useLocation.cjs","names":["useRouterState","AnyRouter","RegisteredRouter","RouterState","Accessor","UseLocationBaseOptions","select","state","TRouter","TSelected","UseLocationResult","useLocation","opts","location"],"sources":["../../src/useLocation.tsx"],"sourcesContent":["import { useRouterState } from './useRouterState'\nimport type {\n  AnyRouter,\n  RegisteredRouter,\n  RouterState,\n} from '@tanstack/router-core'\nimport type { Accessor } from 'solid-js'\n\nexport interface UseLocationBaseOptions<TRouter extends AnyRouter, TSelected> {\n  select?: (state: RouterState<TRouter['routeTree']>['location']) => TSelected\n}\n\nexport type UseLocationResult<\n  TRouter extends AnyRouter,\n  TSelected,\n> = unknown extends TSelected\n  ? RouterState<TRouter['routeTree']>['location']\n  : TSelected\n\nexport function useLocation<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TSelected = unknown,\n>(\n  opts?: UseLocationBaseOptions<TRouter, TSelected>,\n): Accessor<UseLocationResult<TRouter, TSelected>> {\n  return useRouterState({\n    select: (state: any) =>\n      opts?.select ? opts.select(state.location) : state.location,\n  } as any) as Accessor<UseLocationResult<TRouter, TSelected>>\n}\n"],"mappings":";;AAmBA,SAAgBW,YAIdC,MACiD;AACjD,QAAOZ,uBAAAA,eAAe,EACpBM,SAASC,UACPK,MAAMN,SAASM,KAAKN,OAAOC,MAAMM,SAAS,GAAGN,MAAMM,UACtD,CAAQ"}
+{"version":3,"file":"useLocation.cjs","names":["Solid","replaceEqualDeep","useRouter","AnyRouter","RegisteredRouter","RouterState","Accessor","UseLocationBaseOptions","select","state","TRouter","TSelected","UseLocationResult","useLocation","opts","router","stores","location","createMemo","prev","res","undefined"],"sources":["../../src/useLocation.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport { replaceEqualDeep } from '@tanstack/router-core'\nimport { useRouter } from './useRouter'\nimport type {\n  AnyRouter,\n  RegisteredRouter,\n  RouterState,\n} from '@tanstack/router-core'\nimport type { Accessor } from 'solid-js'\n\nexport interface UseLocationBaseOptions<TRouter extends AnyRouter, TSelected> {\n  select?: (state: RouterState<TRouter['routeTree']>['location']) => TSelected\n}\n\nexport type UseLocationResult<\n  TRouter extends AnyRouter,\n  TSelected,\n> = unknown extends TSelected\n  ? RouterState<TRouter['routeTree']>['location']\n  : TSelected\n\nexport function useLocation<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TSelected = unknown,\n>(\n  opts?: UseLocationBaseOptions<TRouter, TSelected>,\n): Accessor<UseLocationResult<TRouter, TSelected>> {\n  const router = useRouter<TRouter>()\n\n  if (!opts?.select) {\n    return (() => router.stores.location.state) as Accessor<\n      UseLocationResult<TRouter, TSelected>\n    >\n  }\n\n  const select = opts.select\n\n  return Solid.createMemo((prev: TSelected | undefined) => {\n    const res = select(router.stores.location.state)\n    if (prev === undefined) return res\n    return replaceEqualDeep(prev, res)\n  }) as Accessor<UseLocationResult<TRouter, TSelected>>\n}\n"],"mappings":";;;;;;AAqBA,SAAgBa,YAIdC,MACiD;CACjD,MAAMC,SAASb,kBAAAA,WAAoB;AAEnC,KAAI,CAACY,MAAMN,OACT,eAAcO,OAAOC,OAAOC,SAASR;CAKvC,MAAMD,SAASM,KAAKN;AAEpB,QAAOR,SAAMkB,YAAYC,SAAgC;EACvD,MAAMC,MAAMZ,OAAOO,OAAOC,OAAOC,SAASR,MAAM;AAChD,MAAIU,SAASE,KAAAA,EAAW,QAAOD;AAC/B,UAAA,GAAA,sBAAA,kBAAwBD,MAAMC,IAAI;GAClC"}

package/dist/cjs/useMatch.cjs

@@ -1,28 +1,30 @@
 const require_runtime = require("./_virtual/_rolldown/runtime.cjs");
-const require_useRouterState = require("./useRouterState.cjs");
+const require_useRouter = require("./useRouter.cjs");
 const require_matchContext = require("./matchContext.cjs");
+let _tanstack_router_core = require("@tanstack/router-core");
 let solid_js = require("solid-js");
 solid_js = require_runtime.__toESM(solid_js);
 let tiny_invariant = require("tiny-invariant");
 tiny_invariant = require_runtime.__toESM(tiny_invariant);
 //#region src/useMatch.tsx
 function useMatch(opts) {
-	const nearestMatchId = solid_js.useContext(opts.from ? require_matchContext.dummyMatchContext : require_matchContext.matchContext);
-	const matchState = require_useRouterState.useRouterState({ select: (state) => {
-		const match = state.matches.find((d) => opts.from ? opts.from === d.routeId : d.id === nearestMatchId());
-		if (match === void 0) return {
-			match: void 0,
-			shouldThrowError: !state.pendingMatches?.find((d) => opts.from ? opts.from === d.routeId : d.id === nearestMatchId()) && !state.isTransitioning && (opts.shouldThrow ?? true)
-		};
-		return {
-			match: opts.select ? opts.select(match) : match,
-			shouldThrowError: false
-		};
-	} });
+	const router = require_useRouter.useRouter();
+	const nearestMatch = opts.from ? void 0 : solid_js.useContext(require_matchContext.nearestMatchContext);
+	const match = () => {
+		if (opts.from) return router.stores.getMatchStoreByRouteId(opts.from).state;
+		return nearestMatch?.match();
+	};
 	solid_js.createEffect(() => {
-		if (matchState().shouldThrowError) (0, tiny_invariant.default)(false, `Could not find ${opts.from ? `an active match from "${opts.from}"` : "a nearest match!"}`);
+		if (match() !== void 0) return;
+		(0, tiny_invariant.default)(!(!(opts.from ? Boolean(router.stores.pendingRouteIds.state[opts.from]) : nearestMatch?.hasPending() ?? false) && !router.stores.isTransitioning.state && (opts.shouldThrow ?? true)), `Could not find ${opts.from ? `an active match from "${opts.from}"` : "a nearest match!"}`);
+	});
+	return solid_js.createMemo((prev) => {
+		const selectedMatch = match();
+		if (selectedMatch === void 0) return void 0;
+		const res = opts.select ? opts.select(selectedMatch) : selectedMatch;
+		if (prev === void 0) return res;
+		return (0, _tanstack_router_core.replaceEqualDeep)(prev, res);
 	});
-	return solid_js.createMemo(() => matchState().match);
 }
 //#endregion
 exports.useMatch = useMatch;

package/dist/cjs/useMatch.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"useMatch.cjs","names":["Solid","invariant","useRouterState","dummyMatchContext","matchContext","AnyRouter","MakeRouteMatch","MakeRouteMatchUnion","RegisteredRouter","StrictOrFrom","ThrowConstraint","ThrowOrOptional","UseMatchBaseOptions","select","match","TRouter","TFrom","TStrict","TSelected","shouldThrow","TThrow","UseMatchRoute","opts","Accessor","UseMatchResult","UseMatchOptions","useMatch","nearestMatchId","useContext","from","matchState","shouldThrowError","state","matches","find","d","routeId","id","undefined","pendingMatch","pendingMatches","isTransitioning","createEffect","createMemo"],"sources":["../../src/useMatch.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport invariant from 'tiny-invariant'\nimport { useRouterState } from './useRouterState'\nimport { dummyMatchContext, matchContext } from './matchContext'\nimport type {\n  AnyRouter,\n  MakeRouteMatch,\n  MakeRouteMatchUnion,\n  RegisteredRouter,\n  StrictOrFrom,\n  ThrowConstraint,\n  ThrowOrOptional,\n} from '@tanstack/router-core'\n\nexport interface UseMatchBaseOptions<\n  TRouter extends AnyRouter,\n  TFrom,\n  TStrict extends boolean,\n  TThrow extends boolean,\n  TSelected,\n> {\n  select?: (\n    match: MakeRouteMatch<TRouter['routeTree'], TFrom, TStrict>,\n  ) => TSelected\n  shouldThrow?: TThrow\n}\n\nexport type UseMatchRoute<out TFrom> = <\n  TRouter extends AnyRouter = RegisteredRouter,\n  TSelected = unknown,\n>(\n  opts?: UseMatchBaseOptions<TRouter, TFrom, true, true, TSelected>,\n) => Solid.Accessor<UseMatchResult<TRouter, TFrom, true, TSelected>>\n\nexport type UseMatchOptions<\n  TRouter extends AnyRouter,\n  TFrom extends string | undefined,\n  TStrict extends boolean,\n  TThrow extends boolean,\n  TSelected,\n> = StrictOrFrom<TRouter, TFrom, TStrict> &\n  UseMatchBaseOptions<TRouter, TFrom, TStrict, TThrow, TSelected>\n\nexport type UseMatchResult<\n  TRouter extends AnyRouter,\n  TFrom,\n  TStrict extends boolean,\n  TSelected,\n> = unknown extends TSelected\n  ? TStrict extends true\n    ? MakeRouteMatch<TRouter['routeTree'], TFrom, TStrict>\n    : MakeRouteMatchUnion<TRouter>\n  : TSelected\n\nexport function useMatch<\n  TRouter extends AnyRouter = RegisteredRouter,\n  const TFrom extends string | undefined = undefined,\n  TStrict extends boolean = true,\n  TThrow extends boolean = true,\n  TSelected = unknown,\n>(\n  opts: UseMatchOptions<\n    TRouter,\n    TFrom,\n    TStrict,\n    ThrowConstraint<TStrict, TThrow>,\n    TSelected\n  >,\n): Solid.Accessor<\n  ThrowOrOptional<UseMatchResult<TRouter, TFrom, TStrict, TSelected>, TThrow>\n> {\n  const nearestMatchId = Solid.useContext(\n    opts.from ? dummyMatchContext : matchContext,\n  )\n\n  // Create a signal to track error state separately from the match\n  const matchState: Solid.Accessor<{\n    match: any\n    shouldThrowError: boolean\n  }> = useRouterState({\n    select: (state: any) => {\n      const match = state.matches.find((d: any) =>\n        opts.from ? opts.from === d.routeId : d.id === nearestMatchId(),\n      )\n\n      if (match === undefined) {\n        // During navigation transitions, check if the match exists in pendingMatches\n        const pendingMatch = state.pendingMatches?.find((d: any) =>\n          opts.from ? opts.from === d.routeId : d.id === nearestMatchId(),\n        )\n\n        // Determine if we should throw an error\n        const shouldThrowError =\n          !pendingMatch && !state.isTransitioning && (opts.shouldThrow ?? true)\n\n        return { match: undefined, shouldThrowError }\n      }\n\n      return {\n        match: opts.select ? opts.select(match) : match,\n        shouldThrowError: false,\n      }\n    },\n  } as any)\n\n  // Use createEffect to throw errors outside the reactive selector context\n  // This allows error boundaries to properly catch the errors\n  Solid.createEffect(() => {\n    const state = matchState()\n    if (state.shouldThrowError) {\n      invariant(\n        false,\n        `Could not find ${opts.from ? `an active match from \"${opts.from}\"` : 'a nearest match!'}`,\n      )\n    }\n  })\n\n  // Return an accessor that extracts just the match value\n  return Solid.createMemo(() => matchState().match) as any\n}\n"],"mappings":";;;;;;;;AAsDA,SAAgB0B,SAOdJ,MASA;CACA,MAAMK,iBAAiB3B,SAAM4B,WAC3BN,KAAKO,OAAO1B,qBAAAA,oBAAoBC,qBAAAA,aACjC;CAGD,MAAM0B,aAGD5B,uBAAAA,eAAe,EAClBW,SAASmB,UAAe;EACtB,MAAMlB,QAAQkB,MAAMC,QAAQC,MAAMC,MAChCb,KAAKO,OAAOP,KAAKO,SAASM,EAAEC,UAAUD,EAAEE,OAAOV,gBACjD,CAAC;AAED,MAAIb,UAAUwB,KAAAA,EAUZ,QAAO;GAAExB,OAAOwB,KAAAA;GAAWP,kBAFzB,CANmBC,MAAMQ,gBAAgBN,MAAMC,MAC/Cb,KAAKO,OAAOP,KAAKO,SAASM,EAAEC,UAAUD,EAAEE,OAAOV,gBACjD,CAAC,IAIkB,CAACK,MAAMS,oBAAoBnB,KAAKH,eAAe;GAErB;AAG/C,SAAO;GACLL,OAAOQ,KAAKT,SAASS,KAAKT,OAAOC,MAAM,GAAGA;GAC1CiB,kBAAkB;GACnB;IAEJ,CAAQ;AAIT/B,UAAM0C,mBAAmB;AAEvB,MADcZ,YAAY,CAChBC,iBACR9B,EAAAA,GAAAA,eAAAA,SACE,OACA,kBAAkBqB,KAAKO,OAAO,yBAAyBP,KAAKO,KAAI,KAAM,qBACvE;GAEH;AAGF,QAAO7B,SAAM2C,iBAAiBb,YAAY,CAAChB,MAAM"}
+{"version":3,"file":"useMatch.cjs","names":["Solid","invariant","replaceEqualDeep","nearestMatchContext","useRouter","AnyRouter","MakeRouteMatch","MakeRouteMatchUnion","RegisteredRouter","StrictOrFrom","ThrowConstraint","ThrowOrOptional","UseMatchBaseOptions","select","match","TRouter","TFrom","TStrict","TSelected","shouldThrow","TThrow","UseMatchRoute","opts","Accessor","UseMatchResult","UseMatchOptions","useMatch","router","nearestMatch","from","undefined","useContext","stores","getMatchStoreByRouteId","state","createEffect","hasPendingMatch","Boolean","pendingRouteIds","hasPending","isTransitioning","createMemo","prev","selectedMatch","res"],"sources":["../../src/useMatch.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport invariant from 'tiny-invariant'\nimport { replaceEqualDeep } from '@tanstack/router-core'\nimport { nearestMatchContext } from './matchContext'\nimport { useRouter } from './useRouter'\nimport type {\n  AnyRouter,\n  MakeRouteMatch,\n  MakeRouteMatchUnion,\n  RegisteredRouter,\n  StrictOrFrom,\n  ThrowConstraint,\n  ThrowOrOptional,\n} from '@tanstack/router-core'\n\nexport interface UseMatchBaseOptions<\n  TRouter extends AnyRouter,\n  TFrom,\n  TStrict extends boolean,\n  TThrow extends boolean,\n  TSelected,\n> {\n  select?: (\n    match: MakeRouteMatch<TRouter['routeTree'], TFrom, TStrict>,\n  ) => TSelected\n  shouldThrow?: TThrow\n}\n\nexport type UseMatchRoute<out TFrom> = <\n  TRouter extends AnyRouter = RegisteredRouter,\n  TSelected = unknown,\n>(\n  opts?: UseMatchBaseOptions<TRouter, TFrom, true, true, TSelected>,\n) => Solid.Accessor<UseMatchResult<TRouter, TFrom, true, TSelected>>\n\nexport type UseMatchOptions<\n  TRouter extends AnyRouter,\n  TFrom extends string | undefined,\n  TStrict extends boolean,\n  TThrow extends boolean,\n  TSelected,\n> = StrictOrFrom<TRouter, TFrom, TStrict> &\n  UseMatchBaseOptions<TRouter, TFrom, TStrict, TThrow, TSelected>\n\nexport type UseMatchResult<\n  TRouter extends AnyRouter,\n  TFrom,\n  TStrict extends boolean,\n  TSelected,\n> = unknown extends TSelected\n  ? TStrict extends true\n    ? MakeRouteMatch<TRouter['routeTree'], TFrom, TStrict>\n    : MakeRouteMatchUnion<TRouter>\n  : TSelected\n\nexport function useMatch<\n  TRouter extends AnyRouter = RegisteredRouter,\n  const TFrom extends string | undefined = undefined,\n  TStrict extends boolean = true,\n  TThrow extends boolean = true,\n  TSelected = unknown,\n>(\n  opts: UseMatchOptions<\n    TRouter,\n    TFrom,\n    TStrict,\n    ThrowConstraint<TStrict, TThrow>,\n    TSelected\n  >,\n): Solid.Accessor<\n  ThrowOrOptional<UseMatchResult<TRouter, TFrom, TStrict, TSelected>, TThrow>\n> {\n  const router = useRouter<TRouter>()\n  const nearestMatch = opts.from\n    ? undefined\n    : Solid.useContext(nearestMatchContext)\n\n  const match = () => {\n    if (opts.from) {\n      return router.stores.getMatchStoreByRouteId(opts.from).state\n    }\n\n    return nearestMatch?.match()\n  }\n\n  Solid.createEffect(() => {\n    if (match() !== undefined) {\n      return\n    }\n\n    const hasPendingMatch = opts.from\n      ? Boolean(router.stores.pendingRouteIds.state[opts.from!])\n      : (nearestMatch?.hasPending() ?? false)\n\n    invariant(\n      !(\n        !hasPendingMatch &&\n        !router.stores.isTransitioning.state &&\n        (opts.shouldThrow ?? true)\n      ),\n      `Could not find ${opts.from ? `an active match from \"${opts.from}\"` : 'a nearest match!'}`,\n    )\n  })\n\n  return Solid.createMemo((prev: TSelected | undefined) => {\n    const selectedMatch = match()\n\n    if (selectedMatch === undefined) return undefined\n    const res = opts.select ? opts.select(selectedMatch as any) : selectedMatch\n    if (prev === undefined) return res as TSelected\n    return replaceEqualDeep(prev, res) as TSelected\n  }) as any\n}\n"],"mappings":";;;;;;;;;AAuDA,SAAgB0B,SAOdJ,MASA;CACA,MAAMK,SAASvB,kBAAAA,WAAoB;CACnC,MAAMwB,eAAeN,KAAKO,OACtBC,KAAAA,IACA9B,SAAM+B,WAAW5B,qBAAAA,oBAAoB;CAEzC,MAAMW,cAAc;AAClB,MAAIQ,KAAKO,KACP,QAAOF,OAAOK,OAAOC,uBAAuBX,KAAKO,KAAK,CAACK;AAGzD,SAAON,cAAcd,OAAO;;AAG9Bd,UAAMmC,mBAAmB;AACvB,MAAIrB,OAAO,KAAKgB,KAAAA,EACd;AAOF7B,GAAAA,GAAAA,eAAAA,SACE,EACE,EANoBqB,KAAKO,OACzBQ,QAAQV,OAAOK,OAAOM,gBAAgBJ,MAAMZ,KAAKO,MAAO,GACvDD,cAAcW,YAAY,IAAI,UAK/B,CAACZ,OAAOK,OAAOQ,gBAAgBN,UAC9BZ,KAAKH,eAAe,QAEvB,kBAAkBG,KAAKO,OAAO,yBAAyBP,KAAKO,KAAI,KAAM,qBACvE;GACD;AAEF,QAAO7B,SAAMyC,YAAYC,SAAgC;EACvD,MAAMC,gBAAgB7B,OAAO;AAE7B,MAAI6B,kBAAkBb,KAAAA,EAAW,QAAOA,KAAAA;EACxC,MAAMc,MAAMtB,KAAKT,SAASS,KAAKT,OAAO8B,cAAqB,GAAGA;AAC9D,MAAID,SAASZ,KAAAA,EAAW,QAAOc;AAC/B,UAAA,GAAA,sBAAA,kBAAwBF,MAAME,IAAI;GAClC"}

package/dist/cjs/useParams.cjs

@@ -3,8 +3,8 @@ const require_useMatch = require("./useMatch.cjs");
 function useParams(opts) {
 	return require_useMatch.useMatch({
 		from: opts.from,
-		shouldThrow: opts.shouldThrow,
 		strict: opts.strict,
+		shouldThrow: opts.shouldThrow,
 		select: (match) => {
 			const params = opts.strict === false ? match.params : match._strictParams;
 			return opts.select ? opts.select(params) : params;

package/dist/cjs/useParams.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"useParams.cjs","names":["useMatch","Accessor","AnyRouter","RegisteredRouter","ResolveUseParams","StrictOrFrom","ThrowConstraint","ThrowOrOptional","UseParamsResult","UseParamsBaseOptions","select","params","TRouter","TFrom","TStrict","TSelected","shouldThrow","TThrow","UseParamsOptions","UseParamsRoute","opts","useParams","from","strict","match","_strictParams"],"sources":["../../src/useParams.tsx"],"sourcesContent":["import { useMatch } from './useMatch'\nimport type { Accessor } from 'solid-js'\nimport type {\n  AnyRouter,\n  RegisteredRouter,\n  ResolveUseParams,\n  StrictOrFrom,\n  ThrowConstraint,\n  ThrowOrOptional,\n  UseParamsResult,\n} from '@tanstack/router-core'\n\nexport interface UseParamsBaseOptions<\n  TRouter extends AnyRouter,\n  TFrom,\n  TStrict extends boolean,\n  TThrow extends boolean,\n  TSelected,\n> {\n  select?: (params: ResolveUseParams<TRouter, TFrom, TStrict>) => TSelected\n  shouldThrow?: TThrow\n}\n\nexport type UseParamsOptions<\n  TRouter extends AnyRouter,\n  TFrom extends string | undefined,\n  TStrict extends boolean,\n  TThrow extends boolean,\n  TSelected,\n> = StrictOrFrom<TRouter, TFrom, TStrict> &\n  UseParamsBaseOptions<TRouter, TFrom, TStrict, TThrow, TSelected>\n\nexport type UseParamsRoute<out TFrom> = <\n  TRouter extends AnyRouter = RegisteredRouter,\n  TSelected = unknown,\n>(\n  opts?: UseParamsBaseOptions<\n    TRouter,\n    TFrom,\n    /* TStrict */ true,\n    /* TThrow */ true,\n    TSelected\n  >,\n) => Accessor<UseParamsResult<TRouter, TFrom, true, TSelected>>\n\nexport function useParams<\n  TRouter extends AnyRouter = RegisteredRouter,\n  const TFrom extends string | undefined = undefined,\n  TStrict extends boolean = true,\n  TThrow extends boolean = true,\n  TSelected = unknown,\n>(\n  opts: UseParamsOptions<\n    TRouter,\n    TFrom,\n    TStrict,\n    ThrowConstraint<TStrict, TThrow>,\n    TSelected\n  >,\n): Accessor<\n  ThrowOrOptional<UseParamsResult<TRouter, TFrom, TStrict, TSelected>, TThrow>\n> {\n  return useMatch({\n    from: opts.from!,\n    shouldThrow: opts.shouldThrow,\n    strict: opts.strict,\n    select: (match) => {\n      const params = opts.strict === false ? match.params : match._strictParams\n\n      return opts.select ? opts.select(params) : params\n    },\n  }) as Accessor<any>\n}\n"],"mappings":";;AA6CA,SAAgBqB,UAOdD,MASA;AACA,QAAOpB,iBAAAA,SAAS;EACdsB,MAAMF,KAAKE;EACXN,aAAaI,KAAKJ;EAClBO,QAAQH,KAAKG;EACbb,SAASc,UAAU;GACjB,MAAMb,SAASS,KAAKG,WAAW,QAAQC,MAAMb,SAASa,MAAMC;AAE5D,UAAOL,KAAKV,SAASU,KAAKV,OAAOC,OAAO,GAAGA;;EAE9C,CAAC"}
+{"version":3,"file":"useParams.cjs","names":["useMatch","Accessor","AnyRouter","RegisteredRouter","ResolveUseParams","StrictOrFrom","ThrowConstraint","ThrowOrOptional","UseParamsResult","UseParamsBaseOptions","select","params","TRouter","TFrom","TStrict","TSelected","shouldThrow","TThrow","UseParamsOptions","UseParamsRoute","opts","useParams","from","strict","match","_strictParams"],"sources":["../../src/useParams.tsx"],"sourcesContent":["import { useMatch } from './useMatch'\nimport type { Accessor } from 'solid-js'\nimport type {\n  AnyRouter,\n  RegisteredRouter,\n  ResolveUseParams,\n  StrictOrFrom,\n  ThrowConstraint,\n  ThrowOrOptional,\n  UseParamsResult,\n} from '@tanstack/router-core'\n\nexport interface UseParamsBaseOptions<\n  TRouter extends AnyRouter,\n  TFrom,\n  TStrict extends boolean,\n  TThrow extends boolean,\n  TSelected,\n> {\n  select?: (params: ResolveUseParams<TRouter, TFrom, TStrict>) => TSelected\n  shouldThrow?: TThrow\n}\n\nexport type UseParamsOptions<\n  TRouter extends AnyRouter,\n  TFrom extends string | undefined,\n  TStrict extends boolean,\n  TThrow extends boolean,\n  TSelected,\n> = StrictOrFrom<TRouter, TFrom, TStrict> &\n  UseParamsBaseOptions<TRouter, TFrom, TStrict, TThrow, TSelected>\n\nexport type UseParamsRoute<out TFrom> = <\n  TRouter extends AnyRouter = RegisteredRouter,\n  TSelected = unknown,\n>(\n  opts?: UseParamsBaseOptions<\n    TRouter,\n    TFrom,\n    /* TStrict */ true,\n    /* TThrow */ true,\n    TSelected\n  >,\n) => Accessor<UseParamsResult<TRouter, TFrom, true, TSelected>>\n\nexport function useParams<\n  TRouter extends AnyRouter = RegisteredRouter,\n  const TFrom extends string | undefined = undefined,\n  TStrict extends boolean = true,\n  TThrow extends boolean = true,\n  TSelected = unknown,\n>(\n  opts: UseParamsOptions<\n    TRouter,\n    TFrom,\n    TStrict,\n    ThrowConstraint<TStrict, TThrow>,\n    TSelected\n  >,\n): Accessor<\n  ThrowOrOptional<UseParamsResult<TRouter, TFrom, TStrict, TSelected>, TThrow>\n> {\n  return useMatch({\n    from: opts.from!,\n    strict: opts.strict,\n    shouldThrow: opts.shouldThrow,\n    select: (match: any) => {\n      const params = opts.strict === false ? match.params : match._strictParams\n      return opts.select ? opts.select(params) : params\n    },\n  }) as Accessor<any>\n}\n"],"mappings":";;AA6CA,SAAgBqB,UAOdD,MASA;AACA,QAAOpB,iBAAAA,SAAS;EACdsB,MAAMF,KAAKE;EACXC,QAAQH,KAAKG;EACbP,aAAaI,KAAKJ;EAClBN,SAASc,UAAe;GACtB,MAAMb,SAASS,KAAKG,WAAW,QAAQC,MAAMb,SAASa,MAAMC;AAC5D,UAAOL,KAAKV,SAASU,KAAKV,OAAOC,OAAO,GAAGA;;EAE9C,CAAC"}

package/dist/cjs/useRouterState.cjs

@@ -1,32 +1,25 @@
-require("./_virtual/_rolldown/runtime.cjs");
+const require_runtime = require("./_virtual/_rolldown/runtime.cjs");
 const require_useRouter = require("./useRouter.cjs");
+let _tanstack_router_core = require("@tanstack/router-core");
+let solid_js = require("solid-js");
+solid_js = require_runtime.__toESM(solid_js);
 let _tanstack_router_core_isServer = require("@tanstack/router-core/isServer");
-let _tanstack_solid_store = require("@tanstack/solid-store");
 //#region src/useRouterState.tsx
-function deepEqual(a, b) {
-	if (Object.is(a, b)) return true;
-	if (typeof a !== "object" || a === null || typeof b !== "object" || b === null) return false;
-	const keysA = Object.keys(a);
-	const keysB = Object.keys(b);
-	if (keysA.length !== keysB.length) return false;
-	for (const key of keysA) {
-		if (!Object.prototype.hasOwnProperty.call(b, key)) return false;
-		if (!deepEqual(a[key], b[key])) return false;
-	}
-	return true;
-}
 function useRouterState(opts) {
 	const contextRouter = require_useRouter.useRouter({ warn: opts?.router === void 0 });
 	const router = opts?.router || contextRouter;
 	if (_tanstack_router_core_isServer.isServer ?? router.isServer) {
-		const state = router.state;
+		const state = router.stores.__store.state;
 		const selected = opts?.select ? opts.select(state) : state;
 		return (() => selected);
 	}
-	return (0, _tanstack_solid_store.useStore)(router.__store, (state) => {
-		if (opts?.select) return opts.select(state);
-		return state;
-	}, { equal: deepEqual });
+	if (!opts?.select) return (() => router.stores.__store.state);
+	const select = opts.select;
+	return solid_js.createMemo((prev) => {
+		const res = select(router.stores.__store.state);
+		if (prev === void 0) return res;
+		return (0, _tanstack_router_core.replaceEqualDeep)(prev, res);
+	});
 }
 //#endregion
 exports.useRouterState = useRouterState;