@elytracms/next 0.0.80 → 0.0.81

package/dist/index.d.ts

@@ -376,6 +376,52 @@ declare function createStaticContentSource(data: StaticContentData): ContentSnap
  */
 declare function createContentSnapshot(adapter: PersistenceAdapter, projectId: string, options?: ContentSnapshotOptions): Promise<ContentSnapshot>;
 
+/**
+ * The locale ⇄ URL mapping, owned in ONE place (EC-486).
+ *
+ * The delivery host reads a request URL and derives `{ locale, path }`; the
+ * sitemap goes the other way, turning an enumerated `{ locale, path }` back
+ * into the URL a crawler will request. Those are inverse functions, and while
+ * they lived in two files they disagreed: a page whose top-level slug happens
+ * to equal a **non-default locale code** (`/de` in a project whose locales are
+ * `['en','de']`, default `en`) was published to `sitemap.xml` as
+ * `https://site/de`, which the host then split as *locale `de`, path `/`* and
+ * 404'd. Measured — see EC-486.
+ *
+ * Keeping both directions here makes the round-trip checkable, which is what
+ * {@link localeUrlPath} reports: some `{ locale, path }` pairs simply have **no
+ * URL that addresses them**, and a caller that publishes URLs must be able to
+ * tell rather than emit a link nothing serves.
+ */
+/**
+ * Derive the request locale from a leading URL segment (`/de/about` → locale
+ * `de`, path `/about`) and return the remaining path. No prefix (or the
+ * default locale's own content at root) falls back to the default locale.
+ */
+declare function splitLocalePath(url: string, locales: LocaleConfig): {
+    locale: Locale;
+    path: string;
+};
+interface LocaleUrlPath {
+    /** The request path a client uses to reach `path` in `locale`. */
+    urlPath: string;
+    /**
+     * Whether {@link splitLocalePath} recovers exactly the `{ locale, path }`
+     * this was built from. `false` means the pair is **unaddressable**: every URL
+     * that could denote it is read by the host as a different locale/path pair,
+     * so the content is unreachable and the URL must not be published.
+     */
+    addressable: boolean;
+}
+/**
+ * The inverse of {@link splitLocalePath}: default locale serves the root,
+ * other locales get a `/<locale>` prefix — then the result is round-tripped
+ * back through `splitLocalePath` so an unaddressable pair is reported rather
+ * than silently emitted (AGENTS.md §4: never a fallback that hides a broken
+ * state).
+ */
+declare function localeUrlPath(path: string, locale: Locale, locales: LocaleConfig): LocaleUrlPath;
+
 /**
  * The pure half of the catch-all route helper (EC-144): URL → outcome, with
  * no Next.js imports — so redirects, 404s, locale handling, payload assembly,
@@ -458,15 +504,7 @@ type CanvasPageOutcome = {
 };
 /** Build the request path from a Next catch-all `slug` param. */
 declare function pathFromSlug(slug: readonly string[] | undefined): string;
-/**
- * Derive the request locale from a leading URL segment (`/de/about` → locale
- * `de`, path `/about`) and return the remaining path. No prefix (or the
- * default locale's own content at root) falls back to the default locale.
- */
-declare function splitLocalePath(url: string, locales: LocaleConfig): {
-    locale: Locale;
-    path: string;
-};
+
 interface ResolveCanvasPageOptions {
     payloads?: CanvasPayloadsFactory;
     /**
@@ -601,6 +639,16 @@ declare function canvasPageMetadata(result: ResolvePageResult, assets?: readonly
  * documents (composing each page's nested path from its parent chain) — no
  * params provider entry needed.
  *
+ * **Enumeration is a candidate list, not the output (EC-486).** Every branch
+ * above — static, provider-fed, and mount — only proposes paths; each one is
+ * then put back through `resolvePage`, and a path the resolver refuses is
+ * dropped. So the sitemap cannot claim a URL the delivery host would 404, even
+ * though the mount branch enumerates its collection independently of route
+ * precedence. Do not read the enumeration in isolation: the gate below it is
+ * what makes the two agree. What a mount enumerated and the resolver then
+ * refused is reported in {@link CanvasSitemapResult.skipped}, never dropped in
+ * silence.
+ *
  * Host usage (`app/sitemap.ts`):
  *
  * ```ts
@@ -1541,4 +1589,4 @@ declare function evaluatePreviewRequest(requestUrl: string | URL, expectedToken:
  */
 declare const PACKAGE = "@elytracms/next";
 
-export { type AssetImageLoaderOptions, type BindingPayloads, type CacheWrapper, type CacheWrapperOptions, type CachedEntry, type CanvasCacheOptions, type CanvasContentRequest, type CanvasDataSource, type CanvasPageOutcome, type CanvasPayloadContext, type CanvasPayloadsFactory, CanvasRenderer, type CanvasRendererProps, type CanvasRequestInfo, type CanvasRoute, type CanvasRouteOptions, type CanvasRouteProps, type CanvasSitemapOptions, type CanvasSitemapResult, type ContentSnapshot, type ContentSnapshotOptions, type ContentSource, type CreateCanvasSitemapOptions, type DefineHostComponentsOptions, ELYTRA_HOST_ENV_KEYS, type ElytraHost, type ElytraHostEnv, type ElytraHostImageOptions, type ElytraHostOptions, ElytraImage, type ElytraImageAsset, type ElytraImageProps, type GlobalsConventions, type HostCanvasRouteOptions, type HostComponent, type HostComponents, type LiveContentOptions, type LoadGlobalsOptions, type MaterializeSourcePayloadsInput, type MaterializedSourcePayloads, type NextImagePrimitiveOptions, PACKAGE, type PreviewEvaluation, type PreviewRouteHandlers, type PreviewRouteOptions, REVALIDATE_SIGNATURE_HEADER, type ResolveCanvasPageOptions, type ResolveGlobalsOptions, type ResolvedLink, type ResolvedNavEntry, type ResolvedNavLink, type RevalidateEvaluation, type RevalidatePayload, type RevalidateRouteHandlers, type RevalidateRouteOptions, type SiteGlobals, type SitemapParamsProvider, type SitemapRouteContext, type SitemapSkippedRoute, type SourcePayloadError, type StaticContentData, 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 { type AssetImageLoaderOptions, type BindingPayloads, type CacheWrapper, type CacheWrapperOptions, type CachedEntry, type CanvasCacheOptions, type CanvasContentRequest, type CanvasDataSource, type CanvasPageOutcome, type CanvasPayloadContext, type CanvasPayloadsFactory, CanvasRenderer, type CanvasRendererProps, type CanvasRequestInfo, type CanvasRoute, type CanvasRouteOptions, type CanvasRouteProps, type CanvasSitemapOptions, type CanvasSitemapResult, type ContentSnapshot, type ContentSnapshotOptions, type ContentSource, type CreateCanvasSitemapOptions, type DefineHostComponentsOptions, ELYTRA_HOST_ENV_KEYS, type ElytraHost, type ElytraHostEnv, type ElytraHostImageOptions, type ElytraHostOptions, ElytraImage, type ElytraImageAsset, type ElytraImageProps, type GlobalsConventions, type HostCanvasRouteOptions, type HostComponent, type HostComponents, type LiveContentOptions, type LoadGlobalsOptions, type LocaleUrlPath, type MaterializeSourcePayloadsInput, type MaterializedSourcePayloads, type NextImagePrimitiveOptions, PACKAGE, type PreviewEvaluation, type PreviewRouteHandlers, type PreviewRouteOptions, REVALIDATE_SIGNATURE_HEADER, type ResolveCanvasPageOptions, type ResolveGlobalsOptions, type ResolvedLink, type ResolvedNavEntry, type ResolvedNavLink, type RevalidateEvaluation, type RevalidatePayload, type RevalidateRouteHandlers, type RevalidateRouteOptions, type SiteGlobals, type SitemapParamsProvider, type SitemapRouteContext, type SitemapSkippedRoute, type SourcePayloadError, type StaticContentData, 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, localeUrlPath, materializeSourcePayloads, mergeCacheTags, nextCacheTags, nextImagePrimitive, pathFromSlug, projectSweepTag, resolveCanvasPage, resolveGlobals, resolveHostEnv, resolvePayloadToken, revalidatePayloadSchema, routeCacheTag, safeRedirectTarget, scopeCacheTag, signRevalidateBody, sourcePayloadError, splitLocalePath };

package/dist/index.js

@@ -307,9 +307,6 @@ async function createContentSnapshot(adapter, projectId, options = {}) {
     assetUrl: (asset) => adapter.blobs.url(asset.storageKey)
   });
 }
-function pathFromSlug(slug) {
-  return "/" + (slug ?? []).join("/");
-}
 function splitLocalePath(url, locales) {
   const segments = splitPath(url);
   const first = segments[0];
@@ -318,6 +315,14 @@ function splitLocalePath(url, locales) {
   }
   return { locale: locales.default, path: "/" + segments.join("/") };
 }
+function localeUrlPath(path, locale, locales) {
+  const urlPath = locale === locales.default ? path : path === "/" ? `/${locale}` : `/${locale}${path}`;
+  const round = splitLocalePath(urlPath, locales);
+  return { urlPath, addressable: round.locale === locale && round.path === path };
+}
+function pathFromSlug(slug) {
+  return "/" + (slug ?? []).join("/");
+}
 function scopeAssetsToPage(allAssets, registry, result, resolveRelation) {
   if (allAssets.length === 0) return allAssets;
   const ids = /* @__PURE__ */ new Set();
@@ -653,10 +658,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 +724,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 = [];
@@ -1299,6 +1320,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, canvasPageMetadata, canvasSitemapEntries, collectBindingSourceIds, collectionCacheTag, createAssetImageLoader, createBindingResolver, createCanvasRoute, createCanvasSitemap, createContentSnapshot, createElytraHost, createPreviewDisableRoute, createPreviewRoute, createRevalidateRoute, createStaticContentSource, defaultBindingPayloads, defineHostComponents, docCacheTag, elytraHostImage, evaluatePreviewRequest, evaluateRevalidateRequest, firstBlockFullBleed, isSourcePayloadError, loadCachedEntry, loadLiveContent, localeUrlPath, materializeSourcePayloads, mergeCacheTags, nextCacheTags, nextImagePrimitive, pathFromSlug, projectSweepTag, resolveCanvasPage, resolveGlobals, resolveHostEnv, resolvePayloadToken, revalidatePayloadSchema, routeCacheTag, safeRedirectTarget, scopeCacheTag, signRevalidateBody, sourcePayloadError, splitLocalePath };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map