@tanstack/react-router 0.0.1-beta.177 → 0.0.1-beta.178

package/build/stats-react.json

@@ -11,19 +11,19 @@
             "children": [
               {
                 "name": "@tanstack+store@0.0.1/node_modules/@tanstack/store/build/esm/index.js",
-                "uid": "b0e2-159"
+                "uid": "4cc2-159"
               },
               {
                 "name": "@tanstack+react-store@0.0.1/node_modules/@tanstack/react-store/build/esm/index.js",
-                "uid": "b0e2-161"
+                "uid": "4cc2-161"
               },
               {
                 "name": "tiny-invariant@1.3.1/node_modules/tiny-invariant/dist/esm/tiny-invariant.js",
-                "uid": "b0e2-163"
+                "uid": "4cc2-163"
               },
               {
                 "name": "tiny-warning@1.0.3/node_modules/tiny-warning/dist/tiny-warning.esm.js",
-                "uid": "b0e2-165"
+                "uid": "4cc2-165"
               }
             ]
           },
@@ -32,25 +32,25 @@
             "children": [
               {
                 "name": "router-core/build/esm/index.js",
-                "uid": "b0e2-167"
+                "uid": "4cc2-167"
               },
               {
                 "name": "react-router/src",
                 "children": [
                   {
-                    "uid": "b0e2-171",
+                    "uid": "4cc2-171",
                     "name": "react.tsx"
                   },
                   {
-                    "uid": "b0e2-173",
+                    "uid": "4cc2-173",
                     "name": "scroll-restoration.tsx"
                   },
                   {
-                    "uid": "b0e2-175",
+                    "uid": "4cc2-175",
                     "name": "awaited.tsx"
                   },
                   {
-                    "uid": "b0e2-177",
+                    "uid": "4cc2-177",
                     "name": "index.tsx"
                   }
                 ]
@@ -58,7 +58,7 @@
             ]
           },
           {
-            "uid": "b0e2-169",
+            "uid": "4cc2-169",
             "name": "\u0000rollupPluginBabelHelpers.js"
           }
         ]
@@ -67,302 +67,302 @@
     "isRoot": true
   },
   "nodeParts": {
-    "b0e2-159": {
+    "4cc2-159": {
       "renderedLength": 1843,
       "gzipLength": 644,
       "brotliLength": 0,
-      "mainUid": "b0e2-158"
+      "mainUid": "4cc2-158"
     },
-    "b0e2-161": {
+    "4cc2-161": {
       "renderedLength": 1006,
       "gzipLength": 479,
       "brotliLength": 0,
-      "mainUid": "b0e2-160"
+      "mainUid": "4cc2-160"
     },
-    "b0e2-163": {
+    "4cc2-163": {
       "renderedLength": 181,
       "gzipLength": 129,
       "brotliLength": 0,
-      "mainUid": "b0e2-162"
+      "mainUid": "4cc2-162"
     },
-    "b0e2-165": {
+    "4cc2-165": {
       "renderedLength": 44,
       "gzipLength": 62,
       "brotliLength": 0,
-      "mainUid": "b0e2-164"
+      "mainUid": "4cc2-164"
     },
-    "b0e2-167": {
-      "renderedLength": 64311,
-      "gzipLength": 15205,
+    "4cc2-167": {
+      "renderedLength": 64128,
+      "gzipLength": 15188,
       "brotliLength": 0,
-      "mainUid": "b0e2-166"
+      "mainUid": "4cc2-166"
     },
-    "b0e2-169": {
+    "4cc2-169": {
       "renderedLength": 429,
       "gzipLength": 238,
       "brotliLength": 0,
-      "mainUid": "b0e2-168"
+      "mainUid": "4cc2-168"
     },
-    "b0e2-171": {
-      "renderedLength": 17226,
-      "gzipLength": 3829,
+    "4cc2-171": {
+      "renderedLength": 17344,
+      "gzipLength": 3846,
       "brotliLength": 0,
-      "mainUid": "b0e2-170"
+      "mainUid": "4cc2-170"
     },
-    "b0e2-173": {
+    "4cc2-173": {
       "renderedLength": 466,
       "gzipLength": 228,
       "brotliLength": 0,
-      "mainUid": "b0e2-172"
+      "mainUid": "4cc2-172"
     },
-    "b0e2-175": {
+    "4cc2-175": {
       "renderedLength": 641,
       "gzipLength": 305,
       "brotliLength": 0,
-      "mainUid": "b0e2-174"
+      "mainUid": "4cc2-174"
     },
-    "b0e2-177": {
+    "4cc2-177": {
       "renderedLength": 0,
       "gzipLength": 0,
       "brotliLength": 0,
-      "mainUid": "b0e2-176"
+      "mainUid": "4cc2-176"
     }
   },
   "nodeMetas": {
-    "b0e2-158": {
+    "4cc2-158": {
       "id": "/node_modules/.pnpm/@tanstack+store@0.0.1/node_modules/@tanstack/store/build/esm/index.js",
       "moduleParts": {
-        "index.production.js": "b0e2-159"
+        "index.production.js": "4cc2-159"
       },
       "imported": [],
       "importedBy": [
         {
-          "uid": "b0e2-160"
+          "uid": "4cc2-160"
         },
         {
-          "uid": "b0e2-166"
+          "uid": "4cc2-166"
         }
       ]
     },
-    "b0e2-160": {
+    "4cc2-160": {
       "id": "/node_modules/.pnpm/@tanstack+react-store@0.0.1/node_modules/@tanstack/react-store/build/esm/index.js",
       "moduleParts": {
-        "index.production.js": "b0e2-161"
+        "index.production.js": "4cc2-161"
       },
       "imported": [
         {
-          "uid": "b0e2-178"
+          "uid": "4cc2-178"
         },
         {
-          "uid": "b0e2-158"
+          "uid": "4cc2-158"
         }
       ],
       "importedBy": [
         {
-          "uid": "b0e2-176"
+          "uid": "4cc2-176"
         },
         {
-          "uid": "b0e2-170"
+          "uid": "4cc2-170"
         }
       ]
     },
-    "b0e2-162": {
+    "4cc2-162": {
       "id": "/node_modules/.pnpm/tiny-invariant@1.3.1/node_modules/tiny-invariant/dist/esm/tiny-invariant.js",
       "moduleParts": {
-        "index.production.js": "b0e2-163"
+        "index.production.js": "4cc2-163"
       },
       "imported": [],
       "importedBy": [
         {
-          "uid": "b0e2-166"
+          "uid": "4cc2-166"
         },
         {
-          "uid": "b0e2-170"
+          "uid": "4cc2-170"
         }
       ]
     },
-    "b0e2-164": {
+    "4cc2-164": {
       "id": "/node_modules/.pnpm/tiny-warning@1.0.3/node_modules/tiny-warning/dist/tiny-warning.esm.js",
       "moduleParts": {
-        "index.production.js": "b0e2-165"
+        "index.production.js": "4cc2-165"
       },
       "imported": [],
       "importedBy": [
         {
-          "uid": "b0e2-166"
+          "uid": "4cc2-166"
         },
         {
-          "uid": "b0e2-170"
+          "uid": "4cc2-170"
         }
       ]
     },
-    "b0e2-166": {
+    "4cc2-166": {
       "id": "/packages/router-core/build/esm/index.js",
       "moduleParts": {
-        "index.production.js": "b0e2-167"
+        "index.production.js": "4cc2-167"
       },
       "imported": [
         {
-          "uid": "b0e2-162"
+          "uid": "4cc2-162"
         },
         {
-          "uid": "b0e2-164"
+          "uid": "4cc2-164"
         },
         {
-          "uid": "b0e2-158"
+          "uid": "4cc2-158"
         }
       ],
       "importedBy": [
         {
-          "uid": "b0e2-176"
+          "uid": "4cc2-176"
         },
         {
-          "uid": "b0e2-170"
+          "uid": "4cc2-170"
         },
         {
-          "uid": "b0e2-172"
+          "uid": "4cc2-172"
         },
         {
-          "uid": "b0e2-174"
+          "uid": "4cc2-174"
         }
       ]
     },
-    "b0e2-168": {
+    "4cc2-168": {
       "id": "\u0000rollupPluginBabelHelpers.js",
       "moduleParts": {
-        "index.production.js": "b0e2-169"
+        "index.production.js": "4cc2-169"
       },
       "imported": [],
       "importedBy": [
         {
-          "uid": "b0e2-170"
+          "uid": "4cc2-170"
         }
       ]
     },
-    "b0e2-170": {
+    "4cc2-170": {
       "id": "/packages/react-router/src/react.tsx",
       "moduleParts": {
-        "index.production.js": "b0e2-171"
+        "index.production.js": "4cc2-171"
       },
       "imported": [
         {
-          "uid": "b0e2-168"
+          "uid": "4cc2-168"
         },
         {
-          "uid": "b0e2-179"
+          "uid": "4cc2-179"
         },
         {
-          "uid": "b0e2-160"
+          "uid": "4cc2-160"
         },
         {
-          "uid": "b0e2-162"
+          "uid": "4cc2-162"
         },
         {
-          "uid": "b0e2-164"
+          "uid": "4cc2-164"
         },
         {
-          "uid": "b0e2-166"
+          "uid": "4cc2-166"
         }
       ],
       "importedBy": [
         {
-          "uid": "b0e2-176"
+          "uid": "4cc2-176"
         },
         {
-          "uid": "b0e2-172"
+          "uid": "4cc2-172"
         },
         {
-          "uid": "b0e2-174"
+          "uid": "4cc2-174"
         }
       ]
     },
-    "b0e2-172": {
+    "4cc2-172": {
       "id": "/packages/react-router/src/scroll-restoration.tsx",
       "moduleParts": {
-        "index.production.js": "b0e2-173"
+        "index.production.js": "4cc2-173"
       },
       "imported": [
         {
-          "uid": "b0e2-179"
+          "uid": "4cc2-179"
         },
         {
-          "uid": "b0e2-166"
+          "uid": "4cc2-166"
         },
         {
-          "uid": "b0e2-170"
+          "uid": "4cc2-170"
         }
       ],
       "importedBy": [
         {
-          "uid": "b0e2-176"
+          "uid": "4cc2-176"
         }
       ]
     },
-    "b0e2-174": {
+    "4cc2-174": {
       "id": "/packages/react-router/src/awaited.tsx",
       "moduleParts": {
-        "index.production.js": "b0e2-175"
+        "index.production.js": "4cc2-175"
       },
       "imported": [
         {
-          "uid": "b0e2-166"
+          "uid": "4cc2-166"
         },
         {
-          "uid": "b0e2-170"
+          "uid": "4cc2-170"
         }
       ],
       "importedBy": [
         {
-          "uid": "b0e2-176"
+          "uid": "4cc2-176"
         }
       ]
     },
-    "b0e2-176": {
+    "4cc2-176": {
       "id": "/packages/react-router/src/index.tsx",
       "moduleParts": {
-        "index.production.js": "b0e2-177"
+        "index.production.js": "4cc2-177"
       },
       "imported": [
         {
-          "uid": "b0e2-160"
+          "uid": "4cc2-160"
         },
         {
-          "uid": "b0e2-166"
+          "uid": "4cc2-166"
         },
         {
-          "uid": "b0e2-170"
+          "uid": "4cc2-170"
         },
         {
-          "uid": "b0e2-172"
+          "uid": "4cc2-172"
         },
         {
-          "uid": "b0e2-174"
+          "uid": "4cc2-174"
         }
       ],
       "importedBy": [],
       "isEntry": true
     },
-    "b0e2-178": {
+    "4cc2-178": {
       "id": "use-sync-external-store/shim/with-selector",
       "moduleParts": {},
       "imported": [],
       "importedBy": [
         {
-          "uid": "b0e2-160"
+          "uid": "4cc2-160"
         }
       ],
       "isExternal": true
     },
-    "b0e2-179": {
+    "4cc2-179": {
       "id": "react",
       "moduleParts": {},
       "imported": [],
       "importedBy": [
         {
-          "uid": "b0e2-170"
+          "uid": "4cc2-170"
         },
         {
-          "uid": "b0e2-172"
+          "uid": "4cc2-172"
         }
       ],
       "isExternal": true

package/build/types/react.d.ts

@@ -42,30 +42,24 @@ declare module '@tanstack/router-core' {
     }
 }
 export type RouteProps<TLoader = unknown, TFullSearchSchema extends AnySearchSchema = AnySearchSchema, TAllParams extends AnyPathParams = AnyPathParams, TRouteContext extends AnyContext = AnyContext, TAllContext extends AnyContext = AnyContext> = {
-    useLoader: <TStrict extends boolean = true, TSelected = TLoader>(opts?: {
-        strict?: TStrict;
+    useLoader: <TSelected = TLoader>(opts?: {
         select?: (search: TLoader) => TSelected;
-    }) => TStrict extends true ? UseLoaderResult<TSelected> : UseLoaderResult<TSelected> | undefined;
-    useMatch: <TStrict extends boolean = true, TSelected = TAllContext>(opts?: {
-        strict?: TStrict;
+    }) => UseLoaderResult<TSelected>;
+    useMatch: <TSelected = TAllContext>(opts?: {
         select?: (search: TAllContext) => TSelected;
-    }) => TStrict extends true ? TSelected : TSelected | undefined;
-    useContext: <TStrict extends boolean = true, TSelected = TAllContext>(opts?: {
-        strict?: TStrict;
+    }) => TSelected;
+    useContext: <TSelected = TAllContext>(opts?: {
         select?: (search: TAllContext) => TSelected;
-    }) => TStrict extends true ? TSelected : TSelected | undefined;
-    useRouteContext: <TStrict extends boolean = true, TSelected = TRouteContext>(opts?: {
-        strict?: TStrict;
+    }) => TSelected;
+    useRouteContext: <TSelected = TRouteContext>(opts?: {
         select?: (search: TRouteContext) => TSelected;
-    }) => TStrict extends true ? TSelected : TSelected | undefined;
-    useSearch: <TStrict extends boolean = true, TSelected = TFullSearchSchema>(opts?: {
-        strict?: TStrict;
+    }) => TSelected;
+    useSearch: <TSelected = TFullSearchSchema>(opts?: {
         select?: (search: TFullSearchSchema) => TSelected;
-    }) => TStrict extends true ? TSelected : TSelected | undefined;
-    useParams: <TStrict extends boolean = true, TSelected = TAllParams>(opts?: {
-        strict?: TStrict;
+    }) => TSelected;
+    useParams: <TSelected = TAllParams>(opts?: {
         select?: (search: TAllParams) => TSelected;
-    }) => TStrict extends true ? TSelected : TSelected | undefined;
+    }) => TSelected;
 };
 export type ErrorRouteProps<TFullSearchSchema extends AnySearchSchema = AnySearchSchema, TAllParams extends AnyPathParams = AnyPathParams, TRouteContext extends AnyContext = AnyContext, TAllContext extends AnyContext = AnyContext> = {
     error: unknown;

package/build/umd/index.development.js

@@ -1300,39 +1300,14 @@
             return parentSearchInfo;
           }
         })();
-        Object.assign(match, {
-          ...searchInfo
-        });
-        const contextInfo = (() => {
-          try {
-            const routeContext = route.options.getContext?.({
-              parentContext: parentMatch?.routeContext ?? {},
-              context: parentMatch?.context ?? this?.options.context ?? {},
-              params: match.params,
-              search: match.search
-            }) || {};
-            const context = {
-              ...(parentMatch?.context ?? this?.options.context),
-              ...routeContext
-            };
-            return {
-              context,
-              routeContext
-            };
-          } catch (err) {
-            route.options.onError?.(err);
-            throw err;
-          }
-        })();
-        Object.assign(match, {
-          ...contextInfo
-        });
+        Object.assign(match, searchInfo);
       });
       return matches;
     };
-    loadMatches = async (resolvedMatches, opts) => {
+    loadMatches = async (_resolvedMatches, opts) => {
+      const getFreshMatches = () => _resolvedMatches.map(d => this.getRouteMatch(d.id));
       if (!opts?.preload) {
-        resolvedMatches.forEach(match => {
+        getFreshMatches().forEach(match => {
           // Update each match with its latest route data
           this.setRouteMatch(match.id, s => ({
             ...s,
@@ -1352,7 +1327,8 @@
 
       // Check each match middleware to see if the route can be accessed
       try {
-        for (const [index, match] of resolvedMatches.entries()) {
+        for (const [index, match] of getFreshMatches().entries()) {
+          const parentMatch = getFreshMatches()[index - 1];
           const route = this.getRoute(match.routeId);
           const handleError = (err, code) => {
             err.routerCode = code;
@@ -1383,10 +1359,21 @@
           }
           let didError = false;
           try {
-            await route.options.beforeLoad?.({
+            const routeContext = (await route.options.beforeLoad?.({
               ...match,
-              preload: !!opts?.preload
-            });
+              preload: !!opts?.preload,
+              parentContext: parentMatch?.routeContext ?? {},
+              context: parentMatch?.context ?? this?.options.context ?? {}
+            })) ?? {};
+            const context = {
+              ...(parentMatch?.context ?? this?.options.context),
+              ...routeContext
+            };
+            this.setRouteMatch(match.id, s => ({
+              ...s,
+              context,
+              routeContext
+            }));
           } catch (err) {
             handleError(err, 'BEFORE_LOAD');
             didError = true;
@@ -1403,7 +1390,7 @@
         }
         throw err;
       }
-      const validResolvedMatches = resolvedMatches.slice(0, firstBadMatchIndex);
+      const validResolvedMatches = getFreshMatches().slice(0, firstBadMatchIndex);
       const matchPromises = [];
       validResolvedMatches.forEach((match, index) => {
         matchPromises.push((async () => {
@@ -2200,14 +2187,14 @@
         return useMatch({
           ...opts,
           from: route.id,
-          select: d => opts?.select?.(d.context) ?? d.context
+          select: d => opts?.select ? opts.select(d.context) : d.context
         });
       },
       useRouteContext: (opts = {}) => {
         return useMatch({
           ...opts,
           from: route.id,
-          select: d => opts?.select?.(d.routeContext) ?? d.routeContext
+          select: d => opts?.select ? opts.select(d.routeContext) : d.routeContext
         });
       },
       useSearch: (opts = {}) => {
@@ -2414,7 +2401,7 @@
     return useRouterState({
       select: state => {
         const matches = state.matches.slice(state.matches.findIndex(d => d.id === matchIds[0]));
-        return opts?.select?.(matches) ?? matches;
+        return opts?.select ? opts.select(matches) : matches;
       }
     });
   }
@@ -2432,39 +2419,39 @@
     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 match = useRouterState({
+    const matchSelection = useRouterState({
       select: state => {
         const matches = state.matches;
         const match = opts?.from ? matches.find(d => d.routeId === opts?.from) : matches.find(d => d.id === nearestMatchId);
         invariant(match, `Could not find ${opts?.from ? `an active match from "${opts.from}"` : 'a nearest match!'}`);
-        return opts?.select?.(match) ?? match;
+        return opts?.select ? opts.select(match) : match;
       }
     });
-    return match;
+    return matchSelection;
   }
   function useLoader(opts) {
     return useMatch({
       ...opts,
-      select: match => opts?.select?.(match.loaderData) ?? match.loaderData
+      select: match => opts?.select ? opts?.select(match.loaderData) : match.loaderData
     });
   }
   function useRouterContext(opts) {
     return useMatch({
       ...opts,
-      select: match => opts?.select?.(match.context) ?? match.context
+      select: match => opts?.select ? opts.select(match.context) : match.context
     });
   }
   function useRouteContext(opts) {
     return useMatch({
       ...opts,
-      select: match => opts?.select?.(match.routeContext) ?? match.routeContext
+      select: match => opts?.select ? opts.select(match.routeContext) : match.routeContext
     });
   }
   function useSearch(opts) {
     return useMatch({
       ...opts,
       select: match => {
-        return opts?.select?.(match.search) ?? match.search;
+        return opts?.select ? opts.select(match.search) : match.search;
       }
     });
   }
@@ -2472,7 +2459,7 @@
     return useRouterState({
       select: state => {
         const params = last(state.matches)?.params;
-        return opts?.select?.(params) ?? params;
+        return opts?.select ? opts.select(params) : params;
       }
     });
   }