@tokenoftrust/cli 2.0.0 → 2.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokenoftrust/cli",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "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/validate.mjs

@@ -17,6 +17,7 @@ import { existsSync } from "node:fs";
 import { join, resolve } from "node:path";
 import { validateTenant, ERROR, WARN } from "../validate.mjs";
 import { fail } from "../errors.mjs";
+import { tenantDirSegments } from "../tenant-dirs.mjs";
 
 function parseArgs(argv) {
   const a = { tenant: null, workspace: null, json: false, help: false };
@@ -47,7 +48,7 @@ function resolveTarget(args, ctx) {
   }
   if (args.tenant) {
     if (ctx.mode === "monorepo") {
-      return { dir: join(ctx.repoRoot, "tenants", args.tenant), tenantId: args.tenant };
+      return { dir: join(ctx.repoRoot, ...tenantDirSegments(args.tenant)), tenantId: args.tenant };
     }
     // A bare tenant name outside the monorepo has no directory to resolve.
     return { error: `"${args.tenant}" is a tenant name, but you're not in a storefront monorepo. Run from a checkout, or use --workspace <dir>.` };

package/src/tenant-dirs.mjs

@@ -0,0 +1,52 @@
+/**
+ * Where a tenant's colocated directory lives — the CLI's mirror.
+ *
+ * A tenant IS a directory. Real tenants sit directly under `tenants/<id>/`;
+ * PLATFORM TEST tenants (every id ending `.e2e.test`) sit one level deeper,
+ * under `tenants/e2e/<id>/`.
+ *
+ * `@tokenoftrust/cli` is a SEPARATE published package kept dependency-free (same
+ * stance as `src/validate.mjs` mirroring `scripts/tenant/validate.mjs` and
+ * `src/open.mjs` mirroring `scripts/dev/port-check.mjs`), so it carries its own
+ * copy rather than importing the monorepo's. All three copies — this,
+ * `scripts/lib/tenant-dirs.mjs`, and `packages/public-runtime/src/tenant.ts` —
+ * are held in lockstep by `packages/public-runtime/tests/tenant-dirs-parity.test.ts`.
+ */
+
+/** The directory segment platform test tenants are nested under. */
+export const E2E_TENANT_DIR = "e2e";
+
+/** True for a PLATFORM TEST tenant id — the `<scenario>.e2e.test` class. */
+export function isE2ETenantId(tenantId) {
+  return /\.e2e\.test$/.test(tenantId);
+}
+
+/** Repo-relative, POSIX-separated directory for a tenant id. */
+export function tenantDirRelative(tenantId) {
+  return isE2ETenantId(tenantId)
+    ? `tenants/${E2E_TENANT_DIR}/${tenantId}`
+    : `tenants/${tenantId}`;
+}
+
+/** The `/tenants/…/<id>/` substring identifying one tenant inside a path. */
+export function tenantDirSegment(tenantId) {
+  return `/${tenantDirRelative(tenantId)}/`;
+}
+
+/** The tenant id a `…/tenants/[e2e/]<id>/…` path encodes, or null. */
+export function tenantIdFromPath(path) {
+  return /\/tenants\/(?:e2e\/)?([^/]+)\//.exec(path)?.[1] ?? null;
+}
+
+/**
+ * Narrow a set of tenant ids to what a generalized listing should show —
+ * platform test tenants are dropped unless explicitly requested.
+ */
+export function listedTenantIds(ids, opts = {}) {
+  return opts.includeTestTenants ? [...ids] : ids.filter((id) => !isE2ETenantId(id));
+}
+
+/** Path segments for `join(repoRoot, ...tenantDirSegments(id))`. */
+export function tenantDirSegments(tenantId) {
+  return tenantDirRelative(tenantId).split("/");
+}