@tokenoftrust/storefront-runner 2.2.105 → 2.2.106

package/agency-kit/tools/lib/catalog-model/model.mjs

@@ -18,8 +18,9 @@
 
 export const CATALOG_MODEL = {
   ProductStatus: { alias: '"active" | "draft" | "archived"' },
+  ProductVisibility: { alias: '"public" | "unlisted" | "hidden"' },
   Currency: { alias: "string" },
-  SourcePlatform: { alias: '"shopify" | "directory" | "csv" | "manual" | "synthesized"' },
+  SourcePlatform: { alias: '"shopify" | "bigcommerce" | "directory" | "csv" | "manual" | "synthesized"' },
   SourceRef: {
     fields: { platform: "SourcePlatform", source_id: "string", "source_handle?": "string" },
   },
@@ -81,10 +82,15 @@ export const CATALOG_MODEL = {
       "compare_at_price?": "number",
       currency: "Currency",
       option_values: "Record<string, string>",
+      "metafields?": "Metafield[]",
       inventory: "InventoryState",
       "barcode?": "string",
+      "mpn?": "string",
       "weight?": "number",
       "weight_unit?": "string",
+      "width?": "number",
+      "height?": "number",
+      "depth?": "number",
       position: "number",
       "image_id?": "string",
     },
@@ -102,6 +108,7 @@ export const CATALOG_MODEL = {
       "product_type?": "string",
       tags: "string[]",
       status: "ProductStatus",
+      "visibility?": "ProductVisibility",
       seo: "SeoFields",
       options: "ProductOption[]",
       images: "CatalogImage[]",
@@ -123,6 +130,7 @@ export const CATALOG_MODEL = {
       source: "SourceRef",
       handle: "string",
       title: "string",
+      "visibility?": "ProductVisibility",
       "description_html?": "string",
       "description_text?": "string",
       "image?": "CatalogImage",
@@ -130,6 +138,8 @@ export const CATALOG_MODEL = {
       product_handles: "string[]",
       "rule?": "Record<string, unknown>",
       "position?": "number",
+      "parent_id?": "string",
+      "tree_id?": "string",
       created_at: "string",
       updated_at: "string",
       migrated_at: "string",

package/apps/storefront/src/lib/d1/catalog.ts

@@ -125,7 +125,7 @@ export async function insertCollection(db: Queryable, c: CatalogCollection): Pro
 }
 
 export async function listCollections(db: Queryable): Promise<CatalogCollection[]> {
-  const rows = await db.all<{ data: string }>(`SELECT data FROM collections ORDER BY position ASC`);
+  const rows = await db.all<{ data: string }>(`SELECT data FROM collections WHERE COALESCE(json_extract(data, '$.visibility'), 'public') = 'public' ORDER BY position ASC`);
   return rows.map((r) => JSON.parse(r.data) as CatalogCollection);
 }
 
@@ -163,6 +163,7 @@ export async function searchProducts(
        FROM products_fts f
        JOIN products p ON p.handle = f.handle
       WHERE products_fts MATCH ? AND p.status = 'active'
+        AND COALESCE(json_extract(p.data, '$.visibility'), 'public') = 'public'
       ORDER BY rank
       LIMIT ?`,
     expr, limit,
@@ -189,7 +190,7 @@ export async function getProductByHandle(
  */
 export async function listAllActiveProducts(db: Queryable): Promise<CatalogProduct[]> {
   const rows = await db.all<{ data: string }>(
-    `SELECT data FROM products WHERE status = 'active' ORDER BY position ASC`,
+    `SELECT data FROM products WHERE status = 'active' AND COALESCE(json_extract(data, '$.visibility'), 'public') = 'public' ORDER BY position ASC`,
   );
   return rows.map((r) => JSON.parse(r.data) as CatalogProduct);
 }
@@ -380,7 +381,7 @@ export async function listProducts(
     ? "JOIN product_collections pc ON pc.handle = p.handle AND pc.collection = ?"
     : "";
   const poolParams: unknown[] = query.collection ? [query.collection] : [];
-  const poolSql = `FROM products p ${poolJoin} WHERE p.status = 'active'`;
+  const poolSql = `FROM products p ${poolJoin} WHERE p.status = 'active' AND COALESCE(json_extract(p.data, '$.visibility'), 'public') = 'public'`;
 
   // Result filters layered on the pool.
   const clauses = buildFilterClauses(query);

package/apps/storefront/src/lib/search/index.ts

@@ -8,7 +8,7 @@
  * merchant gets out of the box (docs/extraction-runbook.md).
  */
 import Fuse, { type IFuseOptions } from "fuse.js";
-import type { CatalogProduct } from "@tot/public-runtime";
+import { isPublicCatalogProduct, type CatalogProduct } from "@tot/public-runtime";
 
 export interface SearchHit {
   product: CatalogProduct;
@@ -35,7 +35,7 @@ const FUSE_OPTIONS: IFuseOptions<CatalogProduct> = {
 
 export function buildSearchIndex(products: CatalogProduct[]): SearchIndex {
   // Defensive: only ever index active products (the draft canary must never leak).
-  const active = products.filter((p) => p.status === "active");
+  const active = products.filter(isPublicCatalogProduct);
   const fuse = new Fuse(active, FUSE_OPTIONS);
   return {
     search(query: string, limit = 12): SearchHit[] {

package/apps/storefront/src/lib/sections.ts

@@ -12,6 +12,7 @@
  */
 import {
   normalizeProductSectionSource,
+  isPublicCatalogProduct,
   type CatalogProduct,
   type ProductSectionSource,
 } from "@tot/public-runtime";
@@ -29,7 +30,7 @@ export const DEFAULT_SECTION_LIMIT = 12;
 /** Bestseller signal is tag-based in Phase 1 (no order history at the edge). */
 const BESTSELLER_TAGS = new Set(["bestseller", "best-seller", "best-sellers"]);
 
-const isActive = (p: CatalogProduct) => p.status === "active";
+const isActive = isPublicCatalogProduct;
 
 /**
  * Resolve a SectionSource to a concrete, active product list via the tenant's

package/apps/storefront/src/lib/tot/ToTClient.ts

@@ -22,6 +22,7 @@ import type {
   Review,
   TenantConfig,
 } from "@tot/public-runtime";
+import { isPublicCatalogProduct } from "@tot/public-runtime";
 import { buildFacets, applyQuery, paginate } from "./query.js";
 import { D1ToTClient } from "./d1Client.js";
 import { fromD1, type D1Like } from "../d1/catalog.js";
@@ -34,7 +35,7 @@ import { readTenantCatalogFiles, type CatalogArtifactSource } from "./tenantCata
 // Re-exported so existing `import { ToTClient } from "./ToTClient"` sites work.
 export type { ToTClient } from "./totClientInterface.js";
 
-const isActive = (p: CatalogProduct) => p.status === "active";
+const isActive = isPublicCatalogProduct;
 
 // ---------------------------------------------------------------------------
 // FixtureToTClient — an in-memory catalog (store files or the in-repo snapshot).
@@ -82,7 +83,7 @@ export class FixtureToTClient implements ToTClient {
   }
 
   async listCollections(): Promise<CatalogCollection[]> {
-    return [...this.collections].sort(
+    return this.collections.filter((collection) => !collection.visibility || collection.visibility === "public").sort(
       (a, b) => (a.position ?? 99) - (b.position ?? 99),
     );
   }

package/apps/storefront/src/lib/tot/query.ts

@@ -265,7 +265,7 @@ export function nonEmptyCollections(
   collections: CatalogCollection[],
   activeProducts: CatalogProduct[],
 ): CatalogCollection[] {
-  return collections.filter((c) => activeMemberCount(c, activeProducts) > 0);
+  return collections.filter((c) => (c.visibility ?? "public") === "public" && activeMemberCount(c, activeProducts) > 0);
 }
 
 export function paginate<T>(

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

@@ -26,7 +26,7 @@ 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) return new Response(null, { status: 404 });
+if (!collection || collection.visibility === "hidden") return new Response(null, { status: 404 });
 
 const url = new URL(Astro.request.url);
 const query = parseQuery(url);

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

@@ -56,10 +56,10 @@ if (!handle) return Astro.redirect(withBase(basePath, "/404"));
 const product = await tot.getProductByHandle(handle);
 
 // Draft canary: drafts resolve by handle (preview/direct link) but are noindex.
-if (!product || product.status === "archived") {
+if (!product || product.status === "archived" || product.visibility === "hidden") {
   return new Response(null, { status: 404 });
 }
-const isDraft = product.status !== "active";
+const isDraft = product.status !== "active" || product.visibility === "unlisted";
 
 // Private-app widgets — product.aside slot, one iframe per live install.
 // No dark-mode preference is resolved anywhere in the storefront yet; "light"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokenoftrust/storefront-runner",
-  "version": "2.2.105",
+  "version": "2.2.106",
   "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/product.ts

@@ -14,6 +14,7 @@
  */
 
 export type ProductStatus = "active" | "draft" | "archived";
+export type ProductVisibility = "public" | "unlisted" | "hidden";
 
 export type Currency = string; // ISO 4217, e.g. "USD"
 
@@ -26,6 +27,7 @@ export type Currency = string; // ISO 4217, e.g. "USD"
  */
 export type SourcePlatform =
   | "shopify"
+  | "bigcommerce"
   | "directory"
   | "csv"
   | "manual"
@@ -149,10 +151,15 @@ export interface CatalogVariant {
   currency: Currency;
   /** Map of optionName -> chosen value, e.g. { "Color": "Black", "Size": "M" }. */
   option_values: Record<string, string>;
+  metafields?: Metafield[];
   inventory: InventoryState;
   barcode?: string;
+  mpn?: string;
   weight?: number;
   weight_unit?: string;
+  width?: number;
+  height?: number;
+  depth?: number;
   position: number;
   /** CatalogImage.id of the variant's featured image, if any. */
   image_id?: string;
@@ -172,6 +179,8 @@ export interface CatalogProduct {
   product_type?: string;
   tags: string[];
   status: ProductStatus;
+  /** Omitted on older records; readers treat them as public. */
+  visibility?: ProductVisibility;
   seo: SeoFields;
   options: ProductOption[];
   images: CatalogImage[];
@@ -193,6 +202,11 @@ export interface CatalogProduct {
   source_checksum: string;
 }
 
+/** Public listings and search include only visible, active products. */
+export function isPublicCatalogProduct(product: Pick<CatalogProduct, "status" | "visibility">): boolean {
+  return product.status === "active" && (product.visibility ?? "public") === "public";
+}
+
 export function normalizePurchaseOptions(
   product: Pick<CatalogProduct, "purchase_options">,
 ): ProductPurchaseOption[] {
@@ -222,6 +236,7 @@ export interface CatalogCollection {
   source: SourceRef;
   handle: string;
   title: string;
+  visibility?: ProductVisibility;
   description_html?: string;
   description_text?: string;
   image?: CatalogImage;
@@ -231,6 +246,9 @@ export interface CatalogCollection {
   /** For smart collections, the original rule (kept for re-resolution / audit). */
   rule?: Record<string, unknown>;
   position?: number;
+  /** Source category parent and tree preserve navigation hierarchy. */
+  parent_id?: string;
+  tree_id?: string;
   created_at: string;
   updated_at: string;
   migrated_at: string;