@tokenoftrust/cli 2.2.15 → 2.2.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokenoftrust/cli",
-  "version": "2.2.15",
+  "version": "2.2.17",
   "description": "Token of Trust developer CLI — clone a tenant store, run it locally with save→reload, and submit it for preview. Installs the `tot` command.",
   "license": "Apache-2.0",
   "author": "Token of Trust",

package/src/commands/dev.mjs

@@ -286,9 +286,12 @@ function runMonorepo(ctx, argv) {
  */
 export class NativeArtifactUnavailableError extends Error {}
 
-/** Same URL shape buildContainerPlan uses — factored out so native + Docker agree. */
+/**
+ * The local landing URL, shared by the native and Docker paths. The store's path is its canonical
+ * id, the config's `tenant` — the same id `tot dev` grafts the checkout under.
+ */
 export function deriveUrl(cfg, port) {
-  const domain = typeof cfg.scope === "string" && cfg.scope.includes(".") ? cfg.scope : null;
+  const domain = typeof cfg.tenant === "string" && cfg.tenant.includes(".") ? cfg.tenant : null;
   return { domain, url: `http://localhost:${port}/${domain ? `${domain}/` : ""}` };
 }
 
@@ -1835,8 +1838,7 @@ export function buildContainerPlan(workspace, args, _ctx) {
 
   const image = resolveDevImage(args);
   const port = String(args.port || "4321");
-  const domain = typeof cfg.scope === "string" && cfg.scope.includes(".") ? cfg.scope : null;
-  const url = `http://localhost:${port}/${domain ? `${domain}/` : ""}`;
+  const { domain, url } = deriveUrl(cfg, port);
 
   // docker run equivalent of scripts/dev/docker-compose.pull.yml: bind-mount the
   // checkout, map the port, force polling (reliable HMR across the mount), pull

package/src/commands/report.mjs

@@ -233,10 +233,14 @@ function resolveStore(args, ctx) {
   return null;
 }
 
-/** @param {string} dir */
+/**
+ * The store's id from its `.tot/config.json` — the id its `/tenants/<id>/` assets bind to. Never the
+ * directory's name.
+ * @param {string} dir
+ */
 function storeTenant(dir) {
   const config = readJson(join(dir, ".tot", "config.json"));
-  return typeof config?.tenant === "string" && config.tenant ? config.tenant : basename(dir);
+  return typeof config?.tenant === "string" && config.tenant ? config.tenant : null;
 }
 
 /**
@@ -272,7 +276,14 @@ export function run(argv, ctx, io = {}) {
     return 2;
   }
   const storeExists = existsSync(store);
-  const tenant = args.tenant ?? (storeExists ? storeTenant(store) : basename(store));
+  const tenant = args.tenant ?? (storeExists ? storeTenant(store) : null);
+  if (!tenant) {
+    err(`${fail(
+      `${store} names no store id`,
+      "set \"tenant\" in .tot/config.json to your store's id (the one `tot whoami` lists), or pass --tenant <id>",
+    )}\n`);
+    return 2;
+  }
   const lint = storeExists ? validateTenant(store, { tenantId: tenant, mode: args.workspace ? "workspace" : "monorepo" }) : null;
   const evidence = evidenceFromDir({ pagesDir, stylePath: args.style ? resolve(args.style) : null, lint });
   if (!evidence.measured) {

package/src/declared-config.mjs

@@ -11,7 +11,7 @@
 
 export const TOT_CONFIG_KEYS = [
   "$schema", "tenant", "scope", "mappings", "hostPlatform", "sample", "seed",
-  "siteType", "compliance", "capabilities", "features",
+  "siteType", "compliance", "capabilities", "features", "embeds",
 ];
 // Keys other tooling has written that the platform does NOT read, with the key it does.
 const RENAMED_CONFIG_KEYS = { appDomain: "scope", tenantId: "tenant" };
@@ -74,5 +74,9 @@ export function validateDeclaredConfig(config, file = ".tot/config.json") {
   if (config.capabilities !== undefined && !isObject(config.capabilities)) {
     out.push(mk(ERROR, "config-capabilities", file, "`capabilities` must be an object"));
   }
+  if (config.embeds !== undefined
+    && !(Array.isArray(config.embeds) && config.embeds.every((/** @type {unknown} */ s) => typeof s === "string"))) {
+    out.push(mk(ERROR, "config-embeds", file, '`embeds` must be an array of embed slugs, e.g. ["youtube"]'));
+  }
   return out;
 }

package/src/validate.mjs

@@ -224,7 +224,7 @@ function providesChrome(contentDir) {
 
 const CAPABILITY_KEYS = new Set(["cartCheckout", "ageVerification", "exciseTax"]);
 
-// Compact mirror of EMBED_PROVIDERS (packages/public-runtime/src/embed-catalog.mjs)
+// Compact mirror of EMBED_PROVIDERS (agency-kit/tools/lib/embed-catalog.mjs)
 // for the embed-CSP shift-left scan. The published `tot` CLI bundle can't reach
 // the repo's public-runtime package at runtime, so this is a copy — but a parity
 // test (packages/public-runtime/tests/embed-catalog-parity.test.ts) pins it to
@@ -237,6 +237,18 @@ export const KNOWN_EMBEDS = [
     markers: ["webforms.pipedrive.com", "pipedriveWebForms"],
     origins: ["https://webforms.pipedrive.com"],
   },
+  {
+    slug: "youtube",
+    label: "YouTube video (privacy-enhanced)",
+    markers: ["www.youtube-nocookie.com/embed/"],
+    origins: ["https://www.youtube-nocookie.com"],
+  },
+  {
+    slug: "vimeo",
+    label: "Vimeo video",
+    markers: ["player.vimeo.com/video/"],
+    origins: ["https://player.vimeo.com"],
+  },
 ];
 const KNOWN_EMBED_SLUGS = new Set(KNOWN_EMBEDS.map((p) => p.slug));
 const EMBED_SRC_RE = /<(?:script|iframe)\b[^>]*\bsrc\s*=\s*["']([^"']+)["']/gi;
@@ -1263,10 +1275,15 @@ export function validateTenant(tenantDir, opts = {}) {
   // provider not opted into embeds.json, or an unknown external <script>/<iframe>
   // origin, is blocking; advisory (info) when there's no embeds.json to compare.
   {
-    let declaredEmbeds = null;
+    // The opt-in is the `embeds` .tot/config.json declares, plus an embeds.json.
+    let declaredEmbeds = Array.isArray(config?.embeds)
+      ? new Set(config.embeds.filter((/** @type {unknown} */ s) => typeof s === "string"))
+      : null;
     if (existsSync(embedsPath)) {
       const { value } = readJsonSafe(embedsPath);
-      if (Array.isArray(value)) declaredEmbeds = new Set(value.filter((s) => typeof s === "string"));
+      if (Array.isArray(value)) {
+        declaredEmbeds = new Set([...(declaredEmbeds ?? []), ...value.filter((s) => typeof s === "string")]);
+      }
     }
     for (const file of walk(contentDir, (p) => p.endsWith(".html"))) {
       const { knownSlugs, unknownOrigins } = scanHtmlForEmbeds(readFileSync(file, "utf8"));

package/src/visual-parity.mjs

@@ -1,11 +1,13 @@
 /**
  * Read-only closure checks for the optional visual-parity migration module.
- * The tenant checkout remains portable: this reads only content/, public/, and
- * .tot/visual-parity.json, never a preview host or a delivery provider.
+ * The tenant checkout remains portable: this reads only content/, public/ and theme.json (where
+ * `.tot/config.json` maps them) and .tot/visual-parity.json, never a preview host or a delivery
+ * provider.
  */
 import { existsSync, readdirSync, readFileSync, statSync } from "node:fs";
 import { spawnSync } from "node:child_process";
 import { extname, join, relative } from "node:path";
+import { workspacePathForTenantRelative } from "./tot-repo-mappings.mjs";
 
 const ERROR = "error";
 // Public routes implemented by the renderer. Authentication and cart URLs are
@@ -59,10 +61,10 @@ function parseConfig(tenantDir) {
   }
 }
 
-function tenantFromConfig(tenantDir) {
+/** The checkout's `.tot/config.json`, or null when absent or unreadable. */
+function readTotConfig(tenantDir) {
   try {
-    const value = JSON.parse(readFileSync(join(tenantDir, ".tot", "config.json"), "utf8"));
-    return typeof value?.tenant === "string" ? value.tenant : null;
+    return JSON.parse(readFileSync(join(tenantDir, ".tot", "config.json"), "utf8"));
   } catch { return null; }
 }
 
@@ -278,7 +280,11 @@ export function validateVisualParityClosure(tenantDir, options = {}) {
   const findings = [];
   const { value: config, findings: configFindings } = parseConfig(tenantDir);
   findings.push(...configFindings);
-  const pagesDir = join(tenantDir, "content", "pages");
+  // Files are found where the checkout's `.tot/config.json` mappings declare them, as `tot validate`
+  // and the hosted reconcile find them.
+  const totConfig = readTotConfig(tenantDir);
+  const located = (rel) => join(tenantDir, workspacePathForTenantRelative(totConfig, rel));
+  const pagesDir = located("content/pages");
   const files = walk(pagesDir).filter((file) => file.endsWith(".json")).sort();
   if (files.length === 0) findings.push(finding("parity-pages-missing", "content/pages/", "no page JSON files define the visual-parity route scope", "add the paired authored page records under content/pages/ before closing parity"));
   const pages = [];
@@ -297,17 +303,17 @@ export function validateVisualParityClosure(tenantDir, options = {}) {
   const routes = new Set(["/"]);
   for (const page of pages) routes.add(normalizeRoute(page.value.slug));
   /** @type {{findings:ParityFinding[], tenantId:string|null, publicDir:string, routes:Set<string>, allowlist:string[], decodeAssets:DecodeAsset[]}} */
-  const context = { findings, tenantId: tenantId ?? tenantFromConfig(tenantDir), publicDir: join(tenantDir, "public"), routes, allowlist: Array.isArray(config.externalNavigationAllowlist) ? config.externalNavigationAllowlist : [], decodeAssets: [] };
+  const context = { findings, tenantId: tenantId ?? (typeof totConfig?.tenant === "string" ? totConfig.tenant : null), publicDir: located("public"), routes, allowlist: Array.isArray(config.externalNavigationAllowlist) ? config.externalNavigationAllowlist : [], decodeAssets: [] };
   if (!context.tenantId) findings.push(finding("parity-tenant-id", ".tot/config.json", "tenant id is required to verify /tenants/<tenant>/ assets", "set tenant in .tot/config.json or pass a resolved tenant id"));
   for (const page of pages) inspectValue(page.value, page.file, [], context);
   for (const name of ["home.json", "chrome.json"]) {
-    const path = join(tenantDir, "content", name);
+    const path = located(`content/${name}`);
     if (existsSync(path)) {
       const value = readStructured(path, `content/${name}`, findings);
       if (value != null) inspectValue(value, `content/${name}`, [], context);
     }
   }
-  const themePath = join(tenantDir, "theme.json");
+  const themePath = located("theme.json");
   if (existsSync(themePath)) {
     const value = readStructured(themePath, "theme.json", findings);
     if (value != null) inspectValue(value, "theme.json", [], context);