fimo-react-router 2.6.0 → 2.7.0-staging.2

package/dist/FimoProviders.d.ts

@@ -1,15 +1,13 @@
+import { type FimoRouteParamConfig } from 'fimo/routes';
 import React from 'react';
 export { getPreviewLocationChange, getPreviewLocationPath } from 'fimo/preview';
-export interface ParamInfo {
-    schema: string;
-    queryField: string;
-    displayField: string;
-}
+/** A route param as `.fimo/config.json` declares it: Studio reads it verbatim. */
+export type ParamInfo = FimoRouteParamConfig;
 export interface DisplayRoute {
     id: string;
     name: string;
     path: string;
-    params?: Record<string, ParamInfo>;
+    params?: Record<string, FimoRouteParamConfig>;
 }
 /**
  * The routes the running app can actually navigate to right now.

package/dist/prefetch.d.ts

@@ -2,8 +2,9 @@ export declare function resolveFimoLocaleForUrl(url: string): import("fimo-react
 /**
  * Fetch route data for SEO meta resolution.
  *
- * Only entry params are fetched: a locale param is resolved from the URL and
- * never corresponds to a CMS schema, so it must not produce a request.
+ * Only entry params are fetched. A locale param is resolved from the URL, and
+ * an external param names a value the application owns; neither corresponds to
+ * a CMS schema, so neither ever produces a request.
  */
 export declare function resolveMetaEntries(url: string): Promise<Record<string, unknown> | undefined>;
 //# sourceMappingURL=prefetch.d.ts.map

package/dist/prefetch.js

@@ -8,8 +8,9 @@ export function resolveFimoLocaleForUrl(url) {
 /**
  * Fetch route data for SEO meta resolution.
  *
- * Only entry params are fetched: a locale param is resolved from the URL and
- * never corresponds to a CMS schema, so it must not produce a request.
+ * Only entry params are fetched. A locale param is resolved from the URL, and
+ * an external param names a value the application owns; neither corresponds to
+ * a CMS schema, so neither ever produces a request.
  */
 export async function resolveMetaEntries(url) {
     // @ts-ignore – import.meta.env is a Vite feature, replaced at build time for both client and SSR

package/dist/request-url.d.ts

@@ -0,0 +1,20 @@
+/**
+ * The page URL a loader is rendering, from the request it received.
+ *
+ * A data request spells the same page differently: prerender and client
+ * navigation ask for `/blog/hello.data`, `/blog/hello/_.data` when the path
+ * kept its trailing slash, and `/_root.data` for the root, plus a `_routes`
+ * search parameter naming the routes being fetched. Reading that pathname as
+ * the page would look up an entry whose slug literally ends in `.data`.
+ *
+ * React Router 8 hands loaders the normalized `url` beside the raw request, so
+ * an explicit `url` is authoritative and returned as-is. React Router 7
+ * normalizes `request.url` itself unless pass-through requests are enabled,
+ * which is why stripping here has to be safe on an already-normalized URL.
+ * The rules mirror React Router's own `getNormalizedPath`. A page whose own
+ * slug ends in `.data` cannot exist: React Router routes every such pathname
+ * to its data handler before any loader runs, so stripping it here never
+ * changes which page a document request renders.
+ */
+export declare function normalizeLoaderUrl(request: Request, url?: URL | string): string;
+//# sourceMappingURL=request-url.d.ts.map

package/dist/request-url.js

@@ -0,0 +1,44 @@
+// `_.data` carries the trailing slash the request matched: `/blog/hello/_.data`
+// is the data request for `/blog/hello/`, so the slash survives the strip.
+const TRAILING_SLASH_DATA_SUFFIX = '/_.data';
+const ROOT_DATA_SUFFIX = '/_root.data';
+const DATA_SUFFIX = '.data';
+function stripDataSuffix(pathname) {
+    if (pathname.endsWith(TRAILING_SLASH_DATA_SUFFIX)) {
+        return pathname.slice(0, -(TRAILING_SLASH_DATA_SUFFIX.length - 1));
+    }
+    if (pathname.endsWith(ROOT_DATA_SUFFIX)) {
+        return pathname.slice(0, -ROOT_DATA_SUFFIX.length) || '/';
+    }
+    if (pathname.endsWith(DATA_SUFFIX)) {
+        return pathname.slice(0, -DATA_SUFFIX.length);
+    }
+    return pathname;
+}
+/**
+ * The page URL a loader is rendering, from the request it received.
+ *
+ * A data request spells the same page differently: prerender and client
+ * navigation ask for `/blog/hello.data`, `/blog/hello/_.data` when the path
+ * kept its trailing slash, and `/_root.data` for the root, plus a `_routes`
+ * search parameter naming the routes being fetched. Reading that pathname as
+ * the page would look up an entry whose slug literally ends in `.data`.
+ *
+ * React Router 8 hands loaders the normalized `url` beside the raw request, so
+ * an explicit `url` is authoritative and returned as-is. React Router 7
+ * normalizes `request.url` itself unless pass-through requests are enabled,
+ * which is why stripping here has to be safe on an already-normalized URL.
+ * The rules mirror React Router's own `getNormalizedPath`. A page whose own
+ * slug ends in `.data` cannot exist: React Router routes every such pathname
+ * to its data handler before any loader runs, so stripping it here never
+ * changes which page a document request renders.
+ */
+export function normalizeLoaderUrl(request, url) {
+    if (url !== undefined) {
+        return String(url);
+    }
+    const normalized = new URL(request.url);
+    normalized.pathname = stripDataSuffix(normalized.pathname);
+    normalized.searchParams.delete('_routes');
+    return normalized.toString();
+}

package/dist/seo.d.ts

@@ -84,9 +84,18 @@ export declare function fimoHtmlProps(localeOrOptions?: string | {
     lang: string;
     dir: 'ltr' | 'rtl';
 };
-/** Root-loader helper: per-route SEO entry data plus the resolved locale. */
-export declare function loadFimoMetaData({ request }: {
+/**
+ * Root-loader helper: per-route SEO entry data plus the resolved locale.
+ *
+ * Pass the whole loader arguments object. React Router 8 puts the normalized
+ * page URL on `url` beside the raw `request`, which still carries the `.data`
+ * pathname of a data request; React Router 7 normalizes `request.url` itself
+ * unless pass-through requests are enabled. Taking both keeps the lookup on
+ * the page being rendered under either version.
+ */
+export declare function loadFimoMetaData({ request, url }: {
     request: Request;
+    url?: URL | string;
 }): Promise<{
     fimoMetaData: Record<string, unknown> | undefined;
     fimoLocale: import("fimo-react").FimoLocaleResolution;

package/dist/seo.js

@@ -3,6 +3,7 @@ import { normalizePathname, resolveSeoForPath } from 'fimo/seo';
 // @ts-ignore - virtual module provided by fimoConfigPlugin in fimo-vite
 import rawConfig from 'virtual:fimo-config';
 import { resolveFimoLocaleForUrl, resolveMetaEntries } from './prefetch.js';
+import { normalizeLoaderUrl } from './request-url.js';
 const config = rawConfig;
 export function getSeoForPath(pathname, routeData) {
     return resolveSeoForPath(pathname, config, routeData);
@@ -77,9 +78,18 @@ export function fimoHtmlProps(localeOrOptions) {
     const locale = explicitLocale ?? config.i18n?.defaultLocale ?? 'en';
     return { lang: toHtmlLang(locale), dir: getFimoTextDirection(locale) };
 }
-/** Root-loader helper: per-route SEO entry data plus the resolved locale. */
-export async function loadFimoMetaData({ request }) {
-    const fimoMetaData = await resolveMetaEntries(request.url);
-    const fimoLocale = resolveFimoLocaleForUrl(request.url);
+/**
+ * Root-loader helper: per-route SEO entry data plus the resolved locale.
+ *
+ * Pass the whole loader arguments object. React Router 8 puts the normalized
+ * page URL on `url` beside the raw `request`, which still carries the `.data`
+ * pathname of a data request; React Router 7 normalizes `request.url` itself
+ * unless pass-through requests are enabled. Taking both keeps the lookup on
+ * the page being rendered under either version.
+ */
+export async function loadFimoMetaData({ request, url }) {
+    const target = normalizeLoaderUrl(request, url);
+    const fimoMetaData = await resolveMetaEntries(target);
+    const fimoLocale = resolveFimoLocaleForUrl(target);
     return { fimoMetaData, fimoLocale };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fimo-react-router",
-  "version": "2.6.0",
+  "version": "2.7.0-staging.2",
   "description": "Fimo runtime, routing and build integration for React Router projects. Pairs with the fimo package at the same version.",
   "files": [
     "dist/",
@@ -42,14 +42,14 @@
     "react-error-boundary": "^6.0.0"
   },
   "devDependencies": {
-    "@fimo/tsconfig": "2.6.0",
+    "@fimo/tsconfig": "2.7.0-staging.2",
     "@tanstack/react-query": "^5.80.6",
     "@types/node": "22.18.6",
     "@types/react": "19.2.14",
     "@types/react-dom": "19.2.3",
-    "fimo": "2.6.0",
-    "fimo-react": "2.6.0",
-    "fimo-vite": "2.6.0",
+    "fimo": "2.7.0-staging.2",
+    "fimo-react": "2.7.0-staging.2",
+    "fimo-vite": "2.7.0-staging.2",
     "react": "19.2.4",
     "react-dom": "19.2.4",
     "react-router": "7.18.2",
@@ -59,7 +59,7 @@
   },
   "peerDependencies": {
     "@tanstack/react-query": "^5.80.6",
-    "fimo": ">=2.0.1",
+    "fimo": "2.7.0-staging.2",
     "fimo-react": ">=2.0.1",
     "fimo-vite": ">=2.0.1",
     "react": "^18.2.0 || ^19.0.0",