@tanstack/react-router 0.0.1-beta.22 → 0.0.1-beta.24

package/build/stats-html.html

@@ -4014,7 +4014,7 @@ var drawChart = (function (exports) {
   </script>
   <script>
     /*<!--*/
-    const data = {"version":2,"tree":{"name":"root","children":[{"name":"index.production.js","children":[{"uid":"4053-59","name":"\u0000rollupPluginBabelHelpers.js"},{"name":"packages","children":[{"name":"router-core/build/esm/index.js","uid":"4053-61"},{"name":"react-router/src/index.tsx","uid":"4053-63"}]}]}],"isRoot":true},"nodeParts":{"4053-59":{"renderedLength":798,"gzipLength":366,"brotliLength":0,"mainUid":"4053-58"},"4053-61":{"renderedLength":75162,"gzipLength":15777,"brotliLength":0,"mainUid":"4053-60"},"4053-63":{"renderedLength":12803,"gzipLength":3212,"brotliLength":0,"mainUid":"4053-62"}},"nodeMetas":{"4053-58":{"id":"\u0000rollupPluginBabelHelpers.js","moduleParts":{"index.production.js":"4053-59"},"imported":[],"importedBy":[{"uid":"4053-62"}]},"4053-60":{"id":"/packages/router-core/build/esm/index.js","moduleParts":{"index.production.js":"4053-61"},"imported":[],"importedBy":[{"uid":"4053-62"}]},"4053-62":{"id":"/packages/react-router/src/index.tsx","moduleParts":{"index.production.js":"4053-63"},"imported":[{"uid":"4053-58"},{"uid":"4053-64"},{"uid":"4053-65"},{"uid":"4053-60"}],"importedBy":[],"isEntry":true},"4053-64":{"id":"react","moduleParts":{},"imported":[],"importedBy":[{"uid":"4053-62"}],"isExternal":true},"4053-65":{"id":"use-sync-external-store/shim","moduleParts":{},"imported":[],"importedBy":[{"uid":"4053-62"}],"isExternal":true}},"env":{"rollup":"2.77.2"},"options":{"gzip":true,"brotli":false,"sourcemap":false}};
+    const data = {"version":2,"tree":{"name":"root","children":[{"name":"index.production.js","children":[{"uid":"64ae-59","name":"\u0000rollupPluginBabelHelpers.js"},{"name":"packages","children":[{"name":"router-core/build/esm/index.js","uid":"64ae-61"},{"name":"react-router/src/index.tsx","uid":"64ae-63"}]}]}],"isRoot":true},"nodeParts":{"64ae-59":{"renderedLength":798,"gzipLength":366,"brotliLength":0,"mainUid":"64ae-58"},"64ae-61":{"renderedLength":75397,"gzipLength":15789,"brotliLength":0,"mainUid":"64ae-60"},"64ae-63":{"renderedLength":13128,"gzipLength":3268,"brotliLength":0,"mainUid":"64ae-62"}},"nodeMetas":{"64ae-58":{"id":"\u0000rollupPluginBabelHelpers.js","moduleParts":{"index.production.js":"64ae-59"},"imported":[],"importedBy":[{"uid":"64ae-62"}]},"64ae-60":{"id":"/packages/router-core/build/esm/index.js","moduleParts":{"index.production.js":"64ae-61"},"imported":[],"importedBy":[{"uid":"64ae-62"}]},"64ae-62":{"id":"/packages/react-router/src/index.tsx","moduleParts":{"index.production.js":"64ae-63"},"imported":[{"uid":"64ae-58"},{"uid":"64ae-64"},{"uid":"64ae-65"},{"uid":"64ae-60"}],"importedBy":[],"isEntry":true},"64ae-64":{"id":"react","moduleParts":{},"imported":[],"importedBy":[{"uid":"64ae-62"}],"isExternal":true},"64ae-65":{"id":"use-sync-external-store/shim","moduleParts":{},"imported":[],"importedBy":[{"uid":"64ae-62"}],"isExternal":true}},"env":{"rollup":"2.77.2"},"options":{"gzip":true,"brotli":false,"sourcemap":false}};
 
     const run = () => {
       const width = window.innerWidth;

package/build/stats-react.json

@@ -7,7 +7,7 @@
         "name": "index.production.js",
         "children": [
           {
-            "uid": "4053-67",
+            "uid": "64ae-67",
             "name": "\u0000rollupPluginBabelHelpers.js"
           },
           {
@@ -15,11 +15,11 @@
             "children": [
               {
                 "name": "router-core/build/esm/index.js",
-                "uid": "4053-69"
+                "uid": "64ae-69"
               },
               {
                 "name": "react-router/src/index.tsx",
-                "uid": "4053-71"
+                "uid": "64ae-71"
               }
             ]
           }
@@ -29,90 +29,90 @@
     "isRoot": true
   },
   "nodeParts": {
-    "4053-67": {
+    "64ae-67": {
       "renderedLength": 798,
       "gzipLength": 366,
       "brotliLength": 0,
-      "mainUid": "4053-66"
+      "mainUid": "64ae-66"
     },
-    "4053-69": {
-      "renderedLength": 75162,
-      "gzipLength": 15777,
+    "64ae-69": {
+      "renderedLength": 75397,
+      "gzipLength": 15789,
       "brotliLength": 0,
-      "mainUid": "4053-68"
+      "mainUid": "64ae-68"
     },
-    "4053-71": {
-      "renderedLength": 12803,
-      "gzipLength": 3212,
+    "64ae-71": {
+      "renderedLength": 13128,
+      "gzipLength": 3268,
       "brotliLength": 0,
-      "mainUid": "4053-70"
+      "mainUid": "64ae-70"
     }
   },
   "nodeMetas": {
-    "4053-66": {
+    "64ae-66": {
       "id": "\u0000rollupPluginBabelHelpers.js",
       "moduleParts": {
-        "index.production.js": "4053-67"
+        "index.production.js": "64ae-67"
       },
       "imported": [],
       "importedBy": [
         {
-          "uid": "4053-70"
+          "uid": "64ae-70"
         }
       ]
     },
-    "4053-68": {
+    "64ae-68": {
       "id": "/packages/router-core/build/esm/index.js",
       "moduleParts": {
-        "index.production.js": "4053-69"
+        "index.production.js": "64ae-69"
       },
       "imported": [],
       "importedBy": [
         {
-          "uid": "4053-70"
+          "uid": "64ae-70"
         }
       ]
     },
-    "4053-70": {
+    "64ae-70": {
       "id": "/packages/react-router/src/index.tsx",
       "moduleParts": {
-        "index.production.js": "4053-71"
+        "index.production.js": "64ae-71"
       },
       "imported": [
         {
-          "uid": "4053-66"
+          "uid": "64ae-66"
         },
         {
-          "uid": "4053-72"
+          "uid": "64ae-72"
         },
         {
-          "uid": "4053-73"
+          "uid": "64ae-73"
         },
         {
-          "uid": "4053-68"
+          "uid": "64ae-68"
         }
       ],
       "importedBy": [],
       "isEntry": true
     },
-    "4053-72": {
+    "64ae-72": {
       "id": "react",
       "moduleParts": {},
       "imported": [],
       "importedBy": [
         {
-          "uid": "4053-70"
+          "uid": "64ae-70"
         }
       ],
       "isExternal": true
     },
-    "4053-73": {
+    "64ae-73": {
       "id": "use-sync-external-store/shim",
       "moduleParts": {},
       "imported": [],
       "importedBy": [
         {
-          "uid": "4053-70"
+          "uid": "64ae-70"
         }
       ],
       "isExternal": true

package/build/types/index.d.ts

@@ -9,7 +9,7 @@
  * @license MIT
  */
 import * as React from 'react';
-import { AnyRouteConfig, RouteConfig, AnyAllRouteInfo, AllRouteInfo, RouterState, RouteMatch, RouteInfo, DefaultAllRouteInfo, AnyRouteInfo, ResolveRelativePath, NoInfer, CheckId, ToIdOption, Router, ValidFromPath, ToOptions, MatchRouteOptions, RouteInfoByPath, RouterOptions, Route, LinkOptions } from '@tanstack/router-core';
+import { AnyRouteConfig, RouterContext, RouteConfig, AnyAllRouteInfo, AllRouteInfo, RouterState, RouteMatch, RouteInfo, DefaultAllRouteInfo, AnyRouteInfo, ResolveRelativePath, NoInfer, CheckId, ToIdOption, Router, ValidFromPath, ToOptions, MatchRouteOptions, RouteInfoByPath, RouterOptions, Route, LinkOptions } from '@tanstack/router-core';
 export * from '@tanstack/router-core';
 
 interface RegisterRouter {
@@ -44,6 +44,9 @@ declare module '@tanstack/router-core' {
     interface FrameworkGenerics {
         Component: RouteComponent;
     }
+    interface RouterOptions<TRouteConfig extends AnyRouteConfig> {
+        useContext?: () => RouterContext;
+    }
     interface Router<TRouteConfig extends AnyRouteConfig = RouteConfig, TAllRouteInfo extends AnyAllRouteInfo = AllRouteInfo<TRouteConfig>> {
         useState: () => RouterState;
         useRoute: <TId extends keyof TAllRouteInfo['routeInfoById']>(routeId: TId) => Route<TAllRouteInfo, TAllRouteInfo['routeInfoById'][TId]>;
@@ -92,6 +95,7 @@ declare function useMatch<TId extends keyof RegisteredAllRouteInfo['routeInfoByI
 }): TStrict extends true ? RouteMatch<RegisteredAllRouteInfo, RegisteredAllRouteInfo['routeInfoById'][TId]> : RouteMatch<RegisteredAllRouteInfo, RegisteredAllRouteInfo['routeInfoById'][TId]> | undefined;
 declare function useNearestMatch(): RouteMatch<RegisteredAllRouteInfo, RouteInfo>;
 declare function useRoute<TId extends keyof RegisteredAllRouteInfo['routeInfoById']>(routeId: TId): Route<RegisteredAllRouteInfo, RegisteredAllRouteInfo['routeInfoById'][TId]>;
+declare function useSearch<TId extends keyof RegisteredAllRouteInfo['routeInfoById'] = keyof RegisteredAllRouteInfo['routeInfoById']>(_routeId?: TId): RegisteredAllRouteInfo['fullSearchSchema'];
 declare function linkProps<TTo extends string = '.'>(props: MakeLinkPropsOptions<RegisteredAllRouteInfo, '/', TTo>): React.AnchorHTMLAttributes<HTMLAnchorElement>;
 declare function MatchRoute<TTo extends string = '.'>(props: MakeMatchRouteOptions<RegisteredAllRouteInfo, '/', TTo>): JSX.Element;
 declare function Outlet(): JSX.Element | null;
@@ -101,4 +105,4 @@ declare function DefaultErrorBoundary({ error }: {
 declare function usePrompt(message: string, when: boolean | any): void;
 declare function Prompt({ message, when, children }: PromptProps): React.ReactNode;
 
-export { DefaultErrorBoundary, Link, MatchRoute, MatchesProvider, MatchesProviderProps, Outlet, Prompt, PromptProps, RegisterRouter, RegisteredAllRouteInfo, RegisteredRouter, RouteComponent, RouterProps, RouterProvider, SyncRouteComponent, createReactRouter, lazy, linkProps, matchesContext, routerContext, useMatch, useMatches, useNearestMatch, usePrompt, useRoute, useRouter };
+export { DefaultErrorBoundary, Link, MatchRoute, MatchesProvider, MatchesProviderProps, Outlet, Prompt, PromptProps, RegisterRouter, RegisteredAllRouteInfo, RegisteredRouter, RouteComponent, RouterProps, RouterProvider, SyncRouteComponent, createReactRouter, lazy, linkProps, matchesContext, routerContext, useMatch, useMatches, useNearestMatch, usePrompt, useRoute, useRouter, useSearch };

package/build/umd/index.development.js

@@ -893,12 +893,6 @@
       throw new Error(value);
   }
 
-  // type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
-  //   k: infer I,
-  // ) => any
-  //   ? I
-  //   : never
-
   /**
    * This function returns `a` if `b` is deeply equal.
    * If not, it will replace any deeply equal children of `b` with those of `a`.
@@ -1120,10 +1114,7 @@
 
     if (matchLocation.to && !pathParams) {
       return;
-    } // if (matchLocation.search && !searchMatched) {
-    //   return
-    // }
-
+    }
 
     return pathParams != null ? pathParams : {};
   }
@@ -1360,6 +1351,7 @@
     })();
 
     let route = {
+      routeInfo: undefined,
       routeId: id,
       routeRouteId: routeId,
       routePath,
@@ -1733,6 +1725,7 @@
       options: originalOptions,
       listeners: [],
       // Resolved after construction
+      context: {},
       basepath: '',
       routeTree: undefined,
       routesById: {},
@@ -1877,7 +1870,19 @@
 
         const matches = router.matchRoutes(router.location.pathname, {
           strictParseParams: true
-        });
+        }); // Check if each match middleware to see if the route can be accessed
+
+        try {
+          await Promise.all(matches.map(match => match.options.beforeLoad == null ? void 0 : match.options.beforeLoad({
+            context: router.context
+          })));
+        } catch (err) {
+          if (err != null && err.then) {
+            await new Promise(() => {});
+          }
+
+          throw err;
+        }
 
         if (typeof document !== 'undefined') {
           router.state = _extends({}, router.state, {
@@ -1947,7 +1952,7 @@
           });
         });
         entering.forEach(d => {
-          d.__.onExit = d.options.onMatch == null ? void 0 : d.options.onMatch({
+          d.__.onExit = d.options.onLoaded == null ? void 0 : d.options.onLoaded({
             params: d.params,
             search: d.search
           });
@@ -2745,6 +2750,8 @@
     return coreRouter;
   }
   function RouterProvider(_ref2) {
+    var _router$options$useCo;
+
     let {
       children,
       router
@@ -2752,9 +2759,11 @@
         rest = _objectWithoutPropertiesLoose(_ref2, _excluded3);
 
     router.update(rest);
+    const defaultRouterContext = React__namespace.useRef({});
+    const userContext = (_router$options$useCo = router.options.useContext == null ? void 0 : router.options.useContext()) != null ? _router$options$useCo : defaultRouterContext.current;
+    router.context = userContext;
     useRouterSubscription(router);
     React__namespace.useEffect(() => {
-      console.log('hello');
       return router.mount();
     }, [router]);
     return /*#__PURE__*/React__namespace.createElement(routerContext.Provider, {
@@ -2789,6 +2798,9 @@
     const router = useRouter();
     return router.useRoute(routeId);
   }
+  function useSearch(_routeId) {
+    return useRouter().state.location.search;
+  }
   function linkProps(props) {
     const router = useRouter();
     return router.linkProps(props);
@@ -2828,7 +2840,6 @@
         return /*#__PURE__*/React__namespace.createElement((_ref4 = (_ref5 = match.__.component) != null ? _ref5 : router.options.defaultComponent) != null ? _ref4 : Outlet);
       }
 
-      console.log(match.matchId, 'suspend');
       throw match.__.loadPromise;
     })())));
   }
@@ -2962,6 +2973,7 @@
   exports.usePrompt = usePrompt;
   exports.useRoute = useRoute;
   exports.useRouter = useRouter;
+  exports.useSearch = useSearch;
   exports.warning = warning;
 
   Object.defineProperty(exports, '__esModule', { value: true });