@tanstack/react-router 0.0.1-beta.233 → 0.0.1-beta.235

package/build/types/Matches.d.ts

@@ -45,13 +45,7 @@ export type MakeMatchRouteOptions<TRouteTree extends AnyRoute = RegisteredRouter
     children?: ((params?: RouteByPath<TRouteTree, ResolveRelativePath<TFrom, NoInfer<TTo>>>['types']['allParams']) => ReactNode) | React.ReactNode;
 };
 export declare function MatchRoute<TRouteTree extends AnyRoute = RegisteredRouter['routeTree'], TFrom extends RoutePaths<TRouteTree> = '/', TTo extends string = '', TMaskFrom extends RoutePaths<TRouteTree> = '/', TMaskTo extends string = ''>(props: MakeMatchRouteOptions<TRouteTree, TFrom, TTo, TMaskFrom, TMaskTo>): any;
-export declare function useMatch<TRouteTree extends AnyRoute = RegisteredRouter['routeTree'], TFrom extends RouteIds<TRouteTree> = RouteIds<TRouteTree>, TStrict extends boolean = true, TRouteMatchState = RouteMatch<TRouteTree, TFrom>, TSelected = TRouteMatchState>(opts: StrictOrFrom<TFrom> & {
-    select?: (match: TRouteMatchState) => TSelected;
-}): TStrict extends true ? TSelected : TSelected | undefined;
+export declare function useMatch<TRouteTree extends AnyRoute = RegisteredRouter['routeTree'], TFrom extends RouteIds<TRouteTree> = RouteIds<TRouteTree>, TStrict extends boolean = true, TRouteMatchState = RouteMatch<TRouteTree, TFrom>>(opts: StrictOrFrom<TFrom>): TStrict extends true ? TRouteMatchState : TRouteMatchState | undefined;
 export declare const matchesContext: React.Context<RouteMatch<AnyRoute, any>[]>;
-export declare function useMatches<T = RouteMatch[]>(opts?: {
-    select?: (matches: RouteMatch[]) => T;
-}): T;
-export declare function useLoaderData<TRouteTree extends AnyRoute = RegisteredRouter['routeTree'], TFrom extends RouteIds<TRouteTree> = RouteIds<TRouteTree>, TStrict extends boolean = true, TRouteMatch extends RouteMatch<TRouteTree, TFrom> = RouteMatch<TRouteTree, TFrom>, TSelected = TRouteMatch['loaderData']>(opts: StrictOrFrom<TFrom> & {
-    select?: (match: TRouteMatch) => TSelected;
-}): TStrict extends true ? TSelected : TSelected | undefined;
+export declare function useMatches(): RouteMatch[];
+export declare function useLoaderData<TRouteTree extends AnyRoute = RegisteredRouter['routeTree'], TFrom extends RouteIds<TRouteTree> = RouteIds<TRouteTree>, TStrict extends boolean = true, TRouteMatch extends RouteMatch<TRouteTree, TFrom> = RouteMatch<TRouteTree, TFrom>>(opts: StrictOrFrom<TFrom>): TStrict extends true ? TRouteMatch['loaderData'] : TRouteMatch['loaderData'] | undefined;

package/build/types/RouterProvider.d.ts

@@ -26,9 +26,6 @@ export type InjectedHtmlEntry = string | (() => Promise<string> | string);
 export declare const routerContext: React.Context<Router<any, Record<string, any>>>;
 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;
-}): TSelected;
 export type RouterProps<TRouteTree extends AnyRoute = RegisteredRouter['routeTree'], TDehydrated extends Record<string, any> = Record<string, any>> = Omit<RouterOptions<TRouteTree, TDehydrated>, 'context'> & {
     router: Router<TRouteTree>;
     context?: Partial<RouterOptions<TRouteTree, TDehydrated>['context']>;

package/build/types/route.d.ts

@@ -180,21 +180,11 @@ export declare class Route<TParentRoute extends RouteConstraints['TParentRoute']
     addChildren: <TNewChildren extends AnyRoute[]>(children: TNewChildren) => Route<TParentRoute, TPath, TFullPath, TCustomId, TId, TSearchSchema, TFullSearchSchema, TParams, TAllParams, TRouteContext, TAllContext, TRouterContext, TNewChildren, TRouteTree, AnyRoute>;
     update: (options: UpdatableRouteOptions<TFullSearchSchema, TAllParams, Expand<Assign<IsAny<TParentRoute['types']['allContext'], {}>, TRouteContext>>, TLoaderData>) => this;
     static __onInit: (route: any) => void;
-    useMatch: <TSelected = TAllContext>(opts?: {
-        select?: ((search: TAllContext) => TSelected) | undefined;
-    } | undefined) => TSelected;
-    useRouteContext: <TSelected = TAllContext>(opts?: {
-        select?: ((search: TAllContext) => TSelected) | undefined;
-    } | undefined) => TSelected;
-    useSearch: <TSelected = TFullSearchSchema>(opts?: {
-        select?: ((search: TFullSearchSchema) => TSelected) | undefined;
-    } | undefined) => TSelected;
-    useParams: <TSelected = TAllParams>(opts?: {
-        select?: ((search: TAllParams) => TSelected) | undefined;
-    } | undefined) => TSelected;
-    useLoaderData: <TSelected = TLoaderData>(opts?: {
-        select?: ((search: TLoaderData) => TSelected) | undefined;
-    } | undefined) => TSelected;
+    useMatch: () => TAllContext;
+    useRouteContext: () => TAllContext;
+    useSearch: () => TFullSearchSchema;
+    useParams: () => TAllParams;
+    useLoaderData: () => TLoaderData;
 }
 export type AnyRootRoute = RootRoute<any, any, any>;
 export declare function rootRouteWithContext<TRouterContext extends {}>(): <TSearchSchema extends Record<string, any> = {}, TRouteContext extends RouteContext = RouteContext, TLoaderData extends unknown = unknown>(options?: Omit<RouteOptions<AnyRoute, "__root__", "", TSearchSchema, TSearchSchema, {}, {}, TRouteContext, Assign<TRouterContext, TRouteContext>, TLoaderData>, "path" | "id" | "getParentRoute" | "stringifyParams" | "parseParams" | "caseSensitive"> | undefined) => RootRoute<TSearchSchema, TRouteContext, TRouterContext, unknown>;
@@ -242,21 +232,11 @@ export declare function createRouteMask<TRouteTree extends AnyRoute, TFrom exten
     routeTree: TRouteTree;
 } & ToSubOptions<TRouteTree, TFrom, TTo>): RouteMask<TRouteTree>;
 export type RouteProps<TFullSearchSchema extends Record<string, any> = AnySearchSchema, TAllParams extends AnyPathParams = AnyPathParams, TAllContext extends Record<string, any> = AnyContext, TLoaderData extends any = unknown> = {
-    useMatch: <TSelected = TAllContext>(opts?: {
-        select?: (search: TAllContext) => TSelected;
-    }) => TSelected;
-    useRouteContext: <TSelected = TAllContext>(opts?: {
-        select?: (search: TAllContext) => TSelected;
-    }) => TSelected;
-    useSearch: <TSelected = TFullSearchSchema>(opts?: {
-        select?: (search: TFullSearchSchema) => TSelected;
-    }) => TSelected;
-    useParams: <TSelected = TAllParams>(opts?: {
-        select?: (search: TAllParams) => TSelected;
-    }) => TSelected;
-    useLoaderData: <TSelected = TLoaderData>(opts?: {
-        select?: (search: TLoaderData) => TSelected;
-    }) => TSelected;
+    useMatch: () => TAllContext;
+    useRouteContext: () => TAllContext;
+    useSearch: () => TFullSearchSchema;
+    useParams: () => TAllParams;
+    useLoaderData: () => TLoaderData;
 };
 export type ErrorRouteProps<TFullSearchSchema extends Record<string, any> = AnySearchSchema, TAllParams extends AnyPathParams = AnyPathParams, TAllContext extends Record<string, any> = AnyContext> = {
     error: unknown;

package/build/types/useParams.d.ts

@@ -2,6 +2,4 @@ import { AnyRoute } from './route';
 import { RouteIds, RouteById, AllParams } from './routeInfo';
 import { RegisteredRouter } from './router';
 import { StrictOrFrom } from './utils';
-export declare function useParams<TRouteTree extends AnyRoute = RegisteredRouter['routeTree'], TFrom extends RouteIds<TRouteTree> = RouteIds<TRouteTree>, TDefaultSelected = AllParams<TRouteTree> & RouteById<TRouteTree, TFrom>['types']['allParams'], TSelected = TDefaultSelected>(opts: StrictOrFrom<TFrom> & {
-    select?: (search: TDefaultSelected) => TSelected;
-}): TSelected;
+export declare function useParams<TRouteTree extends AnyRoute = RegisteredRouter['routeTree'], TFrom extends RouteIds<TRouteTree> = RouteIds<TRouteTree>>(_opts: StrictOrFrom<TFrom>): AllParams<TRouteTree> & RouteById<TRouteTree, TFrom>['types']['allParams'];

package/build/types/useSearch.d.ts

@@ -2,6 +2,4 @@ import { AnyRoute } from './route';
 import { RouteIds, RouteById } from './routeInfo';
 import { RegisteredRouter } from './router';
 import { StrictOrFrom } from './utils';
-export declare function useSearch<TRouteTree extends AnyRoute = RegisteredRouter['routeTree'], TFrom extends RouteIds<TRouteTree> = RouteIds<TRouteTree>, TStrict extends boolean = true, TSearch = RouteById<TRouteTree, TFrom>['types']['fullSearchSchema'], TSelected = TSearch>(opts: StrictOrFrom<TFrom> & {
-    select?: (search: TSearch) => TSelected;
-}): TStrict extends true ? TSelected : TSelected | undefined;
+export declare function useSearch<TRouteTree extends AnyRoute = RegisteredRouter['routeTree'], TFrom extends RouteIds<TRouteTree> = RouteIds<TRouteTree>, TStrict extends boolean = true, TSearch = RouteById<TRouteTree, TFrom>['types']['fullSearchSchema']>(opts: StrictOrFrom<TFrom>): TStrict extends true ? TSearch : TSearch | undefined;

package/build/types/utils.d.ts

@@ -59,8 +59,6 @@ export type StrictOrFrom<TFrom> = {
     strict: false;
 };
 export type RouteFromIdOrRoute<T, TRouteTree extends AnyRoute = RegisteredRouter['routeTree']> = T extends ParseRoute<TRouteTree> ? T : T extends RouteIds<TRouteTree> ? RoutesById<TRouteTree>[T] : T extends string ? RouteIds<TRouteTree> : never;
-export declare function useRouteContext<TRouteTree extends AnyRoute = RegisteredRouter['routeTree'], TFrom extends RouteIds<TRouteTree> = RouteIds<TRouteTree>, TStrict extends boolean = true, TRouteContext = RouteById<TRouteTree, TFrom>['types']['allContext'], TSelected = TRouteContext>(opts: StrictOrFrom<TFrom> & {
-    select?: (search: TRouteContext) => TSelected;
-}): TStrict extends true ? TSelected : TSelected | undefined;
+export declare function useRouteContext<TRouteTree extends AnyRoute = RegisteredRouter['routeTree'], TFrom extends RouteIds<TRouteTree> = RouteIds<TRouteTree>, TStrict extends boolean = true, TRouteContext = RouteById<TRouteTree, TFrom>['types']['allContext'], TSelected = TRouteContext>(opts: StrictOrFrom<TFrom>): TStrict extends true ? TSelected : TSelected | undefined;
 export declare const useLayoutEffect: typeof React.useLayoutEffect;
 export declare function escapeJSON(jsonString: string): string;

package/build/umd/index.development.js

@@ -608,10 +608,7 @@
     return true;
   }
   function useRouteContext(opts) {
-    return useMatch({
-      ...opts,
-      select: match => opts?.select ? opts.select(match.context) : match.context
-    });
+    return useMatch(opts).context;
   }
   const useLayoutEffect$1 = typeof window !== 'undefined' ? React__namespace.useLayoutEffect : React__namespace.useEffect;
   function escapeJSON(jsonString) {
@@ -804,22 +801,12 @@
     return isMatch ? params : undefined;
   }
 
-  function useParams(opts) {
-    return useRouterState({
-      select: state => {
-        const params = last(state.matches)?.params;
-        return opts?.select ? opts.select(params) : params;
-      }
-    });
+  function useParams(_opts) {
+    return last(useRouter().state.matches)?.params;
   }
 
   function useSearch(opts) {
-    return useMatch({
-      ...opts,
-      select: match => {
-        return opts?.select ? opts.select(match.search) : match.search;
-      }
-    });
+    return useMatch(opts).search;
   }
 
   const rootRouteId = '__root__';
@@ -884,34 +871,28 @@
       // This is a dummy static method that should get
       // replaced by a framework specific implementation if necessary
     };
-    useMatch = opts => {
+    useMatch = () => {
       return useMatch({
-        ...opts,
         from: this.id
       });
     };
-    useRouteContext = opts => {
+    useRouteContext = () => {
       return useMatch({
-        ...opts,
-        from: this.id,
-        select: d => opts?.select ? opts.select(d.context) : d.context
-      });
+        from: this.id
+      }).context;
     };
-    useSearch = opts => {
+    useSearch = () => {
       return useSearch({
-        ...opts,
         from: this.id
       });
     };
-    useParams = opts => {
+    useParams = () => {
       return useParams({
-        ...opts,
         from: this.id
       });
     };
-    useLoaderData = opts => {
+    useLoaderData = () => {
       return useLoaderData({
-        ...opts,
         from: this.id
       });
     };
@@ -933,15 +914,12 @@
   //
 
   function Matches() {
-    const {
-      routesById,
-      state
-    } = useRouter();
+    const router = useRouter();
     const {
       matches
-    } = state;
-    const locationKey = useRouterState().location.state.key;
-    const route = routesById[rootRouteId];
+    } = router.state;
+    const locationKey = router.state.location.state.key;
+    const route = router.routesById[rootRouteId];
     const errorComponent = React__namespace.useCallback(props => {
       return /*#__PURE__*/React__namespace.createElement(ErrorComponent, {
         ...props,
@@ -1081,42 +1059,31 @@
     return !!params ? props.children : null;
   }
   function useMatch(opts) {
+    const router = useRouter();
     const nearestMatch = React__namespace.useContext(matchesContext)[0];
     const nearestMatchRouteId = nearestMatch?.routeId;
-    const matchRouteId = useRouterState({
-      select: state => {
-        const match = opts?.from ? state.matches.find(d => d.routeId === opts?.from) : state.matches.find(d => d.id === nearestMatch.id);
-        return match.routeId;
-      }
-    });
+    const matchRouteId = (() => {
+      const match = opts?.from ? router.state.matches.find(d => d.routeId === opts?.from) : router.state.matches.find(d => d.id === nearestMatch.id);
+      return match.routeId;
+    })();
     if (opts?.strict ?? true) {
       invariant(nearestMatchRouteId == matchRouteId, `useMatch("${matchRouteId}") is being called in a component that is meant to render the '${nearestMatchRouteId}' route. Did you mean to 'useMatch("${matchRouteId}", { strict: false })' or 'useRoute("${matchRouteId}")' instead?`);
     }
-    const matchSelection = useRouterState({
-      select: state => {
-        const match = opts?.from ? state.matches.find(d => d.routeId === opts?.from) : state.matches.find(d => d.id === nearestMatch.id);
-        invariant(match, `Could not find ${opts?.from ? `an active match from "${opts.from}"` : 'a nearest match!'}`);
-        return opts?.select ? opts.select(match) : match;
-      }
-    });
+    const matchSelection = (() => {
+      const match = opts?.from ? router.state.matches.find(d => d.routeId === opts?.from) : router.state.matches.find(d => d.id === nearestMatch.id);
+      invariant(match, `Could not find ${opts?.from ? `an active match from "${opts.from}"` : 'a nearest match!'}`);
+      return match;
+    })();
     return matchSelection;
   }
   const matchesContext = /*#__PURE__*/React__namespace.createContext(null);
-  function useMatches(opts) {
+  function useMatches() {
+    const router = useRouter();
     const contextMatches = React__namespace.useContext(matchesContext);
-    return useRouterState({
-      select: state => {
-        const matches = state.matches.slice(state.matches.findIndex(d => d.id === contextMatches[0]?.id));
-        return opts?.select ? opts.select(matches) : matches;
-      }
-    });
+    return router.state.matches.slice(router.state.matches.findIndex(d => d.id === contextMatches[0]?.id));
   }
   function useLoaderData(opts) {
-    const match = useMatch({
-      ...opts,
-      select: undefined
-    });
-    return typeof opts.select === 'function' ? opts.select(match?.loaderData) : match?.loaderData;
+    return useMatch(opts)?.loaderData;
   }
 
   const routerContext = /*#__PURE__*/React__namespace.createContext(null);
@@ -1160,20 +1127,20 @@
     router.state = state;
     router.startReactTransition = startReactTransition;
     const tryLoad = () => {
-      if (state.location !== router.latestLocation) {
-        startReactTransition(() => {
-          try {
-            router.load();
-          } catch (err) {
-            console.error(err);
-          }
-        });
-      }
+      startReactTransition(() => {
+        try {
+          router.load();
+        } catch (err) {
+          console.error(err);
+        }
+      });
     };
     useLayoutEffect$1(() => {
       const unsub = router.history.subscribe(() => {
         router.latestLocation = router.parseLocation(router.latestLocation);
-        tryLoad();
+        if (state.location !== router.latestLocation) {
+          tryLoad();
+        }
       });
       const nextLocation = router.buildLocation({
         search: true,
@@ -1218,13 +1185,6 @@
   function getRouteMatch(state, id) {
     return [...state.pendingMatches, ...state.matches].find(d => d.id === id);
   }
-  function useRouterState(opts) {
-    const {
-      state
-    } = useRouter();
-    // return useStore(router.__store, opts?.select as any)
-    return opts?.select ? opts.select(state) : state;
-  }
   function useRouter() {
     const resolvedContext = typeof document !== 'undefined' ? window.__TSR_ROUTER_CONTEXT__ || routerContext : routerContext;
     const value = React__namespace.useContext(resolvedContext);
@@ -2922,7 +2882,6 @@
   exports.useParams = useParams;
   exports.useRouteContext = useRouteContext;
   exports.useRouter = useRouter;
-  exports.useRouterState = useRouterState;
   exports.useScrollRestoration = useScrollRestoration;
   exports.useSearch = useSearch;
   exports.useStableCallback = useStableCallback;