@tokenoftrust/storefront-runner 2.5.6 → 3.0.1

package/apps/storefront/src/pages/api/compliance/preflight.ts

@@ -34,6 +34,7 @@ import {
   type TotVerificationClient,
   type TotVerificationStatus,
 } from "@/lib/compliance/verification/totVerificationClient";
+import { sharedStorePolicy } from "@/lib/checkout/commerce/sharedStoreAdmission";
 
 export const prerender = false;
 
@@ -268,8 +269,7 @@ function withProviderCleared(ruleset: ComplianceRuleset): ComplianceRuleset {
 }
 
 export async function POST(context: APIContext): Promise<Response> {
-  const { tenant, tot } = context.locals;
-  const regulated = isRegulatedTenant(tenant);
+  const regulated = isRegulatedTenant(context.locals.tenant);
 
   let body: PreflightBody;
   try {
@@ -281,7 +281,45 @@ export async function POST(context: APIContext): Promise<Response> {
       : json({ decision: evaluateEmpty() });
   }
 
+  // The shared test store applies the store's own saved requirements, computed here from the
+  // tenant's config — never from the request, so a shopper cannot waive one.
+  const policy = await sharedStorePolicy(context.locals.tenant, context.locals.commerce, context.locals.customizationEnv);
+  return json(await evaluatePreflight(context, body, policy ? { verification: policy.verification, rules: policy.rules } : {}));
+}
+
+export interface PreflightOptions {
+  /**
+   * Server-owned verification requirement, from the shared test store's policy for this
+   * tenant. "required" requires verification even where the ruleset would not; absent keeps
+   * the ruleset's own. Never read from the request body.
+   */
+  verification?: "required" | "not-required";
+  /**
+   * Server-owned rule enforcement, from the same policy. "off" keeps only the verification
+   * outcome: destination, flavor, purchase-limit and excise blocks do not apply.
+   */
+  rules?: "enforce" | "off";
+}
+
+export interface PreflightResult {
+  decision: CartComplianceDecision;
+  verification?: LiveVerificationMeta;
+}
+
+/** The preflight decision for `body`, evaluated server-side against the tenant's ruleset. */
+export async function evaluatePreflight(
+  context: APIContext,
+  body: PreflightBody,
+  options: PreflightOptions = {},
+): Promise<PreflightResult> {
+  const { tenant, tot } = context.locals;
+  const regulated = isRegulatedTenant(tenant);
+
   let ruleset = await resolveTenantRuleset(tenant);
+  if (ruleset && options.verification) {
+    ruleset = { ...ruleset, verification: { ...ruleset.verification, required: options.verification === "required" } };
+  }
+  const rulesOff = options.rules === "off";
   let verification = normalizeVerification(body.verification);
   const destination = normalizeDestination(body.destination);
   let liveVerification: LiveVerificationMeta | undefined;
@@ -291,7 +329,7 @@ export async function POST(context: APIContext): Promise<Response> {
   // not evidence) and the affirmation shortcut below is unreachable — "tot" is
   // never in SANDBOX_VERIFICATION_PROVIDERS. Any adapter failure clears the
   // provider so the engine blocks fail-closed, exactly as when none is wired.
-  if (ruleset && isLiveTotVerificationProvider(ruleset.verification.provider)) {
+  if (ruleset && ruleset.verification.required && isLiveTotVerificationProvider(ruleset.verification.provider)) {
     const resolved = await resolveLiveVerification(body);
     if (!resolved) {
       ruleset = withProviderCleared(ruleset);
@@ -330,15 +368,12 @@ export async function POST(context: APIContext): Promise<Response> {
     if (!product) {
       // A line we can't resolve on a regulated tenant is a fail-closed block:
       // we can't prove it's shippable, so we don't let it through.
-      if (regulated) {
-        return json(
-          {
-            decision: blockedDecision(
-              `Product "${raw.handle}" could not be resolved for compliance evaluation.`,
-            ),
-          },
-          200,
-        );
+      if (regulated && !rulesOff) {
+        return {
+          decision: blockedDecision(
+            `Product "${raw.handle}" could not be resolved for compliance evaluation.`,
+          ),
+        };
       }
       continue;
     }
@@ -364,7 +399,20 @@ export async function POST(context: APIContext): Promise<Response> {
     ageAffirmed: body.ageAffirmed === true,
   });
 
-  return json(liveVerification ? { decision, verification: liveVerification } : { decision });
+  const applied = rulesOff ? verificationOnly(decision) : decision;
+  return liveVerification ? { decision: applied, verification: liveVerification } : { decision: applied };
+}
+
+/** The decision with only its verification outcome: every rule block removed, status recomputed. */
+function verificationOnly(decision: CartComplianceDecision): CartComplianceDecision {
+  const blocks = decision.blocks.filter((block) => block.code.startsWith("verification_"));
+  return {
+    ...decision,
+    blocks,
+    purchaseLimit: null,
+    failedClosed: blocks.some((block) => block.failedClosed === true),
+    status: blocks.some((block) => block.code !== "verification_required") ? "blocked" : blocks.length ? "action_required" : "clear",
+  };
 }
 
 /** The trivial "nothing to enforce" decision for an unregulated empty request. */

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

@@ -70,7 +70,7 @@ const crumbs = breadcrumbLd(trail, canonicalBase);
   path={blogPaths.author(slug)}
   fullBleed
   jsonLd={[crumbs, profileLd, itemListLd]}
-  structuredData={{ pageType: "collection" }}
+  structuredData={{ pageType: "collection", crumbs: trail, items: posts.map((post) => ({ title: post.title, url: new URL(blogPaths.post(post.slug), canonicalBase + "/").toString() })) }}
 >
   <header class:list={["author-hero", { "author-hero--plain": !presentation.hero }]}>
     <div class="blog-shell">

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

@@ -48,7 +48,7 @@ const crumbs = breadcrumbLd(trail, canonicalBase);
   path={path}
   fullBleed
   jsonLd={[crumbs, itemList]}
-  structuredData={{ pageType: "collection" }}
+  structuredData={{ pageType: "collection", crumbs: trail, items: posts.map((post) => ({ title: post.title, url: new URL(blogPaths.post(post.slug), canonicalBase + "/").toString() })) }}
 >
   <header class:list={["blog-hero", { "blog-hero--plain": !presentation.hero }]}>
     <div class="blog-shell">

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

@@ -46,7 +46,7 @@ const crumbs = breadcrumbLd(trail, canonicalBase);
   path={path}
   fullBleed
   jsonLd={[crumbs, itemList]}
-  structuredData={{ pageType: "collection" }}
+  structuredData={{ pageType: "collection", crumbs: trail, items: posts.map((post) => ({ title: post.title, url: new URL(blogPaths.post(post.slug), canonicalBase + "/").toString() })) }}
 >
   <header class:list={["blog-hero", { "blog-hero--plain": !presentation.hero }]}>
     <div class="blog-shell">

package/apps/storefront/src/pages/catalog-index.json.ts

@@ -0,0 +1,20 @@
+/**
+ * Per-tenant static catalog index (lib/catalog/shared/catalogIndex.ts): what the
+ * browser filters, sorts and searches when a static host serves a listing or
+ * search page whose query no renderer saw. Published alongside the pages it
+ * serves; commerce-only.
+ */
+import type { APIContext } from "astro";
+import { buildCatalogIndex } from "@/lib/catalog/shared/catalogIndex.js";
+
+export async function GET(context: APIContext): Promise<Response> {
+  const { tot, features } = context.locals;
+  if (!features.catalog && !features.productSearch) return new Response(null, { status: 404 });
+  const [products, collections] = await Promise.all([tot.getAllActiveProducts(), tot.listCollections()]);
+  return new Response(JSON.stringify(buildCatalogIndex(products, collections)), {
+    headers: {
+      "content-type": "application/json; charset=utf-8",
+      "cache-control": "public, max-age=300, s-maxage=3600",
+    },
+  });
+}

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

@@ -0,0 +1,28 @@
+---
+/**
+ * `/collections/<h>/page/<n>/` — page N≥2 of a collection, the indexable path
+ * variant every static host can serve (ADR 0013: paging is N-bounded). Page 1
+ * lives at the bare collection path; both render through _CollectionView.
+ */
+import CollectionView from "../../_CollectionView.astro";
+import { collectionPageCount, loadCollectionListing } from "@/lib/catalog/shared/collectionPaging";
+import { effectiveCollectionQuery } from "@/lib/publication/shared/staticQuery";
+import { parsePagedRouteParam } from "@/lib/content/blog/pagination";
+
+// Same query contract as page 1: sort/facets/price/search are applied client-side
+// on a static host, the page number comes from the path.
+export const STATIC_QUERY = "client-applied";
+
+const { handle } = Astro.params;
+if (!Astro.locals.features.catalog) return new Response(null, { status: 404 });
+const pathPage = parsePagedRouteParam(Astro.params.n);
+if (!handle || pathPage === null) return new Response(null, { status: 404 });
+
+const query = effectiveCollectionQuery(Astro.url, pathPage);
+const listing = await loadCollectionListing(Astro.locals.tot, handle, query);
+if (!listing) return new Response(null, { status: 404 });
+// A page past the collection's end is a real 404, never a clamped copy of the last page.
+if (pathPage > collectionPageCount(listing.memberTotal)) return new Response(null, { status: 404 });
+---
+
+<CollectionView {...listing} query={query} pathPage={pathPage} />

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

@@ -1,209 +1,24 @@
 ---
 /**
- * PLP / collection page (brief §5). Responsive grid, collection hero, sort,
- * URL-addressable facets, numbered pagination + load-more. Product data from
- * ToT (active-only); hero copy from the collection record (Storyblok could
- * override later — documented seam).
+ * PLP / collection page 1. Page N≥2 lives at `/collections/<h>/page/<n>/`
+ * (collections/[handle]/page/[n].astro); both render through _CollectionView.
  */
-import Layout from "@/layouts/Layout.astro";
-import Breadcrumbs from "@/components/content/storefront/Breadcrumbs.astro";
-import { homeCrumbLabel, siteTrail } from "@/lib/content/shared/breadcrumbs";
-import ProductCard from "@/components/catalog/storefront/ProductCard.astro";
-import EmptyState from "@/components/content/storefront/EmptyState.astro";
-import FacetSidebar from "@/components/catalog/storefront/plp/FacetSidebar.astro";
-import ActiveFilters from "@/components/catalog/storefront/plp/ActiveFilters.astro";
-import SortSelect from "@/components/catalog/storefront/plp/SortSelect.astro";
-import Pagination from "@/components/catalog/storefront/plp/Pagination.astro";
-import Img from "@/components/assets/storefront/Img.astro";
-import { parseQuery, buildQueryString } from "@/lib/publication/shared/url";
-import { breadcrumbLd, itemListLd } from "@/lib/content/shared/jsonld";
-import { truncate } from "@/lib/content/shared/format";
-import { pageUrlForm } from "@/lib/content/seo/urlForm";
-import { sourceSeoTitle } from "@/lib/content/seo/documentTitle";
-import { withBase } from "@/lib/publication/shared/basePath";
-import { isBlankDescriptionHtml, sanitizeDescriptionHtml } from "@/lib/content/sanitizeDescriptionHtml";
+import CollectionView from "./_CollectionView.astro";
+import { loadCollectionListing } from "@/lib/catalog/shared/collectionPaging";
+import { effectiveCollectionQuery } from "@/lib/publication/shared/staticQuery";
+
+// Sort, facets, price and inline search ride the query string, which a static host
+// never passes to a renderer: CatalogQueryView applies them client-side there.
+export const STATIC_QUERY = "client-applied";
 
 const { handle } = Astro.params;
-const { tenant, tot, canonicalBase } = Astro.locals;
 // Commerce-only route: marketing tenants have no catalog surface.
 if (!Astro.locals.features.catalog) return new Response(null, { status: 404 });
 if (!handle) return new Response(null, { status: 404 });
 
-const collection = await tot.getCollectionByHandle(handle);
-if (!collection || collection.visibility === "hidden") return new Response(null, { status: 404 });
-
-const url = new URL(Astro.request.url);
-const query = parseQuery(url);
-query.collection = handle;
-if (!query.pageSize) query.pageSize = 9;
-
-const { products, page, pageSize, total, facets } = await tot.listProducts(query);
-
-// A synthesized-EMPTY collection (zero active members overall — not merely
-// zero under the current facet/price/q filters) still resolves 200 for a direct
-// link, but must not be indexed: it's a crawlable dead end, kept out of the
-// 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 = 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`,
-// breadcrumbs, and EmptyState — those prefix on their own via withBase.
-const linkBase = withBase(Astro.locals.basePath, basePath);
-
-const crumbs = siteTrail(
-  homeCrumbLabel(await Astro.locals.content.getChrome()),
-  { label: collection.title, href: basePath },
-);
-
-const heroImg = collection.image;
-const desc = collection.description_text || collection.description_html?.replace(/<[^>]+>/g, "");
-// Full-fidelity body (brands/how-it-works/ingredients/FAQ sections on the merchant's
-// live collection pages), sanitized for render-time defense-in-depth on top of the
-// migration pipeline's own sanitize-html pass at ingestion (see
-// sanitizeDescriptionHtml.ts). Rendered as its own block BELOW the product grid,
-// matching the live site's layout — `desc` above stays the short hero excerpt.
-const contentBlockHtml = sanitizeDescriptionHtml(collection.description_html);
-const hasContentBlock = contentBlockHtml.length > 0 && !isBlankDescriptionHtml(contentBlockHtml);
-
-// Zero-results recovery: differentiate the cause (search term vs. facet/price
-// filters) and offer targeted "undo just this" links alongside the existing
-// "clear everything" CTA, instead of one generic message + one broad reset.
-const hasFacetOrPriceFilters =
-  !!query.filters ||
-  query.priceMin != null ||
-  query.priceMax != null ||
-  query.availability === "in-stock";
-const zeroResultsTitle = query.q ? `No matches for "${query.q}"` : "Nothing matches — yet";
-const zeroResultsBody = query.q
-  ? "Try a broader search term, or clear your filters to browse the full collection."
-  : "No pieces fit these filters. Loosen a filter or clear them to see the full collection.";
-const zeroResultsActions: { label: string; href: string }[] = [];
-if (query.q && hasFacetOrPriceFilters) {
-  const { q: _q, ...rest } = query;
-  zeroResultsActions.push({ label: "Clear search, keep filters", href: basePath + buildQueryString(rest) });
-}
-if (query.priceMin != null || query.priceMax != null) {
-  const { priceMin: _priceMin, priceMax: _priceMax, ...rest } = query;
-  zeroResultsActions.push({ label: "Remove price range", href: basePath + buildQueryString(rest) });
-}
+const query = effectiveCollectionQuery(Astro.url);
+const listing = await loadCollectionListing(Astro.locals.tot, handle, query);
+if (!listing) return new Response(null, { status: 404 });
 ---
 
-<Layout
-  title={collection.seo.title || collection.title}
-  seoTitle={sourceSeoTitle(tenant.seo, collection.seo.title)}
-  description={collection.seo.description || (desc ? truncate(desc, 160) : `Shop ${collection.title} at ${tenant.displayName}.`)}
-  path={basePath}
-  noindex={isEmptyCollection}
-  jsonLd={[
-    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)]">
-    <div class="container-prose grid gap-6 py-[clamp(2.5rem,6vw,4.5rem)] md:grid-cols-[1fr_auto] md:items-end">
-      <div data-reveal>
-        <p class="eyebrow mb-3 text-[color-mix(in_srgb,var(--color-primary-contrast)_70%,transparent)]">
-          Collection
-        </p>
-        <h1 class="display-xl">
-          {collection.title}
-        </h1>
-        {desc && (
-          <p class="mt-4 max-w-prose text-[1.05rem] text-[color-mix(in_srgb,var(--color-primary-contrast)_82%,transparent)]">
-            {truncate(desc, 220)}
-          </p>
-        )}
-      </div>
-      {heroImg && (
-        <div class="hidden w-48 overflow-hidden rounded-[var(--radius-md)] md:block" data-reveal>
-          <Img
-            src={heroImg.url}
-            rehosted={heroImg.rehosted}
-            seed={heroImg.id ?? collection.handle}
-            label={collection.title}
-            alt={heroImg.alt ?? collection.title}
-            width={heroImg.width ?? 400}
-            height={heroImg.height ?? 300}
-          />
-        </div>
-      )}
-    </div>
-  </header>
-
-  <div class="container-prose py-4">
-    <Breadcrumbs crumbs={crumbs} />
-  </div>
-
-  <div class="container-prose grid gap-10 pb-16 lg:grid-cols-[230px_1fr]">
-    {/* Facets — sticky on desktop; a <details> drawer on mobile. */}
-    <div class="lg:sticky lg:top-24 lg:self-start">
-      <details class="lg:hidden">
-        <summary class="cursor-pointer rounded-[var(--radius-md)] border border-[var(--color-border)] bg-[var(--color-surface)] px-4 py-2.5 font-display text-sm font-medium">
-          Filters & sort
-        </summary>
-        <div class="mt-4">
-          <FacetSidebar facets={facets} query={query} basePath={linkBase} />
-        </div>
-      </details>
-      <div class="hidden lg:block">
-        <FacetSidebar facets={facets} query={query} basePath={linkBase} />
-      </div>
-    </div>
-
-    <div>
-      <div class="mb-5 flex flex-wrap items-center justify-between gap-3 border-b border-[var(--color-border)] pb-4">
-        <p class="text-sm text-[var(--color-muted)]">
-          {total} {total === 1 ? "item" : "items"}
-        </p>
-        <SortSelect query={query} basePath={linkBase} />
-      </div>
-
-      <ActiveFilters query={query} basePath={linkBase} />
-
-      {products.length === 0 ? (
-        <EmptyState
-          title={zeroResultsTitle}
-          body={zeroResultsBody}
-          ctaLabel="Clear all filters"
-          ctaHref={basePath}
-          secondaryActions={zeroResultsActions}
-        />
-      ) : (
-        <>
-          <div class="grid grid-cols-2 gap-5 sm:grid-cols-2 lg:grid-cols-3">
-            {products.map((p, i) => (
-              <ProductCard
-                product={p}
-                position={(page - 1) * pageSize + i}
-                list={collection.handle}
-                priority={i < 3 && page === 1}
-              />
-            ))}
-          </div>
-          <Pagination
-            query={query}
-            basePath={linkBase}
-            page={page}
-            pageSize={pageSize}
-            total={total}
-          />
-        </>
-      )}
-    </div>
-  </div>
-
-  {hasContentBlock && (
-    <section class="container-prose pb-16">
-      <div class="rte mx-auto max-w-[68ch] text-[var(--color-text)]" set:html={contentBlockHtml} />
-    </section>
-  )}
-</Layout>
+<CollectionView {...listing} query={query} pathPage={1} />