@elytracms/next 0.0.87 → 0.0.88

package/dist/index.d.ts

@@ -10,7 +10,7 @@ import { LocaleConfig, Locale, RouteRecord, CollectionDef, RedirectRecord } from
 export { CmsDocument, CollectionDef, FieldDef, Locale, LocaleConfig, LocaleRequest, LocaleStrategy, LocaleUrlPath, RedirectRecord, RouteRecord, documentSchema, fallbackHomeRoutes, localeConfigSchema, localeUrlPath, mergeRouteRecords, redirectRecordSchema, resolveLocale, routeRecordSchema, splitLocalePath, textDirection } from '@elytracms/core/cms-core';
 import { AssetRecord, PersistenceAdapter } from '@elytracms/core/persistence';
 export { AssetRecord } from '@elytracms/core/persistence';
-import { Metadata, MetadataRoute } from 'next';
+import { ResolvingMetadata, Metadata, ResolvedMetadata, MetadataRoute } from 'next';
 import { z } from 'zod';
 export { z } from 'zod';
 import { ImageLoader } from 'next/image';
@@ -538,13 +538,53 @@ interface CanvasRouteProps {
 interface CanvasRoute {
     /** The page component: `export default route.Page`. */
     Page: (props: CanvasRouteProps) => Promise<ReactNode>;
-    /** Next metadata hook: `export const generateMetadata = route.generateMetadata`. */
-    generateMetadata: (props: CanvasRouteProps) => Promise<Metadata>;
+    /**
+     * Next metadata hook: `export const generateMetadata = route.generateMetadata`.
+     * Next passes the parent segment's resolving metadata as the second argument;
+     * the route merges the page's tags over it (EC-610). A caller that invokes this
+     * by hand (the scaffold's `app/page.tsx`) forwards its own `parent`.
+     */
+    generateMetadata: (props: CanvasRouteProps, parent?: ResolvingMetadata) => Promise<Metadata>;
 }
 /** Create the `{ Page, generateMetadata }` pair for `app/[[...slug]]/page.tsx`. */
 declare function createCanvasRoute(options: CanvasRouteOptions): CanvasRoute;
 
+/**
+ * EC-531, narrowed by EC-610 (owner ruling 3, 2026-10-23): `og:locale` ONLY in the
+ * shape Open Graph specifies — `language_TERRITORY` with an underscore (`de_DE`),
+ * where BCP 47 writes `de-DE`. The value is the page's RESOLVED locale
+ * (`result.tags.locale`, the same fact the router used to pick the content). A
+ * bare language code (`de`) is outside that format, so the kit emits nothing for
+ * it and the layout's own value stands through the merge: inventing a territory
+ * (`de` → `de_DE`) would be wrong exactly where it matters (Austria, the UK,
+ * Brazil, Latin America), and a wrong valid value looks deliberate.
+ */
+declare function openGraphLocale(locale: string): string | null;
 declare function canvasPageMetadata(result: ResolvePageResult, assets?: readonly ResolvedAsset[]): Metadata;
+/**
+ * EC-610 (owner ruling 1, 2026-10-13): **the site provides the default tags, and
+ * the page's tags are merged on top** — a value the page states overrides the
+ * site's, a value the page leaves empty falls back to the site's.
+ *
+ * Next merges metadata SHALLOWLY (read: `generate-metadata.md`, "Merging"): a
+ * page segment's `openGraph` object REPLACES the layout's whole `openGraph`, so a
+ * site-wide `type`, `siteName`, site image or `locale` declared once in the root
+ * layout never reached a canvas page, and both real sites hand-rolled around it
+ * differently (NK-039's page hook, Konditorei's post bypass). This is the one
+ * merge, applied by the canvas route to whatever builds the page's metadata (the
+ * kit's default or the host's `metadata` option): every object-valued key the
+ * page sets (`openGraph`, `twitter`, `robots`, `alternates`, …) is merged one
+ * level deep over the parent's RESOLVED value; a key the page does not set is left
+ * to Next, which inherits it from the parent as before; a scalar or array the
+ * page sets wins outright.
+ *
+ * The parent's resolved shapes spread back cleanly: Next hands `generateMetadata`
+ * a `ResolvedMetadata` whose URLs are already strings, whose `images` are
+ * descriptor objects and whose titles are `{ absolute, template }` — all of which
+ * `Metadata` accepts (Next's own "extend rather than replace" example spreads
+ * `(await parent).openGraph?.images`).
+ */
+declare function mergeMetadataOverParent(parent: ResolvedMetadata | null | undefined, page: Metadata): Metadata;
 
 /**
  * `sitemap.xml` from published routes (EC-171): walk the same route records
@@ -1668,4 +1708,4 @@ declare function evaluatePreviewRequest(requestUrl: string | URL, expectedToken:
  */
 declare const PACKAGE = "@elytracms/next";
 
-export { type AssetImageLoaderOptions, type CacheWrapper, type CacheWrapperOptions, type CachedEntry, type CanvasCacheOptions, type CanvasContentRequest, type CanvasPageOutcome, CanvasRenderer, type CanvasRendererProps, type CanvasRequestInfo, type CanvasRoute, type CanvasRouteOptions, type CanvasRouteProps, type CanvasSitemapOptions, type CanvasSitemapResult, type CanvasWrapContext, type ContentSnapshot, type ContentSnapshotOptions, type ContentSource, type CreateCanvasSitemapOptions, type DefineHostComponentsOptions, type DeliveryPresentation, ELYTRA_HOST_ENV_KEYS, type ElytraContentMode, type ElytraHost, type ElytraHostEnv, type ElytraHostImageOptions, type ElytraHostOptions, ElytraImage, type ElytraImageAsset, type ElytraImageProps, type GlobalsConventions, type HostCanvasRouteOptions, type HostComponent, type HostComponents, type LiveContentOptions, type LoadGlobalsOptions, type NextImagePrimitiveOptions, PACKAGE, type PreviewEvaluation, type PreviewRouteHandlers, type PreviewRouteOptions, REVALIDATE_SIGNATURE_HEADER, type ResolveCanvasPageOptions, type ResolveGlobalsOptions, type ResolvedLink, type ResolvedNavEntry, type ResolvedNavLink, type RevalidateEvaluation, type RevalidatePayload, type RevalidateRouteHandlers, type RevalidateRouteOptions, type SiteGlobals, type SitemapParamsProvider, type SitemapRouteContext, type SitemapSkippedRoute, type StaticContentData, assembleLiveSource, bodyItemsOf, canvasPageMetadata, canvasSitemapEntries, collectionCacheTag, createAssetImageLoader, createCanvasRoute, createCanvasSitemap, createContentSnapshot, createElytraHost, createPreviewDisableRoute, createPreviewRoute, createRevalidateRoute, createStaticContentSource, defineHostComponents, docCacheTag, elytraHostImage, evaluatePreviewRequest, evaluateRevalidateRequest, firstBlockFullBleed, loadCachedEntry, loadLiveContent, mergeCacheTags, nextCacheTags, nextImagePrimitive, pathFromSlug, projectSweepTag, resolveCanvasPage, resolveGlobals, resolveHostEnv, revalidatePayloadSchema, routeCacheTag, safeRedirectTarget, scopeCacheTag, signRevalidateBody };
+export { type AssetImageLoaderOptions, type CacheWrapper, type CacheWrapperOptions, type CachedEntry, type CanvasCacheOptions, type CanvasContentRequest, type CanvasPageOutcome, CanvasRenderer, type CanvasRendererProps, type CanvasRequestInfo, type CanvasRoute, type CanvasRouteOptions, type CanvasRouteProps, type CanvasSitemapOptions, type CanvasSitemapResult, type CanvasWrapContext, type ContentSnapshot, type ContentSnapshotOptions, type ContentSource, type CreateCanvasSitemapOptions, type DefineHostComponentsOptions, type DeliveryPresentation, ELYTRA_HOST_ENV_KEYS, type ElytraContentMode, type ElytraHost, type ElytraHostEnv, type ElytraHostImageOptions, type ElytraHostOptions, ElytraImage, type ElytraImageAsset, type ElytraImageProps, type GlobalsConventions, type HostCanvasRouteOptions, type HostComponent, type HostComponents, type LiveContentOptions, type LoadGlobalsOptions, type NextImagePrimitiveOptions, PACKAGE, type PreviewEvaluation, type PreviewRouteHandlers, type PreviewRouteOptions, REVALIDATE_SIGNATURE_HEADER, type ResolveCanvasPageOptions, type ResolveGlobalsOptions, type ResolvedLink, type ResolvedNavEntry, type ResolvedNavLink, type RevalidateEvaluation, type RevalidatePayload, type RevalidateRouteHandlers, type RevalidateRouteOptions, type SiteGlobals, type SitemapParamsProvider, type SitemapRouteContext, type SitemapSkippedRoute, type StaticContentData, assembleLiveSource, bodyItemsOf, canvasPageMetadata, canvasSitemapEntries, collectionCacheTag, createAssetImageLoader, createCanvasRoute, createCanvasSitemap, createContentSnapshot, createElytraHost, createPreviewDisableRoute, createPreviewRoute, createRevalidateRoute, createStaticContentSource, defineHostComponents, docCacheTag, elytraHostImage, evaluatePreviewRequest, evaluateRevalidateRequest, firstBlockFullBleed, loadCachedEntry, loadLiveContent, mergeCacheTags, mergeMetadataOverParent, nextCacheTags, nextImagePrimitive, openGraphLocale, pathFromSlug, projectSweepTag, resolveCanvasPage, resolveGlobals, resolveHostEnv, revalidatePayloadSchema, routeCacheTag, safeRedirectTarget, scopeCacheTag, signRevalidateBody };

package/dist/index.js

@@ -467,7 +467,7 @@ function resolveOgImage(value, assets) {
   return assets.find((asset) => asset.id === value)?.url ?? null;
 }
 function openGraphLocale(locale) {
-  return locale.replace(/-/g, "_");
+  return locale.includes("-") ? locale.replace(/-/g, "_") : null;
 }
 function canvasPageMetadata(result, assets = []) {
   const doc = result.document;
@@ -484,17 +484,32 @@ function canvasPageMetadata(result, assets = []) {
   if (seoDescription) metadata.description = seoDescription;
   const ogTitle = seoOgTitle ?? title;
   if (doc) {
+    const ogLocale = openGraphLocale(result.tags.locale);
     metadata.openGraph = {
       ...ogTitle !== null ? { title: ogTitle } : {},
       ...seoDescription ? { description: seoDescription } : {},
       ...seoOgImage ? { images: [{ url: seoOgImage }] } : {},
-      locale: openGraphLocale(result.tags.locale)
+      ...ogLocale !== null ? { locale: ogLocale } : {}
     };
   }
   if (seoNoindex) metadata.robots = { index: false };
   if (seoCanonical) metadata.alternates = { canonical: seoCanonical };
   return metadata;
 }
+function mergeMetadataOverParent(parent, page) {
+  if (!parent) return page;
+  const merged = { ...page };
+  for (const [key, pageValue] of Object.entries(page)) {
+    const parentValue = parent[key];
+    if (isPlainObject(pageValue) && isPlainObject(parentValue)) {
+      merged[key] = { ...parentValue, ...pageValue };
+    }
+  }
+  return merged;
+}
+function isPlainObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 function defaultMetadata(result, assets) {
   return canvasPageMetadata(result, assets);
 }
@@ -555,7 +570,7 @@ function createCanvasRoute(options) {
       }
     }
   };
-  const generateMetadata = async (props) => {
+  const pageMetadata = async (props) => {
     const { slug } = await props.params;
     const url = pathFromSlug(slug);
     const perspective = await requestPerspective();
@@ -569,6 +584,10 @@ function createCanvasRoute(options) {
     if (outcome.kind !== "render") return {};
     return options.metadata ? options.metadata(outcome.result, { url, perspective }) : defaultMetadata(outcome.result, outcome.assets);
   };
+  const generateMetadata = async (props, parent) => {
+    const [page, resolvedParent] = await Promise.all([pageMetadata(props), parent ?? null]);
+    return mergeMetadataOverParent(resolvedParent, page);
+  };
   return { Page, generateMetadata };
 }
 function paramNamesOf(pattern) {
@@ -1265,6 +1284,6 @@ function createElytraHost(options) {
 }
 var PACKAGE = "@elytracms/next";
 
-export { CanvasRenderer, ELYTRA_HOST_ENV_KEYS, ElytraImage, PACKAGE, REVALIDATE_SIGNATURE_HEADER, assembleLiveSource, bodyItemsOf, canvasPageMetadata, canvasSitemapEntries, collectionCacheTag, createAssetImageLoader, createCanvasRoute, createCanvasSitemap, createContentSnapshot, createElytraHost, createPreviewDisableRoute, createPreviewRoute, createRevalidateRoute, createStaticContentSource, defineHostComponents, docCacheTag, elytraHostImage, evaluatePreviewRequest, evaluateRevalidateRequest, firstBlockFullBleed, loadCachedEntry, loadLiveContent, mergeCacheTags, nextCacheTags, nextImagePrimitive, pathFromSlug, projectSweepTag, resolveCanvasPage, resolveGlobals, resolveHostEnv, revalidatePayloadSchema, routeCacheTag, safeRedirectTarget, scopeCacheTag, signRevalidateBody };
+export { CanvasRenderer, ELYTRA_HOST_ENV_KEYS, ElytraImage, PACKAGE, REVALIDATE_SIGNATURE_HEADER, assembleLiveSource, bodyItemsOf, canvasPageMetadata, canvasSitemapEntries, collectionCacheTag, createAssetImageLoader, createCanvasRoute, createCanvasSitemap, createContentSnapshot, createElytraHost, createPreviewDisableRoute, createPreviewRoute, createRevalidateRoute, createStaticContentSource, defineHostComponents, docCacheTag, elytraHostImage, evaluatePreviewRequest, evaluateRevalidateRequest, firstBlockFullBleed, loadCachedEntry, loadLiveContent, mergeCacheTags, mergeMetadataOverParent, nextCacheTags, nextImagePrimitive, openGraphLocale, pathFromSlug, projectSweepTag, resolveCanvasPage, resolveGlobals, resolveHostEnv, revalidatePayloadSchema, routeCacheTag, safeRedirectTarget, scopeCacheTag, signRevalidateBody };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map