@elytracms/next 0.0.80 → 0.0.82

package/dist/index.js

@@ -1,11 +1,11 @@
 import { ComponentRegistry } from '@elytracms/core/component-registry';
 export { defineComponent } from '@elytracms/core/component-registry';
-import { basePrimitives, getImplementation, renderComposition, ImageManifest, serializeListingQuery, RenderErrorBoundary, collectReferencedAssetIds, collectReferencedRelations, collectReferencedListings, collectReferencedRichTextLinks, normalizeImageSource } from '@elytracms/core/runtime-renderer';
+import { basePrimitives, getImplementation, renderDocumentBodyItems, documentBodyItems, ImageManifest, serializeListingQuery, RenderErrorBoundary, documentBodyRichTextValues, documentBodyCompositionNodes, richTextEmbedsInValue, collectReferencedAssetIds, collectRichTextRefsInValue, collectReferencedRelations, collectReferencedListings, collectReferencedRichTextLinks, normalizeImageSource } from '@elytracms/core/runtime-renderer';
 import { isValidElement } from 'react';
 import { jsx, Fragment } from 'react/jsx-runtime';
 import { cacheTags, isSectionSourceId, parseCmsSourceQueryConfig, listQueryOfCmsConfig, isDocumentHistory, resolvedAsset, createContentClient, createContentContext } from '@elytracms/core/content';
-import { documentKey, splitPath, hierarchyMount, composePath, mergeRouteRecords, fallbackHomeRoutes, documentSchema, redirectRecordSchema } from '@elytracms/core/cms-core';
-export { documentSchema, fallbackHomeRoutes, localeConfigSchema, mergeRouteRecords, redirectRecordSchema, routeRecordSchema } from '@elytracms/core/cms-core';
+import { documentKey, splitLocalePath, hierarchyMount, composePath, localeUrlPath, mergeRouteRecords, fallbackHomeRoutes, presentationBodyFields, splitPath, documentSchema, redirectRecordSchema } from '@elytracms/core/cms-core';
+export { documentSchema, fallbackHomeRoutes, localeConfigSchema, localeUrlPath, mergeRouteRecords, redirectRecordSchema, routeRecordSchema, splitLocalePath } from '@elytracms/core/cms-core';
 import { revalidateTag, unstable_cache } from 'next/cache';
 import { draftMode } from 'next/headers';
 import { redirect, notFound, permanentRedirect } from 'next/navigation';
@@ -148,11 +148,16 @@ async function CanvasRenderer(props) {
   };
   const document = result.document;
   if (document) {
-    const composition = compositionOf(document);
-    return /* @__PURE__ */ jsx(Fragment, { children: renderComposition(composition, ctx) });
+    return /* @__PURE__ */ jsx(Fragment, { children: renderDocumentBodyItems(bodyItemsOf(document, props.presentation), ctx) });
   }
   return /* @__PURE__ */ jsx(MissingDocumentFallback, {});
 }
+function bodyItemsOf(document, presentation) {
+  if (!document) return [];
+  const fields = presentation?.body ?? [];
+  if (fields.length > 0) return fields.flatMap((name) => documentBodyItems(document[name]));
+  return documentBodyItems(compositionOf(document));
+}
 function compositionOf(document) {
   const body = document["body"];
   if (Array.isArray(body) || isComponentNodeValue(body)) return body;
@@ -164,11 +169,8 @@ function compositionOf(document) {
   }
   return void 0;
 }
-function compositionNodesOf(document) {
-  if (!document) return [];
-  const composition = compositionOf(document);
-  const candidates = Array.isArray(composition) ? composition : [composition];
-  return candidates.filter((node) => isComponentNodeValue(node));
+function compositionNodesOf(document, presentation) {
+  return documentBodyCompositionNodes(bodyItemsOf(document, presentation));
 }
 function isComponentNodeValue(value) {
   return typeof value === "object" && value !== null && typeof value.id === "string" && typeof value.componentId === "string";
@@ -219,9 +221,8 @@ function materializeSourcePayloads(input) {
   }
   return { payloads, tags };
 }
-var DEFAULT_LOCALES = { default: "en", locales: ["en"] };
 function createStaticContentSource(data) {
-  const locales = data.locales ?? DEFAULT_LOCALES;
+  const locales = data.locales;
   const routes = data.routes ?? [];
   const redirects = data.redirects ?? [];
   const assetUrl = data.assetUrl ?? ((asset) => `asset://unresolved/${asset.storageKey}`);
@@ -265,10 +266,15 @@ function createStaticContentSource(data) {
     // dimensions. Baked into the (serializable) render outcome by the route
     // helper, so a cached page keeps its images during a backend outage.
     assets: () => [...assets.values()].map((record2) => resolvedAsset(record2, record2.url ?? assetUrl(record2))),
-    ...data.sources ? { sources: data.sources } : {}
+    ...data.sources ? { sources: data.sources } : {},
+    // EC-499: the schema the route helper reads a collection's declared
+    // `presentation` from (which field is the delivery body, which component
+    // wraps it). Already prefetched for the lookup above — exposing it costs
+    // nothing and keeps the declaration reachable without a second wiring seam.
+    ...data.collections ? { collections: data.collections } : {}
   };
 }
-async function createContentSnapshot(adapter, projectId, options = {}) {
+async function createContentSnapshot(adapter, projectId, options) {
   const schema = await adapter.cms.findSchema(projectId);
   const documentRecords = await adapter.cms.listDocuments(projectId);
   const versionRecords = await adapter.cms.listAllDocumentVersions(projectId);
@@ -297,7 +303,7 @@ async function createContentSnapshot(adapter, projectId, options = {}) {
   });
   return createStaticContentSource({
     projectId,
-    ...options.locales ? { locales: options.locales } : {},
+    locales: options.locales,
     ...options.routes ? { routes: options.routes } : {},
     redirects: options.redirects ? [...options.redirects] : redirects,
     ...options.sources ? { sources: options.sources } : {},
@@ -307,37 +313,57 @@ async function createContentSnapshot(adapter, projectId, options = {}) {
     assetUrl: (asset) => adapter.blobs.url(asset.storageKey)
   });
 }
+function canvasWrapContext(result, info) {
+  const collection = result.document?.collection;
+  return {
+    ...info,
+    ...collection !== void 0 ? { collection } : {},
+    document: result.document,
+    result
+  };
+}
 function pathFromSlug(slug) {
   return "/" + (slug ?? []).join("/");
 }
-function splitLocalePath(url, locales) {
-  const segments = splitPath(url);
-  const first = segments[0];
-  if (first !== void 0 && first !== locales.default && locales.locales.includes(first)) {
-    return { locale: first, path: "/" + segments.slice(1).join("/") };
-  }
-  return { locale: locales.default, path: "/" + segments.join("/") };
-}
-function scopeAssetsToPage(allAssets, registry, result, resolveRelation) {
+function scopeAssetsToPage(allAssets, registry, result, body, resolveRelation) {
   if (allAssets.length === 0) return allAssets;
   const ids = /* @__PURE__ */ new Set();
   const seen = /* @__PURE__ */ new Set();
-  for (const node of compositionNodesOf(result.document)) {
+  for (const node of body.nodes) {
     collectReferencedAssetIds(node, registry, ids, resolveRelation, seen);
   }
+  for (const value of body.richTexts) {
+    collectRichTextRefsInValue(value, { onAsset: (id) => ids.add(id) });
+  }
   const ogImage = result.document?.["seoOgImage"];
   const ogImageId = typeof ogImage === "string" ? ogImage : ogImage && typeof ogImage === "object" && typeof ogImage.id === "string" ? ogImage.id : null;
   if (ogImageId) ids.add(ogImageId);
   return ids.size === 0 ? [] : allAssets.filter((asset) => ids.has(asset.id));
 }
-function pageCompositionNodes(result) {
-  return [...compositionNodesOf(result.document)];
+function pageBodyOf(result, presentation) {
+  const items2 = bodyItemsOf(result.document, presentation);
+  const richTexts = documentBodyRichTextValues(items2);
+  return {
+    nodes: [
+      ...documentBodyCompositionNodes(items2),
+      ...richTexts.flatMap((value) => richTextEmbedsInValue(value))
+    ],
+    richTexts
+  };
+}
+function presentationFor(source, result) {
+  const collectionId = result.document?.collection;
+  if (!collectionId || !source.collections) return void 0;
+  const collection = source.collections.find((candidate) => candidate.id === collectionId);
+  if (!collection?.presentation) return void 0;
+  const body = presentationBodyFields(collection);
+  return body.length > 0 ? { body: [...body] } : void 0;
 }
-function populatePageRelations(result, client, registry) {
+function populatePageRelations(body, client, registry) {
   if (!registry) return { relations: {}, docKeys: [] };
   const refKeys = /* @__PURE__ */ new Set();
   const relations = collectReferencedRelations(
-    pageCompositionNodes(result),
+    body.nodes,
     registry,
     (ref) => client.resolveRelation(ref),
     {},
@@ -345,11 +371,11 @@ function populatePageRelations(result, client, registry) {
   );
   return { relations, docKeys: [...refKeys] };
 }
-function populatePageListings(result, client, registry) {
+function populatePageListings(body, client, registry) {
   if (!registry) return { listings: {}, tags: [] };
   const tags = [];
   const listings = collectReferencedListings(
-    pageCompositionNodes(result),
+    body.nodes,
     registry,
     (query) => {
       const listed = client.listDocuments(query.collection, {
@@ -367,13 +393,20 @@ function populatePageListings(result, client, registry) {
   );
   return { listings, tags };
 }
-function populatePageLinks(result, client, registry) {
+function populatePageLinks(body, client, registry) {
   if (!registry) return { links: {}, docKeys: [] };
   const refs = collectReferencedRichTextLinks(
-    pageCompositionNodes(result),
+    body.nodes,
     registry,
     (ref) => client.resolveRelation(ref)
   );
+  for (const value of body.richTexts) {
+    collectRichTextRefsInValue(value, {
+      onLink: (ref) => {
+        refs[`${ref.collection}:${ref.id}`] = ref;
+      }
+    });
+  }
   const links = {};
   for (const [key, ref] of Object.entries(refs)) {
     const url = client.resolveLink(ref);
@@ -416,11 +449,14 @@ async function resolveCanvasPage(source, url, perspective, options = {}) {
     });
     payloads = { ...payloads, ...custom };
   }
+  const presentation = presentationFor(source, result);
+  const body = pageBodyOf(result, presentation);
   const allAssets = source.assets?.() ?? [];
   const bakedAssets = options.registry ? scopeAssetsToPage(
     allAssets,
     options.registry,
     result,
+    body,
     (ref) => client.resolveRelation(ref)
   ) : allAssets;
   const assetTags = cacheTags({
@@ -428,17 +464,17 @@ async function resolveCanvasPage(source, url, perspective, options = {}) {
     locale: result.tags.locale
   });
   const { relations, docKeys: relationDocKeys } = populatePageRelations(
-    result,
+    body,
     client,
     options.registry
   );
   const relationTags = cacheTags({ docs: relationDocKeys, locale: result.tags.locale });
   const { listings, tags: listingTags } = populatePageListings(
-    result,
+    body,
     client,
     options.registry
   );
-  const { links, docKeys: linkDocKeys } = populatePageLinks(result, client, options.registry);
+  const { links, docKeys: linkDocKeys } = populatePageLinks(body, client, options.registry);
   const linkTags = cacheTags({ docs: linkDocKeys, locale: result.tags.locale });
   return {
     kind: "render",
@@ -448,6 +484,7 @@ async function resolveCanvasPage(source, url, perspective, options = {}) {
     relations,
     listings,
     links,
+    ...presentation ? { presentation } : {},
     tags: mergeCacheTags(
       result.tags,
       ...extraTags,
@@ -606,8 +643,8 @@ function createCanvasRoute(options) {
         return outcome.permanent ? permanentRedirect(outcome.target) : redirect(outcome.target);
       case "not-found":
         return notFound();
-      case "render":
-        return /* @__PURE__ */ jsx(
+      case "render": {
+        const rendered = /* @__PURE__ */ jsx(
           CanvasRenderer,
           {
             result: outcome.result,
@@ -616,9 +653,13 @@ function createCanvasRoute(options) {
             assets: outcome.assets,
             relations: outcome.relations,
             listings: outcome.listings,
-            links: outcome.links
+            links: outcome.links,
+            presentation: outcome.presentation
           }
         );
+        if (!options.wrap) return rendered;
+        return options.wrap(rendered, canvasWrapContext(outcome.result, { url, perspective }));
+      }
     }
   };
   const generateMetadata = async (props) => {
@@ -653,10 +694,8 @@ function fillPattern(pattern, params) {
   }
   return "/" + segments.join("/");
 }
-function absoluteUrl(baseUrl, locale, defaultLocale, path) {
-  const origin = baseUrl.replace(/\/+$/, "");
-  if (locale === defaultLocale) return origin + path;
-  return origin + (path === "/" ? `/${locale}` : `/${locale}${path}`);
+function originOf(baseUrl) {
+  return baseUrl.replace(/\/+$/, "");
 }
 function canvasSitemapEntries(source, options) {
   const routes = options.routes ?? source.routes ?? [];
@@ -721,14 +760,32 @@ function canvasSitemapEntries(source, options) {
           paths.push(path);
         }
       }
+      let unresolved = 0;
       for (const path of paths) {
         const result = client.resolvePage(path, locale);
-        if (result.status !== "ok") continue;
+        if (result.status !== "ok") {
+          if (result.status !== "redirect") unresolved += 1;
+          continue;
+        }
         if (result.document?.["seoNoindex"] === true) continue;
+        const { urlPath, addressable } = localeUrlPath(path, locale, locales);
+        if (!addressable) {
+          skip(
+            route,
+            `"${path}" (locale "${locale}") has no addressable URL \u2014 its first segment is read as a locale prefix`
+          );
+          continue;
+        }
         const perLocale = byPath.get(path) ?? /* @__PURE__ */ new Map();
-        perLocale.set(locale, absoluteUrl(options.baseUrl, locale, locales.default, path));
+        perLocale.set(locale, originOf(options.baseUrl) + urlPath);
         byPath.set(path, perLocale);
       }
+      if (mount && paths.length > 0 && unresolved === paths.length) {
+        skip(
+          route,
+          `hierarchy mount over "${mount.collection}" composed ${paths.length} path(s) in locale "${locale}", none of which the resolver serves`
+        );
+      }
     }
   }
   const entries = [];
@@ -810,7 +867,7 @@ function createRevalidateRoute(options) {
           { status: evaluation.status, headers: cors }
         );
       }
-      for (const tag of evaluation.payload.tags) revalidateTag(tag, "max");
+      for (const tag of evaluation.payload.tags) revalidateTag(tag, { expire: 0 });
       return Response.json({ revalidated: evaluation.payload.tags }, { headers: cors });
     },
     async OPTIONS() {
@@ -914,8 +971,8 @@ function elytraHostImage(options = {}) {
 }
 
 // src/full-bleed.ts
-function firstBlockFullBleed(document, registry) {
-  const first = compositionNodesOf(document)[0];
+function firstBlockFullBleed(document, registry, presentation) {
+  const first = compositionNodesOf(document, presentation)[0];
   if (!first) return false;
   return registry.getManifest(first.componentId)?.presentation?.fullBleed === true;
 }
@@ -1299,6 +1356,6 @@ function createElytraHost(options) {
 }
 var PACKAGE = "@elytracms/next";
 
-export { CanvasRenderer, ELYTRA_HOST_ENV_KEYS, ElytraImage, PACKAGE, REVALIDATE_SIGNATURE_HEADER, assembleLiveSource, canvasPageMetadata, canvasSitemapEntries, collectBindingSourceIds, collectionCacheTag, createAssetImageLoader, createBindingResolver, createCanvasRoute, createCanvasSitemap, createContentSnapshot, createElytraHost, createPreviewDisableRoute, createPreviewRoute, createRevalidateRoute, createStaticContentSource, defaultBindingPayloads, defineHostComponents, docCacheTag, elytraHostImage, evaluatePreviewRequest, evaluateRevalidateRequest, firstBlockFullBleed, isSourcePayloadError, loadCachedEntry, loadLiveContent, materializeSourcePayloads, mergeCacheTags, nextCacheTags, nextImagePrimitive, pathFromSlug, projectSweepTag, resolveCanvasPage, resolveGlobals, resolveHostEnv, resolvePayloadToken, revalidatePayloadSchema, routeCacheTag, safeRedirectTarget, scopeCacheTag, signRevalidateBody, sourcePayloadError, splitLocalePath };
+export { CanvasRenderer, ELYTRA_HOST_ENV_KEYS, ElytraImage, PACKAGE, REVALIDATE_SIGNATURE_HEADER, assembleLiveSource, bodyItemsOf, canvasPageMetadata, canvasSitemapEntries, collectBindingSourceIds, collectionCacheTag, createAssetImageLoader, createBindingResolver, createCanvasRoute, createCanvasSitemap, createContentSnapshot, createElytraHost, createPreviewDisableRoute, createPreviewRoute, createRevalidateRoute, createStaticContentSource, defaultBindingPayloads, defineHostComponents, docCacheTag, elytraHostImage, evaluatePreviewRequest, evaluateRevalidateRequest, firstBlockFullBleed, isSourcePayloadError, loadCachedEntry, loadLiveContent, materializeSourcePayloads, mergeCacheTags, nextCacheTags, nextImagePrimitive, pathFromSlug, projectSweepTag, resolveCanvasPage, resolveGlobals, resolveHostEnv, resolvePayloadToken, revalidatePayloadSchema, routeCacheTag, safeRedirectTarget, scopeCacheTag, signRevalidateBody, sourcePayloadError };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map