@topogram/cli 0.3.71 → 0.3.73

package/src/workspace-paths.js

@@ -4,10 +4,10 @@ import fs from "node:fs";
 import path from "node:path";
 
 export const DEFAULT_TOPO_FOLDER_NAME = "topo";
-export const LEGACY_TOPOGRAM_FOLDER_NAME = "topogram";
 export const DEFAULT_WORKSPACE_PATH = `./${DEFAULT_TOPO_FOLDER_NAME}`;
 export const PROJECT_CONFIG_FILE = "topogram.project.json";
 
+const LEGACY_WORKSPACE_FOLDER_NAME = "topogram";
 const SIGNAL_SCAN_IGNORED_DIRS = new Set([
   ".git",
   ".next",
@@ -19,6 +19,7 @@ const SIGNAL_SCAN_IGNORED_DIRS = new Set([
   "coverage",
   "dist",
   "expected",
+  LEGACY_WORKSPACE_FOLDER_NAME,
   "node_modules",
   "tmp"
 ]);
@@ -56,6 +57,11 @@ const WORKSPACE_SIGNAL_DIRS = new Set([
  * @property {boolean} bootstrappedTopoRoot
  */
 
+/**
+ * @typedef {Object} WorkspaceResolutionOptions
+ * @property {boolean} [ignoreAncestorConfig]
+ */
+
 /**
  * @param {string} candidatePath
  * @returns {boolean}
@@ -128,6 +134,9 @@ export function normalizeWorkspaceConfigPath(workspacePath) {
   if (resolved === ".." || resolved.startsWith("../")) {
     throw new Error("topogram.project.json workspace must not escape the project root.");
   }
+  if (resolved === LEGACY_WORKSPACE_FOLDER_NAME || resolved.startsWith(`${LEGACY_WORKSPACE_FOLDER_NAME}/`)) {
+    throw new Error("topogram.project.json workspace must use ./topo or another non-legacy relative path.");
+  }
   return normalized;
 }
 
@@ -221,10 +230,14 @@ function signalWorkspaceCandidates(root) {
 
 /**
  * @param {string} inputPath
+ * @param {WorkspaceResolutionOptions} [options]
  * @returns {WorkspaceResolution}
  */
-export function resolveWorkspaceContext(inputPath = ".") {
+export function resolveWorkspaceContext(inputPath = ".", options = {}) {
   const absolute = path.resolve(inputPath || ".");
+  if (isDirectory(absolute) && path.basename(absolute) === LEGACY_WORKSPACE_FOLDER_NAME && isWorkspaceSignalRoot(absolute)) {
+    throw new Error("Legacy workspace folders are not supported. Use topo/ or configure topogram.project.json workspace to a non-legacy relative path.");
+  }
   if (
     isDirectory(absolute) &&
     (
@@ -243,7 +256,25 @@ export function resolveWorkspaceContext(inputPath = ".") {
     };
   }
 
-  const configInfo = findProjectRoot(absolute);
+  const directDefaultCandidate = path.join(absolute, DEFAULT_TOPO_FOLDER_NAME);
+  if (
+    isDirectory(absolute) &&
+    !fs.existsSync(path.join(absolute, PROJECT_CONFIG_FILE)) &&
+    isDirectory(directDefaultCandidate) &&
+    isWorkspaceSignalRoot(directDefaultCandidate)
+  ) {
+    return {
+      inputRoot: absolute,
+      topoRoot: directDefaultCandidate,
+      projectRoot: absolute,
+      configPath: null,
+      fromConfig: false,
+      fromSignal: false,
+      bootstrappedTopoRoot: false
+    };
+  }
+
+  const configInfo = options.ignoreAncestorConfig ? null : findProjectRoot(absolute);
   if (configInfo) {
     const topoRoot = resolveProjectWorkspace(configInfo.config, configInfo.configDir);
     return {

package/src/cli/commands/migrate.js

@@ -1,153 +0,0 @@
-// @ts-check
-
-import fs from "node:fs";
-import path from "node:path";
-
-import { stableStringify } from "../../format.js";
-import {
-  DEFAULT_TOPO_FOLDER_NAME,
-  DEFAULT_WORKSPACE_PATH,
-  LEGACY_TOPOGRAM_FOLDER_NAME,
-  PROJECT_CONFIG_FILE
-} from "../../workspace-paths.js";
-
-/**
- * @param {string|null|undefined} inputPath
- * @returns {string}
- */
-function projectRootForMigration(inputPath) {
-  const absolute = path.resolve(inputPath || ".");
-  const base = path.basename(absolute);
-  if (base === DEFAULT_TOPO_FOLDER_NAME || base === LEGACY_TOPOGRAM_FOLDER_NAME) {
-    return path.dirname(absolute);
-  }
-  return absolute;
-}
-
-/**
- * @param {string} projectRoot
- * @returns {string[]}
- */
-function caseCollisionEntries(projectRoot) {
-  if (!fs.existsSync(projectRoot) || !fs.statSync(projectRoot).isDirectory()) {
-    return [];
-  }
-  return fs.readdirSync(projectRoot)
-    .filter((/** @type {string} */ entry) => entry.toLowerCase() === DEFAULT_TOPO_FOLDER_NAME && entry !== DEFAULT_TOPO_FOLDER_NAME);
-}
-
-/**
- * @param {string} projectRoot
- * @returns {{ write: boolean, path: string|null, before: any|null, after: any|null }}
- */
-function plannedProjectConfigUpdate(projectRoot) {
-  const configPath = path.join(projectRoot, PROJECT_CONFIG_FILE);
-  if (!fs.existsSync(configPath)) {
-    return { write: false, path: null, before: null, after: null };
-  }
-  const before = JSON.parse(fs.readFileSync(configPath, "utf8"));
-  const after = { ...before };
-  const currentWorkspace = before.workspace;
-  if (currentWorkspace == null || currentWorkspace === "./topogram" || currentWorkspace === "topogram") {
-    after.workspace = DEFAULT_WORKSPACE_PATH;
-  }
-  return {
-    write: JSON.stringify(before) !== JSON.stringify(after),
-    path: configPath,
-    before,
-    after
-  };
-}
-
-/**
- * @param {string|null|undefined} inputPath
- * @param {{ write?: boolean, json?: boolean }} [options]
- * @returns {number}
- */
-export function runMigrateCommand(inputPath, options = {}) {
-  const projectRoot = projectRootForMigration(inputPath);
-  const legacyPath = path.join(projectRoot, LEGACY_TOPOGRAM_FOLDER_NAME);
-  const topoPath = path.join(projectRoot, DEFAULT_TOPO_FOLDER_NAME);
-  const write = Boolean(options.write);
-  /** @type {Array<Record<string, any>>} */
-  const diagnostics = [];
-  /** @type {Array<Record<string, any>>} */
-  const actions = [];
-
-  if (fs.existsSync(legacyPath) && fs.lstatSync(legacyPath).isSymbolicLink()) {
-    diagnostics.push({ severity: "error", message: `Refusing to migrate symlinked ${LEGACY_TOPOGRAM_FOLDER_NAME}/ at ${legacyPath}.` });
-  }
-  const collisions = caseCollisionEntries(projectRoot);
-  if (collisions.length > 0) {
-    diagnostics.push({ severity: "error", message: `Refusing to migrate because case-conflicting topo path(s) exist: ${collisions.join(", ")}.` });
-  }
-  if (fs.existsSync(legacyPath) && fs.existsSync(topoPath)) {
-    diagnostics.push({ severity: "error", message: `Refusing to migrate because both ${LEGACY_TOPOGRAM_FOLDER_NAME}/ and ${DEFAULT_TOPO_FOLDER_NAME}/ exist.` });
-  }
-  if (!fs.existsSync(legacyPath) && !fs.existsSync(topoPath)) {
-    diagnostics.push({ severity: "error", message: `No ${LEGACY_TOPOGRAM_FOLDER_NAME}/ or ${DEFAULT_TOPO_FOLDER_NAME}/ workspace folder found at ${projectRoot}.` });
-  }
-  if (fs.existsSync(topoPath) && fs.statSync(topoPath).isDirectory() && fs.readdirSync(topoPath).length > 0 && fs.existsSync(legacyPath)) {
-    diagnostics.push({ severity: "error", message: `Refusing to overwrite non-empty ${DEFAULT_TOPO_FOLDER_NAME}/ at ${topoPath}.` });
-  }
-
-  if (fs.existsSync(legacyPath) && diagnostics.length === 0) {
-    actions.push({
-      kind: "rename",
-      from: legacyPath,
-      to: topoPath
-    });
-  }
-  const configUpdate = plannedProjectConfigUpdate(projectRoot);
-  if (configUpdate.write) {
-    actions.push({
-      kind: "update_config",
-      path: configUpdate.path,
-      workspace: DEFAULT_WORKSPACE_PATH
-    });
-  }
-
-  const ok = diagnostics.filter((diagnostic) => diagnostic.severity === "error").length === 0;
-  if (ok && write) {
-    for (const action of actions) {
-      if (action.kind === "rename") {
-        fs.renameSync(action.from, action.to);
-      }
-      if (action.kind === "update_config" && configUpdate.path && configUpdate.after) {
-        fs.writeFileSync(configUpdate.path, `${JSON.stringify(configUpdate.after, null, 2)}\n`, "utf8");
-      }
-    }
-  }
-
-  const payload = {
-    ok,
-    dryRun: !write,
-    projectRoot,
-    legacyPath,
-    topoPath,
-    actions,
-    diagnostics,
-    errors: diagnostics.filter((diagnostic) => diagnostic.severity === "error").map((diagnostic) => diagnostic.message)
-  };
-  if (options.json) {
-    console.log(stableStringify(payload));
-  } else if (payload.ok) {
-    console.log(write ? "Workspace folder migration complete." : "Workspace folder migration dry run.");
-    if (actions.length === 0) {
-      console.log("No changes needed.");
-    }
-    for (const action of actions) {
-      if (action.kind === "rename") {
-        console.log(`Rename: ${action.from} -> ${action.to}`);
-      }
-      if (action.kind === "update_config") {
-        console.log(`Update ${action.path}: workspace ${DEFAULT_WORKSPACE_PATH}`);
-      }
-    }
-  } else {
-    for (const error of payload.errors) {
-      console.error(error);
-    }
-  }
-  return payload.ok ? 0 : 1;
-}