@tokenoftrust/storefront-runner 2.2.89 → 2.2.91

package/scripts/tot-dev.mjs

@@ -62,7 +62,7 @@ import {
 import { dirname, resolve, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { resolveDevSourceRoot } from "./dev/tenant-source-root.mjs";
-import { tenantDirRelative, tenantDirSegments } from "./lib/tenant-dirs.mjs";
+import { tenantDirSegments } from "./lib/tenant-dirs.mjs";
 import { firstFreePort, isPortFree } from "./dev/port-check.mjs";
 import { busyPortMessage, classifyBusyPort, lockPort, unlockPort } from "./dev/port-lock.mjs";
 import { resync, startWatch } from "./dev/checkout-watch.mjs";
@@ -276,12 +276,12 @@ if (workspacePath) {
   console.log(`  checkout: ${wsRoot}`);
 
   /**
-   * Graft one checkout path (`wsRel`, checkout-relative) into the in-tree
-   * `tenants/<tenant>/` layout the app globs, with the same move-aside/restore +
-   * watch-and-resync machinery every mapping gets. Returns true if grafted.
+   * Graft one checkout path (`wsRel`, checkout-relative) to `repoRel` in the
+   * in-tree `tenants/<tenant>/` layout the app globs, with the same
+   * move-aside/restore + watch-and-resync machinery every mapping gets. Returns
+   * true if grafted.
    */
-  function graftOne(wsRel, isDir) {
-    const repoRel = join(tenantDirRelative(tenant), wsRel);
+  function graftOne(wsRel, repoRel, isDir) {
 
     const source = resolve(wsRoot, wsRel); // real files in the checkout
     const target = resolve(repoRoot, repoRel); // where the app globs them
@@ -320,19 +320,19 @@ if (workspacePath) {
     return true;
   }
 
-  // `workspace` is the checkout-relative prefix (e.g. "content/", "theme.json").
-  // COLOCATION: a tenant IS the repo-root dir `tenants/<id>/`, and the checkout
-  // (a `git subtree split --prefix=tenants/<id>` of that dir) has the SAME layout
-  // at its root — so the graft is an identity map: content/ -> tenants/<id>/content/,
-  // public/ -> tenants/<id>/public/, theme.json -> tenants/<id>/theme.json. We map
-  // structurally (ignoring any legacy `repo` field in the checkout's .tot/config.json).
-  // standaloneGraftPlan ALSO appends `.tot/config.json` unconditionally — see its
-  // own doc comment. Its success does NOT count toward "did we graft a usable
-  // site" below: a checkout with config but no content/public/theme is still
-  // nothing to serve.
+  // Each mapping's checkout files land where its `repo` says, under THIS tenant's
+  // directory (see scripts/dev/standalone-graft-plan.mjs) — resolved exactly as
+  // the hosted reconcile resolves them. standaloneGraftPlan ALSO appends
+  // `.tot/config.json` unconditionally — see its own doc comment. Its success does
+  // NOT count toward "did we graft a usable site" below: a checkout with config but
+  // no content/public/theme is still nothing to serve.
   let mappedCount = 0;
-  for (const { workspace, isDir } of standaloneGraftPlan(mappings)) {
-    const grafted = graftOne(workspace, isDir);
+  for (const { workspace, target, isDir } of standaloneGraftPlan(tenant, mappings)) {
+    if (!target) {
+      console.warn(`  ⚠ mapping for "${workspace}" has no valid "repo" under tenants/<id>/ — skipping (run tot validate)`);
+      continue;
+    }
+    const grafted = graftOne(workspace, target, isDir);
     if (workspace === ".tot/config.json") {
       if (!grafted) console.warn(`  ⚠ checkout has no .tot/config.json — compliance/capabilities/siteType resolve undeclared.`);
       continue;