@tokenoftrust/storefront-runner 2.5.2 → 2.5.3

package/apps/storefront/src/lib/content/seo/structuredData.ts

@@ -88,26 +88,28 @@ export function composeStructuredData(input: ComposeInput): Node | null {
   const nameOf = (type: "Product" | "ProductGroup" | "Article" | "BlogPosting", own: string | undefined, fallback: "documentTitle" | "title") =>
     (profile.names?.[type] ?? fallback) === "documentTitle" ? documentTitle : own || documentTitle;
 
-  const siteToken = tokens.find((t) => SITE_TOKENS.has(t));
-  const siteTypes = siteToken ? siteToken.split("+") : [];
-  const siteId = `${base}/#${siteTypes.includes("Person") ? "person" : "organization"}`;
-  const imageUrl = page.image ? absolute(page.image, canonicalBase) : null;
-  const imageId = imageUrl ?? undefined;
-  const pageToken = tokens.find((t) => PAGE_ENTITY_TOKENS.has(t));
-  const pageId = `${canonical}#webpage`;
-  const authorId = page.author ? `${page.author.url ? absolute(page.author.url, canonicalBase) : canonical}#author` : undefined;
-  const ref = (id: string | undefined) => (id ? { "@id": id } : undefined);
-  const pageUrl = (href: string) => pageUrlForm(absolute(href, canonicalBase), tenant.seo);
-
   const pathOf = (value: string) => value.replace(/\/+$/, "") || "/";
   const here = pathOf(new URL(canonical).pathname);
   const scoped = (token: StructuredDataNodeToken) => {
     const paths = profile.onlyOn?.[token];
     return !paths || paths.some((p) => pathOf(p) === here);
   };
+  const imageUrl = page.image ? absolute(page.image, canonicalBase) : null;
+  // References and node emission share the same effective selection, including data availability.
+  const emittedTokens = tokens.filter(scoped).filter((token) =>
+    token === "ImageObject" ? imageUrl !== null : token === "Person:author" ? Boolean(page.author) : true);
+  const siteToken = emittedTokens.find((t) => SITE_TOKENS.has(t));
+  const siteTypes = siteToken ? siteToken.split("+") : [];
+  const siteId = `${base}/#${siteTypes.includes("Person") ? "person" : "organization"}`;
+  const imageId = emittedTokens.includes("ImageObject") ? imageUrl : undefined;
+  const pageToken = emittedTokens.find((t) => PAGE_ENTITY_TOKENS.has(t));
+  const pageId = `${canonical}#webpage`;
+  const authorId = emittedTokens.includes("Person:author") && page.author
+    ? `${page.author.url ? absolute(page.author.url, canonicalBase) : canonical}#author` : undefined;
+  const pageUrl = (href: string) => pageUrlForm(absolute(href, canonicalBase), tenant.seo);
 
   const nodes: Node[] = [];
-  for (const token of tokens.filter(scoped)) {
+  for (const token of emittedTokens) {
     const node = buildNode(token);
     if (node) nodes.push(node);
   }
@@ -120,7 +122,7 @@ export function composeStructuredData(input: ComposeInput): Node | null {
         "@type": siteTypes.length > 1 ? siteTypes : siteTypes[0],
         "@id": siteId,
         name: tenant.displayName,
-        url: base,
+        url: pageUrlForm(base, tenant.seo),
         ...(logo && siteTypes.includes("Organization") ? { logo: { "@type": "ImageObject", url: absolute(logo, canonicalBase) } } : {}),
       };
     }
@@ -131,7 +133,7 @@ export function composeStructuredData(input: ComposeInput): Node | null {
         url: canonical,
         name: documentTitle,
         ...(page.description ? { description: page.description } : {}),
-        isPartOf: { "@id": `${base}/#website` },
+        ...(emittedTokens.includes("WebSite") ? { isPartOf: { "@id": `${base}/#website` } } : {}),
         ...(imageId ? { primaryImageOfPage: { "@id": imageId } } : {}),
         ...(page.datePublished ? { datePublished: page.datePublished } : {}),
         ...(page.dateModified ? { dateModified: page.dateModified } : {}),
@@ -143,7 +145,7 @@ export function composeStructuredData(input: ComposeInput): Node | null {
         return {
           "@type": "WebSite",
           "@id": `${base}/#website`,
-          url: base,
+          url: pageUrlForm(base, tenant.seo),
           name: tenant.displayName,
           ...(siteToken ? { publisher: { "@id": siteId } } : {}),
           inLanguage: lang,

package/apps/storefront/src/lib/content/shared/jsonld.ts

@@ -3,6 +3,7 @@
  * BreadcrumbList, Organization. Kept pure so pages compose them and pass to <Seo>.
  */
 import type { CatalogProduct, Review, TenantConfig } from "@tot/public-runtime";
+import { pageUrlForm } from "../seo/urlForm.js";
 import { isAvailable } from "../../catalog/tot/query.js";
 
 export function organizationLd(tenant: TenantConfig, base: string) {
@@ -20,7 +21,7 @@ export function organizationLd(tenant: TenantConfig, base: string) {
     "@context": "https://schema.org",
     "@type": "Organization",
     name: tenant.displayName,
-    url: base,
+    url: pageUrlForm(base, tenant.seo),
     logo,
   };
 }
@@ -53,7 +54,7 @@ export function websiteLd(tenant: TenantConfig, base: string) {
     "@context": "https://schema.org",
     "@type": "WebSite",
     name: tenant.displayName,
-    url: base,
+    url: pageUrlForm(base, tenant.seo),
     potentialAction: {
       "@type": "SearchAction",
       target: {
@@ -204,7 +205,7 @@ export function productLd(
   tenant: TenantConfig,
   base: string,
 ) {
-  const url = new URL(`/products/${p.handle}`, base + "/").toString();
+  const url = pageUrlForm(new URL(`/products/${p.handle}`, base + "/").toString(), tenant.seo);
   const images = p.images
     .map((i) => i.url)
     .filter((u) => !/cdn\.shopify\.com/.test(u)); // skip dead fixture URLs

package/apps/storefront/src/lib/content/shared/redirects.ts

@@ -0,0 +1,22 @@
+/** Content redirects for ordinary preview/local renders, bound to the page's selected provider. */
+import { buildRedirectSet, COLLECTION_REDIRECTS_PATH, declaredRedirectsFromContent, resolveRedirect } from "@tot/public-runtime/publication-redirects";
+import type { ContentProvider } from "../storyblok/provider.js";
+
+export async function contentRedirectLocation(
+  content: Pick<ContentProvider, "readArtifact" | "listArtifactPaths">,
+  requestPath: string,
+): Promise<string | null> {
+  try {
+    const paths = await content.listArtifactPaths();
+    const declarations = ["redirects.json", ...(paths ?? []).filter((path) => COLLECTION_REDIRECTS_PATH.test(`content/${path}`))];
+    const entries = await Promise.all(declarations.map(async (relative) => {
+      const raw = await content.readArtifact(relative);
+      return raw === null ? null : { path: `content/${relative}`, json: JSON.parse(raw) as unknown };
+    }));
+    const set = buildRedirectSet(declaredRedirectsFromContent(entries.filter((entry) => entry !== null)));
+    return set.ok ? resolveRedirect(set.redirects, requestPath)?.location ?? null : null;
+  } catch {
+    // An unreadable/invalid map must never produce an unsafe or partial redirect set.
+    return null;
+  }
+}

package/apps/storefront/src/middleware/renderChain.ts

@@ -83,6 +83,7 @@ import {
   HTML_CACHE_POLICY_CAPTURE_HEADER,
   HTML_CACHE_POLICY_CAPTURE_PROBE,
 } from "@tot/public-runtime";
+import { contentRedirectLocation } from "@/lib/content/shared/redirects.js";
 import { publicationContentRedirectLocationV1 } from "@tot/public-runtime/publication-content-redirects";
 import { loadTenantIntegrationDeclarations } from "@/lib/integrations/integration/tenantDeclarations";
 import { resolveTenantCommerce } from "@/lib/checkout/shared/checkoutCommerce";
@@ -269,6 +270,57 @@ export async function runRenderChain(input: RenderChainInput): Promise<Response>
     kv ? (key: string) => kv.get(key) : async () => null,
     { env: customization.env, ...(candidatePin ? { pinnedVersionId: candidatePin.versionId } : {}) },
   );
+  // Request-scoped read memo: every content read resolves the same pointer and
+  // version manifest, and a catalog render reads one artifact per catalog file.
+  const kvReads = new Map<string, Promise<string | null>>();
+  const kvGet = kv
+    ? (key: string) => {
+        let read = kvReads.get(key);
+        if (!read) {
+          read = kv.get(key);
+          kvReads.set(key, read);
+        }
+        return read;
+      }
+    : async () => null;
+  const readRuntimeArtifact = (path: string) => candidatePin
+    ? readWithImagePreviewRewriteOverlay(
+        kvGet,
+        tenant.tenant_id,
+        candidatePin.versionId,
+        path,
+        () => readVersionArtifact(kvGet, tenant.tenant_id, candidatePin.versionId, path),
+      )
+    : readPublishedArtifact(kvGet, tenant.tenant_id, customization.env, path);
+
+  // Resolve the shared root adapter first. An opened publication version then
+  // becomes authoritative for selected content while a mounted space may still
+  // reuse root-owned chrome. Neither source falls through to another space.
+  const sharedRootContent = candidatePin
+    ? createContentProvider(tenant, undefined, { get: kvGet, versionId: candidatePin.versionId })
+    : createContentProvider(tenant, {
+        get: kvGet,
+        env: customization.env,
+      });
+  locals.content = bindPublicationSpaceContentProviderV1(
+    sharedRootContent,
+    publicationSource.status === "selected" ? publicationSource.artifact : undefined,
+    // A discovery document lists the whole space it is bound to, not one selected page.
+    { wholeSpace: isPlatformPublicDiscoveryPath(renderPath) },
+  );
+  // Ordinary host, path-prefixed and pinned previews read the same declarations as their pages.
+  // Public CDN redirects remain precomputed in the publication artifact.
+  if (publicationSource.status === "legacy-root") {
+    const location = await contentRedirectLocation(locals.content, renderPath);
+    if (location) {
+      const response = new Response(null, {
+        status: 308,
+        headers: { location: location.startsWith("/") ? `${url.origin}${basePath}${location}${url.search}` : location },
+      });
+      applySecurityHeaders(response.headers);
+      return response;
+    }
+  }
   const publicationTimestamp = publicationSource.status === "selected"
     ? publicationSource.publicationTimestamp
     : exactPublicationTimestamp(await readEnv("TOT_PUBLICATION_TIMESTAMP"));
@@ -484,29 +536,6 @@ export async function runRenderChain(input: RenderChainInput): Promise<Response>
   // test->preview) and resolves it through the immutable site version. A
   // candidate must bypass that pointer so a reviewer sees the candidate's own
   // theme, capabilities, and embed opt-in with its content.
-  // Request-scoped read memo: every content read resolves the same pointer and
-  // version manifest, and a catalog render reads one artifact per catalog file.
-  const kvReads = new Map<string, Promise<string | null>>();
-  const kvGet = kv
-    ? (key: string) => {
-        let read = kvReads.get(key);
-        if (!read) {
-          read = kv.get(key);
-          kvReads.set(key, read);
-        }
-        return read;
-      }
-    : async () => null;
-  const readRuntimeArtifact = (path: string) => candidatePin
-    ? readWithImagePreviewRewriteOverlay(
-        kvGet,
-        tenant.tenant_id,
-        candidatePin.versionId,
-        path,
-        () => readVersionArtifact(kvGet, tenant.tenant_id, candidatePin.versionId, path),
-      )
-    : readPublishedArtifact(kvGet, tenant.tenant_id, customization.env, path);
-
   // Self-heal a DANGLING channel pointer: the pointer for this env's channel may
   // name a version that was never built (or whose manifest was evicted).
   // `readVersionedArtifact` already serves last-built content instead of emptying
@@ -622,21 +651,6 @@ export async function runRenderChain(input: RenderChainInput): Promise<Response>
       ? await resolveTenantCommerce(tenant)
       : null;
   locals.commerce = commerce ?? undefined;
-  // Resolve the shared root adapter first. An opened publication version then
-  // becomes authoritative for selected content while a mounted space may still
-  // reuse root-owned chrome. Neither source falls through to another space.
-  const sharedRootContent = candidatePin
-    ? createContentProvider(tenant, undefined, { get: kvGet, versionId: candidatePin.versionId })
-    : createContentProvider(tenant, {
-        get: kvGet,
-        env: customization.env,
-      });
-  locals.content = bindPublicationSpaceContentProviderV1(
-    sharedRootContent,
-    publicationSource.status === "selected" ? publicationSource.artifact : undefined,
-    // A discovery document lists the whole space it is bound to, not one selected page.
-    { wholeSpace: isPlatformPublicDiscoveryPath(renderPath) },
-  );
   // Developer-draft content overlay — serves the AI-edited artifacts to the draft
   // owner only; every other viewer keeps the published/base chain above.
   if (draft) {

package/package.json

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

package/packages/cli/src/declared-config.mjs

@@ -107,8 +107,8 @@ export function seoDeclarationProblems(seo) {
         problems.push(`\`${at}\`: unknown page type (${STRUCTURED_DATA_PAGE_TYPES.join(", ")})`);
         continue;
       }
-      if (!Array.isArray(tokens) || tokens.length === 0) {
-        problems.push(`\`${at}\` must be a non-empty array of node types`);
+      if (!Array.isArray(tokens)) {
+        problems.push(`\`${at}\` must be an array of node types (empty emits no nodes)`);
         continue;
       }
       const seen = new Set();

package/packages/public-runtime/src/declared-tenant-config.mjs

@@ -153,8 +153,8 @@ export function seoDeclarationProblems(seo) {
         problems.push(`\`${at}\`: unknown page type (${STRUCTURED_DATA_PAGE_TYPES.join(", ")})`);
         continue;
       }
-      if (!Array.isArray(tokens) || tokens.length === 0) {
-        problems.push(`\`${at}\` must be a non-empty array of node types`);
+      if (!Array.isArray(tokens)) {
+        problems.push(`\`${at}\` must be an array of node types (empty emits no nodes)`);
         continue;
       }
       const seen = new Set();

package/packages/public-runtime/src/tenant.ts

@@ -790,7 +790,7 @@ export interface SeoDeclaration {
    * The structured-data profile. When present it is the ONLY JSON-LD a declared page type
    * emits: one `@graph` holding exactly the listed nodes, in order. A node whose data the
    * page lacks (no image, no author, no FAQ) is omitted. A page type without a graph keeps
-   * the platform default.
+   * the platform default. An explicit empty list emits no nodes for that page type.
    */
   structuredData?: {
     graphs: Partial<Record<StructuredDataPageType, StructuredDataNodeToken[]>>;