@tokenoftrust/cli 6.2.0 → 6.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokenoftrust/cli",
-  "version": "6.2.0",
+  "version": "6.3.0",
   "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/declared-config.mjs

@@ -19,7 +19,7 @@
 
 export const TOT_CONFIG_KEYS = [
   "$schema", "tenant", "scope", "mappings", "hostPlatform", "sample", "seed",
-  "displayName", "siteType", "compliance", "capabilities", "features", "embeds", "seo", "currency", "timezone", "shipping",
+  "displayName", "siteType", "compliance", "capabilities", "features", "embeds", "seo", "currency", "timezone", "shipping", "catalog",
 ];
 // Keys other tooling has written that the platform does NOT read, with the key it does.
 const RENAMED_CONFIG_KEYS = { appDomain: "scope", tenantId: "tenant" };
@@ -232,6 +232,37 @@ export function seoDeclarationProblems(seo) {
   return problems;
 }
 
+/** Every `catalog` key a tenant may declare. `serving` stays a platform field. */
+export const CATALOG_KEYS = Object.freeze(["cdnSegment"]);
+
+/** One DNS label. Anything else is not a catalog object-key segment. */
+const CATALOG_SEGMENT = /^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?$/;
+
+/**
+ * What is wrong with a declared `catalog` value, one sentence per problem; `[]` when it is valid.
+ * A tenant cannot set `catalog.serving` here: that field belongs to the platform record.
+ * @param {unknown} catalog
+ * @returns {string[]}
+ */
+export function catalogDeclarationProblems(catalog) {
+  if (!isObject(catalog)) return ["`catalog` must be an object"];
+  const source = /** @type {Record<string, unknown>} */ (catalog);
+  const problems = [];
+  for (const key of Object.keys(source)) {
+    if (!CATALOG_KEYS.includes(key)) problems.push(`\`catalog.${key}\` is not a catalog key (${CATALOG_KEYS.join(", ")})`);
+  }
+  if (source.cdnSegment !== undefined && (typeof source.cdnSegment !== "string" || !CATALOG_SEGMENT.test(source.cdnSegment))) {
+    problems.push("`catalog.cdnSegment` must be one lowercase DNS label");
+  }
+  return problems;
+}
+
+/** The owner-facing sentence for an invalid `catalog` declaration. */
+function catalogProblemMessage(problems) {
+  return `\`catalog\` is not a valid catalog declaration (${problems.join("; ")}). ` +
+    "Owned catalog images stay refused until it is fixed.";
+}
+
 /** Every `shipping` key (mirrors packages/public-runtime/src/declared-tenant-config.mjs). */
 export const SHIPPING_KEYS = Object.freeze(["tiers"]);
 
@@ -690,6 +721,8 @@ export function declarationFindings(current, previous) {
     }
     const shipping = current.shipping === undefined ? [] : shippingDeclarationProblems(current.shipping);
     if (shipping.length > 0) out.push(`CONFIG: ${shippingProblemMessage(shipping)}`);
+    const catalog = current.catalog === undefined ? [] : catalogDeclarationProblems(current.catalog);
+    if (catalog.length > 0) out.push(`CONFIG: ${catalogProblemMessage(catalog)}`);
   }
   for (const { key, notice } of droppedMandatedNotices(previous, current)) {
     out.push(
@@ -790,6 +823,13 @@ export function validateDeclaredConfig(config, file = ".tot/config.json") {
         'declare e.g. `"shipping": { "tiers": [ { "rate": 5.99 }, { "atOrAbove": 100, "rate": 0, "label": "Free shipping" } ] }`, or remove `shipping` to charge none'));
     }
   }
+  if (config.catalog !== undefined) {
+    const problems = catalogDeclarationProblems(config.catalog);
+    if (problems.length > 0) {
+      out.push(mk(ERROR, "config-catalog", `${file} catalog`, catalogProblemMessage(problems),
+        'declare `"catalog": { "cdnSegment": "shop" }` as one lowercase DNS label, or remove `catalog`'));
+    }
+  }
   return out;
 }