@tanstack/solid-router 1.168.11 → 1.168.13

package/dist/source/useRouterState.jsx

@@ -12,16 +12,16 @@ export function useRouterState(opts) {
     // implementation does not provide subscribe() semantics.
     const _isServer = isServer ?? router.isServer;
     if (_isServer) {
-        const state = router.stores.__store.state;
+        const state = router.stores.__store.get();
         const selected = (opts?.select ? opts.select(state) : state);
         return (() => selected);
     }
     if (!opts?.select) {
-        return (() => router.stores.__store.state);
+        return (() => router.stores.__store.get());
     }
     const select = opts.select;
     return Solid.createMemo((prev) => {
-        const res = select(router.stores.__store.state);
+        const res = select(router.stores.__store.get());
         if (prev === undefined)
             return res;
         return replaceEqualDeep(prev, res);

package/dist/source/useRouterState.jsx.map

@@ -1 +1 @@
-{"version":3,"file":"useRouterState.jsx","sourceRoot":"","sources":["../../src/useRouterState.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAA;AACzD,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAkBvC,MAAM,UAAU,cAAc,CAI5B,IAAgD;IAEhD,MAAM,aAAa,GAAG,SAAS,CAAU;QACvC,IAAI,EAAE,IAAI,EAAE,MAAM,KAAK,SAAS;KACjC,CAAC,CAAA;IACF,MAAM,MAAM,GAAG,IAAI,EAAE,MAAM,IAAI,aAAa,CAAA;IAE5C,gEAAgE;IAChE,sEAAsE;IACtE,yDAAyD;IACzD,MAAM,SAAS,GAAG,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAA;IAC7C,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,KAEnC,CAAA;QACD,MAAM,QAAQ,GAAG,CACf,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CACE,CAAA;QAC7C,OAAO,CAAC,GAAG,EAAE,CAAC,QAAQ,CAErB,CAAA;IACH,CAAC;IAED,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;QAClB,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAExC,CAAA;IACH,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAA;IAE1B,OAAO,KAAK,CAAC,UAAU,CAAC,CAAC,IAA2B,EAAE,EAAE;QACtD,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAC/C,IAAI,IAAI,KAAK,SAAS;YAAE,OAAO,GAAG,CAAA;QAClC,OAAO,gBAAgB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;IACpC,CAAC,CAAuD,CAAA;AAC1D,CAAC"}
+{"version":3,"file":"useRouterState.jsx","sourceRoot":"","sources":["../../src/useRouterState.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAA;AACzD,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAkBvC,MAAM,UAAU,cAAc,CAI5B,IAAgD;IAEhD,MAAM,aAAa,GAAG,SAAS,CAAU;QACvC,IAAI,EAAE,IAAI,EAAE,MAAM,KAAK,SAAS;KACjC,CAAC,CAAA;IACF,MAAM,MAAM,GAAG,IAAI,EAAE,MAAM,IAAI,aAAa,CAAA;IAE5C,gEAAgE;IAChE,sEAAsE;IACtE,yDAAyD;IACzD,MAAM,SAAS,GAAG,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAA;IAC7C,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAEtC,CAAA;QACD,MAAM,QAAQ,GAAG,CACf,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CACE,CAAA;QAC7C,OAAO,CAAC,GAAG,EAAE,CAAC,QAAQ,CAErB,CAAA;IACH,CAAC;IAED,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;QAClB,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAExC,CAAA;IACH,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAA;IAE1B,OAAO,KAAK,CAAC,UAAU,CAAC,CAAC,IAA2B,EAAE,EAAE;QACtD,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA;QAC/C,IAAI,IAAI,KAAK,SAAS;YAAE,OAAO,GAAG,CAAA;QAClC,OAAO,gBAAgB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;IACpC,CAAC,CAAuD,CAAA;AAC1D,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-router",
-  "version": "1.168.11",
+  "version": "1.168.13",
   "description": "Modern and scalable routing for Solid applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -92,7 +92,7 @@
     "@solidjs/meta": "^0.29.4",
     "isbot": "^5.1.22",
     "@tanstack/history": "1.161.6",
-    "@tanstack/router-core": "1.168.9"
+    "@tanstack/router-core": "1.168.10"
   },
   "devDependencies": {
     "@solidjs/testing-library": "^0.8.10",

package/src/Match.tsx

@@ -24,7 +24,7 @@ export const Match = (props: { matchId: string }) => {
   const match = Solid.createMemo(() => {
     const id = props.matchId
     if (!id) return undefined
-    return router.stores.activeMatchStoresById.get(id)?.state
+    return router.stores.activeMatchStoresById.get(id)?.get()
   })
 
   const rawMatchState = Solid.createMemo(() => {
@@ -49,7 +49,7 @@ export const Match = (props: { matchId: string }) => {
   const hasPendingMatch = Solid.createMemo(() => {
     const currentRouteId = rawMatchState()?.routeId
     return currentRouteId
-      ? Boolean(router.stores.pendingRouteIds.state[currentRouteId])
+      ? Boolean(router.stores.pendingRouteIds.get()[currentRouteId])
       : false
   })
   const nearestMatch = {
@@ -113,7 +113,7 @@ export const Match = (props: { matchId: string }) => {
               >
                 <Dynamic
                   component={ResolvedCatchBoundary()}
-                  getResetKey={() => router.stores.loadedAt.state}
+                  getResetKey={() => router.stores.loadedAt.get()}
                   errorComponent={routeErrorComponent() || ErrorComponent}
                   onCatch={(error: Error) => {
                     // Forward not found errors (we don't want to show the error component for these)
@@ -202,15 +202,15 @@ function OnRendered() {
   const router = useRouter()
 
   const location = Solid.createMemo(
-    () => router.stores.resolvedLocation.state?.state.__TSR_key,
+    () => router.stores.resolvedLocation.get()?.state.__TSR_key,
   )
   Solid.createEffect(
     Solid.on([location], () => {
       router.emit({
         type: 'onRendered',
         ...getLocationChangeInfo(
-          router.stores.location.state,
-          router.stores.resolvedLocation.state,
+          router.stores.location.get(),
+          router.stores.resolvedLocation.get(),
         ),
       })
     }),
@@ -459,14 +459,14 @@ export const Outlet = () => {
   const childMatchId = Solid.createMemo(() => {
     const currentRouteId = routeId()
     return currentRouteId
-      ? router.stores.childMatchIdByRouteId.state[currentRouteId]
+      ? router.stores.childMatchIdByRouteId.get()[currentRouteId]
       : undefined
   })
 
   const childMatchStatus = Solid.createMemo(() => {
     const id = childMatchId()
     if (!id) return undefined
-    return router.stores.activeMatchStoresById.get(id)?.state.status
+    return router.stores.activeMatchStoresById.get(id)?.get().status
   })
 
   // Only show not-found if we're not in a redirected state

package/src/Matches.tsx

@@ -17,11 +17,8 @@ import type {
   MakeRouteMatchUnion,
   MaskOptions,
   MatchRouteOptions,
-  NoInfer,
   RegisteredRouter,
-  ResolveRelativePath,
   ResolveRoute,
-  RouteByPath,
   ToSubOptionsProps,
 } from '@tanstack/router-core'
 
@@ -65,17 +62,17 @@ export function Matches() {
 
 function MatchesInner() {
   const router = useRouter()
-  const matchId = () => router.stores.firstMatchId.state
+  const matchId = () => router.stores.firstMatchId.get()
   const routeId = () => (matchId() ? rootRouteId : undefined)
   const match = () =>
     routeId()
-      ? router.stores.getMatchStoreByRouteId(rootRouteId).state
+      ? router.stores.getMatchStoreByRouteId(rootRouteId).get()
       : undefined
   const hasPendingMatch = () =>
     routeId()
-      ? Boolean(router.stores.pendingRouteIds.state[rootRouteId])
+      ? Boolean(router.stores.pendingRouteIds.get()[rootRouteId])
       : false
-  const resetKey = () => router.stores.loadedAt.state
+  const resetKey = () => router.stores.loadedAt.get()
   const nearestMatch = {
     matchId,
     routeId,
@@ -145,7 +142,7 @@ export function useMatchRoute<TRouter extends AnyRouter = RegisteredRouter>() {
     return Solid.createMemo(() => {
       const { pending, caseSensitive, fuzzy, includeSearch, ...rest } = opts
 
-      router.stores.matchRouteReactivity.state
+      router.stores.matchRouteReactivity.get()
       return router.matchRoute(rest as any, {
         pending,
         caseSensitive,
@@ -166,10 +163,9 @@ export type MakeMatchRouteOptions<
   // If a function is passed as a child, it will be given the `isActive` boolean to aid in further styling on the element it returns
   children?:
     | ((
-        params?: RouteByPath<
-          TRouter['routeTree'],
-          ResolveRelativePath<TFrom, NoInfer<TTo>>
-        >['types']['allParams'],
+        params?: Expand<
+          ResolveRoute<TRouter, TFrom, TTo>['types']['allParams']
+        >,
       ) => Solid.JSX.Element)
     | Solid.JSX.Element
 }
@@ -215,7 +211,7 @@ export function useMatches<
 ): Solid.Accessor<UseMatchesResult<TRouter, TSelected>> {
   const router = useRouter<TRouter>()
   return Solid.createMemo((prev: TSelected | undefined) => {
-    const matches = router.stores.activeMatchesSnapshot.state as Array<
+    const matches = router.stores.activeMatchesSnapshot.get() as Array<
       MakeRouteMatchUnion<TRouter>
     >
     const res = opts?.select ? opts.select(matches) : matches

package/src/Scripts.tsx

@@ -6,8 +6,8 @@ import type { RouterManagedTag } from '@tanstack/router-core'
 export const Scripts = () => {
   const router = useRouter()
   const nonce = router.options.ssr?.nonce
-  const activeMatches = Solid.createMemo(
-    () => router.stores.activeMatchesSnapshot.state,
+  const activeMatches = Solid.createMemo(() =>
+    router.stores.activeMatchesSnapshot.get(),
   )
   const assetScripts = Solid.createMemo(() => {
     const assetScripts: Array<RouterManagedTag> = []

package/src/Transitioner.tsx

@@ -10,7 +10,7 @@ import { useRouter } from './useRouter'
 export function Transitioner() {
   const router = useRouter()
   let mountLoadForRouter = { router, mounted: false }
-  const isLoading = Solid.createMemo(() => router.stores.isLoading.state)
+  const isLoading = Solid.createMemo(() => router.stores.isLoading.get())
 
   if (isServer ?? router.isServer) {
     return null
@@ -19,8 +19,8 @@ export function Transitioner() {
   const [isSolidTransitioning, startSolidTransition] = Solid.useTransition()
 
   // Track pending state changes
-  const hasPendingMatches = Solid.createMemo(
-    () => router.stores.hasPendingMatches.state,
+  const hasPendingMatches = Solid.createMemo(() =>
+    router.stores.hasPendingMatches.get(),
   )
 
   const isAnyPending = Solid.createMemo(
@@ -95,8 +95,8 @@ export function Transitioner() {
       router.emit({
         type: 'onLoad',
         ...getLocationChangeInfo(
-          router.stores.location.state,
-          router.stores.resolvedLocation.state,
+          router.stores.location.get(),
+          router.stores.resolvedLocation.get(),
         ),
       })
     }
@@ -111,8 +111,8 @@ export function Transitioner() {
       router.emit({
         type: 'onBeforeRouteMount',
         ...getLocationChangeInfo(
-          router.stores.location.state,
-          router.stores.resolvedLocation.state,
+          router.stores.location.get(),
+          router.stores.resolvedLocation.get(),
         ),
       })
     }
@@ -125,8 +125,8 @@ export function Transitioner() {
 
     if (previousIsAnyPending && !currentIsAnyPending) {
       const changeInfo = getLocationChangeInfo(
-        router.stores.location.state,
-        router.stores.resolvedLocation.state,
+        router.stores.location.get(),
+        router.stores.resolvedLocation.get(),
       )
       router.emit({
         type: 'onResolved',
@@ -134,10 +134,8 @@ export function Transitioner() {
       })
 
       Solid.batch(() => {
-        router.stores.status.setState(() => 'idle')
-        router.stores.resolvedLocation.setState(
-          () => router.stores.location.state,
-        )
+        router.stores.status.set('idle')
+        router.stores.resolvedLocation.set(router.stores.location.get())
       })
 
       if (changeInfo.hrefChanged) {

package/src/headContentUtils.tsx

@@ -18,8 +18,8 @@ import type {
 export const useTags = (assetCrossOrigin?: AssetCrossOriginConfig) => {
   const router = useRouter()
   const nonce = router.options.ssr?.nonce
-  const activeMatches = Solid.createMemo(
-    () => router.stores.activeMatchesSnapshot.state,
+  const activeMatches = Solid.createMemo(() =>
+    router.stores.activeMatchesSnapshot.get(),
   )
   const routeMeta = Solid.createMemo(() =>
     activeMatches()

package/src/link.tsx

@@ -125,7 +125,7 @@ export function useLinkProps<
   ])
 
   const currentLocation = Solid.createMemo(
-    () => router.stores.location.state,
+    () => router.stores.location.get(),
     undefined,
     { equals: (prev, next) => prev.href === next.href },
   )

package/src/not-found.tsx

@@ -27,8 +27,8 @@ export function CatchNotFound(props: {
 }) {
   const router = useRouter()
   // TODO: Some way for the user to programmatically reset the not-found boundary?
-  const pathname = Solid.createMemo(() => router.stores.location.state.pathname)
-  const status = Solid.createMemo(() => router.stores.status.state)
+  const pathname = Solid.createMemo(() => router.stores.location.get().pathname)
+  const status = Solid.createMemo(() => router.stores.status.get())
 
   return (
     <CatchBoundary

package/src/routerStores.ts

@@ -28,7 +28,7 @@ function initRouterStores(
   ) => RouterReadableStore<TValue>,
 ) {
   stores.childMatchIdByRouteId = createReadonlyStore(() => {
-    const ids = stores.matchesId.state
+    const ids = stores.matchesId.get()
     const obj: Record<string, string> = {}
     for (let i = 0; i < ids.length - 1; i++) {
       const parentStore = stores.activeMatchStoresById.get(ids[i]!)
@@ -40,7 +40,7 @@ function initRouterStores(
   })
 
   stores.pendingRouteIds = createReadonlyStore(() => {
-    const ids = stores.pendingMatchesId.state
+    const ids = stores.pendingMatchesId.get()
     const obj: Record<string, boolean> = {}
     for (const id of ids) {
       const store = stores.pendingMatchStoresById.get(id)
@@ -57,12 +57,7 @@ function createSolidMutableStore<TValue>(
 ): RouterWritableStore<TValue> {
   const [signal, setSignal] = Solid.createSignal(initialValue)
 
-  return {
-    get state() {
-      return signal()
-    },
-    setState: setSignal,
-  }
+  return { get: signal, set: setSignal }
 }
 
 let finalizationRegistry: FinalizationRegistry<() => void> | null = null
@@ -78,11 +73,7 @@ function createSolidReadonlyStore<TValue>(
     dispose = d
     return Solid.createMemo(read)
   })
-  const store = {
-    get state() {
-      return memo()
-    },
-  }
+  const store = { get: memo }
   finalizationRegistry?.register(store, dispose)
   return store
 }

package/src/ssr/RouterClient.tsx

@@ -11,7 +11,7 @@ const Dummy = (props: { children?: JSXElement }) => <>{props.children}</>
 
 export function RouterClient(props: { router: AnyRouter }) {
   if (!hydrationPromise) {
-    if (!props.router.stores.matchesId.state.length) {
+    if (!props.router.stores.matchesId.get().length) {
       hydrationPromise = hydrate(props.router)
     } else {
       hydrationPromise = Promise.resolve()

package/src/ssr/renderRouterToStream.tsx

@@ -52,7 +52,7 @@ export const renderRouterToStream = async ({
     readable as unknown as ReadableStream,
   )
   return new Response(responseStream as any, {
-    status: router.stores.statusCode.state,
+    status: router.stores.statusCode.get(),
     headers: responseHeaders,
   })
 }

package/src/ssr/renderRouterToString.tsx

@@ -32,7 +32,7 @@ export const renderRouterToString = ({
       html = html.replace(`</body>`, () => `${injectedHtml}</body>`)
     }
     return new Response(`<!DOCTYPE html>${html}`, {
-      status: router.stores.statusCode.state,
+      status: router.stores.statusCode.get(),
       headers: responseHeaders,
     })
   } catch (error) {

package/src/useCanGoBack.ts

@@ -4,6 +4,6 @@ import { useRouter } from './useRouter'
 export function useCanGoBack() {
   const router = useRouter()
   return Solid.createMemo(
-    () => router.stores.location.state.state.__TSR_index !== 0,
+    () => router.stores.location.get().state.__TSR_index !== 0,
   )
 }

package/src/useLocation.tsx

@@ -28,7 +28,7 @@ export function useLocation<
   const router = useRouter<TRouter>()
 
   if (!opts?.select) {
-    return (() => router.stores.location.state) as Accessor<
+    return (() => router.stores.location.get()) as Accessor<
       UseLocationResult<TRouter, TSelected>
     >
   }
@@ -36,7 +36,7 @@ export function useLocation<
   const select = opts.select
 
   return Solid.createMemo((prev: TSelected | undefined) => {
-    const res = select(router.stores.location.state)
+    const res = select(router.stores.location.get())
     if (prev === undefined) return res
     return replaceEqualDeep(prev, res)
   }) as Accessor<UseLocationResult<TRouter, TSelected>>

package/src/useMatch.tsx

@@ -76,7 +76,7 @@ export function useMatch<
 
   const match = () => {
     if (opts.from) {
-      return router.stores.getMatchStoreByRouteId(opts.from).state
+      return router.stores.getMatchStoreByRouteId(opts.from).get()
     }
 
     return nearestMatch?.match()
@@ -88,12 +88,12 @@ export function useMatch<
     }
 
     const hasPendingMatch = opts.from
-      ? Boolean(router.stores.pendingRouteIds.state[opts.from!])
+      ? Boolean(router.stores.pendingRouteIds.get()[opts.from!])
       : (nearestMatch?.hasPending() ?? false)
 
     if (
       !hasPendingMatch &&
-      !router.stores.isTransitioning.state &&
+      !router.stores.isTransitioning.get() &&
       (opts.shouldThrow ?? true)
     ) {
       if (process.env.NODE_ENV !== 'production') {

package/src/useRouterState.tsx

@@ -35,7 +35,7 @@ export function useRouterState<
   // implementation does not provide subscribe() semantics.
   const _isServer = isServer ?? router.isServer
   if (_isServer) {
-    const state = router.stores.__store.state as RouterState<
+    const state = router.stores.__store.get() as RouterState<
       TRouter['routeTree']
     >
     const selected = (
@@ -47,7 +47,7 @@ export function useRouterState<
   }
 
   if (!opts?.select) {
-    return (() => router.stores.__store.state) as Accessor<
+    return (() => router.stores.__store.get()) as Accessor<
       UseRouterStateResult<TRouter, TSelected>
     >
   }
@@ -55,7 +55,7 @@ export function useRouterState<
   const select = opts.select
 
   return Solid.createMemo((prev: TSelected | undefined) => {
-    const res = select(router.stores.__store.state)
+    const res = select(router.stores.__store.get())
     if (prev === undefined) return res
     return replaceEqualDeep(prev, res)
   }) as Accessor<UseRouterStateResult<TRouter, TSelected>>