@elytracms/next 0.0.92 → 0.0.94

package/dist/index.js

@@ -1,16 +1,17 @@
-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 { registerComponents, createRenderContext, renderDocumentBodyItems, documentBodyItems, serializeListingQuery, documentBodyRichTextValues, documentBodyCompositionNodes, richTextEmbedsInValue, collectReferencedAssetIds, collectRichTextRefsInValue, collectReferencedRelations, collectReferencedListings, collectReferencedRichTextLinks, listingRequestOf } from '@elytracms/core/runtime-renderer';
 import { isBlockSequenceValueShape } from '@elytracms/core/rich-text';
 import { jsx, Fragment, jsxs } from 'react/jsx-runtime';
-import { cacheTags, isDocumentHistory, resolvedAsset, createContentClient, createContentContext } from '@elytracms/core/content';
-import { DEFAULT_SEO_FIELD, parseLocaleConfig, documentKey, liveRedirectRecords, SEO_SUBFIELDS, splitLocalePath, DRAFT_PERSPECTIVE, splitPath, localeUrlPath, variantOf, DRAFT_VARIANT, createRouter, presentationBodyFields, documentSchema, redirectRecordSchema } from '@elytracms/core/cms-core';
+import { cacheTags, isDocumentHistory, resolvedAsset, parseDeliveredDocuments, createContentClient, createContentContext } from '@elytracms/core/content';
+import { DEFAULT_SEO_FIELD, parseLocaleConfig, documentKey, liveRedirectRecords, SEO_SUBFIELDS, splitLocalePath, DRAFT_PERSPECTIVE, splitPath, localeUrlPath, variantOf, DRAFT_VARIANT, createRouter, presentationBodyFields, redirectRecordSchema } from '@elytracms/core/cms-core';
 export { DRAFT_PERSPECTIVE, documentSchema, localeConfigSchema, localeUrlPath, parseLocaleConfig, redirectRecordSchema, resolveLocale, routeRecordSchema, splitLocalePath, textDirection, variantOf } from '@elytracms/core/cms-core';
+import { redirectRecordKind } from '@elytracms/core/persistence';
 import { revalidateTag, 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 { verifyRevalidationSignature, readRevalidationBody, REVALIDATE_SIGNATURE_HEADER } from '@elytracms/core/revalidation';
 export { REVALIDATE_SIGNATURE_HEADER, revalidationEventSchema, signRevalidationBody, signedRevalidationRequest } from '@elytracms/core/revalidation';
+import { INGEST_MAX_BODY_BYTES, readIngestPayload, INGEST_RECEIVER_PATH, signedIngestRequest, convexSiteUrl } from '@elytracms/core/ingest';
 import NextImage from 'next/image';
 import { normalizeImageSource } from '@elytracms/components';
 import { projectFrontendUrl, resolveProject } from '@elytracms/core/studio-core';
@@ -34,33 +35,15 @@ function listingResolver(listings) {
     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 bakedListingFailure(listings) {
+  return (query) => {
+    const baked = listings[serializeListingQuery(query)];
+    return baked && !Array.isArray(baked) ? baked.errors.map((error) => error.message) : null;
+  };
 }
 function assetResolver(assets) {
   const byId = new Map(assets.map((asset) => [asset.id, asset]));
-  return (id) => {
-    const asset = byId.get(id);
-    return asset ? {
-      url: asset.url,
-      width: asset.width,
-      height: asset.height,
-      alt: asset.alt,
-      focalPoint: asset.focalPoint,
-      // EC-420: carry the LQIP so a placed Image blurs up on delivery.
-      lqip: asset.lqip,
-      meta: asset.meta
-    } : null;
-  };
+  return (id) => byId.get(id) ?? null;
 }
 function UnresolvedPageFallback(props) {
   return /* @__PURE__ */ jsx("div", { "data-ec-fallback": "unresolved-page", "data-ec-status": props.status, children: `This URL did not resolve to a page (status: ${props.status}).` });
@@ -68,41 +51,28 @@ function UnresolvedPageFallback(props) {
 function MissingDocumentFallback() {
   return /* @__PURE__ */ jsx("div", { "data-ec-fallback": "missing-document", children: `Route resolved but carried no page document to render.` });
 }
-function stripServerErrorBoundary(_node, rendered) {
-  if (isValidElement(rendered) && rendered.type === RenderErrorBoundary) {
-    return rendered.props.children ?? null;
-  }
-  return rendered;
-}
 async function CanvasRenderer(props) {
   const { result, components } = props;
   if (result.status !== "ok") {
     return /* @__PURE__ */ jsx(UnresolvedPageFallback, { status: result.status });
   }
-  const ctx = {
-    registry: components.registry,
-    implementations: components.implementations,
-    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.
-    ...props.relations ? { resolveRelation: relationResolver(props.relations) } : {},
-    // EC-255: wire the listing resolver only when the host baked the query results,
-    // so a host that did not opt in keeps listing props empty (the block's own state).
-    ...props.listings ? { resolveListing: listingResolver(props.listings) } : {},
-    // EC-291: wire the rich-text link resolver only when the host baked the link map,
-    // 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: (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 ctx = createRenderContext({
+    components,
+    mode: "delivery",
+    source: {
+      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.
+      ...props.relations ? { resolveRelation: relationResolver(props.relations) } : {},
+      // EC-255: wire the listing resolver only when the host baked the query results,
+      // so a host that did not opt in keeps listing props empty (the block's own state).
+      ...props.listings ? { resolveListing: listingResolver(props.listings), listingFailure: bakedListingFailure(props.listings) } : {},
+      // EC-291: wire the rich-text link resolver only when the host baked the link map,
+      // 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) } : {}
     }
-  };
+  });
   const document = result.document;
   if (document) {
     return /* @__PURE__ */ jsx(Fragment, { children: renderDocumentBodyItems(bodyItemsOf(document, props.presentation), ctx) });
@@ -181,7 +151,8 @@ function createStaticContentSource(data) {
       locales
     }),
     routes,
-    redirects
+    redirects,
+    ...data.sourceIssues ? { sourceIssues: data.sourceIssues } : {}
   });
   return {
     projectId: data.projectId,
@@ -204,7 +175,7 @@ async function createContentSnapshot(adapter, projectId, options) {
   const documentRecords = await adapter.cms.listDocuments(projectId);
   const versionRecords = await adapter.cms.listAllDocumentVersions(projectId);
   const assetRecords = await adapter.assets.listAssets(projectId);
-  const redirectRecords = await adapter.redirects.listRedirects(projectId);
+  const redirectRecords = await adapter.records(redirectRecordKind).list(projectId);
   const redirects = liveRedirectRecords(redirectRecords);
   const versionsByKey = /* @__PURE__ */ new Map();
   for (const record2 of versionRecords) {
@@ -243,16 +214,12 @@ function seoContextOf(result, assets = []) {
 function str(value) {
   return typeof value === "string" && value.length > 0 ? value : null;
 }
-function looksLikeUrl(value) {
-  return /^(https?:)?\/\//.test(value) || value.startsWith("/");
-}
 function resolveSeoImage(value, assets) {
   if (value && typeof value === "object") {
     const url = value.url;
     return typeof url === "string" && url.length > 0 ? url : null;
   }
   if (typeof value !== "string" || value.length === 0) return null;
-  if (looksLikeUrl(value)) return value;
   return assets.find((asset) => asset.id === value)?.url ?? null;
 }
 function openGraphLocale(locale) {
@@ -318,6 +285,15 @@ function canvasWrapContext(result, info) {
     result
   };
 }
+function canvasBeaconProps(result, info) {
+  const document = result.document;
+  return {
+    path: info.url,
+    status: 200,
+    locale: result.tags.locale,
+    ...document ? { collection: document.collection, documentId: document.id } : {}
+  };
+}
 function pathFromSlug(slug) {
   return "/" + (slug ?? []).join("/");
 }
@@ -625,8 +601,13 @@ function createCanvasRoute(options) {
             presentation: outcome.presentation
           }
         );
-        if (!options.wrap) return rendered;
-        return options.wrap(rendered, canvasWrapContext(outcome.result, { url, perspective }));
+        const page = options.wrap ? options.wrap(rendered, canvasWrapContext(outcome.result, { url, perspective })) : rendered;
+        const Beacon = options.analytics;
+        if (!Beacon || perspective !== "published") return page;
+        return /* @__PURE__ */ jsxs(Fragment, { children: [
+          page,
+          /* @__PURE__ */ jsx(Beacon, { ...canvasBeaconProps(outcome.result, { url}) })
+        ] });
       }
     }
   };
@@ -793,6 +774,177 @@ function createRevalidateRoute(options) {
     }
   };
 }
+function createFixedWindowLimiter(options) {
+  const windowMs = options.windowMs ?? 6e4;
+  const now = options.now ?? Date.now;
+  const windows = /* @__PURE__ */ new Map();
+  return {
+    hit(key) {
+      const at = now();
+      for (const [held, window2] of windows) if (at - window2.windowStart >= windowMs) windows.delete(held);
+      const window = windows.get(key);
+      if (!window) {
+        windows.set(key, { windowStart: at, count: 1 });
+        return { allowed: true };
+      }
+      if (window.count >= options.limit) {
+        return { allowed: false, retryAfterSeconds: Math.max(1, Math.ceil((window.windowStart + windowMs - at) / 1e3)) };
+      }
+      window.count += 1;
+      return { allowed: true };
+    },
+    size: () => windows.size
+  };
+}
+function defaultIngestClientKey(request) {
+  const forwarded = request.headers.get("x-forwarded-for")?.split(",")[0]?.trim();
+  if (forwarded) return forwarded;
+  const real = request.headers.get("x-real-ip")?.trim();
+  return real || "unknown";
+}
+function isCrossOrigin(request) {
+  const site = request.headers.get("sec-fetch-site");
+  if (site && site !== "same-origin" && site !== "none") return true;
+  const origin = request.headers.get("origin");
+  if (!origin) return false;
+  try {
+    return new URL(origin).origin !== new URL(request.url).origin;
+  } catch {
+    return true;
+  }
+}
+async function evaluateIngestRequest(input) {
+  const { request } = input;
+  if (request.method !== "POST") {
+    return { ok: false, status: 405, body: { error: "Only POST is accepted." }, headers: { allow: "POST" } };
+  }
+  if (!input.configured) {
+    return { ok: false, status: 503, body: { error: "Ingest is not configured on this site." } };
+  }
+  if (isCrossOrigin(request)) {
+    return { ok: false, status: 403, body: { error: "Cross-origin requests are not accepted." } };
+  }
+  const limited = input.limiter.hit(input.clientKey(request));
+  if (!limited.allowed) {
+    return {
+      ok: false,
+      status: 429,
+      body: { error: "Too many requests \u2014 try again shortly." },
+      headers: { "retry-after": String(limited.retryAfterSeconds) }
+    };
+  }
+  if (input.rawBody === void 0) {
+    return { ok: false, status: 413, body: { error: "The payload is too large." } };
+  }
+  const read = readIngestPayload(input.rawBody);
+  if (!read.ok) {
+    return { ok: false, status: 400, body: { error: read.message, ...read.issues ? { issues: read.issues } : {} } };
+  }
+  if (input.botGate) {
+    const verdict = await input.botGate({ request, payload: read.value });
+    if (!verdict.allow) {
+      return { ok: false, status: 403, body: { error: "Refused by the bot gate.", gate: "bot", reason: verdict.reason } };
+    }
+  }
+  if (!input.enrich) return { ok: true, payload: read.value };
+  return enrichPayload(input.enrich, request, read.value);
+}
+async function enrichPayload(enrich, request, payload) {
+  let enriched;
+  try {
+    enriched = await enrich({ request, payload });
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    return { ok: false, status: 500, body: { error: `The site's ingest enrichment failed: ${message}` } };
+  }
+  const body = JSON.stringify(enriched ?? null);
+  const reread = readIngestPayload(body);
+  if (!reread.ok) {
+    return {
+      ok: false,
+      status: 500,
+      body: { error: "The site's ingest enrichment returned an invalid payload.", ...reread.issues ? { issues: reread.issues } : {} }
+    };
+  }
+  if (new TextEncoder().encode(body).byteLength > INGEST_MAX_BODY_BYTES) {
+    return { ok: false, status: 500, body: { error: "The site's ingest enrichment grew the payload past the receiver's cap." } };
+  }
+  return { ok: true, payload: reread.value };
+}
+async function readCappedBody(request, maxBytes = INGEST_MAX_BODY_BYTES) {
+  const declared = Number(request.headers.get("content-length"));
+  if (Number.isFinite(declared) && declared > maxBytes) return void 0;
+  if (!request.body) return "";
+  const reader = request.body.getReader();
+  const chunks = [];
+  let total = 0;
+  for (; ; ) {
+    const { done, value } = await reader.read();
+    if (done) break;
+    total += value.byteLength;
+    if (total > maxBytes) {
+      await reader.cancel().catch(() => void 0);
+      return void 0;
+    }
+    chunks.push(value);
+  }
+  const bytes = new Uint8Array(total);
+  let offset = 0;
+  for (const chunk of chunks) {
+    bytes.set(chunk, offset);
+    offset += chunk.byteLength;
+  }
+  return new TextDecoder().decode(bytes);
+}
+var NO_STORE = { "cache-control": "no-store" };
+function createIngestRoute(options) {
+  const maxBodyBytes = options.maxBodyBytes ?? INGEST_MAX_BODY_BYTES;
+  if (maxBodyBytes > INGEST_MAX_BODY_BYTES || maxBodyBytes <= 0) {
+    throw new Error(`createIngestRoute: maxBodyBytes must be between 1 and ${INGEST_MAX_BODY_BYTES} (the receiver's cap).`);
+  }
+  const limiter = createFixedWindowLimiter({
+    limit: options.maxRequestsPerMinute ?? 30,
+    ...options.now ? { now: options.now } : {}
+  });
+  const clientKey = options.clientKey ?? defaultIngestClientKey;
+  const receiver = options.siteUrl ? `${options.siteUrl.replace(/\/+$/, "")}${INGEST_RECEIVER_PATH}` : void 0;
+  const fetchImpl = options.fetchImpl ?? fetch;
+  return {
+    async POST(request) {
+      const rawBody = request.method === "POST" ? await readCappedBody(request, maxBodyBytes) : "";
+      const evaluation = await evaluateIngestRequest({
+        request,
+        rawBody,
+        configured: options.secret !== void 0 && options.secret.length > 0 && receiver !== void 0,
+        limiter,
+        clientKey,
+        ...options.botGate ? { botGate: options.botGate } : {},
+        ...options.enrich ? { enrich: options.enrich } : {}
+      });
+      if (!evaluation.ok) {
+        return Response.json(evaluation.body, { status: evaluation.status, headers: { ...NO_STORE, ...evaluation.headers } });
+      }
+      const signed = await signedIngestRequest(evaluation.payload, options.secret);
+      let answer;
+      try {
+        answer = await fetchImpl(receiver, { method: "POST", headers: signed.headers, body: signed.body });
+      } catch {
+        return Response.json({ error: "The ingest receiver could not be reached." }, { status: 502, headers: NO_STORE });
+      }
+      if (answer.status === 401) {
+        return Response.json(
+          { error: "The ingest receiver refused this site's signature \u2014 INGEST_SECRET must equal the deployment's ELYTRA_INGEST_SECRET." },
+          { status: 502, headers: NO_STORE }
+        );
+      }
+      const text = await answer.text();
+      return new Response(text, {
+        status: answer.status,
+        headers: { ...NO_STORE, "content-type": answer.headers.get("content-type") ?? "application/json" }
+      });
+    }
+  };
+}
 var LQIP_MAX_EDGE = 24;
 function fitLqipLongEdge(width, height) {
   const scale = Math.min(1, LQIP_MAX_EDGE / Math.max(width, height));
@@ -878,7 +1030,7 @@ function elytraHostImage(options = {}) {
   return ({ asset, alt, className, priority, sizes, loading }) => /* @__PURE__ */ jsx(
     ElytraImage,
     {
-      asset: { ...asset, alt },
+      asset: { ...asset, alt: alt ?? asset.alt },
       ...className !== void 0 ? { className } : {},
       ...priority ? { priority: true } : {},
       ...sizes !== void 0 ? { sizes } : {},
@@ -901,7 +1053,8 @@ var ELYTRA_HOST_ENV_KEYS = {
   convexUrl: "ELYTRA_CONVEX_URL",
   projectId: "ELYTRA_PROJECT_ID",
   draftToken: "DRAFT_PREVIEW_TOKEN",
-  revalidateSecret: "REVALIDATE_SECRET"
+  revalidateSecret: "REVALIDATE_SECRET",
+  ingestSecret: "INGEST_SECRET"
 };
 function cleaned(value) {
   const trimmed = value?.trim();
@@ -930,14 +1083,6 @@ async function runConvexQuery(fetchImpl, convexUrl, path, args) {
   }
   return body.value;
 }
-function parseDocuments(rows) {
-  const documents = [];
-  for (const row of rows) {
-    const parsed = documentSchema.safeParse(row);
-    if (parsed.success) documents.push(parsed.data);
-  }
-  return documents;
-}
 function parseRedirects(rows) {
   const redirects = [];
   for (const row of rows) {
@@ -948,7 +1093,7 @@ function parseRedirects(rows) {
 }
 function assembleLiveSource(payload, options, perspective) {
   const locales = options.locales;
-  const documents = parseDocuments(payload.documents);
+  const { documents, issues: sourceIssues } = parseDeliveredDocuments(payload.documents);
   const routes = [...options.routes];
   const documentSources = perspective === "published" ? documents.map((doc) => ({ draft: doc, published: doc, versions: [] })) : documents;
   return createStaticContentSource({
@@ -961,7 +1106,8 @@ function assembleLiveSource(payload, options, perspective) {
     redirects: parseRedirects(payload.redirects ?? []),
     collections: [...options.collections],
     documents: documentSources,
-    assets: payload.assets
+    assets: payload.assets,
+    ...sourceIssues.length > 0 ? { sourceIssues } : {}
   });
 }
 async function loadLiveContent(options, perspective) {
@@ -1023,11 +1169,7 @@ function resolveGlobals(source, options = {}) {
   const navDocs = listDocs(navigationCollection);
   const navigation = (slot) => navDocs.find((doc) => doc.alias === slot) ?? null;
   const assetUrl = (value) => {
-    if (typeof value === "string") {
-      const found = assetById.get(value);
-      if (found) return found.url;
-      return value.startsWith("http") || value.startsWith("/") ? value : void 0;
-    }
+    if (typeof value === "string") return assetById.get(value)?.url;
     const url = record(value).url;
     return typeof url === "string" && url.length > 0 ? url : void 0;
   };
@@ -1182,8 +1324,6 @@ function createPreviewDisableRoute() {
     }
   };
 }
-
-// src/host-kit.ts
 function resolveHostProject(entry) {
   const result = resolveProject(entry);
   if (result.ok) return result.project;
@@ -1284,6 +1424,11 @@ function createElytraHost(options) {
   });
   const previewRoute = () => createPreviewRoute({ token: env.draftToken });
   const previewDisableRoute = () => createPreviewDisableRoute();
+  const ingestRoute = (overrides = {}) => createIngestRoute({
+    ...overrides,
+    secret: env.ingestSecret,
+    siteUrl: "siteUrl" in overrides ? overrides.siteUrl : convexSiteUrl(env.convexUrl)
+  });
   const pageOpensFullBleed = async (slug) => {
     const perspective = await requestPerspective();
     const source = await loadContent({ perspective });
@@ -1309,11 +1454,12 @@ function createElytraHost(options) {
     revalidateRoute,
     previewRoute,
     previewDisableRoute,
+    ingestRoute,
     pageOpensFullBleed
   };
 }
 var PACKAGE = "@elytracms/next";
 
-export { CANVAS_VALIDATION_SLUG, CanvasRenderer, ELYTRA_HOST_ENV_KEYS, ElytraImage, PACKAGE, assembleLiveSource, bodyItemsOf, canvasSitemapEntries, collectionCacheTag, createAssetImageLoader, createCanvasRoute, createCanvasSitemap, createContentSnapshot, createElytraHost, createPreviewDisableRoute, createPreviewRoute, createRevalidateRoute, createStaticContentSource, defineHostComponents, docCacheTag, elytraHostImage, evaluatePreviewRequest, evaluateRevalidateRequest, firstBlockFullBleed, loadLiveContent, mergeCacheTags, mergeMetadataOverParent, nextCacheTags, openGraphLocale, pathFromSlug, projectSweepTag, requestPerspective, resolveCanvasPage, resolveGlobals, resolveHostEnv, revalidationTags, routeCacheTag, safeRedirectTarget, scopeCacheTag, seoContextOf, seoMetadata, seoObjectOf, withNextImage };
+export { CANVAS_VALIDATION_SLUG, CanvasRenderer, ELYTRA_HOST_ENV_KEYS, ElytraImage, PACKAGE, assembleLiveSource, bodyItemsOf, canvasBeaconProps, canvasSitemapEntries, collectionCacheTag, createAssetImageLoader, createCanvasRoute, createCanvasSitemap, createContentSnapshot, createElytraHost, createFixedWindowLimiter, createIngestRoute, createPreviewDisableRoute, createPreviewRoute, createRevalidateRoute, createStaticContentSource, defaultIngestClientKey, defineHostComponents, docCacheTag, elytraHostImage, evaluateIngestRequest, evaluatePreviewRequest, evaluateRevalidateRequest, firstBlockFullBleed, isCrossOrigin, loadLiveContent, mergeCacheTags, mergeMetadataOverParent, nextCacheTags, openGraphLocale, pathFromSlug, projectSweepTag, readCappedBody, requestPerspective, resolveCanvasPage, resolveGlobals, resolveHostEnv, revalidationTags, routeCacheTag, safeRedirectTarget, scopeCacheTag, seoContextOf, seoMetadata, seoObjectOf, withNextImage };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map