@elytracms/next 0.0.86 → 0.0.88

package/dist/index.js

@@ -1,48 +1,21 @@
 import { ComponentRegistry } from '@elytracms/core/component-registry';
 export { defineComponent } from '@elytracms/core/component-registry';
-import { basePrimitives, getImplementation, renderDocumentBodyItems, documentBodyItems, ImageManifest, serializeListingQuery, RenderErrorBoundary, documentBodyRichTextValues, documentBodyCompositionNodes, richTextEmbedsInValue, collectReferencedAssetIds, collectRichTextRefsInValue, collectReferencedRelations, collectReferencedListings, collectReferencedRichTextLinks, normalizeImageSource } from '@elytracms/core/runtime-renderer';
+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 { isBlockSequenceValueShape } from '@elytracms/core/rich-text';
 import { jsx, Fragment } from 'react/jsx-runtime';
-import { cacheTags, isSectionSourceId, parseCmsSourceQueryConfig, listQueryOfCmsConfig, isDocumentHistory, resolvedAsset, createContentClient, createContentContext } from '@elytracms/core/content';
+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 { 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 NextImage from 'next/image';
 
-// src/components.ts
-
-// src/is-component.ts
-var EXOTIC_COMPONENT_TYPES = /* @__PURE__ */ new Set([
-  /* @__PURE__ */ Symbol.for("react.memo"),
-  /* @__PURE__ */ Symbol.for("react.forward_ref"),
-  /* @__PURE__ */ Symbol.for("react.lazy")
-]);
-function isComponentImplementation(value) {
-  if (typeof value === "function") return true;
-  if (typeof value !== "object" || value === null) return false;
-  const marker = value.$$typeof;
-  return typeof marker === "symbol" && EXOTIC_COMPONENT_TYPES.has(marker);
-}
-function describeImplementation(value) {
-  if (value === null) return "null";
-  if (value === void 0) return "undefined";
-  if (typeof value === "string") {
-    return `the string ${JSON.stringify(value)} (which React would render silently as an HTML tag)`;
-  }
-  if (Array.isArray(value)) return "an array";
-  if (typeof value === "object") {
-    const marker = value.$$typeof;
-    return typeof marker === "symbol" ? `an object tagged ${String(marker)}` : "a plain object";
-  }
-  return `a ${typeof value}`;
-}
-
 // src/components.ts
 function defineHostComponents(components = [], options = {}) {
   const includeBase = options.includeBasePrimitives !== false;
@@ -53,74 +26,9 @@ function defineHostComponents(components = [], options = {}) {
     const implementation = getImplementation(base.implementations, manifest.id);
     if (implementation) implementations[manifest.id] = implementation;
   }
-  const implementationIssues = [];
-  for (const component of components) {
-    const id = component.manifest.id;
-    if (isComponentImplementation(component.implementation)) {
-      implementations[id] = component.implementation;
-      continue;
-    }
-    implementationIssues.push({
-      code: "invalid-implementation",
-      componentId: id,
-      message: `Component "${id}": implementation is not a React component \u2014 received ${describeImplementation(component.implementation)}; expected a function or class component, or a React.memo / forwardRef / lazy wrapper. The entry is registered without an implementation, so its nodes render the missing-component fallback.`
-    });
-  }
-  return { registry, implementations, issues: [...registry.issues, ...implementationIssues] };
-}
-
-// src/payloads.ts
-var SOURCE_PAYLOAD_ERROR_KEY = "__elytraSourcePayloadError";
-function sourcePayloadError(sourceId, messages) {
-  return { [SOURCE_PAYLOAD_ERROR_KEY]: true, sourceId, messages: [...messages] };
-}
-function isSourcePayloadError(value) {
-  return typeof value === "object" && value !== null && value[SOURCE_PAYLOAD_ERROR_KEY] === true && typeof value.sourceId === "string" && Array.isArray(value.messages);
-}
-function unescapeRefToken(token) {
-  return token.replace(/~1/g, "/").replace(/~0/g, "~");
-}
-function pathFromToken(token) {
-  if (token === "" || token === "/") return [];
-  if (!token.startsWith("/")) return void 0;
-  return token.slice(1).split("/").map(unescapeRefToken);
-}
-var isPlainObject = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
-function resolvePayloadToken(payload, token) {
-  const path = pathFromToken(token);
-  if (path === void 0) return void 0;
-  let current = payload;
-  for (const segment of path) {
-    if (Array.isArray(current)) {
-      if (!/^(0|[1-9][0-9]*)$/.test(segment)) return void 0;
-      const index = Number(segment);
-      if (index >= current.length) return void 0;
-      current = current[index];
-      continue;
-    }
-    if (isPlainObject(current)) {
-      if (!Object.prototype.hasOwnProperty.call(current, segment)) return void 0;
-      current = current[segment];
-      continue;
-    }
-    return void 0;
-  }
-  return current;
-}
-function createBindingResolver(payloads) {
-  return (ref, item) => {
-    if (ref.mode === "repeaterItem") {
-      return item === void 0 ? void 0 : resolvePayloadToken(item.item, ref.token);
-    }
-    if (!Object.prototype.hasOwnProperty.call(payloads, ref.sourceId)) return void 0;
-    const payload = payloads[ref.sourceId];
-    if (isSourcePayloadError(payload)) {
-      throw new Error(
-        `Source "${payload.sourceId}" query was rejected: ${payload.messages.join("; ")}`
-      );
-    }
-    return resolvePayloadToken(payload, ref.token);
-  };
+  const host = registerImplementations(components);
+  Object.assign(implementations, host.implementations);
+  return { registry, implementations, issues: [...registry.issues, ...host.issues] };
 }
 function relationResolver(relations) {
   return (ref) => relations[`${ref.collection}:${ref.id}`] ?? null;
@@ -159,19 +67,14 @@ function stripServerErrorBoundary(_node, rendered) {
   }
   return rendered;
 }
-function defaultBindingPayloads(result) {
-  return { document: result.document, params: result.dynamicParams };
-}
 async function CanvasRenderer(props) {
   const { result, components } = props;
   if (result.status !== "ok") {
     return /* @__PURE__ */ jsx(UnresolvedPageFallback, { status: result.status });
   }
-  const resolveBinding = props.resolveBinding ?? createBindingResolver(props.payloads ?? defaultBindingPayloads(result));
   const ctx = {
     registry: components.registry,
     implementations: components.implementations,
-    resolveBinding,
     resolveAsset: assetResolver(props.assets ?? []),
     // EC-254: wire relation population only when the host baked the populated
     // targets, so a host that did not opt in keeps the raw-ref passthrough.
@@ -230,42 +133,6 @@ function mergeCacheTags(first, ...rest) {
     locale: first.locale
   });
 }
-function collectBindingSourceIds(node, into = /* @__PURE__ */ new Set()) {
-  for (const value of Object.values(node.props ?? {})) {
-    if (value.kind === "binding") into.add(value.binding.sourceId);
-  }
-  if (node.condition) into.add(node.condition.source.sourceId);
-  for (const children of Object.values(node.slots ?? {})) {
-    for (const child of children) collectBindingSourceIds(child, into);
-  }
-  return into;
-}
-function materializeSourcePayloads(input) {
-  const { client, result, sources } = input;
-  const payloads = {};
-  const tags = [];
-  if (result.status !== "ok") return { payloads, tags };
-  const referenced = /* @__PURE__ */ new Set();
-  const byId = new Map(sources.map((source) => [source.id, source]));
-  for (const sourceId of [...referenced].sort()) {
-    if (!isSectionSourceId(sourceId)) continue;
-    const definition = byId.get(sourceId);
-    if (!definition || definition.kind !== "cms") continue;
-    const config = parseCmsSourceQueryConfig(definition.config);
-    if (!config || config.documentId !== void 0) continue;
-    const list = client.listDocuments(config.collectionId, listQueryOfCmsConfig(config));
-    tags.push(list.tags);
-    if (list.ok) {
-      payloads[sourceId] = list.documents;
-    } else {
-      payloads[sourceId] = sourcePayloadError(
-        sourceId,
-        list.errors.map((error) => error.message)
-      );
-    }
-  }
-  return { payloads, tags };
-}
 function createStaticContentSource(data) {
   const locales = data.locales;
   const routes = data.routes ?? [];
@@ -311,7 +178,6 @@ 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 } : {},
     // 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
@@ -351,7 +217,6 @@ async function createContentSnapshot(adapter, projectId, options) {
     locales: options.locales,
     ...options.routes ? { routes: options.routes } : {},
     redirects: options.redirects ? [...options.redirects] : redirects,
-    ...options.sources ? { sources: options.sources } : {},
     ...schema ? { collections: schema.collections } : {},
     documents,
     assets: assetRecords,
@@ -474,26 +339,6 @@ async function resolveCanvasPage(source, url, perspective, options = {}) {
   if (result.status !== "ok") {
     return { kind: "not-found", tags: result.tags };
   }
-  const extraTags = [];
-  let payloads = defaultBindingPayloads(result);
-  const materialized = materializeSourcePayloads({
-    client,
-    result,
-    sources: source.sources ?? []
-  });
-  payloads = { ...payloads, ...materialized.payloads };
-  extraTags.push(...materialized.tags);
-  if (options.payloads) {
-    const custom = await options.payloads({
-      client,
-      result,
-      perspective,
-      path,
-      params: result.dynamicParams,
-      addTags: (tags) => extraTags.push(tags)
-    });
-    payloads = { ...payloads, ...custom };
-  }
   const presentation = presentationFor(source, result);
   const body = pageBodyOf(result, presentation);
   const allAssets = source.assets?.() ?? [];
@@ -524,7 +369,6 @@ async function resolveCanvasPage(source, url, perspective, options = {}) {
   return {
     kind: "render",
     result,
-    payloads,
     assets: bakedAssets,
     relations,
     listings,
@@ -532,7 +376,6 @@ async function resolveCanvasPage(source, url, perspective, options = {}) {
     ...presentation ? { presentation } : {},
     tags: mergeCacheTags(
       result.tags,
-      ...extraTags,
       ...listingTags,
       assetTags,
       relationTags,
@@ -624,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;
@@ -641,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);
 }
@@ -665,7 +523,6 @@ function createCanvasRoute(options) {
     const resolveFresh = async () => {
       const source = await options.loadContent({ perspective });
       return resolveCanvasPage(source, url, perspective, {
-        ...options.payloads ? { payloads: options.payloads } : {},
         // EC-205: page-scope the baked assets to what the page actually uses.
         registry: options.components.registry
       });
@@ -701,7 +558,6 @@ function createCanvasRoute(options) {
           {
             result: outcome.result,
             components: options.components,
-            payloads: outcome.payloads,
             assets: outcome.assets,
             relations: outcome.relations,
             listings: outcome.listings,
@@ -714,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();
@@ -728,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) {
@@ -830,7 +690,7 @@ function canvasSitemapEntries(source, options) {
           continue;
         }
         const absolute = originOf(options.baseUrl) + urlPath;
-        const group = result.document ? `${route.id}\0doc\0${result.document.collection}\0${result.document.id}` : `${route.id}\0path\0${path}`;
+        const group = result.document ? `${route.id}${COMPOSITE_KEY_SEPARATOR}doc${COMPOSITE_KEY_SEPARATOR}${result.document.collection}${COMPOSITE_KEY_SEPARATOR}${result.document.id}` : `${route.id}${COMPOSITE_KEY_SEPARATOR}path${COMPOSITE_KEY_SEPARATOR}${path}`;
         if (!byUrl.has(absolute)) byUrl.set(absolute, { group, locale });
         const perLocale = byGroup.get(group) ?? /* @__PURE__ */ new Map();
         if (!perLocale.has(locale)) perLocale.set(locale, absolute);
@@ -1080,21 +940,6 @@ function parseRedirects(rows) {
   }
   return redirects;
 }
-var canvasDataSourceSchema = z.object({
-  kind: z.string().min(1),
-  id: z.string().min(1),
-  label: z.string().optional(),
-  config: z.unknown().optional()
-});
-function parseSources(rows) {
-  if (!Array.isArray(rows)) return [];
-  const sources = [];
-  for (const row of rows) {
-    const parsed = canvasDataSourceSchema.safeParse(row);
-    if (parsed.success) sources.push(parsed.data);
-  }
-  return sources;
-}
 function assembleLiveSource(payload, options, perspective) {
   const locales = options.locales;
   const documents = parseDocuments(payload.documents);
@@ -1110,10 +955,7 @@ function assembleLiveSource(payload, options, perspective) {
     redirects: parseRedirects(payload.redirects ?? []),
     collections: [...options.collections],
     documents: documentSources,
-    assets: payload.assets,
-    // EC-166 LIVE mode: the builder's persisted section/template sources, so
-    // the route helper materializes their payloads.
-    sources: parseSources(payload.sources)
+    assets: payload.assets
   });
 }
 async function loadLiveContent(options, perspective) {
@@ -1252,12 +1094,30 @@ function resolveGlobals(source, options = {}) {
 }
 
 // src/preview-core.ts
+var RESOLUTION_ORIGIN = "https://redirect-target.invalid";
+function resolveOnOrigin(value) {
+  let resolved;
+  try {
+    resolved = new URL(value, RESOLUTION_ORIGIN);
+  } catch {
+    return null;
+  }
+  return resolved.origin === RESOLUTION_ORIGIN ? resolved : null;
+}
+function hasControlCharacter(value) {
+  for (let i = 0; i < value.length; i++) {
+    const code = value.charCodeAt(i);
+    if (code <= 31 || code === 127) return true;
+  }
+  return false;
+}
 function safeRedirectTarget(value, fallback = "/") {
   if (value === null || value === void 0 || value === "") return fallback;
-  if (!value.startsWith("/")) return null;
-  if (value.includes("\\")) return null;
-  if (value.startsWith("//")) return null;
-  return value;
+  if (!value.startsWith("/") || hasControlCharacter(value)) return null;
+  const resolved = resolveOnOrigin(value);
+  if (resolved === null) return null;
+  const target = resolved.pathname + resolved.search + resolved.hash;
+  return resolveOnOrigin(target) === null ? null : target;
 }
 function evaluatePreviewRequest(requestUrl, expectedToken) {
   if (expectedToken === void 0 || expectedToken.length === 0) {
@@ -1279,6 +1139,15 @@ function evaluatePreviewRequest(requestUrl, expectedToken) {
   }
   return { ok: true, redirectTo };
 }
+function previewDisableTarget(requestUrl) {
+  let url;
+  try {
+    url = typeof requestUrl === "string" ? new URL(requestUrl, "http://localhost") : requestUrl;
+  } catch {
+    return "/";
+  }
+  return safeRedirectTarget(url.searchParams.get("redirect")) ?? "/";
+}
 
 // src/preview.ts
 function createPreviewRoute(options) {
@@ -1299,13 +1168,7 @@ function createPreviewDisableRoute() {
     async GET(request) {
       const draft = await draftMode();
       draft.disable();
-      let target;
-      try {
-        target = safeRedirectTarget(new URL(request.url).searchParams.get("redirect"));
-      } catch {
-        target = "/";
-      }
-      redirect(target ?? "/");
+      redirect(previewDisableTarget(request.url));
     }
   };
 }
@@ -1345,8 +1208,7 @@ function createElytraHost(options) {
     redirects: [],
     collections: [...options.collections],
     documents: [],
-    assets: [],
-    sources: []
+    assets: []
   });
   const loadContent = (request) => {
     if (live) {
@@ -1422,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, 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 };
+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