@tanstack/react-router 0.0.1-beta.207 → 0.0.1-beta.209

package/build/esm/index.js

@@ -488,7 +488,7 @@ class Router {
   constructor(options) {
     this.options = {
       defaultPreloadDelay: 50,
-      meta: undefined,
+      context: undefined,
       ...options,
       stringifySearch: options?.stringifySearch ?? defaultStringifySearch,
       parseSearch: options?.parseSearch ?? defaultParseSearch
@@ -692,9 +692,9 @@ function RouterProvider({
   const options = {
     ...router.options,
     ...rest,
-    meta: {
-      ...router.options.meta,
-      ...rest?.meta
+    context: {
+      ...router.options.context,
+      ...rest?.context
     }
   };
   const history = React.useState(() => options.history ?? createBrowserHistory())[0];
@@ -903,16 +903,16 @@ function RouterProvider({
         paramsError: parseErrors[index],
         searchError: undefined,
         loadPromise: Promise.resolve(),
-        meta: undefined,
+        context: undefined,
         abortController: new AbortController(),
         fetchedAt: 0
       };
       return routeMatch;
     });
 
-    // Take each match and resolve its search params and meta
+    // Take each match and resolve its search params and context
     // This has to happen after the matches are created or found
-    // so that we can use the parent match's search params and meta
+    // so that we can use the parent match's search params and context
     matches.forEach((match, i) => {
       const parentMatch = matches[i - 1];
       const route = looseRoutesById[match.routeId];
@@ -1166,22 +1166,27 @@ function RouterProvider({
           if (match.searchError) {
             handleError(match.searchError, 'VALIDATE_SEARCH');
           }
-          const parentMeta = parentMatch?.meta ?? options.meta ?? {};
-          const beforeLoadMeta = (await route.options.beforeLoad?.({
+          const parentContext = parentMatch?.context ?? options.context ?? {};
+          const beforeLoadContext = (await route.options.beforeLoad?.({
             search: match.search,
             abortController: match.abortController,
             params: match.params,
             preload: !!preload,
-            meta: parentMeta,
-            location: state.location // TODO: This might need to be latestLocationRef.current...?
+            context: parentContext,
+            location: state.location,
+            // TODO: This might need to be latestLocationRef.current...?
+            navigate: opts => navigate({
+              ...opts,
+              from: match.pathname
+            })
           })) ?? {};
-          const meta = {
-            ...parentMeta,
-            ...beforeLoadMeta
+          const context = {
+            ...parentContext,
+            ...beforeLoadContext
           };
           matches[index] = match = {
             ...match,
-            meta: replaceEqualDeep(match.meta, meta)
+            context: replaceEqualDeep(match.context, context)
           };
         } catch (err) {
           handleError(err, 'BEFORE_LOAD');
@@ -1227,7 +1232,12 @@ function RouterProvider({
               preload: !!preload,
               parentMatchPromise,
               abortController: match.abortController,
-              meta: match.meta
+              context: match.context,
+              location: state.location,
+              navigate: opts => navigate({
+                ...opts,
+                from: match.pathname
+              })
             });
             await Promise.all([componentsPromise, loaderPromise]);
             if (latestPromise = checkLatest()) return await latestPromise;
@@ -1777,10 +1787,10 @@ function useMatch(opts) {
   });
   return matchSelection;
 }
-function useRouteMeta(opts) {
+function useRouteContext(opts) {
   return useMatch({
     ...opts,
-    select: match => opts?.select ? opts.select(match.meta) : match.meta
+    select: match => opts?.select ? opts.select(match.context) : match.context
   });
 }
 function useSearch(opts) {
@@ -1814,6 +1824,9 @@ function useNavigate(defaultOpts) {
     });
   }, []);
 }
+function typedNavigate(navigate) {
+  return navigate;
+}
 function useMatchRoute() {
   const {
     state,
@@ -1854,7 +1867,7 @@ function Matches() {
     return /*#__PURE__*/React.createElement(ErrorComponent, {
       ...props,
       useMatch: route.useMatch,
-      useRouteMeta: route.useRouteMeta,
+      useRouteContext: route.useRouteContext,
       useSearch: route.useSearch,
       useParams: route.useParams
     });
@@ -1910,7 +1923,7 @@ function Match({
     return /*#__PURE__*/React.createElement(routeErrorComponent, {
       ...props,
       useMatch: route.useMatch,
-      useRouteMeta: route.useRouteMeta,
+      useRouteContext: route.useRouteContext,
       useSearch: route.useSearch,
       useParams: route.useParams
     });
@@ -1920,7 +1933,7 @@ function Match({
   }, /*#__PURE__*/React.createElement(ResolvedSuspenseBoundary, {
     fallback: /*#__PURE__*/React.createElement(PendingComponent, {
       useMatch: route.useMatch,
-      useRouteMeta: route.useRouteMeta,
+      useRouteContext: route.useRouteContext,
       useSearch: route.useSearch,
       useParams: route.useParams
     })
@@ -1953,7 +1966,7 @@ function MatchInner({
     if (comp) {
       return /*#__PURE__*/React.createElement(comp, {
         useMatch: route.useMatch,
-        useRouteMeta: route.useRouteMeta,
+        useRouteContext: route.useRouteContext,
         useSearch: route.useSearch,
         useParams: route.useParams
       });
@@ -2129,14 +2142,8 @@ function shallow(objA, objB) {
 
 const rootRouteId = '__root__';
 
-// export type MetaOptions = keyof PickRequired<RouteMeta> extends never
-//   ? {
-//       meta?: RouteMeta
-//     }
-//   : {
-//       meta: RouteMeta
-//     }
 // The parse type here allows a zod schema to be passed directly to the validator
+
 class Route {
   // Set up in this.init()
 
@@ -2200,11 +2207,11 @@ class Route {
       from: this.id
     });
   };
-  useRouteMeta = opts => {
+  useRouteContext = opts => {
     return useMatch({
       ...opts,
       from: this.id,
-      select: d => opts?.select ? opts.select(d.meta) : d.meta
+      select: d => opts?.select ? opts.select(d.context) : d.context
     });
   };
   useSearch = opts => {
@@ -2220,9 +2227,8 @@ class Route {
     });
   };
 }
-class RouterMeta {
-  constructor() {}
-  createRootRoute = options => {
+function rootRouteWithContext() {
+  return options => {
     return new RootRoute(options);
   };
 }
@@ -2246,5 +2252,5 @@ class FileRoute {
   };
 }
 
-export { Block, CatchBoundary, CatchBoundaryImpl, ErrorComponent, FileRoute, Link, MatchRoute, Matches, Navigate, Outlet, PathParamError, RootRoute, Route, Router, RouterMeta, RouterProvider, SearchParamError, cleanPath, componentTypes, createRouteMask, decode, defaultParseSearch, defaultStringifySearch, encode, functionalUpdate, getInitialRouterState, getRouteMatch, interpolatePath, isPlainObject, isRedirect, isServer, joinPaths, last, lazyFn, lazyRouteComponent, matchByPath, matchPathname, matchesContext, parsePathname, parseSearchWith, partialDeepEqual, pick, redirect, replaceEqualDeep, resolvePath, rootRouteId, routerContext, shallow, stringifySearchWith, trimPath, trimPathLeft, trimPathRight, useBlocker, useLinkProps, useMatch, useMatchRoute, useMatches, useNavigate, useParams, useRouteMeta, useRouter, useRouterState, useSearch, useStableCallback };
+export { Block, CatchBoundary, CatchBoundaryImpl, ErrorComponent, FileRoute, Link, MatchRoute, Matches, Navigate, Outlet, PathParamError, RootRoute, Route, Router, RouterProvider, SearchParamError, cleanPath, componentTypes, createRouteMask, decode, defaultParseSearch, defaultStringifySearch, encode, functionalUpdate, getInitialRouterState, getRouteMatch, interpolatePath, isPlainObject, isRedirect, isServer, joinPaths, last, lazyFn, lazyRouteComponent, matchByPath, matchPathname, matchesContext, parsePathname, parseSearchWith, partialDeepEqual, pick, redirect, replaceEqualDeep, resolvePath, rootRouteId, rootRouteWithContext, routerContext, shallow, stringifySearchWith, trimPath, trimPathLeft, trimPathRight, typedNavigate, useBlocker, useLinkProps, useMatch, useMatchRoute, useMatches, useNavigate, useParams, useRouteContext, useRouter, useRouterState, useSearch, useStableCallback };
 //# sourceMappingURL=index.js.map