@richie-router/react 0.1.1 → 0.1.2

package/dist/cjs/router.cjs

@@ -104,9 +104,6 @@ var OutletContext = import_react.default.createContext(null);
 var MatchContext = import_react.default.createContext(null);
 var MANAGED_HEAD_ATTRIBUTE = "data-richie-router-head";
 var EMPTY_HEAD = { meta: [], links: [], scripts: [], styles: [] };
-function isHeadTagReference(head) {
-  return typeof head === "string";
-}
 function routeHasRecord(value) {
   return typeof value === "object" && value !== null;
 }
@@ -303,13 +300,9 @@ class Router {
     });
   }
   resolveSearch(route, rawSearch) {
-    const fromHeadTagSchema = route.searchSchema ? route.searchSchema.parse(rawSearch) : {};
-    const fromRoute = route.options.validateSearch ? route.options.validateSearch(rawSearch) : {};
-    if (routeHasRecord(fromHeadTagSchema) || routeHasRecord(fromRoute)) {
-      return {
-        ...routeHasRecord(fromHeadTagSchema) ? fromHeadTagSchema : {},
-        ...routeHasRecord(fromRoute) ? fromRoute : {}
-      };
+    const fromSchema = route.searchSchema ? route.searchSchema.parse(rawSearch) : {};
+    if (routeHasRecord(fromSchema)) {
+      return fromSchema;
     }
     return rawSearch;
   }
@@ -355,17 +348,16 @@ class Router {
   async resolveLocationHead(matches, location, request) {
     const resolvedHeadByRoute = new Map;
     for (const match of matches) {
-      const headOption = match.route.options.head;
-      if (!isHeadTagReference(headOption)) {
+      if (!match.route.serverHead) {
         continue;
       }
-      resolvedHeadByRoute.set(match.route.fullPath, await this.loadRouteHead(match.route, headOption, match.params, match.search, location, request));
+      resolvedHeadByRoute.set(match.route.fullPath, await this.loadRouteHead(match.route, match.params, match.search, location, request));
     }
     return import_core.resolveHeadConfig(matches, resolvedHeadByRoute);
   }
-  async loadRouteHead(route, headTagName, params, search, location, request) {
+  async loadRouteHead(route, params, search, location, request) {
     const cacheKey = JSON.stringify({
-      headTagName,
+      routeId: route.fullPath,
       params,
       search
     });
@@ -375,31 +367,31 @@ class Router {
     }
     const response = this.options.loadRouteHead !== undefined ? await this.options.loadRouteHead({
       route,
-      headTagName,
+      routeId: route.fullPath,
       params,
       search,
       location,
       request
-    }) : await this.fetchRouteHead(route, headTagName, params, search);
+    }) : await this.fetchRouteHead(route, params, search);
     this.headCache.set(cacheKey, {
       head: response.head,
       expiresAt: Date.now() + (response.staleTime ?? 0)
     });
     return response.head;
   }
-  async fetchRouteHead(route, headTagName, params, search) {
+  async fetchRouteHead(route, params, search) {
     const basePath = this.options.headBasePath ?? "/head-api";
     const searchParams = new URLSearchParams({
       routeId: route.fullPath,
       params: JSON.stringify(params),
       search: JSON.stringify(search)
     });
-    const response = await fetch(`${basePath}/${encodeURIComponent(headTagName)}?${searchParams.toString()}`);
+    const response = await fetch(`${basePath}?${searchParams.toString()}`);
     if (!response.ok) {
       if (response.status === 404) {
         throw import_core.notFound();
       }
-      throw new Error(`Failed to resolve head tag "${headTagName}" for route "${route.fullPath}"`);
+      throw new Error(`Failed to resolve server head for route "${route.fullPath}"`);
     }
     return await response.json();
   }

package/dist/esm/router.mjs

@@ -27,9 +27,6 @@ var OutletContext = React.createContext(null);
 var MatchContext = React.createContext(null);
 var MANAGED_HEAD_ATTRIBUTE = "data-richie-router-head";
 var EMPTY_HEAD = { meta: [], links: [], scripts: [], styles: [] };
-function isHeadTagReference(head) {
-  return typeof head === "string";
-}
 function routeHasRecord(value) {
   return typeof value === "object" && value !== null;
 }
@@ -226,13 +223,9 @@ class Router {
     });
   }
   resolveSearch(route, rawSearch) {
-    const fromHeadTagSchema = route.searchSchema ? route.searchSchema.parse(rawSearch) : {};
-    const fromRoute = route.options.validateSearch ? route.options.validateSearch(rawSearch) : {};
-    if (routeHasRecord(fromHeadTagSchema) || routeHasRecord(fromRoute)) {
-      return {
-        ...routeHasRecord(fromHeadTagSchema) ? fromHeadTagSchema : {},
-        ...routeHasRecord(fromRoute) ? fromRoute : {}
-      };
+    const fromSchema = route.searchSchema ? route.searchSchema.parse(rawSearch) : {};
+    if (routeHasRecord(fromSchema)) {
+      return fromSchema;
     }
     return rawSearch;
   }
@@ -278,17 +271,16 @@ class Router {
   async resolveLocationHead(matches, location, request) {
     const resolvedHeadByRoute = new Map;
     for (const match of matches) {
-      const headOption = match.route.options.head;
-      if (!isHeadTagReference(headOption)) {
+      if (!match.route.serverHead) {
         continue;
       }
-      resolvedHeadByRoute.set(match.route.fullPath, await this.loadRouteHead(match.route, headOption, match.params, match.search, location, request));
+      resolvedHeadByRoute.set(match.route.fullPath, await this.loadRouteHead(match.route, match.params, match.search, location, request));
     }
     return resolveHeadConfig(matches, resolvedHeadByRoute);
   }
-  async loadRouteHead(route, headTagName, params, search, location, request) {
+  async loadRouteHead(route, params, search, location, request) {
     const cacheKey = JSON.stringify({
-      headTagName,
+      routeId: route.fullPath,
       params,
       search
     });
@@ -298,31 +290,31 @@ class Router {
     }
     const response = this.options.loadRouteHead !== undefined ? await this.options.loadRouteHead({
       route,
-      headTagName,
+      routeId: route.fullPath,
       params,
       search,
       location,
       request
-    }) : await this.fetchRouteHead(route, headTagName, params, search);
+    }) : await this.fetchRouteHead(route, params, search);
     this.headCache.set(cacheKey, {
       head: response.head,
       expiresAt: Date.now() + (response.staleTime ?? 0)
     });
     return response.head;
   }
-  async fetchRouteHead(route, headTagName, params, search) {
+  async fetchRouteHead(route, params, search) {
     const basePath = this.options.headBasePath ?? "/head-api";
     const searchParams = new URLSearchParams({
       routeId: route.fullPath,
       params: JSON.stringify(params),
       search: JSON.stringify(search)
     });
-    const response = await fetch(`${basePath}/${encodeURIComponent(headTagName)}?${searchParams.toString()}`);
+    const response = await fetch(`${basePath}?${searchParams.toString()}`);
     if (!response.ok) {
       if (response.status === 404) {
         throw notFound();
       }
-      throw new Error(`Failed to resolve head tag "${headTagName}" for route "${route.fullPath}"`);
+      throw new Error(`Failed to resolve server head for route "${route.fullPath}"`);
     }
     return await response.json();
   }

package/dist/types/router.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { RouteNode, isNotFound, isRedirect, notFound, redirect } from '@richie-router/core';
-import type { AnyComponent, AnyRoute, DehydratedHeadState, HeadConfig, NormalizeRouteId, ParsedLocation, ResolveAllParams, RouteMatch, RouteOptions as CoreRouteOptions, Simplify } from '@richie-router/core';
+import type { AnyComponent, AnyRoute, DehydratedHeadState, HeadConfig, NormalizeRouteId, ParsedLocation, ResolveAllParams, RouteMatch, RouteOptions as CoreRouteOptions } from '@richie-router/core';
 import { createBrowserHistory, createHashHistory, createMemoryHistory } from './history';
 import type { MemoryHistoryOptions, RouterHistory } from './history';
 declare global {
@@ -10,12 +10,9 @@ declare global {
 }
 export interface Register {
 }
-type RegisteredHeadTagMap = Register extends {
-    headTagMap: infer THeadTagMap;
-} ? THeadTagMap : Record<string, string>;
-type RegisteredHeadTagSearchSchema = Register extends {
-    headTagSearchSchema: infer THeadTagSearchSchema;
-} ? THeadTagSearchSchema : Record<string, {}>;
+type RegisteredRouteSearchSchema = Register extends {
+    routeSearchSchema: infer TRouteSearchSchema;
+} ? TRouteSearchSchema : Record<string, {}>;
 type RegisteredRouteTree = Register extends {
     routeTree: infer TRouteTree;
 } ? TRouteTree : AnyRoute;
@@ -65,8 +62,7 @@ type MatchOfRoute<TRoute> = {
 type SafeRouteByTo<TTo extends string> = [RouteById<TTo>] extends [never] ? AnyRoute : RouteById<TTo>;
 type ParamsForTo<TTo extends string> = ParamsOfRoute<SafeRouteByTo<TTo>>;
 type SearchForTo<TTo extends string> = SearchOfRoute<SafeRouteByTo<TTo>>;
-type SearchForFullPath<TPath extends string> = TPath extends keyof RegisteredHeadTagSearchSchema ? RegisteredHeadTagSearchSchema[TPath] : {};
-type HeadTagNameForFullPath<TPath extends string> = TPath extends keyof RegisteredHeadTagMap ? RegisteredHeadTagMap[TPath] : string;
+type SearchForRouteId<TPath extends string> = TPath extends keyof RegisteredRouteSearchSchema ? RegisteredRouteSearchSchema[TPath] : {};
 type ParamsInput<TParams> = TParams | ((previous: TParams) => TParams);
 type SearchInput<TSearch> = TSearch | ((previous: TSearch) => TSearch) | true;
 type ParamsOption<TParams> = keyof TParams extends never ? {
@@ -79,11 +75,12 @@ type ClientHeadOption<TPath extends string, TSearch> = HeadConfig | ((ctx: {
     search: TSearch;
     matches: RouteMatch[];
 }) => HeadConfig);
-type RouteHeadOption<TPath extends string, TSearch> = ClientHeadOption<TPath, TSearch> | (HeadTagNameForFullPath<TPath> extends never ? never : HeadTagNameForFullPath<TPath>);
 type RouteOptionsInput<TPath extends string, TSearch> = Omit<CoreRouteOptions<TPath, TSearch>, 'head'> & {
-    head?: RouteHeadOption<TPath, TSearch>;
+    head?: ClientHeadOption<TPath, TSearch>;
+};
+type FileRouteInstance<TPath extends string, TSearch, TFileTypes = unknown, THasInlineHead extends boolean = boolean> = RouteNode<TPath, NormalizeRouteId<TPath>, ResolveAllParams<TPath>, TSearch, TFileTypes> & RouteApiMethods<RouteNode<TPath, NormalizeRouteId<TPath>, ResolveAllParams<TPath>, TSearch, TFileTypes>> & {
+    __hasInlineHead: THasInlineHead;
 };
-type FileRouteInstance<TPath extends string, TSearch, TFileTypes = unknown> = RouteNode<TPath, NormalizeRouteId<TPath>, ResolveAllParams<TPath>, TSearch, TFileTypes> & RouteApiMethods<RouteNode<TPath, NormalizeRouteId<TPath>, ResolveAllParams<TPath>, TSearch, TFileTypes>>;
 export interface TypedRouteMatch<TPath extends string, TSearch, TRoute extends AnyRoute = AnyRoute> extends Omit<RouteMatch<TRoute>, 'params' | 'search'> {
     params: ResolveAllParams<TPath>;
     search: TSearch;
@@ -142,7 +139,7 @@ export interface RouterOptions<TRouteTree extends AnyRoute> {
     stringifySearch?: (search: Record<string, unknown>) => string;
     loadRouteHead?: (ctx: {
         route: AnyRoute;
-        headTagName: string;
+        routeId: string;
         params: Record<string, string>;
         search: unknown;
         location: ParsedLocation;
@@ -156,12 +153,12 @@ type InternalRouteMatch = RouteMatch & {
     id: string;
 };
 type Selector<TSelection> = (state: RouterState) => TSelection;
-export declare function createFileRoute<TPath extends string>(path: TPath): <TCustomSearch = {}>(options: RouteOptionsInput<TPath, Simplify<SearchForFullPath<TPath> & TCustomSearch>> & {
-    validateSearch?: (raw: Record<string, unknown>) => TCustomSearch;
-}) => FileRouteInstance<TPath, Simplify<SearchForFullPath<TPath> & TCustomSearch>>;
-export declare function createRootRoute<TCustomSearch = {}>(options: CoreRouteOptions<'__root__', TCustomSearch> & {
-    validateSearch?: (raw: Record<string, unknown>) => TCustomSearch;
-}): FileRouteInstance<'__root__', TCustomSearch>;
+export declare function createFileRoute<TPath extends string>(path: TPath): <TOptions extends RouteOptionsInput<TPath, SearchForRouteId<TPath>>>(options: TOptions) => FileRouteInstance<TPath, SearchForRouteId<TPath>, unknown, TOptions extends {
+    head: any;
+} ? true : false>;
+export declare function createRootRoute<TOptions extends RouteOptionsInput<'__root__', SearchForRouteId<'__root__'>>>(options: TOptions): FileRouteInstance<'__root__', SearchForRouteId<'__root__'>, unknown, TOptions extends {
+    head: any;
+} ? true : false>;
 export declare class Router<TRouteTree extends AnyRoute> {
     readonly routeTree: TRouteTree;
     readonly history: RouterHistory;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@richie-router/react",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "React runtime, components, and hooks for Richie Router",
   "sideEffects": false,
   "exports": {
@@ -13,7 +13,7 @@
     }
   },
   "dependencies": {
-    "@richie-router/core": "^0.1.1"
+    "@richie-router/core": "^0.1.2"
   },
   "peerDependencies": {
     "react": "^19"