@tanstack/solid-router 1.120.4-alpha.15 → 1.120.4

package/src/fileRoute.ts

@@ -28,7 +28,6 @@ import type {
   RouteIds,
   RouteLoaderFn,
   UpdatableRouteOptions,
-  UseNavigateResult,
 } from '@tanstack/router-core'
 import type { UseLoaderDepsRoute } from './useLoaderDeps'
 import type { UseLoaderDataRoute } from './useLoaderData'
@@ -42,13 +41,8 @@ export function createFileRoute<
   TFullPath extends
     RouteConstraints['TFullPath'] = FileRoutesByPath[TFilePath]['fullPath'],
 >(
-  path?: TFilePath,
+  path: TFilePath,
 ): FileRoute<TFilePath, TParentRoute, TId, TPath, TFullPath>['createRoute'] {
-  if (typeof path === 'object') {
-    return new FileRoute<TFilePath, TParentRoute, TId, TPath, TFullPath>(path, {
-      silent: true,
-    }).createRoute(path) as any
-  }
   return new FileRoute<TFilePath, TParentRoute, TId, TPath, TFullPath>(path, {
     silent: true,
   }).createRoute
@@ -69,7 +63,7 @@ export class FileRoute<
   silent?: boolean
 
   constructor(
-    public path?: TFilePath,
+    public path: TFilePath,
     _opts?: { silent: boolean },
   ) {
     this.silent = _opts?.silent
@@ -165,18 +159,6 @@ export function FileRouteLoader<
   return (loaderFn) => loaderFn as any
 }
 
-declare module '@tanstack/router-core' {
-  export interface LazyRoute<in out TRoute extends AnyRoute> {
-    useMatch: UseMatchRoute<TRoute['id']>
-    useRouteContext: UseRouteContextRoute<TRoute['id']>
-    useSearch: UseSearchRoute<TRoute['id']>
-    useParams: UseParamsRoute<TRoute['id']>
-    useLoaderDeps: UseLoaderDepsRoute<TRoute['id']>
-    useLoaderData: UseLoaderDataRoute<TRoute['id']>
-    useNavigate: () => UseNavigateResult<TRoute['fullPath']>
-  }
-}
-
 export class LazyRoute<TRoute extends AnyRoute> {
   options: {
     id: string
@@ -226,7 +208,7 @@ export class LazyRoute<TRoute extends AnyRoute> {
     return useLoaderData({ ...opts, from: this.options.id } as any)
   }
 
-  useNavigate = (): UseNavigateResult<TRoute['fullPath']> => {
+  useNavigate = () => {
     const router = useRouter()
     return useNavigate({ from: router.routesById[this.options.id].fullPath })
   }
@@ -247,10 +229,6 @@ export function createLazyRoute<
 export function createLazyFileRoute<
   TFilePath extends keyof FileRoutesByPath,
   TRoute extends FileRoutesByPath[TFilePath]['preLoaderRoute'],
->(id: TFilePath): (opts: LazyRouteOptions) => LazyRoute<TRoute> {
-  if (typeof id === 'object') {
-    return new LazyRoute<TRoute>(id) as any
-  }
-
+>(id: TFilePath) {
   return (opts: LazyRouteOptions) => new LazyRoute<TRoute>({ id, ...opts })
 }

package/src/index.tsx

@@ -47,6 +47,7 @@ export type {
   DeferredPromiseState,
   DeferredPromise,
   ParsedLocation,
+  ParsePathParams,
   RemoveTrailingSlashes,
   RemoveLeadingSlashes,
   ActiveOptions,
@@ -55,8 +56,6 @@ export type {
   RootRouteId,
   AnyPathParams,
   ResolveParams,
-  ResolveOptionalParams,
-  ResolveRequiredParams,
   SearchSchemaInput,
   AnyContext,
   RouteContext,
@@ -78,6 +77,8 @@ export type {
   TrimPath,
   TrimPathLeft,
   TrimPathRight,
+  ParseSplatParams,
+  SplatParams,
   StringifyParamsFn,
   ParamsOptions,
   InferAllParams,
@@ -206,8 +207,6 @@ export type {
   InjectedHtmlEntry,
   RouterErrorSerializer,
   SerializerExtensions,
-  CreateFileRoute,
-  CreateLazyFileRoute,
 } from '@tanstack/router-core'
 
 export {

package/src/router.ts

@@ -1,5 +1,4 @@
 import { RouterCore } from '@tanstack/router-core'
-import { createFileRoute, createLazyFileRoute } from './fileRoute'
 import type { RouterHistory } from '@tanstack/history'
 import type {
   AnyRoute,
@@ -102,11 +101,3 @@ export class Router<
     super(options)
   }
 }
-
-if (typeof globalThis !== 'undefined') {
-  ;(globalThis as any).createFileRoute = createFileRoute
-  ;(globalThis as any).createLazyFileRoute = createLazyFileRoute
-} else if (typeof window !== 'undefined') {
-  ;(window as any).createFileRoute = createFileRoute
-  ;(window as any).createFileRoute = createLazyFileRoute
-}

package/src/useBlocker.tsx

@@ -180,10 +180,7 @@ export function useBlocker(
         location: HistoryLocation,
       ): AnyShouldBlockFnLocation {
         const parsedLocation = router.parseLocation(undefined, location)
-        const matchedRoutes = router.getMatchedRoutes(
-          parsedLocation.pathname,
-          undefined,
-        )
+        const matchedRoutes = router.getMatchedRoutes(parsedLocation)
         if (matchedRoutes.foundRoute === undefined) {
           throw new Error(`No route found for location ${location.href}`)
         }