@tanstack/router-core 0.0.1-beta.188 → 0.0.1-beta.189

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/router-core",
   "author": "Tanner Linsley",
-  "version": "0.0.1-beta.188",
+  "version": "0.0.1-beta.189",
   "license": "MIT",
   "repository": "tanstack/router",
   "homepage": "https://tanstack.com/router",

package/src/history.ts

@@ -15,7 +15,7 @@ export interface RouterHistory {
 }
 
 export interface HistoryLocation extends ParsedPath {
-  state: LocationState
+  state: HistoryState
 }
 
 export interface ParsedPath {
@@ -25,7 +25,7 @@ export interface ParsedPath {
   hash: string
 }
 
-export interface LocationState {
+export interface HistoryState {
   key: string
   __tempLocation?: HistoryLocation
   __tempKey?: string
@@ -161,7 +161,7 @@ function createHistory(opts: {
   }
 }
 
-function assignKey(state: LocationState) {
+function assignKey(state: HistoryState) {
   state.key = createRandomKey()
   // if (state.__actualLocation) {
   //   state.__actualLocation.state = {
@@ -242,7 +242,7 @@ export function createMemoryHistory(
   let index = opts.initialIndex ?? entries.length - 1
   let currentState = {
     key: createRandomKey(),
-  } as LocationState
+  } as HistoryState
 
   const getLocation = () => parseLocation(entries[index]!, currentState)
 
@@ -269,7 +269,7 @@ export function createMemoryHistory(
   })
 }
 
-function parseLocation(href: string, state: LocationState): HistoryLocation {
+function parseLocation(href: string, state: HistoryState): HistoryLocation {
   let hashIndex = href.indexOf('#')
   let searchIndex = href.indexOf('?')
 

package/src/link.ts

@@ -1,19 +1,11 @@
 import { Trim } from './fileRoute'
-import { LocationState } from './history'
 import { AnyRoute } from './route'
-import {
-  AllParams,
-  FullSearchSchema,
-  RouteByPath,
-  RouteIds,
-  RoutePaths,
-} from './routeInfo'
-import { ParsedLocation } from './router'
+import { AllParams, RouteByPath, RouteIds, RoutePaths } from './routeInfo'
+import { LocationState, ParsedLocation } from './router'
 import {
   Expand,
   NoInfer,
   NonNullableUpdater,
-  PickAsRequired,
   PickRequired,
   UnionToIntersection,
   Updater,

package/src/route.ts

@@ -1,12 +1,7 @@
 import invariant from 'tiny-invariant'
-import { RouteById, RoutePaths } from './routeInfo'
+import { RoutePaths } from './routeInfo'
 import { joinPaths, trimPath } from './path'
-import {
-  AnyRouter,
-  RouteMatch,
-  AnyRouteMatch,
-  RegisteredRouter,
-} from './router'
+import { AnyRouter, RouteMatch, AnyRouteMatch } from './router'
 import {
   Expand,
   IsAny,
@@ -14,12 +9,7 @@ import {
   PickRequired,
   UnionToIntersection,
 } from './utils'
-import {
-  ParsePathParams,
-  ResolveRelativePath,
-  ToMaskOptions,
-  ToSubOptions,
-} from './link'
+import { ParsePathParams, ToSubOptions } from './link'
 
 export const rootRouteId = '__root__' as const
 export type RootRouteId = typeof rootRouteId
@@ -53,6 +43,7 @@ export interface RegisterPendingRouteComponent<
 > {
   // PendingRouteComponent: unknown // This is registered by the framework
 }
+
 export interface RegisterRouteProps<
   TLoader = unknown,
   TFullSearchSchema extends AnySearchSchema = AnySearchSchema,

package/src/router.ts

@@ -57,7 +57,7 @@ import {
   createBrowserHistory,
   createMemoryHistory,
   HistoryLocation,
-  LocationState,
+  HistoryState,
   RouterHistory,
 } from './history'
 
@@ -73,6 +73,8 @@ export interface Register {
   // router: Router
 }
 
+export interface LocationState {}
+
 export type AnyRouter = Router<any, any>
 
 export type RegisteredRouter = Register extends {
@@ -86,7 +88,7 @@ export interface ParsedLocation<TSearchObj extends AnySearchSchema = {}> {
   pathname: string
   search: TSearchObj
   searchStr: string
-  state: LocationState
+  state: HistoryState
   hash: string
   maskedLocation?: ParsedLocation<TSearchObj>
   unmaskOnReload?: boolean
@@ -184,10 +186,6 @@ export interface RouterOptions<
   basepath?: string
   createRoute?: (opts: { route: AnyRoute; router: AnyRouter }) => void
   context?: TRouteTree['types']['routerContext']
-  Wrap?: React.ComponentType<{
-    children: React.ReactNode
-    dehydratedState?: TDehydrated
-  }>
   dehydrate?: () => TDehydrated
   hydrate?: (dehydrated: TDehydrated) => void
   routeMasks?: RouteMask<TRouteTree>[]
@@ -1176,11 +1174,7 @@ export class Router<
   >({
     from,
     to = '' as any,
-    search,
-    hash,
-    replace,
-    params,
-    resetScroll,
+    ...rest
   }: NavigateOptions<TRouteTree, TFrom, TTo, TMaskFrom, TMaskTo>) => {
     // If this link simply reloads the current route,
     // make sure it has a new key so it will trigger a data refresh
@@ -1202,13 +1196,9 @@ export class Router<
     )
 
     return this.#buildAndCommitLocation({
+      ...rest,
       from: fromString,
       to: toString,
-      search,
-      hash,
-      params,
-      replace,
-      resetScroll,
     })
   }
 
@@ -1260,51 +1250,39 @@ export class Router<
   buildLink = <
     TFrom extends RoutePaths<TRouteTree> = '/',
     TTo extends string = '',
-  >({
-    from,
-    to = '.' as any,
-    search,
-    params,
-    hash,
-    target,
-    replace,
-    activeOptions,
-    preload,
-    preloadDelay: userPreloadDelay,
-    disabled,
-    state,
-    mask,
-    resetScroll,
-  }: LinkOptions<TRouteTree, TFrom, TTo>): LinkInfo => {
+  >(
+    dest: LinkOptions<TRouteTree, TFrom, TTo>,
+  ): LinkInfo => {
     // If this link simply reloads the current route,
     // make sure it has a new key so it will trigger a data refresh
 
     // If this `to` is a valid external URL, return
     // null for LinkUtils
 
+    const {
+      to,
+      preload: userPreload,
+      preloadDelay: userPreloadDelay,
+      activeOptions,
+      disabled,
+      target,
+      replace,
+      resetScroll,
+    } = dest
+
     try {
       new URL(`${to}`)
       return {
         type: 'external',
-        href: to,
+        href: to as any,
       }
     } catch (e) {}
 
-    const nextOpts = {
-      from,
-      to,
-      search,
-      params,
-      hash,
-      replace,
-      state,
-      mask,
-      resetScroll,
-    }
+    const nextOpts = dest
 
     const next = this.buildLocation(nextOpts)
 
-    preload = preload ?? this.options.defaultPreload
+    const preload = userPreload ?? this.options.defaultPreload
     const preloadDelay =
       userPreloadDelay ?? this.options.defaultPreloadDelay ?? 0
 
@@ -1635,10 +1613,7 @@ export class Router<
         search: replaceEqualDeep(previousLocation?.search, parsedSearch) as any,
         hash: hash.split('#').reverse()[0] ?? '',
         href: `${pathname}${search}${hash}`,
-        state: replaceEqualDeep(
-          previousLocation?.state,
-          state,
-        ) as LocationState,
+        state: replaceEqualDeep(previousLocation?.state, state) as HistoryState,
       }
     }
 
@@ -1763,7 +1738,7 @@ export class Router<
         pathname,
         search,
         searchStr,
-        state: nextState,
+        state: nextState as any,
         hash,
         href: this.history.createHref(`${pathname}${searchStr}${hashStr}`),
         unmaskOnReload: dest.unmaskOnReload,