@decocms/start 1.4.0 → 1.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decocms/start",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "type": "module",
   "description": "Deco framework for TanStack Start - CMS bridge, admin protocol, hooks, schema generation",
   "main": "./src/index.ts",

package/src/cms/resolve.ts

@@ -1551,7 +1551,7 @@ export async function resolveDeferredSectionFull(
  * rawProps for the section at the given index. Expensive but ensures correctness
  * when the in-memory cache has been evicted (different isolate, TTL expired).
  */
-async function reExtractRawProps(
+export async function reExtractRawProps(
   pagePath: string,
   component: string,
   sectionIndex: number,

package/src/routes/cmsRoute.ts

@@ -36,6 +36,7 @@ import {
   extractSeoFromProps,
   extractSeoFromSections,
   getDeferredRawProps,
+  reExtractRawProps,
   resolveDecoPage,
   resolveDeferredSection,
   resolveDeferredSectionFull,
@@ -220,9 +221,14 @@ export const loadDeferredSection = createServerFn({ method: "POST" })
       request: originRequest,
     };
 
-    // Resolve rawProps: prefer client-provided (backward compat), then server cache
+    // Resolve rawProps: prefer client-provided (backward compat), then server cache,
+    // then re-extract from the page as a last resort (handles cross-isolate cache miss
+    // on Cloudflare Workers and TTL expiry for slow-scrolling users).
     const rawProps = clientRawProps
-      ?? (index !== undefined ? getDeferredRawProps(pagePath, component, index) : null);
+      ?? (index !== undefined ? getDeferredRawProps(pagePath, component, index) : null)
+      ?? (index !== undefined
+        ? await reExtractRawProps(pagePath, component, index, matcherCtx)
+        : null);
 
     if (!rawProps) {
       console.warn(`[CMS] Deferred section cache miss: ${component} at index ${index} on ${pagePath}`);

package/src/sdk/workerEntry.ts

@@ -38,9 +38,10 @@ import { isMobileUA } from "./useDevice";
 import { getRenderShellConfig } from "../admin/setup";
 import { RequestContext } from "./requestContext";
 import { getAppMiddleware } from "./setupApps";
-import type { MatcherContext } from "../cms/resolve";
-import { resolveDecoPage } from "../cms/resolve";
-import { runSectionLoaders } from "../cms/sectionLoaders";
+import type { MatcherContext, ResolvedSection } from "../cms/resolve";
+import { resolveDecoPage, extractSeoFromProps, extractSeoFromSections } from "../cms/resolve";
+import { runSectionLoaders, runSingleSectionLoader } from "../cms/sectionLoaders";
+import { getSiteSeo } from "../cms/loader";
 
 /**
  * Append Link preload headers for CSS and fonts so the browser starts
@@ -978,10 +979,45 @@ export function createDecoWorkerEntry(
           return Response.json(null, { status: 404, headers: { "Access-Control-Allow-Origin": "*" } });
         }
         const enrichedSections = await runSectionLoaders(page.resolvedSections, request);
-        const { seoSection: _seo, ...pageData } = page;
+
+        // Build SEO props — same logic as buildPageSeo in cmsRoute.ts:
+        // 1. Run section loader on seoSection (e.g. SEOPDP)
+        // 2. Extract SEO fields from resolved props
+        // 3. Merge with site-wide SEO defaults from the "Site" app block
+        // 4. Extract section-contributed SEO from enriched sections
+        const seoProps = await buildAsJsonSeo(page.seoSection, enrichedSections, request);
+        const seoComponent = page.seoSection?.component ?? "website/sections/Seo/SeoV2.tsx";
+
+        // Build legacy deco-cx/deco (Fresh) compatible response shape.
+        // The old framework returns { props: { name, path, seo, sections, ... }, metadata }.
+        // Mobile apps and other consumers rely on this exact structure.
+        const sections = enrichedSections.map((s) => ({
+          props: s.props,
+          metadata: {
+            resolveChain: [],
+            component: s.component,
+          },
+        }));
+
         const result = {
-          ...pageData,
-          resolvedSections: enrichedSections,
+          props: {
+            name: page.name,
+            path: page.path,
+            seo: {
+              props: seoProps,
+              metadata: {
+                resolveChain: [],
+                component: seoComponent,
+              },
+            },
+            sections,
+            devMode: false,
+            unindexedDomain: false,
+          },
+          metadata: {
+            resolveChain: [],
+            component: "website/pages/Page.tsx",
+          },
         };
         return Response.json(result, {
           headers: {
@@ -1418,3 +1454,75 @@ export function createDecoWorkerEntry(
       return dressResponse(origin, "MISS");
   }
 }
+
+// ---------------------------------------------------------------------------
+// ?asJson SEO builder — mirrors buildPageSeo() from cmsRoute.ts
+// ---------------------------------------------------------------------------
+
+/**
+ * Build SEO props for the ?asJson response, matching the legacy deco-cx/deco
+ * format. Runs the SEO section loader, merges with site-wide SEO defaults,
+ * and extracts section-contributed SEO.
+ */
+async function buildAsJsonSeo(
+  seoSection: ResolvedSection | null | undefined,
+  enrichedSections: ResolvedSection[],
+  request: Request,
+): Promise<Record<string, unknown>> {
+  const siteSeo = getSiteSeo();
+  const sectionSeo = extractSeoFromSections(enrichedSections);
+
+  if (!seoSection) {
+    const merged: Record<string, unknown> = { ...sectionSeo };
+    if (siteSeo.title && !merged.title) merged.title = siteSeo.title;
+    if (siteSeo.description && !merged.description) merged.description = siteSeo.description;
+    if (siteSeo.image && !merged.image) merged.image = siteSeo.image;
+    if (siteSeo.favicon) merged.favicon = siteSeo.favicon;
+    if (!merged.jsonLDs) merged.jsonLDs = [];
+    return merged;
+  }
+
+  // Run the section loader if registered (e.g. SEOPDP)
+  let enrichedProps = seoSection.props;
+  try {
+    const enriched = await runSingleSectionLoader(seoSection, request);
+    if (enriched) enrichedProps = enriched.props;
+  } catch {
+    // Section loader failed — use raw resolved props
+  }
+
+  const pageSeo = extractSeoFromProps(enrichedProps);
+
+  // Merge site-wide SEO defaults (same as cmsRoute.ts buildPageSeo)
+  if (!pageSeo.title && siteSeo.title) pageSeo.title = siteSeo.title;
+  if (!pageSeo.description && siteSeo.description) pageSeo.description = siteSeo.description;
+  if (!pageSeo.image && siteSeo.image) pageSeo.image = siteSeo.image;
+
+  // Apply title/description templates (mirrors buildPageSeo in cmsRoute.ts).
+  // Priority: page-level template → site-level template → no-op.
+  const rawProps = seoSection.props;
+  const titleTemplate =
+    effectiveTemplate(rawProps.titleTemplate as string | undefined) ??
+    effectiveTemplate(siteSeo.titleTemplate);
+  const descTemplate =
+    effectiveTemplate(rawProps.descriptionTemplate as string | undefined) ??
+    effectiveTemplate(siteSeo.descriptionTemplate);
+
+  if (titleTemplate && pageSeo.title) {
+    pageSeo.title = titleTemplate.replace("%s", pageSeo.title);
+  }
+  if (descTemplate && pageSeo.description) {
+    pageSeo.description = descTemplate.replace("%s", pageSeo.description);
+  }
+
+  const merged = { ...sectionSeo, ...pageSeo } as Record<string, unknown>;
+  if (siteSeo.favicon) merged.favicon = siteSeo.favicon;
+  if (!merged.jsonLDs) merged.jsonLDs = [];
+  return merged;
+}
+
+/** Returns a non-trivial template string, or undefined for "%s" / empty / blank. */
+function effectiveTemplate(tmpl: string | undefined): string | undefined {
+  if (!tmpl || tmpl.trim() === "" || tmpl.trim() === "%s") return undefined;
+  return tmpl;
+}