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

package/build/types/router.d.ts

@@ -1,10 +1,9 @@
-/// <reference types="react" />
 import { Store } from '@tanstack/store';
 import { LinkInfo, LinkOptions, NavigateOptions, ToOptions, ResolveRelativePath } from './link';
 import { Route, AnySearchSchema, AnyRoute, AnyContext, AnyPathParams, RegisteredRouteComponent, RegisteredErrorRouteComponent, RegisteredPendingRouteComponent, RouteMask } from './route';
 import { RoutesById, RoutesByPath, ParseRoute, FullSearchSchema, RouteById, RoutePaths, RouteIds } from './routeInfo';
 import { NoInfer, PickAsRequired, Timeout, Updater, NonNullableUpdater } from './utils';
-import { LocationState, RouterHistory } from './history';
+import { HistoryState, RouterHistory } from './history';
 declare global {
     interface Window {
         __TSR_DEHYDRATED__?: HydrationCtx;
@@ -12,6 +11,8 @@ declare global {
 }
 export interface Register {
 }
+export interface LocationState {
+}
 export type AnyRouter = Router<any, any>;
 export type RegisteredRouter = Register extends {
     router: infer TRouter extends AnyRouter;
@@ -21,7 +22,7 @@ export interface ParsedLocation<TSearchObj extends AnySearchSchema = {}> {
     pathname: string;
     search: TSearchObj;
     searchStr: string;
-    state: LocationState;
+    state: HistoryState;
     hash: string;
     maskedLocation?: ParsedLocation<TSearchObj>;
     unmaskOnReload?: boolean;
@@ -89,10 +90,6 @@ export interface RouterOptions<TRouteTree extends AnyRoute, TDehydrated extends
         router: AnyRouter;
     }) => void;
     context?: TRouteTree['types']['routerContext'];
-    Wrap?: React.ComponentType<{
-        children: React.ReactNode;
-        dehydratedState?: TDehydrated;
-    }>;
     dehydrate?: () => TDehydrated;
     hydrate?: (dehydrated: TDehydrated) => void;
     routeMasks?: RouteMask<TRouteTree>[];
@@ -225,9 +222,9 @@ export declare class Router<TRouteTree extends AnyRoute = AnyRoute, TDehydrated
         maxAge?: number;
     }) => Promise<void>;
     resolvePath: (from: string, path: string) => string;
-    navigate: <TFrom extends RoutePaths<TRouteTree> = "/", TTo extends string = "", TMaskFrom extends RoutePaths<TRouteTree> = TFrom, TMaskTo extends string = "">({ from, to, search, hash, replace, params, resetScroll, }: NavigateOptions<TRouteTree, TFrom, TTo, TMaskFrom, TMaskTo>) => Promise<void>;
+    navigate: <TFrom extends RoutePaths<TRouteTree> = "/", TTo extends string = "", TMaskFrom extends RoutePaths<TRouteTree> = TFrom, TMaskTo extends string = "">({ from, to, ...rest }: NavigateOptions<TRouteTree, TFrom, TTo, TMaskFrom, TMaskTo>) => Promise<void>;
     matchRoute: <TRouteTree_1 extends AnyRoute = AnyRoute, TFrom extends RoutePaths<TRouteTree_1> = "/", TTo extends string = "", TResolved = ResolveRelativePath<TFrom, NoInfer<TTo>>>(location: ToOptions<TRouteTree_1, TFrom, TTo, "/", "">, opts?: MatchRouteOptions) => false | RouteById<TRouteTree_1, TResolved>["types"]["allParams"];
-    buildLink: <TFrom extends RoutePaths<TRouteTree> = "/", TTo extends string = "">({ from, to, search, params, hash, target, replace, activeOptions, preload, preloadDelay: userPreloadDelay, disabled, state, mask, resetScroll, }: LinkOptions<TRouteTree, TFrom, TTo, TFrom, "">) => LinkInfo;
+    buildLink: <TFrom extends RoutePaths<TRouteTree> = "/", TTo extends string = "">(dest: LinkOptions<TRouteTree, TFrom, TTo, TFrom, "">) => LinkInfo;
     dehydrate: () => DehydratedRouter;
     hydrate: (__do_not_use_server_ctx?: HydrationCtx) => Promise<void>;
     injectedHtml: (string | (() => Promise<string> | string))[];

package/build/umd/index.development.js

@@ -1440,11 +1440,7 @@
       navigate = async ({
         from,
         to = '',
-        search,
-        hash,
-        replace,
-        params,
-        resetScroll
+        ...rest
       }) => {
         // If this link simply reloads the current route,
         // make sure it has a new key so it will trigger a data refresh
@@ -1460,13 +1456,9 @@
         } catch (e) {}
         invariant(!isExternal, 'Attempting to navigate to external url with this.navigate!');
         return this.#buildAndCommitLocation({
+          ...rest,
           from: fromString,
-          to: toString,
-          search,
-          hash,
-          params,
-          replace,
-          resetScroll
+          to: toString
         });
       };
       matchRoute = (location, opts) => {
@@ -1494,28 +1486,23 @@
         }
         return match;
       };
-      buildLink = ({
-        from,
-        to = '.',
-        search,
-        params,
-        hash,
-        target,
-        replace,
-        activeOptions,
-        preload,
-        preloadDelay: userPreloadDelay,
-        disabled,
-        state,
-        mask,
-        resetScroll
-      }) => {
+      buildLink = dest => {
         // 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 {
@@ -1523,19 +1510,9 @@
             href: to
           };
         } 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;
 
         // Compare path/hash for matches