@elytracms/next 0.0.94 → 0.0.95

package/dist/index.d.ts

@@ -227,8 +227,13 @@ interface ContentSource {
      * backend outage. Optional so existing custom sources stay valid; without it,
      * asset-typed props fall back to their raw value (the renderer's visible
      * degradation), never a crash.
+     *
+     * EC-632: resolved in `locale` (absent → the source's default locale) — a localized
+     * asset-collection field (alt, …) carries its value in that locale, with the default
+     * locale as its fallback. The route helper passes the request's locale, so a page bakes
+     * its assets in the locale it renders in.
      */
-    assets?(): readonly ResolvedAsset[];
+    assets?(locale?: Locale): readonly ResolvedAsset[];
 }
 /**
  * Merge accessor cache tags into one deterministic set (sorted, deduplicated)
@@ -307,10 +312,14 @@ interface StaticContentData {
     documents?: readonly ContentDocumentSource[];
     assets?: readonly AssetRecord[];
     /**
-     * Resolve a serve URL for assets without a stored `url`. Defaults to an
-     * explicit unresolved-placeholder scheme (never a silent empty string).
+     * Resolve a serve URL for assets without a stored `url` (`undefined` when there is
+     * none). EC-633: no default — an asset with no URL is no resolved asset (the ONE
+     * constructor, `resolvedAsset`, decides it): it renders the canvas's empty state, its
+     * field resolves to `null` with an `asset-without-url` issue, and this source names it
+     * on `sourceIssues`. The placeholder this used to default to (`asset://unresolved/…`)
+     * rendered a broken image on the site.
      */
-    assetUrl?: (asset: AssetRecord) => string;
+    assetUrl?: (asset: AssetRecord) => string | undefined;
     /**
      * EC-585 — the stored rows the host could not read (`parseDeliveredDocuments`), handed
      * to every client of this source as its `sourceIssues` (and in the results they
@@ -1991,6 +2000,12 @@ interface LiveContentOptions {
 interface DeliverySnapshotPayload {
     projectId: string;
     redirects?: unknown[];
+    /**
+     * EC-628 — the stored redirects the deployment withheld because it could not read them
+     * (`invalid-redirect` issues from the one live rule). Absent from a deployment older than
+     * EC-628, which serves such rows in `redirects` instead (and this host names them there).
+     */
+    redirectIssues?: unknown[];
     documents: unknown[];
     assets: unknown[];
 }

package/dist/index.js

@@ -1,10 +1,10 @@
 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, 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';
+import { cacheTags, isDocumentHistory, assetWithoutUrlIssue, resolvedAsset, parseDeliveredDocuments, parseDeliveredRedirects, createContentClient, createContentContext } from '@elytracms/core/content';
+import { DEFAULT_SEO_FIELD, parseLocaleConfig, documentKey, readLiveRedirects, SEO_SUBFIELDS, splitLocalePath, DRAFT_PERSPECTIVE, splitPath, localeUrlPath, variantOf, DRAFT_VARIANT, createRouter, presentationBodyFields } 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 { assetReadLocale, redirectRecordKind } from '@elytracms/core/persistence';
 import { revalidateTag, cacheTag } from 'next/cache';
 import { draftMode } from 'next/headers';
 import { redirect, notFound, permanentRedirect } from 'next/navigation';
@@ -122,7 +122,7 @@ function createStaticContentSource(data) {
   const locales = parseLocaleConfig(data.locales);
   const routes = data.routes ?? [];
   const redirects = data.redirects ?? [];
-  const assetUrl = data.assetUrl ?? ((asset) => `asset://unresolved/${asset.storageKey}`);
+  const assetUrl = (asset) => asset.url ?? data.assetUrl?.(asset);
   const collections = /* @__PURE__ */ new Map();
   for (const collection of data.collections ?? []) collections.set(collection.id, collection);
   const documents = /* @__PURE__ */ new Map();
@@ -136,12 +136,16 @@ function createStaticContentSource(data) {
   }
   const assets = /* @__PURE__ */ new Map();
   for (const record2 of data.assets ?? []) assets.set(record2.id, record2);
+  const sourceIssues = [
+    ...data.sourceIssues ?? [],
+    ...[...assets.values()].filter((record2) => !assetUrl(record2)).map((record2) => assetWithoutUrlIssue(record2.id))
+  ];
   const lookupFor = (_perspective) => ({
     collection: (id) => collections.get(id),
     document: (ref) => documents.get(documentKey(ref)),
     documents: (collectionId) => byCollection.get(collectionId) ?? [],
     asset: (id) => assets.get(id),
-    assetUrl: (asset) => asset.url ?? assetUrl(asset)
+    assetUrl
   });
   const client = (init) => createContentClient({
     lookup: lookupFor(init.perspective),
@@ -152,7 +156,7 @@ function createStaticContentSource(data) {
     }),
     routes,
     redirects,
-    ...data.sourceIssues ? { sourceIssues: data.sourceIssues } : {}
+    ...sourceIssues.length > 0 ? { sourceIssues } : {}
   });
   return {
     projectId: data.projectId,
@@ -163,7 +167,14 @@ function createStaticContentSource(data) {
     // `asset`-typed Image prop (an asset id) to a usable url + intrinsic
     // 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))),
+    // EC-632: in the requested locale (the route helper passes the request's), so a
+    // localized alt is baked in the locale the page renders in.
+    // EC-633: a record with no URL is no resolved asset — not baked, so the page renders
+    // the empty state the canvas renders for it (and `sourceIssues` names it).
+    assets: (locale) => [...assets.values()].flatMap((record2) => {
+      const asset = resolvedAsset(record2, assetUrl(record2), assetReadLocale(locales, locale));
+      return asset ? [asset] : [];
+    }),
     // 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
@@ -175,8 +186,16 @@ 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 blobs = adapter.blobs;
+  const servedUrls = /* @__PURE__ */ new Map();
+  await Promise.all(
+    assetRecords.filter((record2) => !record2.url).map(async (record2) => {
+      const url = blobs.resolveUrl ? await blobs.resolveUrl(record2.storageKey).catch(() => void 0) : blobs.url(record2.storageKey);
+      servedUrls.set(record2.id, url || void 0);
+    })
+  );
   const redirectRecords = await adapter.records(redirectRecordKind).list(projectId);
-  const redirects = liveRedirectRecords(redirectRecords);
+  const { redirects, issues: redirectIssues } = readLiveRedirects(redirectRecords);
   const versionsByKey = /* @__PURE__ */ new Map();
   for (const record2 of versionRecords) {
     const key = `${record2.collection}:${record2.docId}`;
@@ -194,13 +213,15 @@ async function createContentSnapshot(adapter, projectId, options) {
   });
   return createStaticContentSource({
     projectId,
+    // EC-628: only for the stored redirects this source serves (an explicit override replaces them).
+    ...options.redirects === void 0 && redirectIssues.length > 0 ? { sourceIssues: redirectIssues } : {},
     locales: options.locales,
     ...options.routes ? { routes: options.routes } : {},
     redirects: options.redirects ? [...options.redirects] : redirects,
     collections: options.collections,
     documents,
     assets: assetRecords,
-    assetUrl: (asset) => adapter.blobs.url(asset.storageKey)
+    assetUrl: (asset) => servedUrls.get(asset.id)
   });
 }
 function seoContextOf(result, assets = []) {
@@ -410,7 +431,7 @@ async function resolveCanvasPage(source, url, perspective, options = {}) {
   }
   const presentation = presentationFor(source, result);
   const body = pageBodyOf(result, presentation);
-  const allAssets = source.assets?.() ?? [];
+  const allAssets = source.assets?.(locale) ?? [];
   const bakedAssets = options.registry ? scopeAssetsToPage(
     allAssets,
     options.registry,
@@ -1083,17 +1104,11 @@ async function runConvexQuery(fetchImpl, convexUrl, path, args) {
   }
   return body.value;
 }
-function parseRedirects(rows) {
-  const redirects = [];
-  for (const row of rows) {
-    const parsed = redirectRecordSchema.safeParse(row);
-    if (parsed.success) redirects.push(parsed.data);
-  }
-  return redirects;
-}
 function assembleLiveSource(payload, options, perspective) {
   const locales = options.locales;
-  const { documents, issues: sourceIssues } = parseDeliveredDocuments(payload.documents);
+  const { documents, issues: documentIssues } = parseDeliveredDocuments(payload.documents);
+  const delivered = parseDeliveredRedirects(payload.redirects ?? [], payload.redirectIssues ?? []);
+  const sourceIssues = [...documentIssues, ...delivered.issues];
   const routes = [...options.routes];
   const documentSources = perspective === "published" ? documents.map((doc) => ({ draft: doc, published: doc, versions: [] })) : documents;
   return createStaticContentSource({
@@ -1103,7 +1118,7 @@ function assembleLiveSource(payload, options, perspective) {
     // Redirects are editorial DATA (EC-303): the ENABLED ones ship in the
     // snapshot, so they change dynamically (no redeploy). Native next.config
     // redirects run before this.
-    redirects: parseRedirects(payload.redirects ?? []),
+    redirects: delivered.redirects,
     collections: [...options.collections],
     documents: documentSources,
     assets: payload.assets,
@@ -1159,7 +1174,7 @@ function resolveGlobals(source, options = {}) {
   const navigationCollection = conventions.navigationCollection ?? "navigation";
   const itemsFields = conventions.navigationItemsFields ?? DEFAULT_ITEMS_FIELDS;
   const client = source.client({ perspective, ...options.locale ? { locale: options.locale } : {} });
-  const assets = source.assets?.() ?? [];
+  const assets = source.assets?.(options.locale) ?? [];
   const assetById = new Map(assets.map((asset) => [asset.id, asset]));
   const listDocs = (collection) => {
     const result = client.listDocuments(collection);