@websolutespa/bom-next 4.0.0-next.3 → 4.0.0-next.4

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @websolutespa/bom-next
 
+## 4.0.0-next.4
+
+### Patch Changes
+
+- Helpers no longer read request data; only the template does and passes it down.
+  - `getPageMetadata` / `getMetadata` read only `params` (no more `DYNAMIC_SERVER_USAGE` on static/ISR pages). A dynamic template awaits its own `searchParams` and calls `buildPageMetadata(page, layout, { searchParams })`.
+  - `getPayload` no longer calls `headers()`: in draft mode pass `headers` from the template.
+  - `draft` defaults to `false` in `createPageContext` and `createLayoutContext`; `'auto'` (reads `draftMode()`) is an explicit opt-in.
+  - Session helpers (`createSession`, `getSession`, `hasValidSession`, `updateSession`, `deleteSession`) take the cookie store as an argument.
+  - `detectedRoute` cookie values with dot segments (`..`, also percent-encoded) or backslashes are rejected.
+
+- Updated dependencies
+  - @websolutespa/payload-plugin-bowl@4.0.0-next.3
+  - @websolutespa/payload-db-memory@3.0.3
+  - @websolutespa/payload-utils@4.0.0-next.0
+  - @websolutespa/bom-core@4.0.0-next.1
+
 ## 4.0.0-next.3
 
 ### Patch Changes

package/README.md

@@ -1,89 +1,89 @@
-# @websolutespa/bom-next
-
-[![npm version](https://badge.fury.io/js/%40websolutespa%2Fbom-next.svg)](https://badge.fury.io/js/%40websolutespa%2Fbom-next)
-
-[![status alpha](https://img.shields.io/badge/status-alpha-red.svg)](https://shields.io/)
-
-Next module of the [BOM Repository](https://github.com/websolutespa/bom) by [websolute](https://www.websolute.com/).
-
----
-
-##### *this library is for internal usage and not production ready*
-
-## Page context
-
-```ts
-import { createPageContext, getMetadata } from '@websolutespa/bom-next/server';
-
-export const generateMetadata = getMetadata('post_detail', config);
-
-const { page, layout, label, link } = await createPageContext(market, locale, 'post_detail', id, {
-  config,
-  depth: 2, // default DEFAULT_PAGE_DEPTH
-  select: { title: true, abstract: true, media: true, components: true },
-  populate: { media: { url: true, alt: true, width: true, height: true, type: true } },
-});
-
-const { layout } = await createLayoutContext(market, locale, { config }); // depth: DEFAULT_LAYOUT_DEPTH (1)
-```
-
-| option | default | |
-|---|---|---|
-| `depth` | `2` | `0` ids only, `1` direct relations/uploads (including those inside blocks), `2` relations of relations |
-| `select` | – | Payload select; envelope fields (`id`, `slug`, `title`, `category`, `markets`, `meta`, `template`) are always read |
-| `populate` | – | per-collection select for populated documents |
-| `draft` | `'auto'` | `true` / `false`, or `'auto'` to read Next `draftMode()` |
-| `layout` | `{ depth: 1 }` | layout options, or `false` to skip the layout |
-
-Page and layout reads are memoized per request, so `getMetadata` and the page component share them when called with the same options.
-To bind `config` once: `export const { createPageContext, createLayoutContext, getMetadata } = createContextHelpers({ config, defaults: { depth: 2 } });`
-
-## Metadata
-
-`getPageMetadata` (and `getMetadata`, its `config`-first form) returns a `generateMetadata` function that renders on the server: plain-text title and description, canonical (keeping `?pagination[page]=N` after the first page), `alternates.languages` with one `locale-COUNTRY` entry per market country plus `x-default`, robots, keywords, Open Graph and Twitter.
-
-```ts
-import { getPageMetadata, JsonLd, buildPageStructuredData } from '@websolutespa/bom-next/server';
-
-export const generateMetadata = getPageMetadata('post_detail', {
-  config,
-  metadata: {
-    brand: { name: 'Example', logo: '/logo.png', twitterName: '@example' },
-    extend: (metadata, { page }) => ({ ...metadata, title: `${metadata.title} | Example` }),
-  },
-});
-
-// JSON-LD in the page component
-<JsonLd data={buildPageStructuredData(page, layout, { brand: { name: 'Example' } })} />
-```
-
-`buildPageMetadata(page, layout, options)` is the same builder for custom routes. URLs are resolved against `NEXT_PUBLIC_URL` unless `baseUrl` is passed. Robots come from `meta.robots`, or `meta.robot` (the `@payloadcms/plugin-seo` field).
-
-The client `MetaDataProvider` only computes values for `useMetaData`; the `next/head` based `Meta`, `OpenGraph` and `StructuredData` components of the mixer packages render nothing in the App Router.
-
-`layout.homeHref` is the root page href for the current market and locale; prefer it to `layout.topLevelHrefs.<slug>`, which is keyed by collection slug or template.
-
-## Routing proxy
-
-`createRouteProxy` resolves each request through `/api/-route` and caches the result per instance: found routes for `BOM_ROUTE_CACHE_TTL` seconds (default `30`, `0` disables), misses and redirects for at most 10 seconds. Draft requests and server errors are never cached. CMS redirects send the browser to the target returned by the resolver.
-
-`routeAutoDetection` redirects `/` straight from the `detectedRoute` cookie when present; otherwise it detects the market (GeoIP, 2 s timeout, cached per IP for one hour) and the locale.
-
-The server context (`getContext`) reads routes from the Bowl route store and caches the rest per market, locale and user for `MEMORY_CACHE_DURATION` seconds (default 300). Any route store change, local or from another instance through Redis, clears it. Draft contexts are never cached.
-
-## Environment
-
-Per-request diagnostics (proxy, local API calls, context cache) are logged in development only (`NODE_ENV` unset or `development`).
-
-| Variable | Default | |
-|---|---|---|
-| `BOM_ROUTE_CACHE_TTL` | `30` | proxy route cache lifetime in seconds, `0` disables it |
-| `MEMORY_CACHE_DURATION` | `300` | server context cache lifetime in seconds |
-| `UI_REGISTRY_SOURCE_DIR` | `packages/ui/src` | registry source directory |
-| `UI_REGISTRY_COMPONENTS_JSON` | nearest `components.json` | shadcn config whose aliases (e.g. `@/ui/lib/utils`) are mapped to registry imports |
-| `UI_REGISTRY_SOURCE_ALIAS` | – | extra import prefix pointing at the registry source, e.g. `@/ui/` |
-| `UI_REGISTRY_SKIP_UNRESOLVED` | – | `1` hides registry items that import app code; otherwise they are listed with `meta.unresolvedImports` |
-
-## User
-
-`UserProvider` reads `/api/auth/me` once per browser session, shared by every mount. Pass `initialUser` (a user or `null`) when the server already knows it to skip the request; `setUser` and `invalidateUser()` keep the cached value current after login or logout.
+# @websolutespa/bom-next
+
+[![npm version](https://badge.fury.io/js/%40websolutespa%2Fbom-next.svg)](https://badge.fury.io/js/%40websolutespa%2Fbom-next)
+
+[![status alpha](https://img.shields.io/badge/status-alpha-red.svg)](https://shields.io/)
+
+Next module of the [BOM Repository](https://github.com/websolutespa/bom) by [websolute](https://www.websolute.com/).
+
+---
+
+##### *this library is for internal usage and not production ready*
+
+## Page context
+
+```ts
+import { createPageContext, getMetadata } from '@websolutespa/bom-next/server';
+
+export const generateMetadata = getMetadata('post_detail', config);
+
+const { page, layout, label, link } = await createPageContext(market, locale, 'post_detail', id, {
+  config,
+  depth: 2, // default DEFAULT_PAGE_DEPTH
+  select: { title: true, abstract: true, media: true, components: true },
+  populate: { media: { url: true, alt: true, width: true, height: true, type: true } },
+});
+
+const { layout } = await createLayoutContext(market, locale, { config }); // depth: DEFAULT_LAYOUT_DEPTH (1)
+```
+
+| option | default | |
+|---|---|---|
+| `depth` | `2` | `0` ids only, `1` direct relations/uploads (including those inside blocks), `2` relations of relations |
+| `select` | – | Payload select; envelope fields (`id`, `slug`, `title`, `category`, `markets`, `meta`, `template`) are always read |
+| `populate` | – | per-collection select for populated documents |
+| `draft` | `'auto'` | `true` / `false`, or `'auto'` to read Next `draftMode()` |
+| `layout` | `{ depth: 1 }` | layout options, or `false` to skip the layout |
+
+Page and layout reads are memoized per request, so `getMetadata` and the page component share them when called with the same options.
+To bind `config` once: `export const { createPageContext, createLayoutContext, getMetadata } = createContextHelpers({ config, defaults: { depth: 2 } });`
+
+## Metadata
+
+`getPageMetadata` (and `getMetadata`, its `config`-first form) returns a `generateMetadata` function that renders on the server: plain-text title and description, canonical (keeping `?pagination[page]=N` after the first page), `alternates.languages` with one `locale-COUNTRY` entry per market country plus `x-default`, robots, keywords, Open Graph and Twitter.
+
+```ts
+import { getPageMetadata, JsonLd, buildPageStructuredData } from '@websolutespa/bom-next/server';
+
+export const generateMetadata = getPageMetadata('post_detail', {
+  config,
+  metadata: {
+    brand: { name: 'Example', logo: '/logo.png', twitterName: '@example' },
+    extend: (metadata, { page }) => ({ ...metadata, title: `${metadata.title} | Example` }),
+  },
+});
+
+// JSON-LD in the page component
+<JsonLd data={buildPageStructuredData(page, layout, { brand: { name: 'Example' } })} />
+```
+
+`buildPageMetadata(page, layout, options)` is the same builder for custom routes. URLs are resolved against `NEXT_PUBLIC_URL` unless `baseUrl` is passed. Robots come from `meta.robots`, or `meta.robot` (the `@payloadcms/plugin-seo` field).
+
+The client `MetaDataProvider` only computes values for `useMetaData`; the `next/head` based `Meta`, `OpenGraph` and `StructuredData` components of the mixer packages render nothing in the App Router.
+
+`layout.homeHref` is the root page href for the current market and locale; prefer it to `layout.topLevelHrefs.<slug>`, which is keyed by collection slug or template.
+
+## Routing proxy
+
+`createRouteProxy` resolves each request through `/api/-route` and caches the result per instance: found routes for `BOM_ROUTE_CACHE_TTL` seconds (default `30`, `0` disables), misses and redirects for at most 10 seconds. Draft requests and server errors are never cached. CMS redirects send the browser to the target returned by the resolver.
+
+`routeAutoDetection` redirects `/` straight from the `detectedRoute` cookie when present; otherwise it detects the market (GeoIP, 2 s timeout, cached per IP for one hour) and the locale.
+
+The server context (`getContext`) reads routes from the Bowl route store and caches the rest per market, locale and user for `MEMORY_CACHE_DURATION` seconds (default 300). Any route store change, local or from another instance through Redis, clears it. Draft contexts are never cached.
+
+## Environment
+
+Per-request diagnostics (proxy, local API calls, context cache) are logged in development only (`NODE_ENV` unset or `development`).
+
+| Variable | Default | |
+|---|---|---|
+| `BOM_ROUTE_CACHE_TTL` | `30` | proxy route cache lifetime in seconds, `0` disables it |
+| `MEMORY_CACHE_DURATION` | `300` | server context cache lifetime in seconds |
+| `UI_REGISTRY_SOURCE_DIR` | `packages/ui/src` | registry source directory |
+| `UI_REGISTRY_COMPONENTS_JSON` | nearest `components.json` | shadcn config whose aliases (e.g. `@/ui/lib/utils`) are mapped to registry imports |
+| `UI_REGISTRY_SOURCE_ALIAS` | – | extra import prefix pointing at the registry source, e.g. `@/ui/` |
+| `UI_REGISTRY_SKIP_UNRESOLVED` | – | `1` hides registry items that import app code; otherwise they are listed with `meta.unresolvedImports` |
+
+## User
+
+`UserProvider` reads `/api/auth/me` once per page load, shared by every mount and client navigation. Pass `initialUser` (a user or `null`) when the server already knows it to skip the request; `setUser` and `invalidateUser()` keep the cached value current after login or logout.

package/dist/client/client.d.ts

@@ -1,7 +1,7 @@
-import * as react0 from "react";
+import * as react1 from "react";
 
 //#region src/client/client.d.ts
-declare function Client(): react0.JSX.Element;
+declare function Client(): react1.JSX.Element;
 //# sourceMappingURL=client.d.ts.map
 
 //#endregion

package/dist/client/extra.d.ts

@@ -1,15 +1,15 @@
-import * as react1 from "react";
+import * as react0 from "react";
 
 //#region src/client/extra.d.ts
 type IExtraContext = Record<string, any>;
-declare const ExtraContext: react1.Context<IExtraContext | undefined>;
+declare const ExtraContext: react0.Context<IExtraContext | undefined>;
 declare function ExtraProvider({
   extra,
   children
 }: {
   extra?: Record<string, any>;
   children?: React.ReactNode;
-}): react1.JSX.Element;
+}): react0.JSX.Element;
 //# sourceMappingURL=extra.d.ts.map
 
 //#endregion

package/dist/client/extra.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extra.d.ts","names":[],"sources":["../../src/client/extra.tsx"],"sourcesContent":[],"mappings":";;;KAIY,aAAA,GAAgB;cAEf,cAAY,MAAA,CAAA,QAAA;iBAET,aAAA;;;;EAJJ,KAAA,CAAA,EAQF,MARE,CAAA,MAAa,EAAA,GAAA,CAAA;EAEZ,QAAA,CAAA,EAOA,KAAA,CAAM,SAP4D;CAAA,CAAA,EAQ9E,MAAA,CAAA,GAAA,CAAA,OAR8E"}
+{"version":3,"file":"extra.d.ts","names":[],"sources":["../../src/client/extra.tsx"],"sourcesContent":[],"mappings":";;;KAIY,aAAA,GAAgB;cAEf,cAAY,MAAA,CAAA,QAAA;iBAET,aAAA;;;;EAJJ,KAAA,CAAA,EAQF,MARE,CAAA,MAAa,EAAA,GAAA,CAAG;EAEf,QAAA,CAAA,EAOA,KAAA,CAAM,SAP4D;CAAA,CAAA,EAQ9E,MAAA,CAAA,GAAA,CAAA,OAR8E"}

package/dist/client/label.d.ts

@@ -1,13 +1,13 @@
-import * as react3 from "react";
+import * as react2 from "react";
 
 //#region src/client/label.d.ts
 type ILabelContext = (key: string, params?: Record<string, any>) => string;
-declare const LabelContext: react3.Context<ILabelContext | undefined>;
+declare const LabelContext: react2.Context<ILabelContext | undefined>;
 declare function LabelProvider({
   children
 }: {
   children?: React.ReactNode;
-}): react3.JSX.Element;
+}): react2.JSX.Element;
 //# sourceMappingURL=label.d.ts.map
 
 //#endregion

package/dist/client/layout.d.ts

@@ -1,16 +1,16 @@
 import { ILayout } from "@websolutespa/bom-core";
-import * as react9 from "react";
+import * as react4 from "react";
 
 //#region src/client/layout.d.ts
 type ILayoutContext = ILayout;
-declare const LayoutContext: react9.Context<ILayoutContext | undefined>;
+declare const LayoutContext: react4.Context<ILayoutContext | undefined>;
 declare function LayoutProvider({
   layout,
   children
 }: {
   layout: ILayout;
   children?: React.ReactNode;
-}): react9.JSX.Element;
+}): react4.JSX.Element;
 //# sourceMappingURL=layout.d.ts.map
 
 //#endregion

package/dist/client/metadata.d.ts

@@ -2,7 +2,7 @@ import { OpenGraphType } from "../lib/open-graph.js";
 import { StructuredDataType } from "../lib/structured-data.js";
 import { TwitterCardType } from "../lib/twitter-card.js";
 import { IMetaData } from "../lib/meta-data.js";
-import * as react5 from "react";
+import * as react6 from "react";
 import { ReactNode } from "react";
 
 //#region src/client/metadata.d.ts
@@ -29,7 +29,7 @@ type IMetaDataOptions = {
   twitterCard?: TwitterCardType;
 };
 type IMetaDataContext = IMetaData;
-declare const MetaDataContext: react5.Context<IMetaData | undefined>;
+declare const MetaDataContext: react6.Context<IMetaData | undefined>;
 /**
  * Computes page metadata for client components (`useMetaData`). It renders
  * nothing into `<head>`: in the App Router, export `generateMetadata` built
@@ -46,7 +46,7 @@ declare function MetaDataProvider({
   metaData: IMetaDataOptions;
   search?: string;
   children?: ReactNode;
-}): react5.JSX.Element;
+}): react6.JSX.Element;
 //# sourceMappingURL=metadata.d.ts.map
 //#endregion
 export { IMetaDataContext, IMetaDataOptions, MetaDataContext, MetaDataProvider };

package/dist/client/page.d.ts

@@ -1,10 +1,10 @@
 import * as _websolutespa_bom_core0 from "@websolutespa/bom-core";
 import { ILocalized, IPage } from "@websolutespa/bom-core";
-import * as react7 from "react";
+import * as react8 from "react";
 
 //#region src/client/page.d.ts
 type IPageContext = ILocalized<IPage>;
-declare const PageContext: react7.Context<{
+declare const PageContext: react8.Context<{
   [x: string]: unknown;
   id: _websolutespa_bom_core0.IEquatable;
   schema: string;
@@ -398,7 +398,7 @@ declare function PageProvider({
 }: {
   page: ILocalized<IPage>;
   children?: React.ReactNode;
-}): react7.JSX.Element;
+}): react8.JSX.Element;
 //# sourceMappingURL=page.d.ts.map
 //#endregion
 export { IPageContext, PageContext, PageProvider };

package/dist/client/useApi.d.ts

@@ -1,13 +1,13 @@
 import { ApiRequestOptions } from "../lib/http.js";
-import * as react11 from "react";
+import * as react15 from "react";
 
 //#region src/client/useApi.d.ts
-declare function useApiFetch<T = unknown>(pathname: string, options?: ApiRequestOptions): [T | undefined, boolean, any, react11.Dispatch<any>];
-declare function useApiGet<T = unknown>(pathname: string, options?: ApiRequestOptions): [T | undefined, boolean, any, react11.Dispatch<any>];
-declare function useApiPost<T = unknown>(pathname: string, payload: unknown, options?: ApiRequestOptions): [T | undefined, boolean, any, react11.Dispatch<any>];
-declare function useApiPut<T = unknown>(pathname: string, payload: unknown, options?: ApiRequestOptions): [T | undefined, boolean, any, react11.Dispatch<any>];
-declare function useApiPatch<T = unknown>(pathname: string, payload: unknown, options?: ApiRequestOptions): [T | undefined, boolean, any, react11.Dispatch<any>];
-declare function useApiDelete<T = unknown>(pathname: string, options?: ApiRequestOptions): [T | undefined, boolean, any, react11.Dispatch<any>];
+declare function useApiFetch<T = unknown>(pathname: string, options?: ApiRequestOptions): [T | undefined, boolean, any, react15.Dispatch<any>];
+declare function useApiGet<T = unknown>(pathname: string, options?: ApiRequestOptions): [T | undefined, boolean, any, react15.Dispatch<any>];
+declare function useApiPost<T = unknown>(pathname: string, payload: unknown, options?: ApiRequestOptions): [T | undefined, boolean, any, react15.Dispatch<any>];
+declare function useApiPut<T = unknown>(pathname: string, payload: unknown, options?: ApiRequestOptions): [T | undefined, boolean, any, react15.Dispatch<any>];
+declare function useApiPatch<T = unknown>(pathname: string, payload: unknown, options?: ApiRequestOptions): [T | undefined, boolean, any, react15.Dispatch<any>];
+declare function useApiDelete<T = unknown>(pathname: string, options?: ApiRequestOptions): [T | undefined, boolean, any, react15.Dispatch<any>];
 type Api = {
   get: <T = unknown>(pathname: string, options?: ApiRequestOptions) => Promise<T>;
   post: <T = unknown>(pathname: string, payload?: unknown, options?: ApiRequestOptions) => Promise<T>;

package/dist/client/useCollectionApi.d.ts

@@ -1,6 +1,6 @@
 import { ApiRequestOptions } from "../lib/http.js";
 import { QueryParams } from "@websolutespa/bom-core";
-import * as react17 from "react";
+import * as react10 from "react";
 
 //#region src/client/useCollectionApi.d.ts
 type CollectionApi = {
@@ -11,11 +11,11 @@ type CollectionApi = {
   delete: <T = unknown>(pathname: string, options?: ApiRequestOptions) => Promise<T>;
 };
 declare function useCollectionApi(): CollectionApi;
-declare function useCollectionApiGet<T = unknown>(pathname: string, params?: QueryParams, options?: ApiRequestOptions): [T | undefined, boolean, any, react17.Dispatch<any>];
-declare function useCollectionApiPost<T = unknown>(pathname: string, payload: unknown, options?: ApiRequestOptions): [T | undefined, boolean, any, react17.Dispatch<any>];
-declare function useCollectionApiPut<T = unknown>(pathname: string, payload: unknown, options?: ApiRequestOptions): [T | undefined, boolean, any, react17.Dispatch<any>];
-declare function useCollectionApiPatch<T = unknown>(pathname: string, payload: unknown, options?: ApiRequestOptions): [T | undefined, boolean, any, react17.Dispatch<any>];
-declare function useCollectionApiDelete<T = unknown>(pathname: string, options?: ApiRequestOptions): [T | undefined, boolean, any, react17.Dispatch<any>];
+declare function useCollectionApiGet<T = unknown>(pathname: string, params?: QueryParams, options?: ApiRequestOptions): [T | undefined, boolean, any, react10.Dispatch<any>];
+declare function useCollectionApiPost<T = unknown>(pathname: string, payload: unknown, options?: ApiRequestOptions): [T | undefined, boolean, any, react10.Dispatch<any>];
+declare function useCollectionApiPut<T = unknown>(pathname: string, payload: unknown, options?: ApiRequestOptions): [T | undefined, boolean, any, react10.Dispatch<any>];
+declare function useCollectionApiPatch<T = unknown>(pathname: string, payload: unknown, options?: ApiRequestOptions): [T | undefined, boolean, any, react10.Dispatch<any>];
+declare function useCollectionApiDelete<T = unknown>(pathname: string, options?: ApiRequestOptions): [T | undefined, boolean, any, react10.Dispatch<any>];
 //#endregion
 export { useCollectionApi, useCollectionApiDelete, useCollectionApiGet, useCollectionApiPatch, useCollectionApiPost, useCollectionApiPut };
 //# sourceMappingURL=useCollectionApi.d.ts.map

package/dist/client/user.d.ts

@@ -1,5 +1,5 @@
 import { IEndUser, IUser } from "../types.js";
-import * as react22 from "react";
+import * as react21 from "react";
 import { ReactNode } from "react";
 
 //#region src/client/user.d.ts
@@ -8,7 +8,7 @@ type UserContextType = {
   user?: UserValue;
   setUser: (user?: UserValue) => void;
 };
-declare const UserContext: react22.Context<UserContextType>;
+declare const UserContext: react21.Context<UserContextType>;
 /** Forces the next UserProvider mount to read `/auth/me` again. */
 declare function invalidateUser(): void;
 /**
@@ -21,7 +21,7 @@ declare function UserProvider({
 }: {
   initialUser?: UserValue;
   children: ReactNode;
-}): react22.JSX.Element;
+}): react21.JSX.Element;
 //#endregion
 export { UserContext, UserContextType, UserProvider, invalidateUser };
 //# sourceMappingURL=user.d.ts.map

package/dist/proxy/route-auto-detection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route-auto-detection.d.ts","names":[],"sources":["../../src/proxy/route-auto-detection.ts"],"sourcesContent":[],"mappings":";;;;iBAMsB,YAAA,UAAsB,sCAAmC;;AAA/E;;;AAA+E,iBA2C/D,oBAAA,CA3C+D,KAAA,CAAA,EAAA,MAAA,CAAA,EAAA,KAAA,IAAA,MAAA;AAAA,iBA+CzD,aAAA,CA/CyD,OAAA,EA+ClC,WA/CkC,EAAA,aAAA,CAAA,EAAA,MAAA,CAAA,EA+CC,OA/CD,CAAA,MAAA,GAAA,SAAA,CAAA;AA2C/D,cAgDH,kBAhDuB,EAgDH,UAhDG;AAIpC"}
+{"version":3,"file":"route-auto-detection.d.ts","names":[],"sources":["../../src/proxy/route-auto-detection.ts"],"sourcesContent":[],"mappings":";;;;iBAMsB,YAAA,UAAsB,sCAAmC;;AAA/E;;;AAA+E,iBA2C/D,oBAAA,CA3C+D,KAAA,CAAA,EAAA,MAAA,CAAA,EAAA,KAAA,IAAA,MAAA;AAAA,iBAyDzD,aAAA,CAzDyD,OAAA,EAyDlC,WAzDkC,EAAA,aAAA,CAAA,EAAA,MAAA,CAAA,EAyDC,OAzDD,CAAA,MAAA,GAAA,SAAA,CAAA;AA2C/D,cA0DH,kBA1DuB,EA0DH,UA1DG;AAcpC"}

package/dist/proxy/route-auto-detection.js

@@ -42,7 +42,14 @@ function setCachedCountry(ip, country) {
 
 */
 function isValidDetectedRoute(value) {
-	return Boolean(value && value.startsWith("/") && !value.startsWith("//") && value !== "/");
+	if (!value || !value.startsWith("/") || value.startsWith("//") || value === "/" || value.includes("\\")) return false;
+	let decoded;
+	try {
+		decoded = decodeURIComponent(value);
+	} catch {
+		return false;
+	}
+	return !decoded.split(/[/?#]/).some((segment) => segment === "." || segment === "..") && !decoded.includes("\\");
 }
 async function detectCountry(request, defaultMarket$1) {
 	let ip = request.headers.get("x-forwarded-for") || request.headers.get("x-real-ip");

package/dist/proxy/route-auto-detection.js.map

@@ -1 +1 @@
-{"version":3,"file":"route-auto-detection.js","names":["request: NextRequest","defaultLocale?: string","defaultLocale","ip: string","country: string","value?: string","defaultMarket?: string","defaultMarket","routeAutoDetection: Middleware","redirectUrl: string | undefined","rootRoutes: IRoute[]","markets: IMarket[]","countries: string[]","x","market","origin: string","redirectUrl: string"],"sources":["../../src/proxy/route-auto-detection.ts"],"sourcesContent":["import { asEquatable, defaultLocale, defaultMarket, IMarket, IRoute } from '@websolutespa/bom-core';\r\nimport { NextRequest, NextResponse } from 'next/server';\r\nimport { debug } from '../lib/debug';\r\nimport { localApiGet } from '../lib/http';\r\nimport { getRequestOrigin, Middleware, MiddlewareOptions } from './proxy';\r\n\r\nexport async function detectLocale(request: NextRequest, defaultLocale?: string) {\r\n  const acceptLanguage = request.headers.get('accept-language')?.split(',')[0];\r\n  const detectedLocale = request.cookies.get('NEXT_LOCALE')?.value || acceptLanguage || defaultLocale || process.env.DEFAULT_LOCALE;\r\n  return detectedLocale as string;\r\n}\r\n\r\nconst GEOIP_TIMEOUT = 2000;\r\nconst GEOIP_CACHE_TTL = 60 * 60 * 1000;\r\nconst GEOIP_CACHE_MAX = 1000;\r\n\r\ntype GeoIpCacheEntry = { country: string; expires: number };\r\nconst globalForGeoIp = globalThis as typeof globalThis & { _bomGeoIpCache?: Map<string, GeoIpCacheEntry> };\r\n// Country lookups are external calls; cache them per IP so repeat visitors\r\n// and crawlers do not hit the GeoIP service on every request to `/`.\r\nconst geoIpCache = globalForGeoIp._bomGeoIpCache ??= new Map<string, GeoIpCacheEntry>();\r\n\r\nfunction getCachedCountry(ip: string): string | undefined {\r\n  const entry = geoIpCache.get(ip);\r\n  if (!entry) {\r\n    return undefined;\r\n  }\r\n  if (entry.expires < Date.now()) {\r\n    geoIpCache.delete(ip);\r\n    return undefined;\r\n  }\r\n  return entry.country;\r\n}\r\n\r\nfunction setCachedCountry(ip: string, country: string) {\r\n  if (geoIpCache.size >= GEOIP_CACHE_MAX) {\r\n    // Maps iterate in insertion order, so the first key is the oldest entry.\r\n    const oldest = geoIpCache.keys().next().value;\r\n    if (oldest !== undefined) {\r\n      geoIpCache.delete(oldest);\r\n    }\r\n  }\r\n  geoIpCache.set(ip, { country, expires: Date.now() + GEOIP_CACHE_TTL });\r\n}\r\n\r\n/**\r\n * A relative, same-origin path previously set by this middleware. Anything\r\n * else (absolute or protocol-relative URLs) is ignored to avoid open redirects.\r\n */\r\nexport function isValidDetectedRoute(value?: string): value is string {\r\n  return Boolean(value && value.startsWith('/') && !value.startsWith('//') && value !== '/');\r\n}\r\n\r\nexport async function detectCountry(request: NextRequest, defaultMarket?: string) {\r\n  let ip = request.headers.get('x-forwarded-for') || request.headers.get('x-real-ip');\r\n  if (ip) {\r\n    ip = ip.split(',')[0]!.trim();\r\n  }\r\n  const isValidIp = ip?.match(/^(\\d+?)\\.(\\d+?)\\.(\\d+?)\\.(\\d+?)$/);\r\n  const cachedCountry = isValidIp && ip ? getCachedCountry(ip) : undefined;\r\n  if (cachedCountry !== undefined) {\r\n    return cachedCountry || defaultMarket || process.env.DEFAULT_MARKET;\r\n  }\r\n  let detectedCountry = '';\r\n  try {\r\n    const token = process.env.IPINFO_TOKEN;\r\n    if (token) {\r\n      const url = isValidIp ?\r\n        `https://api.ipinfo.io/lite/${ip}/country_code?token=${token}` :\r\n        `https://api.ipinfo.io/lite/me/country_code?token=${token}`;\r\n      const response = await fetch(url, { signal: AbortSignal.timeout(GEOIP_TIMEOUT) });\r\n      if (response.ok) {\r\n        const data = await response.text();\r\n        detectedCountry = data.toLowerCase();\r\n      }\r\n    } else {\r\n      const url = `https://geoip.websolute.it/Ip2Location/get_info.aspx?ipaddress=${isValidIp ? ip : ''}`;\r\n      const response = await fetch(url, { signal: AbortSignal.timeout(GEOIP_TIMEOUT) });\r\n      if (response.ok) {\r\n        const xml = await response.text();\r\n        detectedCountry = (\r\n          ((xml.split('<CountryCode><![CDATA[')[1] || '').split(']]></CountryCode>')[0] || '')\r\n        ).replace('-', '').toLowerCase();\r\n        // console.log('detectedCountry', detectedCountry);\r\n      }\r\n    }\r\n    // console.log('routeInterceptor.detectCountry', detectedCountry);\r\n    if (isValidIp && ip) {\r\n      setCachedCountry(ip, detectedCountry);\r\n    }\r\n    return detectedCountry || defaultMarket || process.env.DEFAULT_MARKET;\r\n  } catch (error) {\r\n    console.warn('routeInterceptor.detectCountry.error', error);\r\n  }\r\n  return (defaultMarket || process.env.DEFAULT_MARKET) as string;\r\n}\r\n\r\nexport const routeAutoDetection: Middleware = async ({ request }: MiddlewareOptions) => {\r\n  let redirectUrl: string | undefined = undefined;\r\n  const url = request.nextUrl;\r\n  const origin = getRequestOrigin(request);\r\n  if (url.pathname === '/') {\r\n    const cookie = request.cookies.get('detectedRoute');\r\n    if (isValidDetectedRoute(cookie?.value)) {\r\n      // The cookie is only set after a successful detection, so trust it and\r\n      // skip the route, market and GeoIP lookups entirely.\r\n      return createDetectedRouteResponse(request, origin, cookie.value);\r\n    }\r\n    // console.log('routeInterceptor.routeAutoDetection', url.pathname);\r\n    const rootRoutes: IRoute[] = await localApiGet('/-route?where[isRoot][equals]=true', {}, undefined, origin);\r\n    // console.log('routeInterceptor.routeAutoDetection.rootRoutes', rootRoutes);\r\n    const defaultRoute = rootRoutes.find(x => x.id === '/');\r\n    // console.log('routeInterceptor.routeAutoDetection.defaultRoute', defaultRoute);\r\n    if (defaultRoute) {\r\n      return;\r\n    }\r\n    const markets: IMarket[] = await localApiGet('/market?pagination=false', {}, undefined, origin);\r\n    // console.log('routeInterceptor.routeAutoDetection.markets', markets);\r\n    const market = markets.find(x => x.isDefault) || markets.find(x => x.id === defaultMarket) || markets[0];\r\n    // console.log('routeInterceptor.routeAutoDetection.market', market);\r\n    const detectedCountry = await detectCountry(request, market.id);\r\n    // console.log('routeInterceptor.routeAutoDetection.detectedCountry', detectedCountry);\r\n    const detectedMarket = detectedCountry ? (\r\n      markets.filter(x => Array.isArray(x.countries)).find(x => {\r\n        const countries: string[] = (x.countries || []).map(x => typeof x === 'string' ? x : x.id as string);\r\n        return countries.includes(detectedCountry);\r\n      }) ||\r\n      markets.find(x => !Array.isArray(x.countries))\r\n    ) : undefined;\r\n    // console.log('routeInterceptor.routeAutoDetection.detectedMarket', detectedMarket);\r\n    let detectedMarketRoutes = rootRoutes.filter(x => x.market === detectedMarket?.id);\r\n    if (detectedMarketRoutes.length === 0) {\r\n      detectedMarketRoutes = rootRoutes.filter(x => x.market === market.id);\r\n    }\r\n    // console.log('routeInterceptor.routeAutoDetection.detectedMarketRoutes', detectedMarketRoutes);\r\n    const defaultMarketLocale = market.defaultLanguage ? (\r\n      typeof market.defaultLanguage === 'string' ? market.defaultLanguage : market.defaultLanguage.id\r\n    ) as string : defaultLocale;\r\n    // console.log('routeInterceptor.routeAutoDetection.defaultMarketLocale', defaultMarketLocale);\r\n    const detectedLocale = await detectLocale(request, defaultMarketLocale);\r\n    // console.log('routeInterceptor.routeAutoDetection.detectedLocale', detectedLocale);\r\n    const detectedLocaleRoutes = detectedMarketRoutes.filter(x => x.locale === detectedLocale);\r\n    const detectedRoute =\r\n      detectedLocaleRoutes.length > 0 ?\r\n        detectedLocaleRoutes[0]! :\r\n        detectedMarketRoutes.find(x => {\r\n          const market = markets.find(m => m.id === x.market)!;\r\n          const marketLocale = (market.defaultLanguage ? asEquatable(market.defaultLanguage as string) : defaultMarketLocale);\r\n          return x.locale === marketLocale;\r\n        })!;\r\n    // console.log('routeInterceptor.routeAutoDetection.detectedRoute', detectedRoute);\r\n    if (detectedRoute && detectedRoute.id !== url.pathname) {\r\n      debug('routeInterceptor.routeAutoDetection', detectedLocale, detectedCountry, detectedRoute.id);\r\n      redirectUrl = detectedRoute.id;\r\n    }\r\n    // console.log('routeInterceptor.routeAutoDetection', locale, detectedCountry, rootRoutes);\r\n  }\r\n  if (redirectUrl) {\r\n    return createDetectedRouteResponse(request, origin, redirectUrl);\r\n  }\r\n};\r\n\r\nfunction createDetectedRouteResponse(request: NextRequest, origin: string, redirectUrl: string) {\r\n  const resolvedUrl = new URL(redirectUrl, origin).href;\r\n  const search = request.nextUrl.search;\r\n  const response = NextResponse.redirect(resolvedUrl + search, { status: 307 });\r\n  response.cookies.set({\r\n    expires: new Date(Date.now() + 1 * 24 * 60 * 60 * 1000),\r\n    httpOnly: true,\r\n    name: 'detectedRoute',\r\n    path: '/',\r\n    sameSite: 'lax',\r\n    secure: true,\r\n    value: redirectUrl,\r\n  });\r\n  return response;\r\n}\r\n"],"mappings":"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"}
+{"version":3,"file":"route-auto-detection.js","names":["request: NextRequest","defaultLocale?: string","defaultLocale","ip: string","country: string","value?: string","decoded: string","defaultMarket?: string","defaultMarket","routeAutoDetection: Middleware","redirectUrl: string | undefined","rootRoutes: IRoute[]","markets: IMarket[]","countries: string[]","x","market","origin: string","redirectUrl: string"],"sources":["../../src/proxy/route-auto-detection.ts"],"sourcesContent":["import { asEquatable, defaultLocale, defaultMarket, IMarket, IRoute } from '@websolutespa/bom-core';\r\nimport { NextRequest, NextResponse } from 'next/server';\r\nimport { debug } from '../lib/debug';\r\nimport { localApiGet } from '../lib/http';\r\nimport { getRequestOrigin, Middleware, MiddlewareOptions } from './proxy';\r\n\r\nexport async function detectLocale(request: NextRequest, defaultLocale?: string) {\r\n  const acceptLanguage = request.headers.get('accept-language')?.split(',')[0];\r\n  const detectedLocale = request.cookies.get('NEXT_LOCALE')?.value || acceptLanguage || defaultLocale || process.env.DEFAULT_LOCALE;\r\n  return detectedLocale as string;\r\n}\r\n\r\nconst GEOIP_TIMEOUT = 2000;\r\nconst GEOIP_CACHE_TTL = 60 * 60 * 1000;\r\nconst GEOIP_CACHE_MAX = 1000;\r\n\r\ntype GeoIpCacheEntry = { country: string; expires: number };\r\nconst globalForGeoIp = globalThis as typeof globalThis & { _bomGeoIpCache?: Map<string, GeoIpCacheEntry> };\r\n// Country lookups are external calls; cache them per IP so repeat visitors\r\n// and crawlers do not hit the GeoIP service on every request to `/`.\r\nconst geoIpCache = globalForGeoIp._bomGeoIpCache ??= new Map<string, GeoIpCacheEntry>();\r\n\r\nfunction getCachedCountry(ip: string): string | undefined {\r\n  const entry = geoIpCache.get(ip);\r\n  if (!entry) {\r\n    return undefined;\r\n  }\r\n  if (entry.expires < Date.now()) {\r\n    geoIpCache.delete(ip);\r\n    return undefined;\r\n  }\r\n  return entry.country;\r\n}\r\n\r\nfunction setCachedCountry(ip: string, country: string) {\r\n  if (geoIpCache.size >= GEOIP_CACHE_MAX) {\r\n    // Maps iterate in insertion order, so the first key is the oldest entry.\r\n    const oldest = geoIpCache.keys().next().value;\r\n    if (oldest !== undefined) {\r\n      geoIpCache.delete(oldest);\r\n    }\r\n  }\r\n  geoIpCache.set(ip, { country, expires: Date.now() + GEOIP_CACHE_TTL });\r\n}\r\n\r\n/**\r\n * A relative, same-origin path previously set by this middleware. Anything\r\n * else (absolute or protocol-relative URLs) is ignored to avoid open redirects.\r\n */\r\nexport function isValidDetectedRoute(value?: string): value is string {\r\n  if (!value || !value.startsWith('/') || value.startsWith('//') || value === '/' || value.includes('\\\\')) {\r\n    return false;\r\n  }\r\n  // dot segments (also percent-encoded) would resolve to a different path on redirect\r\n  let decoded: string;\r\n  try {\r\n    decoded = decodeURIComponent(value);\r\n  } catch {\r\n    return false;\r\n  }\r\n  return !decoded.split(/[/?#]/).some(segment => segment === '.' || segment === '..') && !decoded.includes('\\\\');\r\n}\r\n\r\nexport async function detectCountry(request: NextRequest, defaultMarket?: string) {\r\n  let ip = request.headers.get('x-forwarded-for') || request.headers.get('x-real-ip');\r\n  if (ip) {\r\n    ip = ip.split(',')[0]!.trim();\r\n  }\r\n  const isValidIp = ip?.match(/^(\\d+?)\\.(\\d+?)\\.(\\d+?)\\.(\\d+?)$/);\r\n  const cachedCountry = isValidIp && ip ? getCachedCountry(ip) : undefined;\r\n  if (cachedCountry !== undefined) {\r\n    return cachedCountry || defaultMarket || process.env.DEFAULT_MARKET;\r\n  }\r\n  let detectedCountry = '';\r\n  try {\r\n    const token = process.env.IPINFO_TOKEN;\r\n    if (token) {\r\n      const url = isValidIp ?\r\n        `https://api.ipinfo.io/lite/${ip}/country_code?token=${token}` :\r\n        `https://api.ipinfo.io/lite/me/country_code?token=${token}`;\r\n      const response = await fetch(url, { signal: AbortSignal.timeout(GEOIP_TIMEOUT) });\r\n      if (response.ok) {\r\n        const data = await response.text();\r\n        detectedCountry = data.toLowerCase();\r\n      }\r\n    } else {\r\n      const url = `https://geoip.websolute.it/Ip2Location/get_info.aspx?ipaddress=${isValidIp ? ip : ''}`;\r\n      const response = await fetch(url, { signal: AbortSignal.timeout(GEOIP_TIMEOUT) });\r\n      if (response.ok) {\r\n        const xml = await response.text();\r\n        detectedCountry = (\r\n          ((xml.split('<CountryCode><![CDATA[')[1] || '').split(']]></CountryCode>')[0] || '')\r\n        ).replace('-', '').toLowerCase();\r\n        // console.log('detectedCountry', detectedCountry);\r\n      }\r\n    }\r\n    // console.log('routeInterceptor.detectCountry', detectedCountry);\r\n    if (isValidIp && ip) {\r\n      setCachedCountry(ip, detectedCountry);\r\n    }\r\n    return detectedCountry || defaultMarket || process.env.DEFAULT_MARKET;\r\n  } catch (error) {\r\n    console.warn('routeInterceptor.detectCountry.error', error);\r\n  }\r\n  return (defaultMarket || process.env.DEFAULT_MARKET) as string;\r\n}\r\n\r\nexport const routeAutoDetection: Middleware = async ({ request }: MiddlewareOptions) => {\r\n  let redirectUrl: string | undefined = undefined;\r\n  const url = request.nextUrl;\r\n  const origin = getRequestOrigin(request);\r\n  if (url.pathname === '/') {\r\n    const cookie = request.cookies.get('detectedRoute');\r\n    if (isValidDetectedRoute(cookie?.value)) {\r\n      // The cookie is only set after a successful detection, so trust it and\r\n      // skip the route, market and GeoIP lookups entirely.\r\n      return createDetectedRouteResponse(request, origin, cookie.value);\r\n    }\r\n    // console.log('routeInterceptor.routeAutoDetection', url.pathname);\r\n    const rootRoutes: IRoute[] = await localApiGet('/-route?where[isRoot][equals]=true', {}, undefined, origin);\r\n    // console.log('routeInterceptor.routeAutoDetection.rootRoutes', rootRoutes);\r\n    const defaultRoute = rootRoutes.find(x => x.id === '/');\r\n    // console.log('routeInterceptor.routeAutoDetection.defaultRoute', defaultRoute);\r\n    if (defaultRoute) {\r\n      return;\r\n    }\r\n    const markets: IMarket[] = await localApiGet('/market?pagination=false', {}, undefined, origin);\r\n    // console.log('routeInterceptor.routeAutoDetection.markets', markets);\r\n    const market = markets.find(x => x.isDefault) || markets.find(x => x.id === defaultMarket) || markets[0];\r\n    // console.log('routeInterceptor.routeAutoDetection.market', market);\r\n    const detectedCountry = await detectCountry(request, market.id);\r\n    // console.log('routeInterceptor.routeAutoDetection.detectedCountry', detectedCountry);\r\n    const detectedMarket = detectedCountry ? (\r\n      markets.filter(x => Array.isArray(x.countries)).find(x => {\r\n        const countries: string[] = (x.countries || []).map(x => typeof x === 'string' ? x : x.id as string);\r\n        return countries.includes(detectedCountry);\r\n      }) ||\r\n      markets.find(x => !Array.isArray(x.countries))\r\n    ) : undefined;\r\n    // console.log('routeInterceptor.routeAutoDetection.detectedMarket', detectedMarket);\r\n    let detectedMarketRoutes = rootRoutes.filter(x => x.market === detectedMarket?.id);\r\n    if (detectedMarketRoutes.length === 0) {\r\n      detectedMarketRoutes = rootRoutes.filter(x => x.market === market.id);\r\n    }\r\n    // console.log('routeInterceptor.routeAutoDetection.detectedMarketRoutes', detectedMarketRoutes);\r\n    const defaultMarketLocale = market.defaultLanguage ? (\r\n      typeof market.defaultLanguage === 'string' ? market.defaultLanguage : market.defaultLanguage.id\r\n    ) as string : defaultLocale;\r\n    // console.log('routeInterceptor.routeAutoDetection.defaultMarketLocale', defaultMarketLocale);\r\n    const detectedLocale = await detectLocale(request, defaultMarketLocale);\r\n    // console.log('routeInterceptor.routeAutoDetection.detectedLocale', detectedLocale);\r\n    const detectedLocaleRoutes = detectedMarketRoutes.filter(x => x.locale === detectedLocale);\r\n    const detectedRoute =\r\n      detectedLocaleRoutes.length > 0 ?\r\n        detectedLocaleRoutes[0]! :\r\n        detectedMarketRoutes.find(x => {\r\n          const market = markets.find(m => m.id === x.market)!;\r\n          const marketLocale = (market.defaultLanguage ? asEquatable(market.defaultLanguage as string) : defaultMarketLocale);\r\n          return x.locale === marketLocale;\r\n        })!;\r\n    // console.log('routeInterceptor.routeAutoDetection.detectedRoute', detectedRoute);\r\n    if (detectedRoute && detectedRoute.id !== url.pathname) {\r\n      debug('routeInterceptor.routeAutoDetection', detectedLocale, detectedCountry, detectedRoute.id);\r\n      redirectUrl = detectedRoute.id;\r\n    }\r\n    // console.log('routeInterceptor.routeAutoDetection', locale, detectedCountry, rootRoutes);\r\n  }\r\n  if (redirectUrl) {\r\n    return createDetectedRouteResponse(request, origin, redirectUrl);\r\n  }\r\n};\r\n\r\nfunction createDetectedRouteResponse(request: NextRequest, origin: string, redirectUrl: string) {\r\n  const resolvedUrl = new URL(redirectUrl, origin).href;\r\n  const search = request.nextUrl.search;\r\n  const response = NextResponse.redirect(resolvedUrl + search, { status: 307 });\r\n  response.cookies.set({\r\n    expires: new Date(Date.now() + 1 * 24 * 60 * 60 * 1000),\r\n    httpOnly: true,\r\n    name: 'detectedRoute',\r\n    path: '/',\r\n    sameSite: 'lax',\r\n    secure: true,\r\n    value: redirectUrl,\r\n  });\r\n  return response;\r\n}\r\n"],"mappings":"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"}

package/dist/server/helpers.d.ts

@@ -1,4 +1,4 @@
-import { IPageContext, LayoutContextOptions, LayoutOption, LayoutOptions, PageContextOptions, PageSelect, SearchParams, TypedPageContext } from "../types.js";
+import { IPageContext, LayoutContextOptions, LayoutOption, LayoutOptions, PageContextOptions, PageSelect, TypedPageContext } from "../types.js";
 import { CollectionSlug, SanitizedConfig } from "payload";
 import * as next0 from "next";
 
@@ -40,7 +40,6 @@ declare function createContextHelpers({
       locale: string;
       id: string;
     }>;
-    searchParams?: Promise<SearchParams>;
   }>, _parent?: next0.ResolvingMetadata) => Promise<next0.Metadata>;
 };
 //#endregion

package/dist/server/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","names":[],"sources":["../../src/server/helpers.ts"],"sourcesContent":[],"mappings":";;;;;;;;;AACkH;;KAS7G,eAAA,GAAkB,IAAK,CAAA,kBAAA,EAAA,QAAA,GAAA,SAAA,GAAA,QAAA,GAAA,UAAA,GAAA,OAAA,GAAA,QAAA,CAAA,GAAA;EAAkB,MAAvB,CAAA,EACZ,aADY;CAAI;AACH,KAGnB,WAHmB,CAAA,cAGO,cAHP,EAAA,gBAGuC,UAHvC,CAGkD,KAHlD,CAAA,EAAA,gBAG0E,YAH1E,CAAA,GAItB,IAJsB,CAIjB,kBAJiB,CAIE,KAJF,EAIS,OAJT,EAIkB,OAJlB,CAAA,EAAA,QAAA,CAAA,GAAA;EAGnB,MAAA,CAAA,EACsE,OAD3D,CACmE,eADnE,CAAA;CAAA;;;;;;;;;;AACmE,iBAWnE,oBAAA,CAXmE;EAAA,MAAA;EAAA;AAWnF,CAXmF,EAAA;EAAe,MAAvB,EAejE,OAfiE,CAezD,eAfyD,CAAA;EAAO,QAAA,CAAA,EAgBrE,eAhBqE;AAWlF,CAAA,CAAA,EAAgB;EAAoB,iBAAA,CAAA,cAYA,cAZA,EAAA,gBAYgC,UAZhC,CAY2C,KAZ3C,CAAA,GAAA,SAAA,EAAA,gBAY+E,YAZ/E,GAY2F,aAZ3F,CAAA,CAAA,MAAA,EAAA,MAAA,EAAA,MAAA,EAAA,MAAA,EAAA,IAAA,EAaQ,KAbR,EAAA,EAAA,EAAA,MAAA,EAAA,OAAA,CAAA,EAaqC,WAbrC,CAaiD,KAbjD,EAawD,OAbxD,EAaiE,OAbjE,CAAA,CAAA,EAayE,OAbzE,CAayE,gBAbzE,CAayE,KAbzE,EAayE,OAbzE,EAayE,OAbzE,CAAA,CAAA;EAAA,qBAClC,CAAA,cAgBsC,cAhBtC,EAAA,gBAgBsE,UAhBtE,CAgBiF,KAhBjF,CAAA,GAAA,SAAA,EAAA,gBAgBqH,YAhBrH,GAgBiI,aAhBjI,CAAA,CAAA,MAAA,EAAA,MAAA,EAAA,MAAA,EAAA,MAAA,EAAA,IAAA,EAiB0C,KAjB1C,EAAA,EAAA,EAAA,MAAA,EAAA,OAAA,CAAA,EAiBuE,WAjBvE,CAiBmF,KAjBnF,EAiB0F,OAjB1F,EAiBmG,OAjBnG,CAAA,CAAA,EAiB2G,OAjB3G,CAiB2G,gBAjB3G,CAiB2G,KAjB3G,EAiB2G,OAjB3G,EAiB2G,OAjB3G,CAAA,CAAA;EAAM,mBACN,CAAA,MAAA,EAAA,MAAA,EAAA,MAAA,EAAA,MAAA,EAAA,OAAA,CAAA,EAoBgE,OApBhE,CAoBwE,oBApBxE,CAAA,CAAA,EAoB6F,OApB7F,CAoBuE,YAAA,CApBvE;EAAa,WAEG,CAAA,cAqBY,cArBZ,EAAA,gBAqB4C,UArB5C,CAqBuD,KArBvD,CAAA,GAAA,SAAA,CAAA,CAAA,IAAA,EAsBN,KAtBM,EAAA,OAAA,CAAA,EAsBW,IAtBX,CAsBgB,kBAtBhB,CAsBmC,KAtBnC,EAsB0C,OAtB1C,EAsBmD,YAtBnD,CAAA,EAAA,QAAA,CAAA,CAAA,EAAA,CAAA,KAAA,EAsB2E,QAtB3E,CAAA;IAAR,MAAA,EAsBuB,OAtBvB,CAAA;MACG,MAAA,EAAA,MAAA;MAOuB,MAAA,EAAA,MAAA;MAA2C,EAAA,EAAA,MAAA;IAAX,CAAA,CAAA;IAA+C,YAAA,CAAA,SAAA,cAAA;EAAY,CAAA,CAAA,EAAA,OAAA,CAAA,EAclC,KAAA,CAAA,iBAdkC,EAAA,UAAA,gBAAA;CAAA"}
+{"version":3,"file":"helpers.d.ts","names":[],"sources":["../../src/server/helpers.ts"],"sourcesContent":[],"mappings":";;;;;;;;;AACkH;;KAS7G,eAAA,GAAkB,IAAK,CAAA,kBAAA,EAAA,QAAA,GAAA,SAAA,GAAA,QAAA,GAAA,UAAA,GAAA,OAAA,GAAA,QAAA,CAAA,GAAA;EAAkB,MAAvB,CAAA,EACZ,aADY;CAAI;AACH,KAGnB,WAHmB,CAAA,cAGO,cAHP,EAAA,gBAGuC,UAHvC,CAGkD,KAHlD,CAAA,EAAA,gBAG0E,YAH1E,CAAA,GAItB,IAJsB,CAIjB,kBAJiB,CAIE,KAJF,EAIS,OAJT,EAIkB,OAJlB,CAAA,EAAA,QAAA,CAAA,GAAA;EAGnB,MAAA,CAAA,EACsE,OAD3D,CACmE,eADnE,CAAA;CAAA;;;;;;;;;;AACmE,iBAWnE,oBAAA,CAXmE;EAAA,MAAA;EAAA;AAWnF,CAXmF,EAAA;EAAe,MAAvB,EAejE,OAfiE,CAezD,eAfyD,CAAA;EAAO,QAAA,CAAA,EAgBrE,eAhBqE;AAWlF,CAAA,CAAA,EAAgB;EAAoB,iBAAA,CAAA,cAYA,cAZA,EAAA,gBAYgC,UAZhC,CAY2C,KAZ3C,CAAA,GAAA,SAAA,EAAA,gBAY+E,YAZ/E,GAY2F,aAZ3F,CAAA,CAAA,MAAA,EAAA,MAAA,EAAA,MAAA,EAAA,MAAA,EAAA,IAAA,EAaQ,KAbR,EAAA,EAAA,EAAA,MAAA,EAAA,OAAA,CAAA,EAaqC,WAbrC,CAaiD,KAbjD,EAawD,OAbxD,EAaiE,OAbjE,CAAA,CAAA,EAayE,OAbzE,CAayE,gBAbzE,CAayE,KAbzE,EAayE,OAbzE,EAayE,OAbzE,CAAA,CAAA;EAAA,qBAClC,CAAA,cAgBsC,cAhBtC,EAAA,gBAgBsE,UAhBtE,CAgBiF,KAhBjF,CAAA,GAAA,SAAA,EAAA,gBAgBqH,YAhBrH,GAgBiI,aAhBjI,CAAA,CAAA,MAAA,EAAA,MAAA,EAAA,MAAA,EAAA,MAAA,EAAA,IAAA,EAiB0C,KAjB1C,EAAA,EAAA,EAAA,MAAA,EAAA,OAAA,CAAA,EAiBuE,WAjBvE,CAiBmF,KAjBnF,EAiB0F,OAjB1F,EAiBmG,OAjBnG,CAAA,CAAA,EAiB2G,OAjB3G,CAiB2G,gBAjB3G,CAiB2G,KAjB3G,EAiB2G,OAjB3G,EAiB2G,OAjB3G,CAAA,CAAA;EAAM,mBACN,CAAA,MAAA,EAAA,MAAA,EAAA,MAAA,EAAA,MAAA,EAAA,OAAA,CAAA,EAoBgE,OApBhE,CAoBwE,oBApBxE,CAAA,CAAA,EAoB6F,OApB7F,CAoBuE,YAAA,CApBvE;EAAa,WAEG,CAAA,cAqBY,cArBZ,EAAA,gBAqB4C,UArB5C,CAqBuD,KArBvD,CAAA,GAAA,SAAA,CAAA,CAAA,IAAA,EAsBN,KAtBM,EAAA,OAAA,CAAA,EAsBW,IAtBX,CAsBgB,kBAtBhB,CAsBmC,KAtBnC,EAsB0C,OAtB1C,EAsBmD,YAtBnD,CAAA,EAAA,QAAA,CAAA,CAAA,EAAA,CAAA,KAAA,EAsB2E,QAtB3E,CAAA;IAAR,MAAA,EAsBuB,OAtBvB,CAAA;MACG,MAAA,EAAA,MAAA;MAOuB,MAAA,EAAA,MAAA;MAA2C,EAAA,EAAA,MAAA;IAAX,CAAA,CAAA;EAAU,CAAA,CAAA,EAAqC,OAAA,CAAA,EActB,KAAA,CAAA,iBAdsB,EAAA,UAAA,gBAAA;CAAY"}

package/dist/server/json-ld.d.ts

@@ -1,6 +1,6 @@
 import { PageMetadataOptions } from "../lib/page-metadata.js";
 import { ILayout, IPage } from "@websolutespa/bom-core";
-import * as react0 from "react";
+import * as react23 from "react";
 import { WebPage, WithContext } from "schema-dts";
 
 //#region src/server/json-ld.d.ts
@@ -25,7 +25,7 @@ declare function JsonLd({
   data
 }: {
   data: object;
-}): react0.JSX.Element;
+}): react23.JSX.Element;
 //# sourceMappingURL=json-ld.d.ts.map
 
 //#endregion

package/dist/server/json-ld.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"json-ld.d.ts","names":[],"sources":["../../src/server/json-ld.tsx"],"sourcesContent":[],"mappings":";;;;;;KAKY,yBAAA,GAA4B,KAAK;;;IAAjC,IAAA,CAAA,EAAA,MAAA;IAAyB,GAAA,CAAA,EAAA,MAAA;IAAQ,MAAA,CAAA,EAKhC,MALgC,CAAA,MAAA,EAAA,MAAA,CAAA;EAAmB,CAAA;CAApB;AAKzB;AAQnB;;;AAA8D,iBAA9C,uBAAA,CAA8C,IAAA,EAAhB,KAAgB,EAAA,MAAA,CAAA,EAAA,OAAA,EAAA,OAAA,CAAA,EAAkB,yBAAlB,CAAA,EAAmD,WAAnD,CAA+D,OAA/D,CAAA;;;;AAA8D;AA4B5G,iBAAA,MAAA,CAAM;EAAA;CAAA,EAAA;EAAA,IAAA,EAAA,MAAA;CAAA,CAAA,EAA2B,MAAA,CAAA,GAAA,CAAA,OAAxB"}
+{"version":3,"file":"json-ld.d.ts","names":[],"sources":["../../src/server/json-ld.tsx"],"sourcesContent":[],"mappings":";;;;;;KAKY,yBAAA,GAA4B,KAAK;;;IAAjC,IAAA,CAAA,EAAA,MAAA;IAAyB,GAAA,CAAA,EAAA,MAAA;IAAQ,MAAA,CAAA,EAKhC,MALgC,CAAA,MAAA,EAAA,MAAA,CAAA;EAAmB,CAAA;CAApB;AAKzB;AAQnB;;;AAA8D,iBAA9C,uBAAA,CAA8C,IAAA,EAAhB,KAAgB,EAAA,MAAA,CAAA,EAAA,OAAA,EAAA,OAAA,CAAA,EAAkB,yBAAlB,CAAA,EAAmD,WAAnD,CAA+D,OAA/D,CAAA;;;;AAA8D;AA4B5G,iBAAA,MAAA,CAAM;EAAA;CAAA,EAAA;EAAA,IAAA,EAAA,MAAA;CAAA,CAAA,EAA2B,OAAA,CAAA,GAAA,CAAA,OAAxB"}

package/dist/server/metadata.d.ts

@@ -1,4 +1,4 @@
-import { LayoutOption, PageContextOptions, PageParams, PageSelect, SearchParams } from "../types.js";
+import { LayoutOption, PageContextOptions, PageParams, PageSelect } from "../types.js";
 import { PageMetadataBrand, PageMetadataContext, PageMetadataOptions, PageMetadataSearchParams, buildPageMetadata, getPageAlternates, getPageXDefault, getPaginationQuery, inheritParentMetadata, resolveMetadataUrl, toPlainText } from "../lib/page-metadata.js";
 import { CollectionSlug, SanitizedConfig } from "payload";
 import { Metadata, ResolvingMetadata } from "next";
@@ -6,7 +6,6 @@ import { Metadata, ResolvingMetadata } from "next";
 //#region src/server/metadata.d.ts
 type PageMetadataProps = Readonly<{
   params: Promise<PageParams>;
-  searchParams?: Promise<SearchParams>;
 }>;
 type GetPageMetadataOptions<TSlug extends CollectionSlug, TSelect extends PageSelect<TSlug> = undefined> = PageContextOptions<TSlug, TSelect, LayoutOption> & {
   metadata?: PageMetadataOptions;
@@ -19,6 +18,11 @@ type GetPageMetadataOptions<TSlug extends CollectionSlug, TSelect extends PageSe
  * It uses the same defaults as `createPageContext`, so the page read is
  * memoized and shared with the page component within the same request.
  * Pass the same options used by the page (depth, select, headers…) to hit that cache.
+ *
+ * It reads only `params`, never request data, so static/ISR pages stay static.
+ * A dynamic template (e.g. a paginated listing that wants `pagination[page]` in
+ * the canonical) writes its own `generateMetadata`, awaits its own
+ * `props.searchParams` and passes it to `buildPageMetadata(page, layout, { searchParams })`.
  */
 declare function getPageMetadata<TSlug extends CollectionSlug, TSelect extends PageSelect<TSlug> = undefined>(slug: TSlug, options: GetPageMetadataOptions<TSlug, TSelect>): (props: PageMetadataProps, _parent?: ResolvingMetadata) => Promise<Metadata>;
 /**
@@ -31,7 +35,6 @@ declare function getMetadata<TSlug extends CollectionSlug, TSelect extends PageS
     locale: string;
     id: string;
   }>;
-  searchParams?: Promise<SearchParams>;
 }>, _parent?: ResolvingMetadata) => Promise<Metadata>;
 //# sourceMappingURL=metadata.d.ts.map
 

package/dist/server/metadata.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metadata.d.ts","names":[],"sources":["../../src/server/metadata.ts"],"sourcesContent":[],"mappings":";;;;;;KAQY,iBAAA,GAAoB;EAApB,MAAA,EACA,OADA,CACQ,UADS,CAAA;EAAA,YAAA,CAAA,EAEV,OAFU,CAEF,YAFE,CAAA;CAAA,CAAA;AACjB,KAIA,sBAJA,CAAA,cAIqC,cAJrC,EAAA,gBAIqE,UAJrE,CAIgF,KAJhF,CAAA,GAAA,SAAA,CAAA,GAKR,kBALQ,CAKW,KALX,EAKkB,OALlB,EAK2B,YAL3B,CAAA,GAAA;EAAO,QACQ,CAAA,EAKR,mBALQ;CAAY;;AAFC;AAKxC;;;;;;;AACuC,iBAavB,eAbuB,CAAA,cAaO,cAbP,EAAA,gBAauC,UAbvC,CAakD,KAblD,CAAA,GAAA,SAAA,CAAA,CAAA,IAAA,EAc7B,KAd6B,EAAA,OAAA,EAe1B,sBAf0B,CAeH,KAfG,EAeI,OAfJ,CAAA,CAAA,EAAA,CAAA,KAAA,EAmBxB,iBAnBwB,EAAA,OAAA,CAAA,EAoBrB,iBApBqB,EAAA,GAqBhC,OArBgC,CAqBxB,QArBwB,CAAA;;;AACD;AAYtC;AAA+B,iBA2Bf,WA3Be,CAAA,cA2BW,cA3BX,EAAA,gBA2B2C,UA3B3C,CA2BsD,KA3BtD,CAAA,GAAA,SAAA,CAAA,CAAA,IAAA,EA4BrB,KA5BqB,EAAA,MAAA,EA6BnB,OA7BmB,CA6BX,eA7BW,CAAA,EAAA,OAAA,CAAA,EA8BjB,IA9BiB,CA8BZ,sBA9BY,CA8BW,KA9BX,EA8BkB,OA9BlB,CAAA,EAAA,QAAA,CAAA,CAAA,EAAA,CAAA,KAAA,EA8BqC,QA9BrC,CAAA;EAAA,MAAe,EA8B5B,OA9B4B,CAAA;IAA2C,MAAA,EAAA,MAAA;IAAX,MAAA,EAAA,MAAA;IACpE,EAAA,EAAA,MAAA;EAAK,CAAA,CAAA;EAC0B,YAAE,CAAA,EAnBxB,OAmBwB,CAnBhB,YAmBgB,CAAA;CAAO,CAAA,EAAA,OAArC,CAAA,EAKK,iBALL,EAAA,GAMN,OANM,CAME,QANF,CAAA"}
+{"version":3,"file":"metadata.d.ts","names":[],"sources":["../../src/server/metadata.ts"],"sourcesContent":[],"mappings":";;;;;;KAQY,iBAAA,GAAoB;EAApB,MAAA,EACA,OADA,CACQ,UADS,CAAA;CAAA,CAAA;AACT,KAGR,sBAHQ,CAAA,cAG6B,cAH7B,EAAA,gBAG6D,UAH7D,CAGwE,KAHxE,CAAA,GAAA,SAAA,CAAA,GAIhB,kBAJgB,CAIG,KAJH,EAIU,OAJV,EAImB,YAJnB,CAAA,GAAA;EAAU,QAAlB,CAAA,EAKO,mBALP;CAAO;AADqB;AAIxC;;;;;;;;;;AAEsC;AAiBtC;;AAA8C,iBAA9B,eAA8B,CAAA,cAAA,cAAA,EAAA,gBAAgC,UAAhC,CAA2C,KAA3C,CAAA,GAAA,SAAA,CAAA,CAAA,IAAA,EACpC,KADoC,EAAA,OAAA,EAEjC,sBAFiC,CAEV,KAFU,EAEH,OAFG,CAAA,CAAA,EAAA,CAAA,KAAA,EAM/B,iBAN+B,EAAA,OAAA,CAAA,EAO5B,iBAP4B,EAAA,GAQvC,OARuC,CAQ/B,QAR+B,CAAA;;;;;AAEH,iBAqB3B,WArB2B,CAAA,cAqBD,cArBC,EAAA,gBAqB+B,UArB/B,CAqB0C,KArB1C,CAAA,GAAA,SAAA,CAAA,CAAA,IAAA,EAsBjC,KAtBiC,EAAA,MAAA,EAuB/B,OAvB+B,CAuBvB,eAvBuB,CAAA,EAAA,OAAA,CAAA,EAwB7B,IAxB6B,CAwBxB,sBAxBwB,CAwBD,KAxBC,EAwBM,OAxBN,CAAA,EAAA,QAAA,CAAA,CAAA,EAAA,CAAA,KAAA,EAwByB,QAxBzB,CAAA;EAAO,MAArC,EAwBK,OAxBL,CAAA;IAIE,MAAA,EAAA,MAAA;IACG,MAAA,EAAA,MAAA;IACH,EAAA,EAAA,MAAA;EAAQ,CAAA,CAAA;AAAT,CAAA,CAAA,EAAA,OAAA,CAAA,EADI,iBACJ,EAAA,GAAP,OAAO,CAAC,QAAD,CAAA;AAed"}