@tanstack/react-router 0.0.1-beta.224 → 0.0.1-beta.226

package/build/types/CatchBoundary.d.ts

@@ -4,7 +4,7 @@ export declare function CatchBoundary(props: {
     children: any;
     errorComponent?: any;
     onCatch: (error: any) => void;
-}): JSX.Element;
+}): React.JSX.Element;
 export declare class CatchBoundaryImpl extends React.Component<{
     resetKey: string;
     children: (props: {
@@ -30,4 +30,4 @@ export declare class CatchBoundaryImpl extends React.Component<{
 }
 export declare function ErrorComponent({ error }: {
     error: any;
-}): JSX.Element;
+}): React.JSX.Element;

package/build/types/Matches.d.ts

@@ -28,11 +28,11 @@ export interface RouteMatch<TRouteTree extends AnyRoute = AnyRoute, TRouteId ext
     cause: 'enter' | 'stay';
 }
 export type AnyRouteMatch = RouteMatch<any>;
-export declare function Matches(): JSX.Element;
+export declare function Matches(): React.JSX.Element;
 export declare function Match({ matches }: {
     matches: RouteMatch[];
-}): JSX.Element;
-export declare function Outlet(): JSX.Element | null;
+}): React.JSX.Element;
+export declare function Outlet(): React.JSX.Element | null;
 export interface MatchRouteOptions {
     pending?: boolean;
     caseSensitive?: boolean;

package/build/types/RouterProvider.d.ts

@@ -3,7 +3,7 @@ import { LinkInfo, LinkOptions, NavigateOptions, ResolveRelativePath, ToOptions
 import { ParsedLocation } from './location';
 import { AnyRoute } from './route';
 import { RouteById, RoutePaths } from './routeInfo';
-import { BuildNextOptions, DehydratedRouteMatch, RegisteredRouter, Router, RouterOptions, RouterState } from './router';
+import { BuildNextOptions, RegisteredRouter, Router, RouterOptions, RouterState } from './router';
 import { NoInfer } from './utils';
 import { MatchRouteOptions } from './Matches';
 import { RouteMatch } from './Matches';
@@ -21,11 +21,6 @@ export interface MatchLocation {
 export type BuildLinkFn<TRouteTree extends AnyRoute> = <TFrom extends RoutePaths<TRouteTree> = '/', TTo extends string = ''>(dest: LinkOptions<TRouteTree, TFrom, TTo>) => LinkInfo;
 export type NavigateFn<TRouteTree extends AnyRoute> = <TFrom extends RoutePaths<TRouteTree> = '/', TTo extends string = '', TMaskFrom extends RoutePaths<TRouteTree> = TFrom, TMaskTo extends string = ''>(opts: NavigateOptions<TRouteTree, TFrom, TTo, TMaskFrom, TMaskTo>) => Promise<void>;
 export type MatchRouteFn<TRouteTree extends AnyRoute> = <TFrom extends RoutePaths<TRouteTree> = '/', TTo extends string = '', TResolved = ResolveRelativePath<TFrom, NoInfer<TTo>>>(location: ToOptions<TRouteTree, TFrom, TTo>, opts?: MatchRouteOptions) => false | RouteById<TRouteTree, TResolved>['types']['allParams'];
-export type LoadFn = (opts?: {
-    next?: ParsedLocation;
-    throwOnError?: boolean;
-    __dehydratedMatches?: DehydratedRouteMatch[];
-}) => Promise<void>;
 export type BuildLocationFn<TRouteTree extends AnyRoute> = (opts: BuildNextOptions) => ParsedLocation;
 export type InjectedHtmlEntry = string | (() => Promise<string> | string);
 export declare const routerContext: React.Context<Router<any, Record<string, any>>>;
@@ -34,7 +29,7 @@ export declare class SearchParamError extends Error {
 export declare class PathParamError extends Error {
 }
 export declare function getInitialRouterState(location: ParsedLocation): RouterState<any>;
-export declare function RouterProvider<TRouteTree extends AnyRoute = RegisteredRouter['routeTree'], TDehydrated extends Record<string, any> = Record<string, any>>({ router, ...rest }: RouterProps<TRouteTree, TDehydrated>): JSX.Element;
+export declare function RouterProvider<TRouteTree extends AnyRoute = RegisteredRouter['routeTree'], TDehydrated extends Record<string, any> = Record<string, any>>({ router, ...rest }: RouterProps<TRouteTree, TDehydrated>): React.JSX.Element;
 export declare function getRouteMatch<TRouteTree extends AnyRoute>(state: RouterState<TRouteTree>, id: string): undefined | RouteMatch<TRouteTree>;
 export declare function useRouterState<TSelected = RouterState<RegisteredRouter['routeTree']>>(opts?: {
     select: (state: RouterState<RegisteredRouter['routeTree']>) => TSelected;

package/build/types/awaited.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { DeferredPromise } from './defer';
 export type AwaitOptions<T> = {
     promise: DeferredPromise<T>;

package/build/types/fileRoute.d.ts

@@ -1,4 +1,5 @@
-import { AnyRoute, ResolveFullPath, RouteContext, AnyContext, RouteOptions, UpdatableRouteOptions, Route, AnyPathParams, RootRouteId, TrimPathLeft, RouteConstraints } from './route';
+import { ParsePathParams } from './link';
+import { AnyRoute, ResolveFullPath, ResolveFullSearchSchema, MergeFromFromParent, RouteContext, AnyContext, RouteOptions, UpdatableRouteOptions, Route, AnyPathParams, RootRouteId, TrimPathLeft, RouteConstraints } from './route';
 import { Assign, Expand, IsAny } from './utils';
 export interface FileRoutesByPath {
 }
@@ -12,7 +13,7 @@ export type FileRoutePath<TParentRoute extends AnyRoute, TFilePath extends strin
 export declare class FileRoute<TFilePath extends keyof FileRoutesByPath, TParentRoute extends AnyRoute = FileRoutesByPath[TFilePath]['parentRoute'], TId extends RouteConstraints['TId'] = TFilePath, TPath extends RouteConstraints['TPath'] = FileRoutePath<TParentRoute, TFilePath>, TFullPath extends RouteConstraints['TFullPath'] = ResolveFullPath<TParentRoute, RemoveUnderScores<TPath>>> {
     path: TFilePath;
     constructor(path: TFilePath);
-    createRoute: <TSearchSchema extends import("./route").AnySearchSchema = {}, TFullSearchSchema extends import("./route").AnySearchSchema = Expand<Assign<import("./route").InferFullSearchSchema<TParentRoute>, TSearchSchema>>, TParams extends Record<string, any> = (TrimLeft<TrimRight<import("./link").Split<TPath, true>[number], "_">, "_"> extends infer T ? T extends TrimLeft<TrimRight<import("./link").Split<TPath, true>[number], "_">, "_"> ? T extends `$${infer L}` ? L : never : never : never) extends never ? AnyPathParams : Record<TrimLeft<TrimRight<import("./link").Split<TPath, true>[number], "_">, "_"> extends infer T ? T extends TrimLeft<TrimRight<import("./link").Split<TPath, true>[number], "_">, "_"> ? T extends `$${infer L}` ? L : never : never : never, string>, TAllParams extends Record<string, any> = IsAny<TParentRoute["types"]["allParams"], TParams, TParentRoute["types"]["allParams"] & TParams>, TRouteContext extends RouteContext = RouteContext, TContext extends Expand<Assign<IsAny<TParentRoute["types"]["allContext"], {}, TParentRoute["types"]["allContext"]>, TRouteContext>> = Expand<Assign<IsAny<TParentRoute["types"]["allContext"], {}, TParentRoute["types"]["allContext"]>, TRouteContext>>, TRouterContext extends AnyContext = AnyContext, TLoaderData extends unknown = unknown, TChildren extends unknown = unknown, TRouteTree extends AnyRoute = AnyRoute>(options?: (Omit<RouteOptions<TParentRoute, string, string, TSearchSchema, TFullSearchSchema, TParams, TAllParams, TRouteContext, TContext, TLoaderData>, "path" | "id" | "getParentRoute"> & {
+    createRoute: <TSearchSchema extends import("./route").AnySearchSchema = {}, TFullSearchSchema extends import("./route").AnySearchSchema = ResolveFullSearchSchema<TParentRoute, TSearchSchema>, TParams extends Record<string, any> = ParsePathParams<TPath> extends never ? AnyPathParams : Record<ParsePathParams<TPath>, string>, TAllParams extends Record<string, any> = MergeFromFromParent<TParentRoute["types"]["allParams"], TParams>, TRouteContext extends RouteContext = RouteContext, TContext extends Expand<Assign<IsAny<TParentRoute["types"]["allContext"], {}>, TRouteContext>> = Expand<Assign<IsAny<TParentRoute["types"]["allContext"], {}>, TRouteContext>>, TRouterContext extends AnyContext = AnyContext, TLoaderData extends unknown = unknown, TChildren extends unknown = unknown, TRouteTree extends AnyRoute = AnyRoute>(options?: (Omit<RouteOptions<TParentRoute, string, string, TSearchSchema, TFullSearchSchema, TParams, TAllParams, TRouteContext, TContext, TLoaderData>, "path" | "id" | "getParentRoute"> & {
         meta?: import("./route").RouteMeta | undefined;
     } & {
         caseSensitive?: boolean | undefined;

package/build/types/route.d.ts

@@ -29,7 +29,7 @@ export type MetaOptions = keyof PickRequired<RouteMeta> extends never ? {
 } : {
     meta: RouteMeta;
 };
-export type RouteOptions<TParentRoute extends AnyRoute = AnyRoute, TCustomId extends string = string, TPath extends string = string, TSearchSchema extends Record<string, any> = {}, TFullSearchSchema extends Record<string, any> = TSearchSchema, TParams extends AnyPathParams = AnyPathParams, TAllParams extends AnyPathParams = TParams, TRouteContext extends RouteContext = RouteContext, TAllContext extends Record<string, any> = AnyContext, TLoaderData extends any = unknown> = BaseRouteOptions<TParentRoute, TCustomId, TPath, TSearchSchema, TFullSearchSchema, TParams, TAllParams, TRouteContext, TAllContext, TLoaderData> & NoInfer<UpdatableRouteOptions<TFullSearchSchema, TAllParams, TAllContext, TLoaderData>>;
+export type RouteOptions<TParentRoute extends AnyRoute = AnyRoute, TCustomId extends string = string, TPath extends string = string, TSearchSchema extends Record<string, any> = {}, TFullSearchSchema extends Record<string, any> = TSearchSchema, TParams extends AnyPathParams = AnyPathParams, TAllParams extends AnyPathParams = TParams, TRouteContext extends RouteContext = RouteContext, TAllContext extends Record<string, any> = AnyContext, TLoaderData extends any = unknown> = BaseRouteOptions<TParentRoute, TCustomId, TPath, TSearchSchema, TFullSearchSchema, TParams, TAllParams, TRouteContext, TAllContext, TLoaderData> & UpdatableRouteOptions<NoInfer<TFullSearchSchema>, NoInfer<TAllParams>, NoInfer<TAllContext>, NoInfer<TLoaderData>>;
 export type ParamsFallback<TPath extends string, TParams> = unknown extends TParams ? Record<ParsePathParams<TPath>, string> : TParams;
 export type BaseRouteOptions<TParentRoute extends AnyRoute = AnyRoute, TCustomId extends string = string, TPath extends string = string, TSearchSchema extends Record<string, any> = {}, TFullSearchSchema extends Record<string, any> = TSearchSchema, TParams extends AnyPathParams = {}, TAllParams = ParamsFallback<TPath, TParams>, TRouteContext extends RouteContext = RouteContext, TAllContext extends Record<string, any> = AnyContext, TLoaderData extends any = unknown> = RoutePathOptions<TCustomId, TPath> & {
     getParentRoute: () => TParentRoute;

package/build/types/router.d.ts

@@ -9,7 +9,7 @@ import { AnyRouteMatch, RouteMatch } from './Matches';
 import { ParsedLocation } from './location';
 import { LocationState } from './location';
 import { SearchSerializer, SearchParser } from './searchParams';
-import { BuildLinkFn, BuildLocationFn, CommitLocationOptions, InjectedHtmlEntry, LoadFn, MatchRouteFn, NavigateFn } from './RouterProvider';
+import { BuildLinkFn, BuildLocationFn, CommitLocationOptions, InjectedHtmlEntry, MatchRouteFn, NavigateFn } from './RouterProvider';
 declare global {
     interface Window {
         __TSR_DEHYDRATED__?: HydrationCtx;
@@ -152,12 +152,16 @@ export declare class Router<TRouteTree extends AnyRoute = AnyRoute, TDehydrated
     commitLocation: ({ startTransition, ...next }: ParsedLocation & CommitLocationOptions) => Promise<void>;
     buildAndCommitLocation: ({ replace, resetScroll, startTransition, ...rest }?: BuildNextOptions & CommitLocationOptions) => Promise<void>;
     navigate: NavigateFn<TRouteTree>;
-    loadMatches: ({ checkLatest, matches, preload, }: {
+    loadMatches: ({ checkLatest, matches, preload, invalidate, }: {
         checkLatest: () => Promise<void> | undefined;
         matches: AnyRouteMatch[];
         preload?: boolean | undefined;
+        invalidate?: boolean | undefined;
     }) => Promise<RouteMatch[]>;
-    load: LoadFn;
+    invalidate: () => Promise<void>;
+    load: (opts?: {
+        invalidate?: boolean;
+    }) => Promise<void>;
     preloadRoute: (navigateOpts?: BuildNextOptions) => Promise<readonly [RouteMatch<AnyRoute, any>, RouteMatch<AnyRoute, any>[]]>;
     buildLink: BuildLinkFn<TRouteTree>;
     matchRoute: MatchRouteFn<TRouteTree>;

package/build/umd/index.development.js

@@ -14,8 +14,7 @@
   (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.ReactRouter = {}, global.React));
 })(this, (function (exports, React) { 'use strict';
 
-  function _interopNamespace(e) {
-    if (e && e.__esModule) return e;
+  function _interopNamespaceDefault(e) {
     var n = Object.create(null);
     if (e) {
       Object.keys(e).forEach(function (k) {
@@ -28,11 +27,11 @@
         }
       });
     }
-    n["default"] = e;
+    n.default = e;
     return Object.freeze(n);
   }
 
-  var React__namespace = /*#__PURE__*/_interopNamespace(React);
+  var React__namespace = /*#__PURE__*/_interopNamespaceDefault(React);
 
   /**
    * @tanstack/history/src/index.ts
@@ -170,6 +169,7 @@
    * @returns A history instance
    */
   function createBrowserHistory(opts) {
+    console.log('hello');
     const getHref = opts?.getHref ?? (() => `${window.location.pathname}${window.location.search}${window.location.hash}`);
     const createHref = opts?.createHref ?? (path => path);
     let currentLocation = parseLocation(getHref(), window.history.state);
@@ -446,6 +446,7 @@
   //       : never
   //   }
   // >
+
   // // Sample types to merge
   // type TypeA = {
   //   shared: string
@@ -456,6 +457,7 @@
   //   }
   //   array: string[]
   // }
+
   // type TypeB = {
   //   shared: number
   //   onlyInB: number
@@ -465,6 +467,7 @@
   //   }
   //   array: number[]
   // }
+
   // type TypeC = {
   //   shared: boolean
   //   onlyInC: boolean
@@ -474,9 +477,12 @@
   //   }
   //   array: boolean[]
   // }
+
   // type Test = Expand<Assign<TypeA, TypeB>>
+
   // // Using DeepMerge to merge TypeA and TypeB
   // type MergedType = Expand<AssignAll<[TypeA, TypeB, TypeC]>>
+
   //
 
   const isServer = typeof document === 'undefined';
@@ -832,6 +838,7 @@
       this.options = options || {};
       this.isRoot = !options?.getParentRoute;
       Route.__onInit(this);
+      this.$$typeof = Symbol.for('react.memo');
     }
     init = opts => {
       this.originalIndex = opts.originalIndex;
@@ -1130,6 +1137,7 @@
   //   ) => () => void
   //   hydrateData: <T>(key: any) => T | undefined
   // }
+
   const routerContext = /*#__PURE__*/React__namespace.createContext(null);
   if (typeof document !== 'undefined') {
     window.__TSR_ROUTER_CONTEXT__ = routerContext;
@@ -1198,7 +1206,7 @@
       return () => {
         unsub();
       };
-    }, [history]);
+    }, [router.history]);
     React__namespace.useLayoutEffect(() => {
       if (!isTransitioning && state.resolvedLocation !== state.location) {
         router.emit({
@@ -2075,7 +2083,8 @@
     loadMatches = async ({
       checkLatest,
       matches,
-      preload
+      preload,
+      invalidate
     }) => {
       let latestPromise;
       let firstBadMatchIndex;
@@ -2191,7 +2200,7 @@
             // Default to reloading the route all the time
             let shouldReload = true;
             let shouldReloadDeps = typeof route.options.shouldReload === 'function' ? route.options.shouldReload?.(loaderContext) : !!(route.options.shouldReload ?? true);
-            if (match.cause === 'enter') {
+            if (match.cause === 'enter' || invalidate) {
               match.shouldReloadDeps = shouldReloadDeps;
             } else if (match.cause === 'stay') {
               if (typeof shouldReloadDeps === 'object') {
@@ -2274,7 +2283,10 @@
       await Promise.all(matchPromises);
       return matches;
     };
-    load = async () => {
+    invalidate = () => this.load({
+      invalidate: true
+    });
+    load = async opts => {
       const promise = new Promise(async (resolve, reject) => {
         const next = this.latestLocation;
         const prevLocation = this.state.resolvedLocation;
@@ -2309,7 +2321,8 @@
             // Load the matches
             await this.loadMatches({
               matches,
-              checkLatest: () => this.checkLatest(promise)
+              checkLatest: () => this.checkLatest(promise),
+              invalidate: opts?.invalidate
             });
           } catch (err) {
             // swallow this error, since we'll display the
@@ -2887,7 +2900,5 @@
   exports.useStableCallback = useStableCallback;
   exports.warning = warning;
 
-  Object.defineProperty(exports, '__esModule', { value: true });
-
 }));
 //# sourceMappingURL=index.development.js.map