@tanstack/react-router 1.104.0 → 1.105.0

package/dist/cjs/route.d.cts

@@ -59,6 +59,12 @@ export type MakeRemountDepsOptionsUnion<TRouteTree extends AnyRoute = Registered
 export interface BeforeLoadContextOptions<in out TParentRoute extends AnyRoute, in out TSearchValidator, in out TParams, in out TRouterContext, in out TRouteContextFn> extends ContextOptions<TParentRoute, TParams>, FullSearchSchemaOption<TParentRoute, TSearchValidator> {
     context: Expand<BeforeLoadContextParameter<TParentRoute, TRouterContext, TRouteContextFn>>;
 }
+type AssetFnContextOptions<in out TRouteId, in out TFullPath, in out TParentRoute extends AnyRoute, in out TParams, in out TSearchValidator, in out TLoaderFn, in out TRouterContext, in out TRouteContextFn, in out TBeforeLoadFn, in out TLoaderDeps> = {
+    matches: Array<RouteMatch<TRouteId, TFullPath, ResolveAllParamsFromParent<TParentRoute, TParams>, ResolveFullSearchSchema<TParentRoute, TSearchValidator>, ResolveLoaderData<TLoaderFn>, ResolveAllContext<TParentRoute, TRouterContext, TRouteContextFn, TBeforeLoadFn>, TLoaderDeps>>;
+    match: RouteMatch<TRouteId, TFullPath, ResolveAllParamsFromParent<TParentRoute, TParams>, ResolveFullSearchSchema<TParentRoute, TSearchValidator>, ResolveLoaderData<TLoaderFn>, ResolveAllContext<TParentRoute, TRouterContext, TRouteContextFn, TBeforeLoadFn>, TLoaderDeps>;
+    params: ResolveAllParamsFromParent<TParentRoute, TParams>;
+    loaderData: ResolveLoaderData<TLoaderFn>;
+};
 export interface UpdatableRouteOptions<in out TParentRoute extends AnyRoute, in out TRouteId, in out TFullPath, in out TParams, in out TSearchValidator, in out TLoaderFn, in out TLoaderDeps, in out TRouterContext, in out TRouteContextFn, in out TBeforeLoadFn> extends UpdatableStaticRouteOption {
     caseSensitive?: boolean;
     wrapInSuspense?: boolean;
@@ -92,16 +98,12 @@ export interface UpdatableRouteOptions<in out TParentRoute extends AnyRoute, in
     headers?: (ctx: {
         loaderData: ResolveLoaderData<TLoaderFn>;
     }) => Record<string, string>;
-    head?: (ctx: {
-        matches: Array<RouteMatch<TRouteId, TFullPath, ResolveAllParamsFromParent<TParentRoute, TParams>, ResolveFullSearchSchema<TParentRoute, TSearchValidator>, ResolveLoaderData<TLoaderFn>, ResolveAllContext<TParentRoute, TRouterContext, TRouteContextFn, TBeforeLoadFn>, TLoaderDeps>>;
-        match: RouteMatch<TRouteId, TFullPath, ResolveAllParamsFromParent<TParentRoute, TParams>, ResolveFullSearchSchema<TParentRoute, TSearchValidator>, ResolveLoaderData<TLoaderFn>, ResolveAllContext<TParentRoute, TRouterContext, TRouteContextFn, TBeforeLoadFn>, TLoaderDeps>;
-        params: ResolveAllParamsFromParent<TParentRoute, TParams>;
-        loaderData: ResolveLoaderData<TLoaderFn> | undefined;
-    }) => {
+    head?: (ctx: AssetFnContextOptions<TRouteId, TFullPath, TParentRoute, TParams, TSearchValidator, TLoaderFn, TRouterContext, TRouteContextFn, TBeforeLoadFn, TLoaderDeps>) => {
         links?: AnyRouteMatch['links'];
-        scripts?: AnyRouteMatch['scripts'];
+        scripts?: AnyRouteMatch['headScripts'];
         meta?: AnyRouteMatch['meta'];
     };
+    scripts?: (ctx: AssetFnContextOptions<TRouteId, TFullPath, TParentRoute, TParams, TSearchValidator, TLoaderFn, TRouterContext, TRouteContextFn, TBeforeLoadFn, TLoaderDeps>) => AnyRouteMatch['scripts'];
     ssr?: boolean;
     codeSplitGroupings?: Array<Array<'loader' | 'component' | 'pendingComponent' | 'notFoundComponent' | 'errorComponent'>>;
 }
@@ -292,3 +294,4 @@ export type NotFoundRouteComponent = SyncRouteComponent<NotFoundRouteProps>;
 export declare class NotFoundRoute<TParentRoute extends AnyRootRoute, TRouterContext = AnyContext, TRouteContextFn = AnyContext, TBeforeLoadFn = AnyContext, TSearchValidator = undefined, TLoaderDeps extends Record<string, any> = {}, TLoaderFn = undefined, TChildren = unknown> extends Route<TParentRoute, '/404', '/404', '404', '404', TSearchValidator, {}, TRouterContext, TRouteContextFn, TBeforeLoadFn, TLoaderDeps, TLoaderFn, TChildren> {
     constructor(options: Omit<RouteOptions<TParentRoute, string, string, string, string, TSearchValidator, {}, TLoaderDeps, TLoaderFn, TRouterContext, TRouteContextFn, TBeforeLoadFn>, 'caseSensitive' | 'parseParams' | 'stringifyParams' | 'path' | 'id' | 'params'>);
 }
+export {};

package/dist/cjs/router.cjs

@@ -1064,7 +1064,7 @@ class Router {
                         preload: !!preload && !this.state.matches.find((d) => d.id === matchId)
                       }));
                       const runLoader = async () => {
-                        var _a2, _b2, _c2, _d, _e, _f, _g, _h, _i;
+                        var _a2, _b2, _c2, _d, _e, _f, _g, _h, _i, _j, _k;
                         try {
                           const potentialPendingMinPromise = async () => {
                             const latestMatch = this.getMatch(matchId);
@@ -1085,16 +1085,18 @@ class Router {
                             );
                             await route._lazyPromise;
                             await potentialPendingMinPromise();
-                            const headFnContent = (_d = (_c2 = route.options).head) == null ? void 0 : _d.call(_c2, {
+                            const assetContext = {
                               matches,
                               match: this.getMatch(matchId),
                               params: this.getMatch(matchId).params,
                               loaderData
-                            });
+                            };
+                            const headFnContent = (_d = (_c2 = route.options).head) == null ? void 0 : _d.call(_c2, assetContext);
                             const meta = headFnContent == null ? void 0 : headFnContent.meta;
                             const links = headFnContent == null ? void 0 : headFnContent.links;
-                            const scripts = headFnContent == null ? void 0 : headFnContent.scripts;
-                            const headers = (_f = (_e = route.options).headers) == null ? void 0 : _f.call(_e, {
+                            const headScripts = headFnContent == null ? void 0 : headFnContent.scripts;
+                            const scripts = (_f = (_e = route.options).scripts) == null ? void 0 : _f.call(_e, assetContext);
+                            const headers = (_h = (_g = route.options).headers) == null ? void 0 : _h.call(_g, {
                               loaderData
                             });
                             updateMatch(matchId, (prev) => ({
@@ -1106,15 +1108,16 @@ class Router {
                               loaderData,
                               meta,
                               links,
-                              scripts,
-                              headers
+                              headScripts,
+                              headers,
+                              scripts
                             }));
                           } catch (e) {
                             let error = e;
                             await potentialPendingMinPromise();
                             handleRedirectAndNotFound(this.getMatch(matchId), e);
                             try {
-                              (_h = (_g = route.options).onError) == null ? void 0 : _h.call(_g, e);
+                              (_j = (_i = route.options).onError) == null ? void 0 : _j.call(_i, e);
                             } catch (onErrorError) {
                               error = onErrorError;
                               handleRedirectAndNotFound(
@@ -1129,7 +1132,7 @@ class Router {
                               isFetching: false
                             }));
                           }
-                          (_i = this.serverSsr) == null ? void 0 : _i.onMatchSettled({
+                          (_k = this.serverSsr) == null ? void 0 : _k.onMatchSettled({
                             router: this,
                             match: this.getMatch(matchId)
                           });
@@ -1503,7 +1506,7 @@ class Router {
       return parentContext;
     };
     matchedRoutes.forEach((route, index) => {
-      var _a, _b, _c, _d;
+      var _a, _b;
       const parentMatch = matches[index - 1];
       const [preMatchSearch, strictMatchSearch, searchError] = (() => {
         const parentSearch = (parentMatch == null ? void 0 : parentMatch.search) ?? next.search;
@@ -1589,17 +1592,13 @@ class Router {
           preload: false,
           links: void 0,
           scripts: void 0,
+          headScripts: void 0,
           meta: void 0,
           staticData: route.options.staticData || {},
           loadPromise: routerCore.createControlledPromise(),
           fullPath: route.fullPath
         };
       }
-      if (match.status === "success") {
-        match.headers = (_d = (_c = route.options).headers) == null ? void 0 : _d.call(_c, {
-          loaderData: match.loaderData
-        });
-      }
       if (!(opts == null ? void 0 : opts.preload)) {
         match.globalNotFound = globalNotFoundRouteId === route.id;
       }
@@ -1613,7 +1612,7 @@ class Router {
       matches.push(match);
     });
     matches.forEach((match, index) => {
-      var _a, _b, _c, _d;
+      var _a, _b, _c, _d, _e, _f, _g, _h;
       const route = this.looseRoutesById[match.routeId];
       const existingMatch = this.getMatch(match.id);
       if (!existingMatch && (opts == null ? void 0 : opts._buildLocation) !== true) {
@@ -1638,15 +1637,22 @@ class Router {
           ...match.__beforeLoadContext
         };
       }
-      const headFnContent = (_d = (_c = route.options).head) == null ? void 0 : _d.call(_c, {
-        matches,
-        match,
-        params: match.params,
-        loaderData: match.loaderData ?? void 0
-      });
-      match.links = headFnContent == null ? void 0 : headFnContent.links;
-      match.scripts = headFnContent == null ? void 0 : headFnContent.scripts;
-      match.meta = headFnContent == null ? void 0 : headFnContent.meta;
+      if (match.status === "success") {
+        match.headers = (_d = (_c = route.options).headers) == null ? void 0 : _d.call(_c, {
+          loaderData: match.loaderData
+        });
+        const assetContext = {
+          matches,
+          match,
+          params: match.params,
+          loaderData: match.loaderData
+        };
+        const headFnContent = (_f = (_e = route.options).head) == null ? void 0 : _f.call(_e, assetContext);
+        match.links = headFnContent == null ? void 0 : headFnContent.links;
+        match.headScripts = headFnContent == null ? void 0 : headFnContent.scripts;
+        match.meta = headFnContent == null ? void 0 : headFnContent.meta;
+        match.scripts = (_h = (_g = route.options).scripts) == null ? void 0 : _h.call(_g, assetContext);
+      }
     });
     return matches;
   }