@tokenoftrust/storefront-runner 2.4.20 → 2.4.21

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

@@ -25,7 +25,10 @@ import {
   type PublicationSpaceManifestV1,
   type RouteTierIndexV1,
   type TenantConfig,
+  PUBLICATION_DISCOVERY_ENTRY_KINDS_V1,
+  type PublicationDiscoveryEntryKindV1,
 } from "@tot/public-runtime";
+import { rawPageCanonicalUrl } from "../rawMarketingHtml.js";
 
 export type DiscoverySurfaceV1 = "sitemap" | "feeds" | "publicSearch" | "llms";
 
@@ -34,6 +37,8 @@ export interface MountedDiscoveryEntryV1 {
   spaceId: string;
   /** Tenant-relative canonical route (no trailing slash). */
   canonicalPath: string;
+  /** The renderer that serves it; {@link mountedDiscoveryUrlV1} builds its URL from this. */
+  kind: PublicationDiscoveryEntryKindV1;
   title: string;
   summary: string;
   searchText: string;
@@ -88,8 +93,9 @@ function boundedString(value: unknown, allowEmpty = true): value is string {
 function parseEntry(value: unknown): MountedDiscoveryEntryV1 | null {
   if (!value || typeof value !== "object" || Array.isArray(value)) return null;
   const raw = value as Record<string, unknown>;
-  if (!exactKeys(raw, ["spaceId", "canonicalPath", "title", "summary", "searchText", "surfaces"],
-    ["publishedAt", "updatedAt"])) return null;
+  if (!exactKeys(raw, ["spaceId", "canonicalPath", "kind", "title", "summary", "searchText", "surfaces"],
+    ["publishedAt", "updatedAt"]) ||
+    !(PUBLICATION_DISCOVERY_ENTRY_KINDS_V1 as readonly unknown[]).includes(raw.kind)) return null;
   const surfaces = raw.surfaces;
   if (!surfaces || typeof surfaces !== "object" || Array.isArray(surfaces) ||
     !exactKeys(surfaces, SURFACES) ||
@@ -102,6 +108,7 @@ function parseEntry(value: unknown): MountedDiscoveryEntryV1 | null {
   return {
     spaceId: raw.spaceId,
     canonicalPath: raw.canonicalPath,
+    kind: raw.kind as PublicationDiscoveryEntryKindV1,
     title: raw.title,
     summary: raw.summary,
     searchText: raw.searchText,
@@ -180,6 +187,17 @@ export async function readMountedPublicationDiscoveryV1(input: {
     left.canonicalPath < right.canonicalPath ? -1 : left.canonicalPath > right.canonicalPath ? 1 : 0);
 }
 
+/**
+ * The absolute URL every discovery surface lists for a mounted entry: the canonical the page
+ * itself declares. A raw-HTML page's comes from {@link rawPageCanonicalUrl}, the constructor its
+ * renderer (`pages/[...slug].astro`) calls, so the sitemap and the page cannot disagree.
+ */
+export function mountedDiscoveryUrlV1(canonicalBase: string, entry: Pick<MountedDiscoveryEntryV1,
+  "canonicalPath" | "kind">): string {
+  if (entry.kind === "raw-html") return rawPageCanonicalUrl(canonicalBase, entry.canonicalPath.slice(1));
+  return `${canonicalBase.replace(/\/$/, "")}${entry.canonicalPath}`;
+}
+
 /** An RFC 3339 instant for a feed, or undefined when the value is not a date. */
 export function feedInstantV1(value: string | undefined): string | undefined {
   if (!value) return undefined;

package/apps/storefront/src/pages/feed.json.ts

@@ -11,6 +11,7 @@ import { readKv } from "@/lib/runtimeEnv.js";
 import {
   declaresMountedSpacesV1,
   feedInstantV1,
+  mountedDiscoveryUrlV1,
   readMountedPublicationDiscoveryV1,
   rootOwnsDiscoveryPathV1,
 } from "@/lib/publication/mountedDiscovery.js";
@@ -53,7 +54,7 @@ export async function GET(context: APIContext): Promise<Response> {
     const mounted = await readMountedPublicationDiscoveryV1({ tenant, store: await readKv("TENANT_CACHE"), index });
     for (const entry of mounted) {
       if (!entry.surfaces.feeds) continue;
-      items.push(item(`${base}${entry.canonicalPath}`, entry.title, entry.summary, entry.searchText,
+      items.push(item(mountedDiscoveryUrlV1(canonicalBase, entry), entry.title, entry.summary, entry.searchText,
         entry.publishedAt, entry.updatedAt));
     }
   }

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

@@ -16,6 +16,7 @@ import { compileRouteTierIndexV1 } from "@tot/public-runtime";
 import { readKv } from "@/lib/runtimeEnv.js";
 import {
   declaresMountedSpacesV1,
+  mountedDiscoveryUrlV1,
   readMountedPublicationDiscoveryV1,
   rootOwnsDiscoveryPathV1,
 } from "@/lib/publication/mountedDiscovery.js";
@@ -119,7 +120,7 @@ export async function GET(context: APIContext): Promise<Response> {
     lines.push("## More content");
     for (const entry of mounted) {
       const desc = oneLine(entry.summary);
-      lines.push(`- [${oneLine(entry.title, 200) ?? entry.title}](${base}${entry.canonicalPath})${desc ? `: ${desc}` : ""}`);
+      lines.push(`- [${oneLine(entry.title, 200) ?? entry.title}](${mountedDiscoveryUrlV1(canonicalBase, entry)})${desc ? `: ${desc}` : ""}`);
     }
     lines.push("");
   }

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

@@ -9,6 +9,7 @@ import { compileRouteTierIndexV1 } from "@tot/public-runtime";
 import { readKv } from "@/lib/runtimeEnv.js";
 import {
   declaresMountedSpacesV1,
+  mountedDiscoveryUrlV1,
   readMountedPublicationDiscoveryV1,
   rootOwnsDiscoveryPathV1,
 } from "@/lib/publication/mountedDiscovery.js";
@@ -35,7 +36,7 @@ export async function GET(context: APIContext): Promise<Response> {
     const mounted = await readMountedPublicationDiscoveryV1({ tenant, store: await readKv("TENANT_CACHE"), index });
     for (const entry of mounted) {
       if (!entry.surfaces.publicSearch) continue;
-      entries.push({ canonicalPath: entry.canonicalPath, canonicalUrl: `${base}${entry.canonicalPath}`,
+      entries.push({ canonicalPath: entry.canonicalPath, canonicalUrl: mountedDiscoveryUrlV1(canonicalBase, entry),
         title: entry.title, summary: entry.summary, searchText: entry.searchText });
     }
   }

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

@@ -20,6 +20,7 @@ import { compileRouteTierIndexV1 } from "@tot/public-runtime";
 import { readKv } from "@/lib/runtimeEnv.js";
 import {
   declaresMountedSpacesV1,
+  mountedDiscoveryUrlV1,
   readMountedPublicationDiscoveryV1,
   rootOwnsDiscoveryPathV1,
 } from "@/lib/publication/mountedDiscovery.js";
@@ -137,7 +138,7 @@ export async function GET(context: APIContext): Promise<Response> {
     const mounted = await readMountedPublicationDiscoveryV1({ tenant, store: await readKv("TENANT_CACHE"), index });
     for (const entry of mounted) {
       if (!entry.surfaces.sitemap) continue;
-      const loc = `${base}${entry.canonicalPath}`;
+      const loc = mountedDiscoveryUrlV1(canonicalBase, entry);
       if (listed.has(loc)) continue;
       listed.add(loc);
       const lastmod = entry.updatedAt ?? entry.publishedAt;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokenoftrust/storefront-runner",
-  "version": "2.4.20",
+  "version": "2.4.21",
   "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/public-runtime/src/publication-space.ts

@@ -27,6 +27,15 @@ export const PUBLICATION_MOUNT_ENTRY_VERSION = 1 as const;
 export const PUBLICATION_SPACE_PATH_CASE_POLICY = "sensitive" as const;
 export const PUBLICATION_SPACE_UNICODE_POLICY = "nfc" as const;
 
+/**
+ * Which renderer serves a discovery entry's route, so every discovery surface lists the canonical
+ * that page declares: `raw-html` pages (a mounted space's home and its pages-html) carry the
+ * raw-page trailing slash; `page`, `post` and `archive` routes are listed as they are.
+ */
+export type PublicationDiscoveryEntryKindV1 = "raw-html" | "page" | "post" | "archive";
+export const PUBLICATION_DISCOVERY_ENTRY_KINDS_V1: readonly PublicationDiscoveryEntryKindV1[] =
+  ["raw-html", "page", "post", "archive"];
+
 /** Static public-discovery outputs generated from exact live publication versions. */
 export const PUBLICATION_DISCOVERY_OUTPUT_PATHS_V1 = [
   "/feed.json",