@tokenoftrust/storefront-runner 2.2.115 → 2.2.117

package/apps/storefront/src/lib/storyblok/content-model.ts

@@ -306,6 +306,16 @@ export interface HomeContent {
   blocks: (HomeBlock | MarketingBlock)[];
 }
 
+/** Minimum shape the home renderer can consume without dereferencing invalid blocks. */
+export function hasHomeContentShape(value: unknown): boolean {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return false;
+  const blocks = (value as { blocks?: unknown }).blocks;
+  return Array.isArray(blocks) && blocks.every((block) =>
+    !!block && typeof block === "object" && !Array.isArray(block) &&
+    typeof (block as { component?: unknown }).component === "string",
+  );
+}
+
 export interface EditorialPage {
   slug: string;
   title: string;

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

@@ -18,6 +18,7 @@ import type {
   EditorialPage,
   HomeContent,
 } from "./content-model.js";
+import { hasHomeContentShape } from "./content-model.js";
 import type { ChromeConfig } from "../chrome/model.js";
 import type { CustomizationEnv, KvGet, TenantConfig } from "@tot/public-runtime";
 import {
@@ -730,19 +731,14 @@ export class PublishedContentProvider implements ContentProvider {
 }
 
 // ---------------------------------------------------------------------------
-// VersionPinnedContentProvider — pins content to ONE exact immutable
-// `versionId`, bypassing channel/pointer resolution entirely (the candidate/
-// revision preview's read path). Structurally the version-pinned twin of
-// PublishedContentProvider (channel -> versionId vs. versionId direct); every
-// method mirrors it 1:1 so a candidate's OWN pages/blog/products/etc. render
-// through the exact same generic-content plumbing as a live/preview page,
-// pinned to the exact commit under review instead of the shared channel.
+// VersionPinnedContentProvider reads only ONE immutable version. An absent file
+// stays absent, so a candidate cannot render bundled tenant content that its
+// version manifest does not contain.
 // ---------------------------------------------------------------------------
 
 export class VersionPinnedContentProvider implements ContentProvider {
   readonly perRequestArtifactReads = true;
   constructor(
-    private readonly base: ContentProvider,
     private readonly tenantId: string,
     private readonly get: KvGet,
     private readonly versionId: string,
@@ -770,24 +766,24 @@ export class VersionPinnedContentProvider implements ContentProvider {
   }
 
   async getHome(): Promise<HomeContent> {
-    return (await this.pinned<HomeContent>("home.json")) ?? this.base.getHome();
+    const home = await this.pinned<HomeContent>("home.json");
+    if (!home || !hasHomeContentShape(home)) throw new Error("Pinned version has no renderable home.json");
+    return home;
   }
   async getHomeHtml(): Promise<string | null> {
     const raw = await this.pinnedRaw("home.html");
-    return raw !== null ? stampTrackingIdsAtPublish(raw) : this.base.getHomeHtml();
+    return raw !== null ? stampTrackingIdsAtPublish(raw) : null;
   }
   async getPageHtml(slug: string): Promise<string | null> {
     const rel = `pages-html/${normalizeRawPageSlug(slug)}.html`;
     const raw = await this.pinnedRaw(rel);
-    return raw !== null ? stampTrackingIdsAtPublish(raw) : this.base.getPageHtml(slug);
+    return raw !== null ? stampTrackingIdsAtPublish(raw) : null;
   }
   listPageHtmlSlugs(): Promise<string[]> {
     return this.listArtifactPaths("pages-html/").then((paths) =>
-      paths === null
-        ? this.base.listPageHtmlSlugs()
-        : paths
-            .filter((path) => path.endsWith(".html"))
-            .map((path) => path.slice("pages-html/".length, -".html".length)),
+      (paths ?? [])
+        .filter((path) => path.endsWith(".html"))
+        .map((path) => path.slice("pages-html/".length, -".html".length)),
     );
   }
   async getChromeHtml(currentPath?: string): Promise<string | null> {
@@ -798,20 +794,19 @@ export class VersionPinnedContentProvider implements ContentProvider {
       const assignments = parseChromeAssignments(await this.pinned<unknown>("chrome-assignments.json"));
       return renderRawChrome(config, currentPath, assignments);
     }
-    return this.base.getChromeHtml(currentPath);
+    return null;
   }
   async getChrome(): Promise<ChromeConfig> {
     const config = parseChromeConfig(await this.pinned<unknown>("chrome.json"));
-    return config ?? this.base.getChrome();
+    return config ?? EMPTY_CHROME_CONFIG;
   }
   async getPage(slug: string): Promise<EditorialPage | null> {
-    return (await this.pinned<EditorialPage>(`pages/${slug}.json`)) ?? this.base.getPage(slug);
+    return this.pinned<EditorialPage>(`pages/${slug}.json`);
   }
   async listPages(): Promise<EditorialPage[]> {
     const paths = await this.listArtifactPaths("pages/");
-    if (paths === null) return this.base.listPages();
     const pages = await Promise.all(
-      paths.filter((path) => path.endsWith(".json")).map(async (path) => this.pinned<EditorialPage>(path)),
+      (paths ?? []).filter((path) => path.endsWith(".json")).map(async (path) => this.pinned<EditorialPage>(path)),
     );
     return pages.filter((page): page is EditorialPage => page !== null);
   }
@@ -923,15 +918,15 @@ export function createContentProvider(
   pin?: ContentVersionPin,
 ): ContentProvider {
   // Content dirs are keyed by tenant_id (the adopter writes content/<tenant>/).
+  if (pin) {
+    return new VersionPinnedContentProvider(tenant.tenant_id, pin.get, pin.versionId);
+  }
   const local = new LocalContentProvider(tenant.tenant_id);
   const token = tenant.storyblok_space_token;
   const usable = token && !PLACEHOLDER_TOKEN_RE.test(token);
   const base: ContentProvider = usable
     ? new StoryblokContentProvider(token, local)
     : local;
-  if (pin) {
-    return new VersionPinnedContentProvider(base, tenant.tenant_id, pin.get, pin.versionId);
-  }
   return customization
     ? new PublishedContentProvider(base, tenant.tenant_id, customization)
     : base;

package/package.json

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