@elytracms/next 0.0.65 → 0.0.67

package/dist/index.d.ts

@@ -5,8 +5,8 @@ import { ComponentImplementations, ResolveBinding, RelationTarget } from '@elytr
 export { ComponentImplementations, RenderAsset } from '@elytracms/core/runtime-renderer';
 import { ResolvePageResult, ResolvedAsset, Perspective, ContentClient, CacheTags, ContentDocumentSource, ResolvedDocument } from '@elytracms/core/content';
 export { Perspective } from '@elytracms/core/content';
-import { LocaleConfig, Locale, RouteRecord, RedirectRecord, CollectionDef, CmsDocument } from '@elytracms/core/cms-core';
-export { CmsDocument, CollectionDef, FieldDef, Locale, LocaleConfig, RedirectRecord, RouteRecord, documentSchema, localeConfigSchema, redirectRecordSchema, routeRecordSchema } from '@elytracms/core/cms-core';
+import { LocaleConfig, Locale, RouteRecord, RedirectRecord, CollectionDef } from '@elytracms/core/cms-core';
+export { CmsDocument, CollectionDef, FieldDef, Locale, LocaleConfig, RedirectRecord, RouteRecord, documentSchema, fallbackHomeRoutes, localeConfigSchema, mergeRouteRecords, redirectRecordSchema, routeRecordSchema } from '@elytracms/core/cms-core';
 import { ComponentNode } from '@elytracms/core/project-graph';
 export { ComponentNode } from '@elytracms/core/project-graph';
 import { AssetRecord, PersistenceAdapter } from '@elytracms/core/persistence';
@@ -359,18 +359,7 @@ interface StaticContentData {
      */
     sources?: readonly CanvasDataSource[];
 }
-/**
- * Merge stored route records with derived fallback routes (EC-177 gap 2):
- * stored records win per pattern+locale; fallback routes only fill patterns
- * the stored set does not cover. Never XOR — the first stored route must not
- * drop the implicit per-locale home-page fallback (or vice versa).
- *
- * Coverage rules mirror the router's locale matching (EC-018/019): a stored
- * locale-agnostic route (no `locale`) covers its pattern for every locale; a
- * locale-specific stored route covers only that locale, so fallbacks for the
- * other locales still apply.
- */
-declare function mergeRouteRecords(stored: readonly RouteRecord[], fallback: readonly RouteRecord[]): RouteRecord[];
+
 /**
  * Assemble a `ContentSource` from plain prefetched data — the pure half of
  * {@link createContentSnapshot}, shared with hosts that fetched the data
@@ -949,6 +938,13 @@ interface ElytraImageProps {
     /** Quality (1–100) forwarded to `next/image`; Next defaults to 75. */
     quality?: number;
     className?: string;
+    /**
+     * Loading strategy forwarded to `next/image` (EC-428/NK-026). `'eager'` opts an
+     * image out of lazy-loading without the preload `priority` implies. Next throws
+     * on `priority` + `loading='lazy'` together, so {@link ElytraImage} drops `lazy`
+     * when `priority` is set (priority wins) — delivery never crashes.
+     */
+    loading?: 'eager' | 'lazy';
     /**
      * Custom `next/image` loader (e.g. from {@link createAssetImageLoader})
      * when assets sit behind a transforming CDN. Omit for the v1 default:
@@ -1461,14 +1457,7 @@ interface DeliverySnapshotPayload {
     documents: unknown[];
     assets: unknown[];
 }
-/**
- * Implicit fallback route table (EC-187): `/` → the first `page`-collection
- * document (lowest id), once per configured locale. Merged UNDER the stored
- * records. The delivery snapshot is already perspective-filtered server-side,
- * so in draft mode this correctly previews the draft home even when
- * unpublished.
- */
-declare function fallbackHomeRoutes(documents: readonly CmsDocument[], locales: LocaleConfig): RouteRecord[];
+
 /**
  * Assemble a fetched delivery-snapshot payload into a `ContentSource` — the
  * pure half of {@link loadLiveContent}, exported so the parsing/assembly rules
@@ -1547,4 +1536,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, fallbackHomeRoutes, firstBlockFullBleed, isSourcePayloadError, loadCachedEntry, loadLiveContent, materializeSourcePayloads, mergeCacheTags, mergeRouteRecords, 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 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 };

package/dist/index.js

@@ -4,8 +4,8 @@ import { basePrimitives, getImplementation, renderComposition, ImageManifest, se
 import { isValidElement } from 'react';
 import { jsx, Fragment } from 'react/jsx-runtime';
 import { cacheTags, isSectionSourceId, parseCmsSourceQueryConfig, listQueryOfCmsConfig, isDocumentHistory, resolvedAsset, createContentClient, createContentContext } from '@elytracms/core/content';
-import { documentKey, splitPath, hierarchyMount, composePath, documentSchema, redirectRecordSchema } from '@elytracms/core/cms-core';
-export { documentSchema, localeConfigSchema, redirectRecordSchema, routeRecordSchema } from '@elytracms/core/cms-core';
+import { documentKey, splitPath, hierarchyMount, composePath, mergeRouteRecords, fallbackHomeRoutes, documentSchema, redirectRecordSchema } from '@elytracms/core/cms-core';
+export { documentSchema, fallbackHomeRoutes, localeConfigSchema, mergeRouteRecords, redirectRecordSchema, routeRecordSchema } from '@elytracms/core/cms-core';
 import { revalidateTag, unstable_cache } from 'next/cache';
 import { draftMode } from 'next/headers';
 import { redirect, notFound, permanentRedirect } from 'next/navigation';
@@ -220,23 +220,6 @@ function materializeSourcePayloads(input) {
   return { payloads, tags };
 }
 var DEFAULT_LOCALES = { default: "en", locales: ["en"] };
-function patternKey(pattern) {
-  return "/" + splitPath(pattern).join("/");
-}
-function mergeRouteRecords(stored, fallback) {
-  const agnostic = /* @__PURE__ */ new Set();
-  const localized = /* @__PURE__ */ new Set();
-  for (const route of stored) {
-    if (route.locale === void 0) agnostic.add(patternKey(route.pattern));
-    else localized.add(`${route.locale}|${patternKey(route.pattern)}`);
-  }
-  const covered = (route) => {
-    const key = patternKey(route.pattern);
-    if (agnostic.has(key)) return true;
-    return route.locale !== void 0 && localized.has(`${route.locale}|${key}`);
-  };
-  return [...stored, ...fallback.filter((route) => !covered(route))];
-}
 function createStaticContentSource(data) {
   const locales = data.locales ?? DEFAULT_LOCALES;
   const routes = data.routes ?? [];
@@ -835,12 +818,21 @@ function createRevalidateRoute(options) {
     }
   };
 }
+var LQIP_MAX_EDGE = 24;
+function fitLqipLongEdge(width, height) {
+  const scale = Math.min(1, LQIP_MAX_EDGE / Math.max(width, height));
+  return { width: Math.max(1, Math.round(width * scale)), height: Math.max(1, Math.round(height * scale)) };
+}
+function scaledLqipBlur(lqip, width, height) {
+  const { width: lqipW, height: lqipH } = fitLqipLongEdge(width, height);
+  const svg = `<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 ${lqipW * 40} ${lqipH * 40}'><filter id='b' color-interpolation-filters='sRGB'><feGaussianBlur stdDeviation='20'/><feColorMatrix values='1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 100 -1' result='s'/><feFlood x='0' y='0' width='100%' height='100%'/><feComposite operator='out' in='s'/><feComposite in2='SourceGraphic'/><feGaussianBlur stdDeviation='20'/></filter><image width='100%' height='100%' x='0' y='0' preserveAspectRatio='none' style='filter:url(#b)' href='${lqip}'/></svg>`;
+  return `data:image/svg+xml;base64,${btoa(svg)}`;
+}
 function ElytraImage(props) {
-  const { asset, sizes, priority, quality, className, loader } = props;
+  const { asset, sizes, priority, quality, className, loader, loading } = props;
   if (!asset || asset.url.length === 0) return null;
   const alt = asset.alt ?? "";
   const objectPosition = asset.focalPoint ? `${asset.focalPoint.x * 100}% ${asset.focalPoint.y * 100}%` : void 0;
-  const blur = asset.lqip ? { placeholder: "blur", blurDataURL: asset.lqip } : {};
   if (asset.width === null || asset.height === null) {
     return /* @__PURE__ */ jsx(
       "img",
@@ -853,6 +845,9 @@ function ElytraImage(props) {
       }
     );
   }
+  const blurDataURL = asset.lqip == null ? null : asset.lqip.startsWith("data:image/svg") ? asset.lqip : scaledLqipBlur(asset.lqip, asset.width, asset.height);
+  const blur = blurDataURL ? { placeholder: "blur", blurDataURL } : {};
+  const loadingProp = priority && loading === "lazy" ? void 0 : loading;
   return /* @__PURE__ */ jsx(
     NextImage,
     {
@@ -863,6 +858,7 @@ function ElytraImage(props) {
       height: asset.height,
       ...sizes !== void 0 ? { sizes } : {},
       ...priority !== void 0 ? { priority } : {},
+      ...loadingProp !== void 0 ? { loading: loadingProp } : {},
       ...quality !== void 0 ? { quality } : {},
       ...className !== void 0 ? { className } : {},
       ...loader !== void 0 ? { loader } : {},
@@ -903,13 +899,14 @@ function nextImagePrimitive(options = {}) {
   };
 }
 function elytraHostImage(options = {}) {
-  return ({ asset, alt, className, priority, sizes }) => /* @__PURE__ */ jsx(
+  return ({ asset, alt, className, priority, sizes, loading }) => /* @__PURE__ */ jsx(
     ElytraImage,
     {
       asset: { ...asset, alt },
       ...className !== void 0 ? { className } : {},
       ...priority ? { priority: true } : {},
       ...sizes !== void 0 ? { sizes } : {},
+      ...loading !== void 0 ? { loading } : {},
       ...options.loader !== void 0 ? { loader: options.loader } : {},
       ...options.quality !== void 0 ? { quality: options.quality } : {}
     }
@@ -989,16 +986,6 @@ function parseSources(rows) {
   }
   return sources;
 }
-function fallbackHomeRoutes(documents, locales) {
-  const homePage = [...documents].filter((doc) => doc.collection === "page").sort((a, b) => a.id < b.id ? -1 : a.id > b.id ? 1 : 0)[0];
-  if (!homePage) return [];
-  return locales.locales.map((locale) => ({
-    id: `r-live-home-${locale}`,
-    pattern: "/",
-    locale,
-    document: { collection: "page", id: homePage.id }
-  }));
-}
 function assembleLiveSource(payload, options, perspective) {
   const locales = options.locales;
   const documents = parseDocuments(payload.documents);
@@ -1310,6 +1297,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, fallbackHomeRoutes, firstBlockFullBleed, isSourcePayloadError, loadCachedEntry, loadLiveContent, materializeSourcePayloads, mergeCacheTags, mergeRouteRecords, 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, 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