@elytracms/next 0.0.88 → 0.0.91

package/dist/index.js

@@ -1,34 +1,25 @@
-import { ComponentRegistry } from '@elytracms/core/component-registry';
-export { defineComponent } from '@elytracms/core/component-registry';
-import { basePrimitives, getImplementation, registerImplementations, renderDocumentBodyItems, documentBodyItems, ImageManifest, serializeListingQuery, RenderErrorBoundary, documentBodyRichTextValues, documentBodyCompositionNodes, richTextEmbedsInValue, collectReferencedAssetIds, collectRichTextRefsInValue, collectReferencedRelations, collectReferencedListings, collectReferencedRichTextLinks, normalizeImageSource } from '@elytracms/core/runtime-renderer';
-import { isValidElement } from 'react';
+import { registerComponents, renderDocumentBodyItems, documentBodyItems, serializeListingQuery, documentBodyRichTextValues, documentBodyCompositionNodes, richTextEmbedsInValue, collectReferencedAssetIds, collectRichTextRefsInValue, collectReferencedRelations, collectReferencedListings, collectReferencedRichTextLinks, RenderErrorBoundary, nodeListingOf, listingRequestOf } from '@elytracms/core/runtime-renderer';
+import { Fragment as Fragment$1, isValidElement } from 'react';
 import { isBlockSequenceValueShape } from '@elytracms/core/rich-text';
-import { jsx, Fragment } from 'react/jsx-runtime';
+import { jsx, Fragment, jsxs } from 'react/jsx-runtime';
 import { cacheTags, isDocumentHistory, resolvedAsset, createContentClient, createContentContext } from '@elytracms/core/content';
-import { documentKey, splitLocalePath, hierarchyMount, composePath, localeUrlPath, mergeRouteRecords, fallbackHomeRoutes, presentationBodyFields, splitPath, documentSchema, redirectRecordSchema } from '@elytracms/core/cms-core';
-export { documentSchema, fallbackHomeRoutes, localeConfigSchema, localeUrlPath, mergeRouteRecords, redirectRecordSchema, resolveLocale, routeRecordSchema, splitLocalePath, textDirection } from '@elytracms/core/cms-core';
-import { revalidateTag, unstable_cache } from 'next/cache';
+import { parseLocaleConfig, documentKey, splitLocalePath, hierarchyMount, composePath, localeUrlPath, mergeRouteRecords, fallbackHomeRoutes, presentationBodyFields, splitPath, documentSchema, redirectRecordSchema } from '@elytracms/core/cms-core';
+export { documentSchema, fallbackHomeRoutes, localeConfigSchema, localeUrlPath, mergeRouteRecords, parseLocaleConfig, redirectRecordSchema, resolveLocale, routeRecordSchema, splitLocalePath, textDirection } from '@elytracms/core/cms-core';
+import { revalidateTag, cacheLife, cacheTag } from 'next/cache';
 import { draftMode } from 'next/headers';
 import { redirect, notFound, permanentRedirect } from 'next/navigation';
 import { COMPOSITE_KEY_SEPARATOR } from '@elytracms/core/project-graph';
-import { createHmac, timingSafeEqual } from 'crypto';
-import { z } from 'zod';
-export { z } from 'zod';
+import { verifyRevalidationSignature, readRevalidationBody, REVALIDATE_SIGNATURE_HEADER } from '@elytracms/core/revalidation';
+export { REVALIDATE_SIGNATURE_HEADER, revalidationEventSchema, signRevalidationBody, signedRevalidationRequest } from '@elytracms/core/revalidation';
 import NextImage from 'next/image';
+import { normalizeImageSource } from '@elytracms/components';
+export { defineComponent } from '@elytracms/core/component-registry';
+export { z } from 'zod';
 
 // src/components.ts
-function defineHostComponents(components = [], options = {}) {
-  const includeBase = options.includeBasePrimitives !== false;
-  const base = includeBase ? basePrimitives() : { manifests: [], implementations: {} };
-  const registry = new ComponentRegistry([...base.manifests, ...components.map((c) => c.manifest)]);
-  const implementations = {};
-  for (const manifest of base.manifests) {
-    const implementation = getImplementation(base.implementations, manifest.id);
-    if (implementation) implementations[manifest.id] = implementation;
-  }
-  const host = registerImplementations(components);
-  Object.assign(implementations, host.implementations);
-  return { registry, implementations, issues: [...registry.issues, ...host.issues] };
+function defineHostComponents(components = []) {
+  const { registry, implementations } = registerComponents(components);
+  return { registry, implementations };
 }
 function relationResolver(relations) {
   return (ref) => relations[`${ref.collection}:${ref.id}`] ?? null;
@@ -37,7 +28,22 @@ function linkResolver(links) {
   return (ref) => links[`${ref.collection}:${ref.id}`] ?? null;
 }
 function listingResolver(listings) {
-  return (query) => listings[serializeListingQuery(query)] ?? null;
+  return (query) => {
+    const baked = listings[serializeListingQuery(query)];
+    return Array.isArray(baked) ? baked : null;
+  };
+}
+function listingFailureOf(node, components, listings) {
+  const manifest = components.registry.getManifest(node.componentId);
+  if (!manifest) return null;
+  const listing = nodeListingOf(node, manifest, components.registry);
+  if (!listing || listing.state === "awaiting") return null;
+  if (listing.state === "invalid") return listing.messages;
+  const baked = listings?.[serializeListingQuery(listing.query)];
+  return baked && !Array.isArray(baked) ? baked.errors.map((error) => error.message) : null;
+}
+function InvalidListingNotice(props) {
+  return /* @__PURE__ */ jsx("div", { "data-ec-fallback": "invalid-listing", "data-ec-node-id": props.nodeId, role: "note", children: `This listing can't run: ${props.messages.join(" ")}` });
 }
 function assetResolver(assets) {
   const byId = new Map(assets.map((asset) => [asset.id, asset]));
@@ -49,7 +55,7 @@ function assetResolver(assets) {
       height: asset.height,
       alt: asset.alt,
       focalPoint: asset.focalPoint,
-      // EC-420: carry the LQIP so a placed base.Image blurs up on delivery.
+      // EC-420: carry the LQIP so a placed Image blurs up on delivery.
       lqip: asset.lqip,
       meta: asset.meta
     } : null;
@@ -86,7 +92,15 @@ async function CanvasRenderer(props) {
     // so a host that did not opt in degrades a reference link to the visible
     // `unresolved-ref` issue (EC-290) rather than a wrong href.
     ...props.links ? { resolveLink: linkResolver(props.links) } : {},
-    decorateNode: stripServerErrorBoundary
+    decorateNode: (node, rendered) => {
+      const stripped = stripServerErrorBoundary(node, rendered);
+      const failure = listingFailureOf(node, components, props.listings);
+      if (!failure) return stripped;
+      return /* @__PURE__ */ jsxs(Fragment$1, { children: [
+        /* @__PURE__ */ jsx(InvalidListingNotice, { nodeId: node.id, messages: failure }),
+        stripped
+      ] }, node.id);
+    }
   };
   const document = result.document;
   if (document) {
@@ -134,7 +148,7 @@ function mergeCacheTags(first, ...rest) {
   });
 }
 function createStaticContentSource(data) {
-  const locales = data.locales;
+  const locales = parseLocaleConfig(data.locales);
   const routes = data.routes ?? [];
   const redirects = data.redirects ?? [];
   const assetUrl = data.assetUrl ?? ((asset) => `asset://unresolved/${asset.storageKey}`);
@@ -235,6 +249,7 @@ function canvasWrapContext(result, info) {
 function pathFromSlug(slug) {
   return "/" + (slug ?? []).join("/");
 }
+var systemClock = () => (/* @__PURE__ */ new Date()).toISOString();
 function scopeAssetsToPage(allAssets, registry, result, body, resolveRelation) {
   if (allAssets.length === 0) return allAssets;
   const ids = /* @__PURE__ */ new Set();
@@ -281,27 +296,33 @@ function populatePageRelations(body, client, registry) {
   );
   return { relations, docKeys: [...refKeys] };
 }
-function populatePageListings(body, client, registry) {
-  if (!registry) return { listings: {}, tags: [] };
+function populatePageListings(body, client, registry, clock) {
+  if (!registry) return { listings: {}, tags: [], readsNow: false };
   const tags = [];
+  let instant;
+  const now = () => instant ??= clock();
   const listings = collectReferencedListings(
     body.nodes,
     registry,
     (query) => {
-      const listed = client.listDocuments(query.collection, {
-        where: query.where,
-        ...query.sort ? { sort: query.sort } : {},
-        ...query.limit !== void 0 ? { limit: query.limit } : {}
-      });
+      const listed = client.listDocuments(query.collection, listDocumentsQueryOf(query, now));
       tags.push(listed.tags);
-      return listed.ok ? listed.documents : [];
+      return listed.ok ? listed.documents : { errors: listed.errors };
     },
     // EC-255: reach listings nested inside transcluded reusable content (the same
     // depth-1 populate the relation bake uses), so a grid inside a reusable bakes —
     // and its membership tag is folded in — instead of rendering empty on the host.
     (ref) => client.resolveRelation(ref)
   );
-  return { listings, tags };
+  return { listings, tags, readsNow: instant !== void 0 };
+}
+function listDocumentsQueryOf(query, now) {
+  const request = listingRequestOf(query, now);
+  return {
+    where: request.where,
+    ...request.sort ? { sort: request.sort } : {},
+    ...request.limit !== void 0 ? { limit: request.limit } : {}
+  };
 }
 function populatePageLinks(body, client, registry) {
   if (!registry) return { links: {}, docKeys: [] };
@@ -359,11 +380,11 @@ async function resolveCanvasPage(source, url, perspective, options = {}) {
     options.registry
   );
   const relationTags = cacheTags({ docs: relationDocKeys, locale: result.tags.locale });
-  const { listings, tags: listingTags } = populatePageListings(
-    body,
-    client,
-    options.registry
-  );
+  const {
+    listings,
+    tags: listingTags,
+    readsNow
+  } = populatePageListings(body, client, options.registry, options.clock ?? systemClock);
   const { links, docKeys: linkDocKeys } = populatePageLinks(body, client, options.registry);
   const linkTags = cacheTags({ docs: linkDocKeys, locale: result.tags.locale });
   return {
@@ -372,6 +393,7 @@ async function resolveCanvasPage(source, url, perspective, options = {}) {
     assets: bakedAssets,
     relations,
     listings,
+    readsNow,
     links,
     ...presentation ? { presentation } : {},
     tags: mergeCacheTags(
@@ -414,40 +436,61 @@ function nextCacheTags(tags, scope) {
   for (const assetId of tags.assets) all.add(assetCacheTag(assetId, scope));
   return [...all].sort();
 }
-function canvasCacheKey({ scope, mode, url }) {
-  return ["elytra-route", scope ?? "", mode ?? "", url];
+function revalidationTags(event, project) {
+  const { scope } = project;
+  const tags = /* @__PURE__ */ new Set();
+  switch (event.kind) {
+    case "publish":
+    case "unpublish":
+    case "delete":
+      tags.add(docCacheTag(`${event.collection}:${event.id}`, scope));
+      for (const locale of project.locales) tags.add(collectionCacheTag(event.collection, locale, scope));
+      break;
+    case "redirects":
+      tags.add(projectSweepTag(scope));
+      break;
+    case "asset":
+      tags.add(assetCacheTag(event.id, scope));
+      tags.add(projectSweepTag(scope));
+      break;
+  }
+  return [...tags].sort();
 }
-var CacheDiscoveryBail = class extends Error {
-  constructor() {
-    super("elytra cache discovery bail (never user-visible)");
-    this.name = "CacheDiscoveryBail";
+function canvasCacheKey({ scope, mode, url }) {
+  return [scope ?? "", mode ?? "", url];
+}
+var CANVAS_CACHE_LIFE = { revalidate: Infinity, expire: Infinity };
+var CANVAS_DEV_CACHE_LIFE = { revalidate: 1, expire: 300 };
+var CANVAS_CLOCK_CACHE_LIFE = { revalidate: 60, expire: Infinity };
+function canvasEntryLife(nodeEnv, readsClock = false) {
+  if (nodeEnv === "development") return CANVAS_DEV_CACHE_LIFE;
+  return readsClock ? CANVAS_CLOCK_CACHE_LIFE : CANVAS_CACHE_LIFE;
+}
+var NEXT_CACHE_TAG_CALL_LIMIT = 128;
+function entryTagCalls(tags, scope) {
+  const sweep = projectSweepTag(scope);
+  const rest = nextCacheTags(tags, scope).filter((tag) => tag !== sweep);
+  const calls = [[sweep]];
+  for (let start = 0; start < rest.length; start += NEXT_CACHE_TAG_CALL_LIMIT) {
+    calls.push(rest.slice(start, start + NEXT_CACHE_TAG_CALL_LIMIT));
   }
-};
-function passthrough(impl) {
-  return async () => impl();
-}
-async function loadCachedEntry(cache, keyParts, baselineTags, load) {
-  let fresh;
-  const probe = cache(
-    passthrough(async () => {
-      fresh = await load();
-      throw new CacheDiscoveryBail();
-    }),
-    keyParts,
-    { tags: [...baselineTags], revalidate: false }
-  );
-  try {
-    return await probe();
-  } catch (error) {
-    if (!(error instanceof CacheDiscoveryBail)) throw error;
+  return calls;
+}
+var canvasResolvers = /* @__PURE__ */ new Map();
+function resolverKey(scope, mode) {
+  return JSON.stringify([scope, mode]);
+}
+function registerCanvasResolver(scope, mode, resolve) {
+  canvasResolvers.set(resolverKey(scope, mode), resolve);
+}
+function canvasResolverFor(scope, mode) {
+  const resolve = canvasResolvers.get(resolverKey(scope, mode));
+  if (!resolve) {
+    throw new Error(
+      `Elytra delivery cache: no canvas route registered for scope "${scope}" and content mode "${mode}" in this server process \u2014 the cached route function has no loader to run. This is a wiring defect: create the route with createCanvasRoute / elytra.canvasRoute() before its Page renders.`
+    );
   }
-  const entry = fresh;
-  const write = cache(
-    passthrough(async () => entry),
-    keyParts,
-    { tags: entry.tags, revalidate: false }
-  );
-  return write();
+  return resolve;
 }
 
 // src/metadata.ts
@@ -510,6 +553,8 @@ function mergeMetadataOverParent(parent, page) {
 function isPlainObject(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
+var CANVAS_VALIDATION_SLUG = ["_elytra"];
+var CANVAS_VALIDATION_PATH = pathFromSlug([...CANVAS_VALIDATION_SLUG]);
 function defaultMetadata(result, assets) {
   return canvasPageMetadata(result, assets);
 }
@@ -517,33 +562,35 @@ async function requestPerspective() {
   const { isEnabled } = await draftMode();
   return isEnabled ? "draft" : "published";
 }
-var nextCacheWrapper = (cb, keyParts, options) => unstable_cache(cb, keyParts, { tags: options.tags, revalidate: options.revalidate });
+async function cachedCanvasOutcome(scope, mode, url) {
+  "use cache";
+  const outcome = await canvasResolverFor(scope, mode)(url);
+  cacheLife(canvasEntryLife(process.env.NODE_ENV, outcome.kind === "render" && outcome.readsNow));
+  for (const tags of entryTagCalls(outcome.tags, scope)) cacheTag(...tags);
+  return outcome;
+}
 function createCanvasRoute(options) {
+  const resolveFresh = async (url, perspective) => {
+    const source = await options.loadContent({ perspective });
+    return resolveCanvasPage(source, url, perspective, {
+      // EC-205: page-scope the baked assets to what the page actually uses.
+      registry: options.components.registry
+    });
+  };
+  const cache = options.cache;
+  const entryKey = (url) => canvasCacheKey({ scope: cache?.scope, mode: cache?.mode, url });
+  if (cache) {
+    const [scope, mode] = entryKey("");
+    registerCanvasResolver(scope, mode, (url) => resolveFresh(url, "published"));
+  }
   const loadOutcome = async (url, perspective) => {
-    const resolveFresh = async () => {
-      const source = await options.loadContent({ perspective });
-      return resolveCanvasPage(source, url, perspective, {
-        // EC-205: page-scope the baked assets to what the page actually uses.
-        registry: options.components.registry
-      });
-    };
-    const devBypass = process.env.NODE_ENV === "development";
-    if (!options.cache || perspective !== "published" || devBypass) return resolveFresh();
-    const scope = options.cache.scope;
-    const entry = await loadCachedEntry(
-      nextCacheWrapper,
-      canvasCacheKey({ scope, mode: options.cache.mode, url }),
-      [projectSweepTag(scope)],
-      async () => {
-        const outcome = await resolveFresh();
-        return { value: outcome, tags: nextCacheTags(outcome.tags, scope) };
-      }
-    );
-    return entry.value;
+    if (!cache || perspective !== "published") return resolveFresh(url, perspective);
+    return cachedCanvasOutcome(...entryKey(url));
   };
   const Page = async (props) => {
     const { slug } = await props.params;
     const url = pathFromSlug(slug);
+    if (url === CANVAS_VALIDATION_PATH) return notFound();
     const perspective = await requestPerspective();
     const outcome = await loadOutcome(url, perspective);
     options.onTags?.(outcome.tags, { url, perspective });
@@ -573,8 +620,9 @@ function createCanvasRoute(options) {
   const pageMetadata = async (props) => {
     const { slug } = await props.params;
     const url = pathFromSlug(slug);
+    if (url === CANVAS_VALIDATION_PATH) return {};
     const perspective = await requestPerspective();
-    if (options.cache && perspective === "published") {
+    if (cache && perspective === "published") {
       const outcome2 = await loadOutcome(url, perspective);
       if (outcome2.kind !== "render") return {};
       return options.metadata ? options.metadata(outcome2.result, { url, perspective }) : defaultMetadata(outcome2.result, outcome2.assets);
@@ -585,10 +633,13 @@ function createCanvasRoute(options) {
     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]);
+    const [page, resolvedParent] = await Promise.all([pageMetadata(props), parent]);
     return mergeMetadataOverParent(resolvedParent, page);
   };
-  return { Page, generateMetadata };
+  const generateStaticParams = async () => [
+    { slug: [...CANVAS_VALIDATION_SLUG] }
+  ];
+  return { Page, generateMetadata, generateStaticParams };
 }
 function paramNamesOf(pattern) {
   return splitPath(pattern).filter((segment) => segment.startsWith(":")).map((segment) => segment.slice(1));
@@ -719,71 +770,33 @@ function createCanvasSitemap(options) {
     return canvasSitemapEntries(source, options).entries;
   };
 }
-var REVALIDATE_SIGNATURE_HEADER = "x-elytra-signature";
-var revalidatePayloadSchema = z.object({
-  projectId: z.string().min(1),
-  /** The operation that fired, e.g. `documents.setState`, `publishing.publish`. */
-  event: z.string().min(1),
-  /** Fully-formatted Next tag strings (already scoped) — revalidated verbatim. */
-  tags: z.array(z.string().min(1)),
-  /** ISO timestamp of emission. Informational in v1 (no replay window). */
-  timestamp: z.string().min(1)
-});
-function signRevalidateBody(rawBody, secret) {
-  return `sha256=${createHmac("sha256", secret).update(rawBody, "utf8").digest("hex")}`;
-}
-var SIGNATURE_PREFIX = "sha256=";
-var HEX_PATTERN = /^[0-9a-f]+$/;
-function evaluateRevalidateRequest(rawBody, signature, secret) {
+async function evaluateRevalidateRequest(rawBody, signature, secret) {
   if (secret === void 0 || secret.length === 0) {
     return { ok: false, status: 401, message: "Revalidation webhook is not configured." };
   }
-  if (signature === null || signature === void 0 || !signature.startsWith(SIGNATURE_PREFIX)) {
+  if (typeof signature !== "string" || signature.length === 0) {
     return { ok: false, status: 401, message: "Missing or malformed webhook signature." };
   }
-  const providedHex = signature.slice(SIGNATURE_PREFIX.length).toLowerCase();
-  const expectedHex = createHmac("sha256", secret).update(rawBody, "utf8").digest("hex");
-  if (providedHex.length !== expectedHex.length || !HEX_PATTERN.test(providedHex) || !timingSafeEqual(Buffer.from(providedHex, "hex"), Buffer.from(expectedHex, "hex"))) {
+  if (!await verifyRevalidationSignature(rawBody, signature, secret)) {
     return { ok: false, status: 401, message: "Invalid webhook signature." };
   }
-  let parsed;
-  try {
-    parsed = JSON.parse(rawBody);
-  } catch {
-    return { ok: false, status: 400, message: "Webhook body is not valid JSON." };
-  }
-  const payload = revalidatePayloadSchema.safeParse(parsed);
-  if (!payload.success) {
-    return { ok: false, status: 400, message: "Webhook payload has an invalid shape." };
-  }
-  return { ok: true, payload: payload.data };
-}
-function corsHeaders(allowOrigin) {
-  if (allowOrigin === void 0 || allowOrigin.length === 0) return {};
-  return {
-    "access-control-allow-origin": allowOrigin,
-    "access-control-allow-methods": "POST, OPTIONS",
-    "access-control-allow-headers": `content-type, ${REVALIDATE_SIGNATURE_HEADER}`
-  };
+  const read = readRevalidationBody(rawBody);
+  if (!read.ok) return { ok: false, status: 400, message: read.message };
+  return { ok: true, event: read.event };
 }
 function createRevalidateRoute(options) {
-  const cors = corsHeaders(options.allowOrigin);
+  const project = { scope: options.scope, locales: [...options.locales] };
   return {
     async POST(request) {
       const rawBody = await request.text();
       const signature = request.headers.get(REVALIDATE_SIGNATURE_HEADER);
-      const evaluation = evaluateRevalidateRequest(rawBody, signature, options.secret);
+      const evaluation = await evaluateRevalidateRequest(rawBody, signature, options.secret);
       if (!evaluation.ok) {
-        return Response.json(
-          { error: evaluation.message },
-          { status: evaluation.status, headers: cors }
-        );
+        return Response.json({ error: evaluation.message }, { status: evaluation.status });
       }
-      for (const tag of evaluation.payload.tags) revalidateTag(tag, { expire: 0 });
-      return Response.json({ revalidated: evaluation.payload.tags }, { headers: cors });
-    },
-    async OPTIONS() {
-      return new Response(null, { status: 204, headers: cors });
+      const tags = revalidationTags(evaluation.event, project);
+      for (const tag of tags) revalidateTag(tag, { expire: 0 });
+      return Response.json({ revalidated: tags });
     }
   };
 }
@@ -845,8 +858,8 @@ function createAssetImageLoader(options = {}) {
     return `${src}${separator}${widthParam}=${width}&${qualityParam}=${quality ?? defaultQuality}`;
   };
 }
-function createNextImagePrimitive(options) {
-  return function NextImagePrimitive(props) {
+function createNextImage(options) {
+  return function ElytraNextImage(props) {
     const { url, width, height, alt, focalPoint, lqip } = normalizeImageSource(props);
     if (url.length === 0) return null;
     return /* @__PURE__ */ jsx(
@@ -861,11 +874,12 @@ function createNextImagePrimitive(options) {
     );
   };
 }
-function nextImagePrimitive(options = {}) {
-  return {
-    manifest: ImageManifest,
-    implementation: createNextImagePrimitive(options)
-  };
+function withNextImage(components, options = {}) {
+  const list = [...components ?? []];
+  const image = registerComponents(list).registry.roleComponent("image");
+  if (!image) return list;
+  const implementation = createNextImage(options);
+  return list.map((entry) => entry.manifest === image ? { manifest: entry.manifest, implementation } : entry);
 }
 function elytraHostImage(options = {}) {
   return ({ asset, alt, className, priority, sizes, loading }) => /* @__PURE__ */ jsx(
@@ -894,8 +908,7 @@ var ELYTRA_HOST_ENV_KEYS = {
   convexUrl: "ELYTRA_CONVEX_URL",
   projectId: "ELYTRA_PROJECT_ID",
   draftToken: "DRAFT_PREVIEW_TOKEN",
-  revalidateSecret: "REVALIDATE_SECRET",
-  studioOrigin: "STUDIO_ORIGIN"
+  revalidateSecret: "REVALIDATE_SECRET"
 };
 function cleaned(value) {
   const trimmed = value?.trim();
@@ -1189,17 +1202,7 @@ function createElytraHost(options) {
   }
   const contentMode = live ? "live" : options.fallbackContent ? "fallback" : "empty";
   const contentScope = live ? env.projectId : options.slug;
-  const components = defineHostComponents([
-    // Batteries included (EC-368 image defaults): graph `base.Image` nodes render
-    // through next/image — resized variants via the host's own optimizer. The
-    // canonical manifest stays (first registration wins in defineHostComponents).
-    ...options.image === false ? [] : [nextImagePrimitive(options.image ?? {})],
-    // EC-539: the option is the CONFIG's entry shape (`implementation: unknown`)
-    // so the recommended `{ ...site }` spread compiles; EC-541: registration
-    // takes that shape too and checks each implementation at runtime (see the
-    // option's doc comment) — no narrowing cast here.
-    ...options.components ?? []
-  ]);
+  const components = defineHostComponents(options.components ?? []);
   const emptySource = createStaticContentSource({
     projectId: contentScope,
     locales: options.locales,
@@ -1241,11 +1244,10 @@ function createElytraHost(options) {
     return createCanvasRoute({
       loadContent,
       components,
-      // Tag scope = the project id the studio publishes under, so its webhook
-      // tags match this site's cached entries.
-      // EC-543: the mode is in the entry key so no world ever reads another's
-      // entries; an explicit override may replace the scope, not drop the mode.
-      ...cache === false ? {} : { cache: { mode: contentMode, ...cache ?? { scope: contentScope } } },
+      // Tag scope = `contentScope`, the SAME value `revalidateRoute` derives its
+      // invalidation tags with (EC-579) — one scope, so they cannot disagree.
+      // EC-543: the mode is in the entry key so no world ever reads another's entries.
+      ...cache === false ? {} : { cache: { mode: contentMode, scope: contentScope } },
       ...rest
     });
   };
@@ -1253,7 +1255,11 @@ function createElytraHost(options) {
     // An unset secret keeps the endpoint CLOSED (401) — the kit never ships a
     // default secret (an auth-shaped no-op is worse than an explicit gap).
     secret: "secret" in overrides ? overrides.secret : env.revalidateSecret,
-    ...overrides.allowOrigin !== void 0 ? { allowOrigin: overrides.allowOrigin } : env.studioOrigin !== void 0 ? { allowOrigin: env.studioOrigin } : {}
+    // EC-579: the receiver's OWN project — the scope its cache entries are written
+    // under (`canvasRoute` above) and every locale it serves. The emitter sends only
+    // the event, so this is the one place the scope and locales are read for it.
+    scope: contentScope,
+    locales: options.locales.locales
   });
   const previewRoute = () => createPreviewRoute({ token: env.draftToken });
   const previewDisableRoute = () => createPreviewDisableRoute();
@@ -1267,6 +1273,7 @@ function createElytraHost(options) {
     return firstBlockFullBleed(resolved.document, components.registry);
   };
   return {
+    collections: options.collections,
     contentScope,
     contentMode,
     env,
@@ -1284,6 +1291,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, mergeMetadataOverParent, nextCacheTags, nextImagePrimitive, openGraphLocale, pathFromSlug, projectSweepTag, resolveCanvasPage, resolveGlobals, resolveHostEnv, revalidatePayloadSchema, routeCacheTag, safeRedirectTarget, scopeCacheTag, signRevalidateBody };
+export { CANVAS_VALIDATION_SLUG, CanvasRenderer, ELYTRA_HOST_ENV_KEYS, ElytraImage, PACKAGE, assembleLiveSource, bodyItemsOf, canvasPageMetadata, canvasSitemapEntries, collectionCacheTag, createAssetImageLoader, createCanvasRoute, createCanvasSitemap, createContentSnapshot, createElytraHost, createPreviewDisableRoute, createPreviewRoute, createRevalidateRoute, createStaticContentSource, defineHostComponents, docCacheTag, elytraHostImage, evaluatePreviewRequest, evaluateRevalidateRequest, firstBlockFullBleed, loadLiveContent, mergeCacheTags, mergeMetadataOverParent, nextCacheTags, openGraphLocale, pathFromSlug, projectSweepTag, resolveCanvasPage, resolveGlobals, resolveHostEnv, revalidationTags, routeCacheTag, safeRedirectTarget, scopeCacheTag, withNextImage };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map