@tanstack/solid-router 1.112.11 → 1.112.15

package/src/routerContext.tsx

@@ -1,5 +1,5 @@
 import * as Solid from 'solid-js'
-import type { AnyRouter, Router } from './router'
+import type { AnyRouter } from '@tanstack/router-core'
 
 declare global {
   interface Window {
@@ -7,8 +7,8 @@ declare global {
   }
 }
 
-const routerContext = Solid.createContext<Router<any, any, any>>(
-  null as unknown as Router<any, any, any>,
+const routerContext = Solid.createContext<AnyRouter>(
+  null as unknown as AnyRouter,
 )
 
 export function getRouterContext() {

package/src/scroll-restoration.tsx

@@ -1,8 +1,12 @@
 import { functionalUpdate } from '@tanstack/router-core'
 import { useRouter } from './useRouter'
 import { ScriptOnce } from './ScriptOnce'
-import type { AnyRouter } from './router'
-import type { NonNullableUpdater, ParsedLocation } from '@tanstack/router-core'
+
+import type {
+  AnyRouter,
+  NonNullableUpdater,
+  ParsedLocation,
+} from '@tanstack/router-core'
 
 export type ScrollRestorationEntry = { scrollX: number; scrollY: number }
 

package/src/typePrimitives.ts

@@ -1,14 +1,15 @@
 import type { LinkComponentProps } from './link'
-import type { AnyRouter, RegisteredRouter } from './router'
 import type { UseParamsOptions } from './useParams'
 import type { UseSearchOptions } from './useSearch'
 import type {
+  AnyRouter,
   Constrain,
   ConstrainLiteral,
   FromPathOption,
   NavigateOptions,
   PathParamOptions,
   Redirect,
+  RegisteredRouter,
   RouteIds,
   SearchParamOptions,
   ToPathOption,

package/src/useBlocker.tsx

@@ -5,9 +5,13 @@ import type {
   HistoryAction,
   HistoryLocation,
 } from '@tanstack/history'
-import type { AnyRoute, SolidNode } from './route'
-import type { ParseRoute } from '@tanstack/router-core'
-import type { AnyRouter, RegisteredRouter } from './router'
+import type { SolidNode } from './route'
+import type {
+  AnyRoute,
+  AnyRouter,
+  ParseRoute,
+  RegisteredRouter,
+} from '@tanstack/router-core'
 
 interface ShouldBlockFnLocation<
   out TRouteId,

package/src/useLoaderData.tsx

@@ -1,9 +1,10 @@
 import { useMatch } from './useMatch'
 import type { Accessor } from 'solid-js'
-import type { AnyRouter, RegisteredRouter } from './router'
-import type { StrictOrFrom } from './utils'
 import type {
+  AnyRouter,
+  RegisteredRouter,
   ResolveUseLoaderData,
+  StrictOrFrom,
   UseLoaderDataResult,
 } from '@tanstack/router-core'
 

package/src/useLoaderDeps.tsx

@@ -1,8 +1,9 @@
 import { useMatch } from './useMatch'
-import type { AnyRouter, RegisteredRouter } from './router'
-import type { StrictOrFrom } from './utils'
 import type {
+  AnyRouter,
+  RegisteredRouter,
   ResolveUseLoaderDeps,
+  StrictOrFrom,
   UseLoaderDepsResult,
 } from '@tanstack/router-core'
 

package/src/useLocation.tsx

@@ -1,6 +1,10 @@
 import { useRouterState } from './useRouterState'
+import type {
+  AnyRouter,
+  RegisteredRouter,
+  RouterState,
+} from '@tanstack/router-core'
 import type { Accessor } from 'solid-js'
-import type { AnyRouter, RegisteredRouter, RouterState } from './router'
 
 export interface UseLocationBaseOptions<TRouter extends AnyRouter, TSelected> {
   select?: (state: RouterState<TRouter['routeTree']>['location']) => TSelected

package/src/useMatch.tsx

@@ -2,11 +2,12 @@ import * as Solid from 'solid-js'
 import invariant from 'tiny-invariant'
 import { useRouterState } from './useRouterState'
 import { dummyMatchContext, matchContext } from './matchContext'
-import type { AnyRouter, RegisteredRouter } from './router'
-import type { StrictOrFrom } from './utils'
 import type {
+  AnyRouter,
   MakeRouteMatch,
   MakeRouteMatchUnion,
+  RegisteredRouter,
+  StrictOrFrom,
   ThrowOrOptional,
 } from '@tanstack/router-core'
 

package/src/useNavigate.tsx

@@ -1,11 +1,12 @@
 import * as Solid from 'solid-js'
 import { useRouter } from './useRouter'
 import type {
+  AnyRouter,
   FromPathOption,
   NavigateOptions,
+  RegisteredRouter,
   UseNavigateResult,
 } from '@tanstack/router-core'
-import type { AnyRouter, RegisteredRouter } from './router'
 
 export function useNavigate<
   TRouter extends AnyRouter = RegisteredRouter,
@@ -16,25 +17,10 @@ export function useNavigate<
   const { navigate } = useRouter()
 
   return ((options: NavigateOptions) => {
-    return navigate({ ...options })
+    return navigate({ from: _defaultOpts?.from, ...options })
   }) as UseNavigateResult<TDefaultFrom>
 }
 
-// NOTE: I don't know of anyone using this. It's undocumented, so let's wait until someone needs it
-// export function typedNavigate<
-//   TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],
-//   TDefaultFrom extends RoutePaths<TRouteTree> = '/',
-// >(navigate: (opts: NavigateOptions<any>) => Promise<void>) {
-//   return navigate as <
-//     TFrom extends RoutePaths<TRouteTree> = TDefaultFrom,
-//     TTo extends string = '',
-//     TMaskFrom extends RoutePaths<TRouteTree> = '/',
-//     TMaskTo extends string = '',
-//   >(
-//     opts?: NavigateOptions<TRouteTree, TFrom, TTo, TMaskFrom, TMaskTo>,
-//   ) => Promise<void>
-// } //
-
 export function Navigate<
   TRouter extends AnyRouter = RegisteredRouter,
   const TFrom extends string = string,

package/src/useParams.tsx

@@ -1,10 +1,11 @@
 import { useMatch } from './useMatch'
 import type { ThrowConstraint } from './useMatch'
 import type { Accessor } from 'solid-js'
-import type { AnyRouter, RegisteredRouter } from './router'
-import type { StrictOrFrom } from './utils'
 import type {
+  AnyRouter,
+  RegisteredRouter,
   ResolveUseParams,
+  StrictOrFrom,
   ThrowOrOptional,
   UseParamsResult,
 } from '@tanstack/router-core'

package/src/useRouteContext.ts

@@ -1,8 +1,8 @@
 import { useMatch } from './useMatch'
 import type { Accessor } from 'solid-js'
-
-import type { AnyRouter, RegisteredRouter } from './router'
 import type {
+  AnyRouter,
+  RegisteredRouter,
   UseRouteContextBaseOptions,
   UseRouteContextOptions,
   UseRouteContextResult,

package/src/useRouter.tsx

@@ -1,7 +1,7 @@
 import * as Solid from 'solid-js'
 import warning from 'tiny-warning'
 import { getRouterContext } from './routerContext'
-import type { AnyRouter, RegisteredRouter } from './router'
+import type { AnyRouter, RegisteredRouter } from '@tanstack/router-core'
 
 export function useRouter<TRouter extends AnyRouter = RegisteredRouter>(opts?: {
   warn?: boolean

package/src/useRouterState.tsx

@@ -1,6 +1,10 @@
 import { useStore } from '@tanstack/solid-store'
 import { useRouter } from './useRouter'
-import type { AnyRouter, RegisteredRouter, RouterState } from './router'
+import type {
+  AnyRouter,
+  RegisteredRouter,
+  RouterState,
+} from '@tanstack/router-core'
 import type { Accessor } from 'solid-js'
 
 export type UseRouterStateOptions<TRouter extends AnyRouter, TSelected> = {

package/src/useSearch.tsx

@@ -1,10 +1,11 @@
 import { useMatch } from './useMatch'
 import type { ThrowConstraint } from './useMatch'
 import type { Accessor } from 'solid-js'
-import type { AnyRouter, RegisteredRouter } from './router'
-import type { StrictOrFrom } from './utils'
 import type {
+  AnyRouter,
+  RegisteredRouter,
   ResolveUseSearch,
+  StrictOrFrom,
   ThrowOrOptional,
   UseSearchResult,
 } from '@tanstack/router-core'

package/src/utils.ts

@@ -1,20 +1,4 @@
 import * as Solid from 'solid-js'
-import type { AnyRouter } from './router'
-import type { ConstrainLiteral, RouteIds } from '@tanstack/router-core'
-
-export type StrictOrFrom<
-  TRouter extends AnyRouter,
-  TFrom,
-  TStrict extends boolean = true,
-> = TStrict extends false
-  ? {
-      from?: never
-      strict: TStrict
-    }
-  : {
-      from: ConstrainLiteral<TFrom, RouteIds<TRouter['routeTree']>>
-      strict?: TStrict
-    }
 
 export const useLayoutEffect =
   typeof window !== 'undefined' ? Solid.createRenderEffect : Solid.createEffect