@tanstack/react-router 0.0.1-beta.30 → 0.0.1-beta.32

package/build/stats-react.json

@@ -7,7 +7,7 @@
         "name": "index.production.js",
         "children": [
           {
-            "uid": "bc11-73",
+            "uid": "7bea-73",
             "name": "\u0000rollupPluginBabelHelpers.js"
           },
           {
@@ -15,15 +15,15 @@
             "children": [
               {
                 "name": "@babel+runtime@7.20.6/node_modules/@babel/runtime/helpers/esm/extends.js",
-                "uid": "bc11-75"
+                "uid": "7bea-75"
               },
               {
                 "name": "history@5.3.0/node_modules/history/index.js",
-                "uid": "bc11-77"
+                "uid": "7bea-77"
               },
               {
                 "name": "tiny-invariant@1.3.1/node_modules/tiny-invariant/dist/esm/tiny-invariant.js",
-                "uid": "bc11-79"
+                "uid": "7bea-79"
               }
             ]
           },
@@ -32,11 +32,11 @@
             "children": [
               {
                 "name": "router-core/build/esm/index.js",
-                "uid": "bc11-81"
+                "uid": "7bea-81"
               },
               {
                 "name": "react-router/src/index.tsx",
-                "uid": "bc11-83"
+                "uid": "7bea-83"
               }
             ]
           }
@@ -46,155 +46,155 @@
     "isRoot": true
   },
   "nodeParts": {
-    "bc11-73": {
+    "7bea-73": {
       "renderedLength": 793,
       "gzipLength": 363,
       "brotliLength": 0,
-      "mainUid": "bc11-72"
+      "mainUid": "7bea-72"
     },
-    "bc11-75": {
+    "7bea-75": {
       "renderedLength": 435,
       "gzipLength": 241,
       "brotliLength": 0,
-      "mainUid": "bc11-74"
+      "mainUid": "7bea-74"
     },
-    "bc11-77": {
+    "7bea-77": {
       "renderedLength": 20630,
       "gzipLength": 3800,
       "brotliLength": 0,
-      "mainUid": "bc11-76"
+      "mainUid": "7bea-76"
     },
-    "bc11-79": {
+    "7bea-79": {
       "renderedLength": 181,
       "gzipLength": 129,
       "brotliLength": 0,
-      "mainUid": "bc11-78"
+      "mainUid": "7bea-78"
     },
-    "bc11-81": {
-      "renderedLength": 54734,
-      "gzipLength": 12313,
+    "7bea-81": {
+      "renderedLength": 54705,
+      "gzipLength": 12303,
       "brotliLength": 0,
-      "mainUid": "bc11-80"
+      "mainUid": "7bea-80"
     },
-    "bc11-83": {
-      "renderedLength": 14099,
-      "gzipLength": 3516,
+    "7bea-83": {
+      "renderedLength": 14166,
+      "gzipLength": 3535,
       "brotliLength": 0,
-      "mainUid": "bc11-82"
+      "mainUid": "7bea-82"
     }
   },
   "nodeMetas": {
-    "bc11-72": {
+    "7bea-72": {
       "id": "\u0000rollupPluginBabelHelpers.js",
       "moduleParts": {
-        "index.production.js": "bc11-73"
+        "index.production.js": "7bea-73"
       },
       "imported": [],
       "importedBy": [
         {
-          "uid": "bc11-82"
+          "uid": "7bea-82"
         }
       ]
     },
-    "bc11-74": {
+    "7bea-74": {
       "id": "/node_modules/.pnpm/@babel+runtime@7.20.6/node_modules/@babel/runtime/helpers/esm/extends.js",
       "moduleParts": {
-        "index.production.js": "bc11-75"
+        "index.production.js": "7bea-75"
       },
       "imported": [],
       "importedBy": [
         {
-          "uid": "bc11-76"
+          "uid": "7bea-76"
         }
       ]
     },
-    "bc11-76": {
+    "7bea-76": {
       "id": "/node_modules/.pnpm/history@5.3.0/node_modules/history/index.js",
       "moduleParts": {
-        "index.production.js": "bc11-77"
+        "index.production.js": "7bea-77"
       },
       "imported": [
         {
-          "uid": "bc11-74"
+          "uid": "7bea-74"
         }
       ],
       "importedBy": [
         {
-          "uid": "bc11-80"
+          "uid": "7bea-80"
         }
       ]
     },
-    "bc11-78": {
+    "7bea-78": {
       "id": "/node_modules/.pnpm/tiny-invariant@1.3.1/node_modules/tiny-invariant/dist/esm/tiny-invariant.js",
       "moduleParts": {
-        "index.production.js": "bc11-79"
+        "index.production.js": "7bea-79"
       },
       "imported": [],
       "importedBy": [
         {
-          "uid": "bc11-80"
+          "uid": "7bea-80"
         }
       ]
     },
-    "bc11-80": {
+    "7bea-80": {
       "id": "/packages/router-core/build/esm/index.js",
       "moduleParts": {
-        "index.production.js": "bc11-81"
+        "index.production.js": "7bea-81"
       },
       "imported": [
         {
-          "uid": "bc11-76"
+          "uid": "7bea-76"
         },
         {
-          "uid": "bc11-78"
+          "uid": "7bea-78"
         }
       ],
       "importedBy": [
         {
-          "uid": "bc11-82"
+          "uid": "7bea-82"
         }
       ]
     },
-    "bc11-82": {
+    "7bea-82": {
       "id": "/packages/react-router/src/index.tsx",
       "moduleParts": {
-        "index.production.js": "bc11-83"
+        "index.production.js": "7bea-83"
       },
       "imported": [
         {
-          "uid": "bc11-72"
+          "uid": "7bea-72"
         },
         {
-          "uid": "bc11-84"
+          "uid": "7bea-84"
         },
         {
-          "uid": "bc11-85"
+          "uid": "7bea-85"
         },
         {
-          "uid": "bc11-80"
+          "uid": "7bea-80"
         }
       ],
       "importedBy": [],
       "isEntry": true
     },
-    "bc11-84": {
+    "7bea-84": {
       "id": "react",
       "moduleParts": {},
       "imported": [],
       "importedBy": [
         {
-          "uid": "bc11-82"
+          "uid": "7bea-82"
         }
       ],
       "isExternal": true
     },
-    "bc11-85": {
+    "7bea-85": {
       "id": "use-sync-external-store/shim",
       "moduleParts": {},
       "imported": [],
       "importedBy": [
         {
-          "uid": "bc11-82"
+          "uid": "7bea-82"
         }
       ],
       "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, ValidFromPath, ToOptions, MatchRouteOptions, RouteInfoByPath, RegisteredAllRouteInfo, RegisteredRouter, RouterOptions, Router, Route, LinkOptions } from '@tanstack/router-core';
+import { AnyRouteConfig, RouteConfig, AnyAllRouteInfo, AllRouteInfo, RouterState, RouteMatch, DefaultAllRouteInfo, AnyRouteInfo, RouteInfo, ResolveRelativePath, NoInfer, CheckId, ToIdOption, ValidFromPath, LinkOptions, ToOptions, MatchRouteOptions, RouteInfoByPath, RegisteredAllRouteInfo, RegisteredRouter, RouterOptions, Router, Route } from '@tanstack/router-core';
 export * from '@tanstack/router-core';
 
 type SyncRouteComponent<TProps = {}> = (props: TProps) => JSX.Element | React.ReactNode;
@@ -47,7 +47,6 @@ declare module '@tanstack/router-core' {
     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]>;
-        useNearestMatch: () => RouteMatch<TAllRouteInfo, RouteInfo>;
         useMatch: <TId extends keyof TAllRouteInfo['routeInfoById'], TStrict extends boolean = true>(routeId: TId, opts?: {
             strict?: TStrict;
         }) => TStrict extends true ? RouteMatch<TAllRouteInfo, TAllRouteInfo['routeInfoById'][TId]> : RouteMatch<TAllRouteInfo, TAllRouteInfo['routeInfoById'][TId]> | undefined;
@@ -102,4 +101,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, RouteComponent, RouterProps, RouterProvider, SyncRouteComponent, createReactRouter, lazy, linkProps, matchesContext, routerContext, useMatch, useMatches, useNearestMatch, usePrompt, useRoute, useRouter, useSearch };
+export { DefaultErrorBoundary, Link, LinkPropsOptions, MakeLinkOptions, MakeLinkPropsOptions, MakeMatchRouteOptions, MatchRoute, MatchesProvider, MatchesProviderProps, Outlet, Prompt, PromptProps, RouteComponent, RouterProps, RouterProvider, SyncRouteComponent, createReactRouter, lazy, linkProps, matchesContext, routerContext, useMatch, useMatches, useNearestMatch, usePrompt, useRoute, useRouter, useSearch };

package/build/umd/index.development.js

@@ -1401,7 +1401,7 @@
         validate: () => {
           var _routeMatch$parentMat, _routeMatch$parentMat2;
           // Validate the search params and stabilize them
-          const parentSearch = (_routeMatch$parentMat = (_routeMatch$parentMat2 = routeMatch.parentMatch) == null ? void 0 : _routeMatch$parentMat2.search) != null ? _routeMatch$parentMat : router.location.search;
+          const parentSearch = (_routeMatch$parentMat = (_routeMatch$parentMat2 = routeMatch.parentMatch) == null ? void 0 : _routeMatch$parentMat2.search) != null ? _routeMatch$parentMat : router.__location.search;
           try {
             var _validator;
             const prevSearch = routeMatch.routeSearch;
@@ -1639,7 +1639,7 @@
       basepath: '',
       routeTree: undefined,
       routesById: {},
-      location: undefined,
+      __location: undefined,
       //
       resolveNavigation: () => {},
       matchCache: {},
@@ -1672,7 +1672,7 @@
       },
       dehydrate: () => {
         return {
-          location: router.location,
+          location: router.__location,
           state: _extends({}, pick(router.state, ['status', 'location', 'lastUpdated', 'location']), {
             matches: router.state.matches.map(match => pick(match, ['matchId', 'status', 'routeLoaderData', 'loaderData', 'isInvalid', 'invalidAt']))
           }),
@@ -1681,13 +1681,13 @@
       },
       hydrate: dehydratedState => {
         // Update the location
-        router.location = dehydratedState.location;
+        router.__location = dehydratedState.location;
 
         // Update the context
         router.options.context = dehydratedState.context;
 
         // Match the routes
-        const matches = router.matchRoutes(router.location.pathname, {
+        const matches = router.matchRoutes(router.__location.pathname, {
           strictParseParams: true
         });
         matches.forEach((match, index) => {
@@ -1709,14 +1709,14 @@
 
         // If the current location isn't updated, trigger a navigation
         // to the current location. Otherwise, load the current location.
-        if (next.href !== router.location.href) {
+        if (next.href !== router.__location.href) {
           router.__.commitLocation(next, true);
         }
         if (!router.state.matches.length) {
           router.load();
         }
         const unsub = router.history.listen(event => {
-          router.load(router.__.parseLocation(event.location, router.location));
+          router.load(router.__.parseLocation(event.location, router.__location));
         });
 
         // addEventListener does not exist in React Native, but window does
@@ -1740,12 +1740,12 @@
       },
       update: opts => {
         const newHistory = (opts == null ? void 0 : opts.history) !== router.history;
-        if (!router.location || newHistory) {
+        if (!router.__location || newHistory) {
           if (opts != null && opts.history) {
             router.history = opts.history;
           }
-          router.location = router.__.parseLocation(router.history.location);
-          router.state.location = router.location;
+          router.__location = router.__.parseLocation(router.history.location);
+          router.state.location = router.__location;
         }
         Object.assign(router.options, opts);
         const {
@@ -1770,28 +1770,28 @@
         router.startedLoadingAt = id;
         if (next) {
           // Ingest the new location
-          router.location = next;
+          router.__location = next;
         }
 
         // Cancel any pending matches
         router.cancelMatches();
 
         // Match the routes
-        const matches = router.matchRoutes(router.location.pathname, {
+        const matches = router.matchRoutes(router.__location.pathname, {
           strictParseParams: true
         });
         if (typeof document !== 'undefined') {
           router.state = _extends({}, router.state, {
             pending: {
               matches: matches,
-              location: router.location
+              location: router.__location
             },
             status: 'loading'
           });
         } else {
           router.state = _extends({}, router.state, {
             matches: matches,
-            location: router.location,
+            location: router.__location,
             status: 'loading'
           });
         }
@@ -1875,7 +1875,7 @@
           }
         });
         router.state = _extends({}, router.state, {
-          location: router.location,
+          location: router.__location,
           matches,
           pending: undefined,
           status: 'idle'
@@ -1904,7 +1904,7 @@
       },
       loadRoute: async function loadRoute(navigateOpts) {
         if (navigateOpts === void 0) {
-          navigateOpts = router.location;
+          navigateOpts = router.__location;
         }
         const next = router.buildNext(navigateOpts);
         const matches = router.matchRoutes(next.pathname, {
@@ -1916,7 +1916,7 @@
       preloadRoute: async function preloadRoute(navigateOpts, loaderOpts) {
         var _ref3, _ref4, _loaderOpts$maxAge, _ref5, _ref6, _loaderOpts$gcMaxAge;
         if (navigateOpts === void 0) {
-          navigateOpts = router.location;
+          navigateOpts = router.__location;
         }
         const next = router.buildNext(navigateOpts);
         const matches = router.matchRoutes(next.pathname, {
@@ -2296,11 +2296,9 @@
           if (dest === void 0) {
             dest = {};
           }
-          // const resolvedFrom: Location = {
-          //   ...router.location,
-          const fromPathname = dest.fromCurrent ? router.location.pathname : (_dest$from = dest.from) != null ? _dest$from : router.location.pathname;
+          const fromPathname = dest.fromCurrent ? router.__location.pathname : (_dest$from = dest.from) != null ? _dest$from : router.__location.pathname;
           let pathname = resolvePath((_router$basepath = router.basepath) != null ? _router$basepath : '/', fromPathname, "" + ((_dest$to = dest.to) != null ? _dest$to : '.'));
-          const fromMatches = router.matchRoutes(router.location.pathname, {
+          const fromMatches = router.matchRoutes(router.__location.pathname, {
             strictParseParams: true
           });
           const toMatches = router.matchRoutes(pathname);
@@ -2314,7 +2312,7 @@
           pathname = interpolatePath(pathname, nextParams != null ? nextParams : {});
 
           // Pre filters first
-          const preFilteredSearch = (_dest$__preSearchFilt = dest.__preSearchFilters) != null && _dest$__preSearchFilt.length ? dest.__preSearchFilters.reduce((prev, next) => next(prev), router.location.search) : router.location.search;
+          const preFilteredSearch = (_dest$__preSearchFilt = dest.__preSearchFilters) != null && _dest$__preSearchFilt.length ? dest.__preSearchFilters.reduce((prev, next) => next(prev), router.__location.search) : router.__location.search;
 
           // Then the link/navigate function
           const destSearch = dest.search === true ? preFilteredSearch // Preserve resolvedFrom true
@@ -2324,15 +2322,15 @@
 
           // Then post filters
           const postFilteredSearch = (_dest$__postSearchFil = dest.__postSearchFilters) != null && _dest$__postSearchFil.length ? dest.__postSearchFilters.reduce((prev, next) => next(prev), destSearch) : destSearch;
-          const search = replaceEqualDeep(router.location.search, postFilteredSearch);
+          const search = replaceEqualDeep(router.__location.search, postFilteredSearch);
           const searchStr = router.options.stringifySearch(search);
-          let hash = dest.hash === true ? router.location.hash : functionalUpdate(dest.hash, router.location.hash);
+          let hash = dest.hash === true ? router.__location.hash : functionalUpdate(dest.hash, router.__location.hash);
           hash = hash ? "#" + hash : '';
           return {
             pathname,
             search,
             searchStr,
-            state: router.location.state,
+            state: router.__location.state,
             hash,
             href: "" + pathname + searchStr + hash,
             key: dest.key
@@ -2493,8 +2491,9 @@
               });else handleClick(e);
           };
           const composeHandlers = handlers => e => {
-            e.persist();
+            if (e.persist) e.persist();
             handlers.forEach(handler => {
+              if (e.defaultPrevented) return;
               if (handler) handler(e);
             });
           };
@@ -2762,7 +2761,7 @@
           unblock();
           transition.retry();
         } else {
-          router.location.pathname = window.location.pathname;
+          router.state.location.pathname = window.location.pathname;
         }
       });
       return unblock;