@tokenoftrust/storefront-runner 2.2.116 → 2.2.118

package/apps/storefront/src/lib/publication/contentProvider.ts

@@ -2,7 +2,7 @@ import type {
   OpenPublicationArtifactV1,
   PublicationRouteRenderPlanV1,
 } from "@tot/public-runtime";
-import type { EditorialPage, HomeContent } from "@/lib/storyblok/content-model.js";
+import { hasHomeContentShape, type EditorialPage, type HomeContent } from "@/lib/storyblok/content-model.js";
 import type { ChromeConfig } from "@/lib/chrome/model.js";
 import { parseChromeConfig } from "@/lib/chrome/parseConfig.js";
 import { parseChromeAssignments } from "@/lib/chrome/model.js";
@@ -75,7 +75,7 @@ export class PublicationSpaceContentProvider implements ContentProvider {
   async getHome(): Promise<HomeContent> {
     if (!this.ownsRoot) return this.sharedRoot.getHome();
     const home = parseJson<HomeContent>(this.publication.readContent("home.json"));
-    if (!home) throw new Error("selected root publication home is unavailable");
+    if (!home || !hasHomeContentShape(home)) throw new Error("selected root publication home is unavailable");
     return home;
   }
 

package/apps/storefront/src/lib/storyblok/provider.ts

@@ -595,11 +595,9 @@ export class StoryblokContentProvider implements ContentProvider {
 
 // ---------------------------------------------------------------------------
 // PublishedContentProvider — overlays published customization content for the
-// resolved environment (store->app wiring). For each content artifact it checks
-// the customization store ({live,test} pointer -> versioned JSON); if present it
-// serves that, otherwise it delegates to the base provider (Storyblok/local).
-// Enumeration also follows the selected immutable manifest, so sitemap/blog/page
-// indexes do not need a build-time tenant checkout.
+// resolved environment (store->app wiring). A selected immutable version is
+// authoritative for both individual reads and enumeration. Legacy per-path
+// customization delegates absent files to the base provider (Storyblok/local).
 // ---------------------------------------------------------------------------
 
 export interface ContentCustomization {
@@ -609,13 +607,27 @@ export interface ContentCustomization {
 
 export class PublishedContentProvider implements ContentProvider {
   readonly perRequestArtifactReads = true;
+  private versionedPathsPromise: Promise<string[] | null> | null = null;
   constructor(
     private readonly base: ContentProvider,
     private readonly tenantId: string,
     private readonly cust: ContentCustomization,
   ) {}
 
-  /** Raw published-artifact string for a tenant file, or null to fall back to base. */
+  private versionedPaths(): Promise<string[] | null> {
+    return this.versionedPathsPromise ??= listPublishedArtifactPaths(
+      this.cust.get,
+      this.tenantId,
+      this.cust.env,
+      contentArtifactPath(this.tenantId, ""),
+    );
+  }
+
+  private async usesVersionedContent(): Promise<boolean> {
+    return (await this.versionedPaths()) !== null;
+  }
+
+  /** Raw published-artifact string for a tenant file, or null when absent. */
   private publishedRaw(relative: string): Promise<string | null> {
     return readPublishedArtifact(
       this.cust.get,
@@ -636,7 +648,10 @@ export class PublishedContentProvider implements ContentProvider {
   }
 
   async getHome(): Promise<HomeContent> {
-    return (await this.published<HomeContent>("home.json")) ?? this.base.getHome();
+    const home = await this.published<HomeContent>("home.json");
+    if (home && hasHomeContentShape(home)) return home;
+    if (await this.usesVersionedContent()) throw new Error("Published version has no renderable home.json");
+    return this.base.getHome();
   }
   // Raw whole-page documents (T0 marketing tenants) publish via KV too, so a
   // vendor edit previews / goes live with NO Worker rebuild. Artifact path mirrors
@@ -650,12 +665,14 @@ export class PublishedContentProvider implements ContentProvider {
   // is dt-id-writeback's job.
   async getHomeHtml(): Promise<string | null> {
     const raw = await this.publishedRaw("home.html");
-    return raw !== null ? stampTrackingIdsAtPublish(raw) : this.base.getHomeHtml();
+    if (raw !== null) return stampTrackingIdsAtPublish(raw);
+    return (await this.usesVersionedContent()) ? null : this.base.getHomeHtml();
   }
   async getPageHtml(slug: string): Promise<string | null> {
     const rel = `pages-html/${normalizeRawPageSlug(slug)}.html`;
     const raw = await this.publishedRaw(rel);
-    return raw !== null ? stampTrackingIdsAtPublish(raw) : this.base.getPageHtml(slug);
+    if (raw !== null) return stampTrackingIdsAtPublish(raw);
+    return (await this.usesVersionedContent()) ? null : this.base.getPageHtml(slug);
   }
   listPageHtmlSlugs(): Promise<string[]> {
     return this.listArtifactPaths("pages-html/").then((paths) =>
@@ -682,18 +699,19 @@ export class PublishedContentProvider implements ContentProvider {
       const assignments = parseChromeAssignments(await this.published<unknown>("chrome-assignments.json"));
       return renderRawChrome(config, currentPath, assignments);
     }
-    // Otherwise fall back to the base chain (bundled chrome.html or config render).
-    return this.base.getChromeHtml(currentPath);
+    // Legacy per-path content may use bundled chrome; a selected version owns its chrome.
+    return (await this.usesVersionedContent()) ? null : this.base.getChromeHtml(currentPath);
   }
   async getChrome(): Promise<ChromeConfig> {
     // Runs through the SAME fail-closed schema validator as getChromeHtml's
     // chrome.json branch (lib/chrome/parseConfig.ts) — a published artifact is
     // no longer trusted blind (was: JSON.parse + a raw cast to SiteChrome).
     const config = parseChromeConfig(await this.published<unknown>("chrome.json"));
-    return config ?? this.base.getChrome();
+    return config ?? ((await this.usesVersionedContent()) ? EMPTY_CHROME_CONFIG : this.base.getChrome());
   }
   async getPage(slug: string): Promise<EditorialPage | null> {
-    return (await this.published<EditorialPage>(`pages/${slug}.json`)) ?? this.base.getPage(slug);
+    const page = await this.published<EditorialPage>(`pages/${slug}.json`);
+    return page ?? ((await this.usesVersionedContent()) ? null : this.base.getPage(slug));
   }
   async listPages(): Promise<EditorialPage[]> {
     const paths = await this.listArtifactPaths("pages/");
@@ -720,13 +738,9 @@ export class PublishedContentProvider implements ContentProvider {
 
   async listArtifactPaths(prefix = ""): Promise<string[] | null> {
     const root = contentArtifactPath(this.tenantId, "");
-    const paths = await listPublishedArtifactPaths(
-      this.cust.get,
-      this.tenantId,
-      this.cust.env,
-      `${root}${prefix}`,
-    );
-    return paths?.map((path) => path.slice(root.length)) ?? null;
+    const paths = await this.versionedPaths();
+    return paths?.filter((path) => path.startsWith(`${root}${prefix}`))
+      .map((path) => path.slice(root.length)) ?? null;
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokenoftrust/storefront-runner",
-  "version": "2.2.116",
+  "version": "2.2.118",
   "license": "SEE LICENSE IN LICENSE",
   "description": "World-shareable storefront runner: multi-tenant renderer on Astro/Cloudflare. No control plane.",
   "packageManager": "pnpm@11.9.0",