@tokenoftrust/storefront-runner 2.4.73 → 2.4.75

package/apps/storefront/src/pages/blog/[slug].astro

@@ -1,20 +1,6 @@
 ---
-import Layout from "@/layouts/Layout.astro";
-import Breadcrumbs from "@/components/Breadcrumbs.astro";
-import BlogPaywall from "@/components/blog/BlogPaywall.astro";
-import ReactionBar from "@/components/blog/ReactionBar.astro";
-import ShareRow from "@/components/blog/ShareRow.astro";
-import { getBlogPost, getBlogSettings, listBlogPosts, resolveBlogRedirect } from "@/lib/blog/provider.js";
-import { authorSlug, categorySlug, getTranslations } from "@/lib/blog/collection.js";
-import { bylineAuthor, resolveBlogPresentation, shareLinks } from "@/lib/blog/presentation.js";
-import { homeCrumbLabel, siteTrail } from "@/lib/breadcrumbs.js";
-import { viewerHasBlogAccess } from "@/lib/blog/access.js";
-import { articleBodyHtml } from "@/lib/blog/teaser.js";
-import { readViewerSession, safeNext } from "@/lib/auth/route.js";
-import { buildAlternates } from "@/lib/seo/alternates.js";
-import { languageLabel } from "@/lib/i18n.js";
-import { breadcrumbLd, blogPostingLd } from "@/lib/jsonld.js";
-import { collectionPathsV1 } from "@/lib/blog/collectionPaths.js";
+import BlogPostArticle from "@/components/blog/BlogPostArticle.astro";
+import { loadBlogPostViewV1 } from "@/lib/blog/postView.js";
 
 // These redirects also exist in the published artifact: the publication composition lifts this
 // file into the space's `routes.aliases`, which reach the CDN plane through the live pointer. The
@@ -24,209 +10,13 @@ import { collectionPathsV1 } from "@/lib/blog/collectionPaths.js";
 // a source the composition actually materializes.
 export const MATERIALIZED_REDIRECT_SOURCE = "content/blog/redirects.json";
 
-const { tenant, canonicalBase, basePath, content, publicationTimestamp } = Astro.locals;
-const blogPaths = collectionPathsV1(Astro.locals, "blog");
 const slug = Astro.params.slug ?? "";
-const post = await getBlogPost(tenant.tenant_id, slug, content, publicationTimestamp);
-if (!post) {
-  const redirect = await resolveBlogRedirect(tenant.tenant_id, slug, content);
-  // 308, matching the `redirect-308` alias contract the published plane serves, so a renamed slug
-  // behaves identically on both substrates.
-  if (redirect) return Astro.redirect(`${basePath}${blogPaths.post(redirect)}`, 308);
-  return new Response(null, { status: 404 });
-}
+const result = await loadBlogPostViewV1(Astro, slug);
 
-// Entitlement (⟂ visibility): a gated post is still published/listed, but an
-// unentitled reader sees a teaser + paywall rather than the full body. A teaser
-// is a legitimate partial-content 200 — indexable, NOT noindexed (B4.0 spike §4).
-const viewer = await readViewerSession(Astro);
-const gated = (post.access ?? "public") !== "public";
-const unlock = viewerHasBlogAccess(viewer, post);
-const bodyHtml = articleBodyHtml(post.contentHtml, { gated, unlock });
-const next = safeNext(`${basePath}${blogPaths.post(post.slug)}`);
-const loginHref = `/auth/login?next=${encodeURIComponent(next)}`;
-
-const canonical = new URL(blogPaths.post(post.slug), canonicalBase + "/").toString();
-const presentation = resolveBlogPresentation(await getBlogSettings(tenant.tenant_id, content));
-// A post that names no author has no byline: never attribute it to anyone (the blog's title, the
-// store) its content does not name.
-const author = bylineAuthor(post.author);
-// The author archive (`/blog/author/<slug>`) lists posts from the curated blog
-// index, and 404s for an author with no LISTED post (an unlisted-only or
-// index-omitted byline). Resolve that up front so the byline links ONLY when the
-// archive will actually render — a byline must never point at a missing page
-// (the invariant `blog/author/[author].astro` documents). Same slug + same source
-// the archive itself filters on, so the two can't disagree. Tag links follow the
-// same rule against `blog/tag/[tag].astro`.
-const listed = await listBlogPosts(tenant.tenant_id, content, publicationTimestamp);
-const authorArchiveSlug = author ? authorSlug(author) : "";
-const authorHasArchive = authorArchiveSlug !== "" && listed.some(
-  (p) => authorSlug(p.author) === authorArchiveSlug,
-);
-const archivedTags = new Set(listed.flatMap((p) => p.tags.map(categorySlug)));
-const tagLinks = post.tags.map((tag) => {
-  const slug = categorySlug(tag);
-  return { label: tag, href: slug && archivedTags.has(slug) ? `${basePath}${blogPaths.tag(slug)}` : null };
-});
-const authorUrl = authorHasArchive
-  ? new URL(blogPaths.author(authorArchiveSlug), canonicalBase + "/").toString()
-  : undefined;
-const articleLd = blogPostingLd(post, {
-  url: canonical,
-  canonicalBase,
-  publisherName: tenant.displayName,
-  authorUrl,
-});
-const trail = siteTrail(
-  homeCrumbLabel(await content.getChrome()),
-  { label: "Blog", href: blogPaths.index },
-  { label: post.title, href: blogPaths.post(post.slug) },
-);
-const crumbs = breadcrumbLd(trail, canonicalBase);
-const blogHref = `${basePath}${blogPaths.index}`;
-const authorHref = authorHasArchive
-  ? `${basePath}${blogPaths.author(authorArchiveSlug)}`
-  : null;
-const share = shareLinks(presentation.share, {
-  url: canonical,
-  title: post.title,
-  image: post.featuredImage ? new URL(post.featuredImage.src, canonicalBase + "/").toString() : undefined,
-});
-
-// I2 — hreflang alternates + per-variant <html lang>. Singleton ⇒ [] alternates
-// and no `lang` override, so a non-translated post is byte-identical to today.
-const translations = post.translationGroupId
-  ? await getTranslations(tenant.tenant_id, "blog", post.slug, { content, now: publicationTimestamp })
-  : [];
-const alternates = buildAlternates(translations, (s) =>
-  new URL(blogPaths.post(s), canonicalBase + "/").toString(),
-);
-const lang = alternates.length ? (post.inLanguage ?? "en") : undefined;
+if (result.status === "not_found") return new Response(null, { status: 404 });
+// 308, matching the `redirect-308` alias contract the published plane serves, so a renamed slug
+// behaves identically on both substrates.
+if (result.status === "redirect") return Astro.redirect(result.to, 308);
 ---
 
-<Layout
-  title={post.seoTitle || post.title}
-  description={post.description}
-  path={blogPaths.post(post.slug)}
-  ogType="article"
-  ogImage={post.featuredImage?.src}
-  noindex={post.status === "unlisted"}
-  jsonLd={[crumbs, articleLd]}
-  article={{
-    publishedTime: post.publishedAt,
-    modifiedTime: post.modifiedAt,
-    author: authorUrl,
-    section: post.categories[0],
-    tags: post.tags,
-  }}
-  imageAlt={post.featuredImage?.alt}
-  imageWidth={post.featuredImage?.width}
-  imageHeight={post.featuredImage?.height}
-  canonicalOverride={post.canonicalUrl}
-  alternates={alternates}
-  lang={lang}
->
-  <article class="article-shell">
-    <Breadcrumbs crumbs={trail} class="breadcrumbs" />
-    <header>
-      {presentation.postEyebrow && post.tags[0] && <p class="eyebrow eyebrow--tick">{post.tags[0]}</p>}
-      <h1>{post.title}</h1>
-      {presentation.dek && post.excerpt && <p class="dek">{post.excerpt}</p>}
-      <div class="byline">
-        {author && <span>By {authorHref
-          ? <a href={authorHref} class="byline-author" rel="author">{author}</a>
-          : <span class="byline-author">{author}</span>}</span>}
-        {author && <span aria-hidden="true">·</span>}
-        <time datetime={post.publishedAt}>{new Date(post.publishedAt).toLocaleDateString("en-US", { year: "numeric", month: "long", day: "numeric" })}</time>
-      </div>
-      {translations.length > 1 && (
-        <nav class="lang-switcher" aria-label="Available languages">
-          {translations.map((variant) => {
-            const code = variant.inLanguage ?? "en";
-            const current = variant.slug === post.slug;
-            return (
-              <a
-                hreflang={code}
-                href={`${basePath}${blogPaths.post(variant.slug)}`}
-                aria-current={current ? "true" : undefined}
-              >{languageLabel(code)}</a>
-            );
-          })}
-        </nav>
-      )}
-    </header>
-    {post.featuredImage && (
-      <img
-        class="featured"
-        src={post.featuredImage.src}
-        alt={post.featuredImage.alt}
-        width={post.featuredImage.width}
-        height={post.featuredImage.height}
-        fetchpriority="high"
-        decoding="async"
-      />
-    )}
-    <div class:list={["article-grid", { "article-grid--single": !presentation.aside }]}>
-      {presentation.aside && (
-        <aside>
-          <a href={blogHref}>← All articles</a>
-          {tagLinks.length > 0 && <div class="article-tags">{tagLinks.map((tag) => tag.href ? <a href={tag.href}>{tag.label}</a> : <span>{tag.label}</span>)}</div>}
-        </aside>
-      )}
-      <div class="blog-main">
-        <div class="blog-body" set:html={bodyHtml}></div>
-        {gated && !unlock && (
-          <BlogPaywall access={post.access ?? "authenticated"} next={next} signedIn={!!viewer} loginHref={loginHref} />
-        )}
-        {!presentation.aside && tagLinks.length > 0 && (
-          <ul class="post-tags" aria-label="Tags">
-            {tagLinks.map((tag) => <li>{tag.href ? <a href={tag.href}>{tag.label}</a> : <span>{tag.label}</span>}</li>)}
-          </ul>
-        )}
-        <ShareRow links={share} />
-      </div>
-    </div>
-    {presentation.reactions && <ReactionBar collection="blog" slug={post.slug} />}
-  </article>
-</Layout>
-
-<style>
-  .article-shell { width: min(1120px, calc(100% - 2rem)); margin-inline: auto; padding-block: clamp(2rem, 5vw, 5rem); }
-  .article-shell :global(.breadcrumbs) { font-size: .84rem; }
-  .article-shell :global(.breadcrumbs a) { color: var(--color-accent-ink); font-weight: 700; }
-  header { max-width: 880px; margin: clamp(2.5rem, 6vw, 5rem) auto clamp(2rem, 5vw, 3.5rem); text-align: center; }
-  header .eyebrow { justify-content: center; }
-  h1 { margin-top: .9rem; font-size: clamp(2.5rem, 6vw, 5rem); line-height: 1.02; }
-  .dek { max-width: 68ch; margin: 1.5rem auto 0; color: var(--color-muted); font-size: clamp(1rem, 2vw, 1.2rem); }
-  .byline { display: flex; justify-content: center; gap: .55rem; margin-top: 1.35rem; color: var(--color-muted); font-size: .85rem; }
-  .byline-author { color: var(--color-accent-ink); font-weight: 700; text-decoration: none; }
-  .byline-author:hover { text-decoration: underline; text-underline-offset: .18em; }
-  .lang-switcher { display: flex; flex-wrap: wrap; justify-content: center; gap: .4rem; margin-top: 1.1rem; }
-  .lang-switcher a { padding: .28rem .6rem; border: 1px solid var(--color-border); border-radius: var(--radius-full); color: var(--color-muted); font-size: .78rem; font-weight: 600; text-decoration: none; }
-  .lang-switcher a:hover { color: var(--color-accent-ink); border-color: var(--color-accent); }
-  .lang-switcher a[aria-current="true"] { color: var(--color-accent-ink); border-color: var(--color-accent); background: var(--color-surface); }
-  .featured { display: block; width: 100%; max-height: 620px; object-fit: cover; border-radius: var(--radius-lg); box-shadow: var(--shadow-md); }
-  .article-grid { display: grid; grid-template-columns: 190px minmax(0, 720px); justify-content: center; gap: clamp(2rem, 6vw, 5rem); margin-top: clamp(3rem, 7vw, 5.5rem); }
-  aside { align-self: start; position: sticky; top: 7rem; }
-  aside > a { color: var(--color-accent-ink); font-size: .88rem; font-weight: 700; }
-  .article-grid--single { grid-template-columns: minmax(0, 720px); }
-  .article-tags { display: flex; flex-wrap: wrap; gap: .45rem; margin-top: 1.2rem; }
-  .article-tags > *, .post-tags :is(a, span) { padding: .3rem .55rem; border: 1px solid var(--color-border); border-radius: var(--radius-full); color: var(--color-muted); font-size: .7rem; text-decoration: none; }
-  .article-tags a:hover, .post-tags a:hover { color: var(--color-accent-ink); border-color: var(--color-accent); }
-  .post-tags { display: flex; flex-wrap: wrap; gap: .45rem; margin: 2rem 0 0; padding: 0; list-style: none; }
-  .blog-main { min-width: 0; }
-  .blog-body { min-width: 0; font-size: 1.05rem; line-height: 1.78; }
-  .blog-body :global(p), .blog-body :global(ul), .blog-body :global(ol), .blog-body :global(blockquote), .blog-body :global(figure), .blog-body :global(table), .blog-body :global(pre) { margin-block: 1.25rem; }
-  .blog-body :global(h2), .blog-body :global(h3), .blog-body :global(h4) { scroll-margin-top: 7rem; margin: 2.8rem 0 1rem; line-height: 1.18; }
-  .blog-body :global(h2) { font-size: clamp(1.75rem, 3vw, 2.35rem); }
-  .blog-body :global(h3) { font-size: clamp(1.35rem, 2.4vw, 1.75rem); }
-  .blog-body :global(a) { color: var(--color-accent-ink); text-decoration: underline; text-underline-offset: .18em; }
-  .blog-body :global(ul), .blog-body :global(ol) { padding-left: 1.4rem; }
-  .blog-body :global(li) { margin-block: .45rem; }
-  .blog-body :global(blockquote) { padding: .8rem 1.25rem; border-left: 4px solid var(--color-accent); background: var(--color-surface); color: var(--color-muted); }
-  .blog-body :global(img) { display: block; width: auto; max-width: 100%; margin-inline: auto; border-radius: var(--radius-md); }
-  .blog-body :global(figcaption) { margin-top: .5rem; color: var(--color-muted); text-align: center; font-size: .78rem; }
-  .blog-body :global(table) { display: block; width: 100%; overflow-x: auto; border-collapse: collapse; }
-  .blog-body :global(th), .blog-body :global(td) { padding: .7rem; border: 1px solid var(--color-border); text-align: left; }
-  @media (max-width: 760px) { .article-grid { grid-template-columns: 1fr; } aside { position: static; } .article-tags { display: none; } }
-</style>
+<BlogPostArticle {...result.props} />

package/apps/storefront/src/pages/blog/author/[author].astro

@@ -7,18 +7,19 @@ import { resolveBlogPresentation } from "@/lib/blog/presentation.js";
 import { homeCrumbLabel, siteTrail } from "@/lib/breadcrumbs.js";
 import { authorSlug, getAuthors } from "@/lib/blog/collection.js";
 import { breadcrumbLd } from "@/lib/jsonld.js";
-import { collectionPathsV1 } from "@/lib/blog/collectionPaths.js";
+import { collectionPathsV1, blogPathOptsV1 } from "@/lib/blog/collectionPaths.js";
 
 // Author archive for the `/blog` collection. Lists exactly the posts whose
 // bylines link here (same source as /blog/index.astro + /blog/[slug].astro),
 // so a byline never points at a page missing its post.
 const { tenant, basePath, canonicalBase, content, publicationTimestamp } = Astro.locals;
-const blogPaths = collectionPathsV1(Astro.locals, "blog");
 const slug = Astro.params.author ?? "";
 
 const allPosts = await listBlogPosts(tenant.tenant_id, content, publicationTimestamp);
 const posts = slug ? allPosts.filter((post) => authorSlug(post.author) === slug) : [];
 if (posts.length === 0) return new Response(null, { status: 404 });
+const blogSettings = await getBlogSettings(tenant.tenant_id, content);
+const blogPaths = collectionPathsV1(Astro.locals, "blog", blogPathOptsV1(blogSettings));
 
 const authorName = posts[0]!.author;
 const bio = (await getAuthors(tenant.tenant_id, "blog", content))[slug];
@@ -54,7 +55,7 @@ const itemListLd = {
     url: new URL(blogPaths.post(post.slug), canonicalBase + "/").toString(),
   })),
 };
-const presentation = resolveBlogPresentation(await getBlogSettings(tenant.tenant_id, content));
+const presentation = resolveBlogPresentation(blogSettings);
 const trail = siteTrail(
   homeCrumbLabel(await content.getChrome()),
   { label: "Blog", href: blogPaths.index },
@@ -69,6 +70,7 @@ const crumbs = breadcrumbLd(trail, canonicalBase);
   path={blogPaths.author(slug)}
   fullBleed
   jsonLd={[crumbs, profileLd, itemListLd]}
+  structuredData={{ pageType: "collection" }}
 >
   <header class:list={["author-hero", { "author-hero--plain": !presentation.hero }]}>
     <div class="blog-shell">

package/apps/storefront/src/pages/blog/category/[category].astro

@@ -7,10 +7,9 @@ import { collectPostsByTerm } from "@/lib/blog/collection.js";
 import { resolveBlogPresentation } from "@/lib/blog/presentation.js";
 import { homeCrumbLabel, siteTrail } from "@/lib/breadcrumbs.js";
 import { breadcrumbLd } from "@/lib/jsonld.js";
-import { collectionPathsV1 } from "@/lib/blog/collectionPaths.js";
+import { collectionPathsV1, blogPathOptsV1 } from "@/lib/blog/collectionPaths.js";
 
 const { tenant, basePath, canonicalBase, content, publicationTimestamp } = Astro.locals;
-const blogPaths = collectionPathsV1(Astro.locals, "blog");
 const param = Astro.params.category ?? "";
 
 // Same source as the /blog index (the collection's curated list), filtered to
@@ -19,7 +18,9 @@ const all = await listBlogPosts(tenant.tenant_id, content, publicationTimestamp)
 const match = collectPostsByTerm(all, "categories", param);
 if (!match) return new Response(null, { status: 404 });
 const { label, posts } = match;
-const presentation = resolveBlogPresentation(await getBlogSettings(tenant.tenant_id, content));
+const blogSettings = await getBlogSettings(tenant.tenant_id, content);
+const blogPaths = collectionPathsV1(Astro.locals, "blog", blogPathOptsV1(blogSettings));
+const presentation = resolveBlogPresentation(blogSettings);
 
 const path = blogPaths.category(param);
 const itemList = {
@@ -47,6 +48,7 @@ const crumbs = breadcrumbLd(trail, canonicalBase);
   path={path}
   fullBleed
   jsonLd={[crumbs, itemList]}
+  structuredData={{ pageType: "collection" }}
 >
   <header class:list={["blog-hero", { "blog-hero--plain": !presentation.hero }]}>
     <div class="blog-shell">

package/apps/storefront/src/pages/blog/index.astro

@@ -34,4 +34,5 @@ const tags = [...new Set(posts.flatMap((post) => post.tags))].sort((a, b) => a.l
   pagePosts={pagePosts}
   page={1}
   totalPages={totalPages}
+  postsAtRoot={settings?.postsAtRoot}
 />

package/apps/storefront/src/pages/blog/page/[n].astro

@@ -38,4 +38,5 @@ const tags = [...new Set(posts.flatMap((post) => post.tags))].sort((a, b) => a.l
   pagePosts={sliced.posts}
   page={sliced.page}
   totalPages={sliced.totalPages}
+  postsAtRoot={settings?.postsAtRoot}
 />

package/apps/storefront/src/pages/blog/tag/[tag].astro

@@ -7,17 +7,18 @@ import { collectPostsByTerm } from "@/lib/blog/collection.js";
 import { resolveBlogPresentation } from "@/lib/blog/presentation.js";
 import { homeCrumbLabel, siteTrail } from "@/lib/breadcrumbs.js";
 import { breadcrumbLd } from "@/lib/jsonld.js";
-import { collectionPathsV1 } from "@/lib/blog/collectionPaths.js";
+import { collectionPathsV1, blogPathOptsV1 } from "@/lib/blog/collectionPaths.js";
 
 const { tenant, basePath, canonicalBase, content, publicationTimestamp } = Astro.locals;
-const blogPaths = collectionPathsV1(Astro.locals, "blog");
 const param = Astro.params.tag ?? "";
 
 const all = await listBlogPosts(tenant.tenant_id, content, publicationTimestamp);
 const match = collectPostsByTerm(all, "tags", param);
 if (!match) return new Response(null, { status: 404 });
 const { label, posts } = match;
-const presentation = resolveBlogPresentation(await getBlogSettings(tenant.tenant_id, content));
+const blogSettings = await getBlogSettings(tenant.tenant_id, content);
+const blogPaths = collectionPathsV1(Astro.locals, "blog", blogPathOptsV1(blogSettings));
+const presentation = resolveBlogPresentation(blogSettings);
 
 const path = blogPaths.tag(param);
 const itemList = {
@@ -45,6 +46,7 @@ const crumbs = breadcrumbLd(trail, canonicalBase);
   path={path}
   fullBleed
   jsonLd={[crumbs, itemList]}
+  structuredData={{ pageType: "collection" }}
 >
   <header class:list={["blog-hero", { "blog-hero--plain": !presentation.hero }]}>
     <div class="blog-shell">

package/apps/storefront/src/pages/collections/[handle].astro

@@ -18,6 +18,7 @@ import Img from "@/components/Img.astro";
 import { parseQuery, buildQueryString } from "@/lib/url";
 import { breadcrumbLd, itemListLd } from "@/lib/jsonld";
 import { truncate } from "@/lib/format";
+import { pageUrlForm } from "@/lib/seo/urlForm";
 import { withBase } from "@/lib/basePath";
 import { isBlankDescriptionHtml, sanitizeDescriptionHtml } from "@/lib/content/sanitizeDescriptionHtml";
 
@@ -43,7 +44,7 @@ const { products, page, pageSize, total, facets } = await tot.listProducts(query
 // sitemap + directory too. Detect it via the UNFILTERED membership total.
 const { total: memberTotal } = await tot.listProducts({ collection: handle, pageSize: 1 });
 const isEmptyCollection = memberTotal === 0;
-const basePath = `/collections/${handle}`;
+const basePath = pageUrlForm(`/collections/${handle}`, tenant.seo);
 // Tenant-prefixed page path for facet/sort/pagination, which build links by
 // string-concatenating onto this base (so they stay inside a path-routed
 // tenant). `basePath` itself stays unprefixed for the SEO canonical `path`,
@@ -97,6 +98,12 @@ if (query.priceMin != null || query.priceMax != null) {
     breadcrumbLd(crumbs, canonicalBase),
     itemListLd(products, canonicalBase, (page - 1) * pageSize),
   ]}
+  structuredData={{
+    pageType: "collection",
+    description: collection.seo.description || undefined,
+    crumbs,
+    items: products.map((p) => ({ title: p.title, url: new URL(`/products/${p.handle}`, canonicalBase + "/").toString() })),
+  }}
 >
   {/* Collection hero */}
   <header class="bg-[var(--color-primary)] text-[var(--color-primary-contrast)]">

package/apps/storefront/src/pages/collections/index.astro

@@ -34,6 +34,7 @@ const crumbs = siteTrail(
   description={`Browse every collection at ${tenant.displayName}.`}
   path="/collections"
   jsonLd={breadcrumbLd(crumbs, canonicalBase)}
+  structuredData={{ pageType: "collection" }}
 >
   <div class="container-prose pt-6">
     <Breadcrumbs crumbs={crumbs} />

package/apps/storefront/src/pages/index.astro

@@ -182,6 +182,14 @@ const homeSectionWidgets = marketing
   path="/"
   ogType="website"
   fullBleed={marketing}
+  structuredData={{
+    pageType: "home",
+    headline: home.seoTitle ?? tenant.displayName,
+    description: home.seoDescription,
+    image: home.image,
+    author: home.author,
+    faq: home.blocks.flatMap((block) => (block.component === "faq" ? block.items : [])),
+  }}
 >
   {marketing && <MarketingBlocks blocks={marketingBlocks} basePath={basePath} />}
   {

package/apps/storefront/src/pages/llms.txt.ts

@@ -11,7 +11,7 @@
  */
 import type { APIContext } from "astro";
 import { nonEmptyCollections } from "@/lib/tot/query.js";
-import { listBlogPosts } from "@/lib/blog/provider.js";
+import { getBlogSettings, listBlogPosts } from "@/lib/blog/provider.js";
 import { compileRouteTierIndexV1 } from "@tot/public-runtime";
 import { readKv } from "@/lib/runtimeEnv.js";
 import {
@@ -20,7 +20,7 @@ import {
   readMountedPublicationDiscoveryV1,
   rootOwnsDiscoveryPathV1,
 } from "@/lib/publication/mountedDiscovery.js";
-import { collectionPathsV1 } from "@/lib/blog/collectionPaths.js";
+import { collectionPathsV1, blogPathOptsV1 } from "@/lib/blog/collectionPaths.js";
 
 /** Collapse HTML/whitespace to a single trimmed line for a link description. */
 function oneLine(s: string | undefined, max = 140): string | undefined {
@@ -32,12 +32,11 @@ function oneLine(s: string | undefined, max = 140): string | undefined {
 
 export async function GET(context: APIContext): Promise<Response> {
   const { tot, tenant, canonicalBase, content, publicationTimestamp } = context.locals;
-  const blogPaths = collectionPathsV1(context.locals, "blog");
   const base = canonicalBase.replace(/\/$/, "");
 
   // Use the request-resolved ContentProvider (locals.content) so any published /
   // dev-draft overlay is reflected, matching sitemap.xml.ts (not a fresh provider).
-  const [allCollections, activeProducts, rootPages, featured, home, rootBlogPosts] =
+  const [allCollections, activeProducts, rootPages, featured, home, rootBlogPosts, blogSettings] =
     await Promise.all([
       tot.listCollections(),
       tot.getAllActiveProducts(),
@@ -45,7 +44,9 @@ export async function GET(context: APIContext): Promise<Response> {
       tot.getFeatured(12),
       content.getHome().catch(() => null),
       listBlogPosts(tenant.tenant_id, content, publicationTimestamp),
+      getBlogSettings(tenant.tenant_id, content),
     ]);
+  const blogPaths = collectionPathsV1(context.locals, "blog", blogPathOptsV1(blogSettings));
   // Empty synthesized collections (no active members) never make the guide —
   // an LLM shouldn't be pointed at a URL that resolves to zero products.
   const collections = nonEmptyCollections(allCollections, activeProducts);

package/apps/storefront/src/pages/products/[handle].astro

@@ -45,6 +45,8 @@ import { truncate } from "@/lib/format";
 import { productLd, breadcrumbLd, reviewLd } from "@/lib/jsonld";
 import { isUsableImageUrl } from "@/lib/placeholder";
 import { withBase } from "@/lib/basePath";
+import { productPageType, structuredDataProfile } from "@/lib/seo/structuredData";
+import { pageUrlForm } from "@/lib/seo/urlForm";
 import { shippingPolicyPath } from "@/lib/commerce/shippingPolicy";
 import AppWidgetFrame from "@/components/apps/AppWidgetFrame.astro";
 import { getRegistryService } from "@/lib/apps/registryAccess.js";
@@ -155,7 +157,7 @@ const flavorTags = (product.tags ?? [])
   .map((t) => ({
     label: t.slice(3).trim(),
     href: flavorCollection
-      ? `/collections/${flavorCollection}?tag=${encodeURIComponent(t)}`
+      ? pageUrlForm(`/collections/${flavorCollection}?tag=${encodeURIComponent(t)}`, tenant.seo)
       : undefined,
   }))
   .filter((f) => f.label);
@@ -299,6 +301,13 @@ const productJsonLd: Record<string, unknown> = {
   ...reviewLd(reviewAvg, reviewCount, reviews),
 };
 const jsonLd = [productJsonLd, breadcrumbLd(crumbs, canonicalBase)];
+const structuredData = {
+  pageType: productPageType(structuredDataProfile(tenant), product),
+  image: ogPrimary && isUsableImageUrl(ogPrimary.url, ogPrimary.rehosted) ? ogPrimary.url : null,
+  product,
+  reviews: reviewLd(reviewAvg, reviewCount, reviews),
+  crumbs,
+};
 ---
 
 <Layout
@@ -309,6 +318,7 @@ const jsonLd = [productJsonLd, breadcrumbLd(crumbs, canonicalBase)];
   ogImage={ogImage}
   noindex={isDraft}
   jsonLd={jsonLd}
+  structuredData={structuredData}
 >
   <div class="container-prose pt-6">
     <Breadcrumbs crumbs={crumbs} />

package/apps/storefront/src/pages/sitemap.xml.ts

@@ -24,7 +24,8 @@ import {
   readMountedPublicationDiscoveryV1,
   rootOwnsDiscoveryPathV1,
 } from "@/lib/publication/mountedDiscovery.js";
-import { collectionPathsV1 } from "@/lib/blog/collectionPaths.js";
+import { collectionPathsV1, blogPathOptsV1 } from "@/lib/blog/collectionPaths.js";
+import { pageUrlForm } from "@/lib/seo/urlForm.js";
 
 interface SitemapUrl {
   loc: string;
@@ -44,7 +45,8 @@ function escapeXml(value: string): string {
 export async function GET(context: APIContext): Promise<Response> {
   const { tot, tenant, canonicalBase, content, features, publicationTimestamp } = context.locals;
   const base = canonicalBase.replace(/\/$/, "");
-  const blogPaths = collectionPathsV1(context.locals, "blog");
+  const blogSettings = await getBlogSettings(tenant.tenant_id, content);
+  const blogPaths = collectionPathsV1(context.locals, "blog", blogPathOptsV1(blogSettings));
   const buildPaths = collectionPathsV1(context.locals, "the-build");
 
   const urls: SitemapUrl[] = [{ loc: `${base}/` }];
@@ -93,7 +95,6 @@ export async function GET(context: APIContext): Promise<Response> {
     // straight off this list (withSitemapRoutes in scripts/publish/lib/routes.mjs),
     // so listing them here is what makes /blog/page/N/ exist in BOTH serving
     // planes, not just the SSR Worker.
-    const blogSettings = await getBlogSettings(tenant.tenant_id, content);
     const { pageSize } = resolveBlogIndexCopy(blogSettings, tenant.displayName);
     const totalBlogPages = Math.max(1, Math.ceil(blogPosts.length / pageSize));
     for (let n = 2; n <= totalBlogPages; n++) urls.push({ loc: `${base}${blogPaths.page(n)}` });
@@ -154,7 +155,7 @@ export async function GET(context: APIContext): Promise<Response> {
 ${urls
   .map(
     (u) =>
-      `  <url>\n    <loc>${escapeXml(u.loc)}</loc>${
+      `  <url>\n    <loc>${escapeXml(pageUrlForm(u.loc, tenant.seo))}</loc>${
         u.lastmod ? `\n    <lastmod>${escapeXml(u.lastmod)}</lastmod>` : ""
       }\n  </url>`,
   )

package/package.json

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