@mnci/cli 1.11.2 → 1.12.1

package/README.md

@@ -146,9 +146,17 @@ same options `new` would have and calls the exact same `applyOverlay` `new`
 itself calls — the one function that does every bit of `mnci`-owned file
 writing (`nx.json`'s `release`/`sync`/`generators`/`mnci` blocks, `.npmrc`,
 `eslint.config.mjs`, `.prettierrc.json`, `commitlint.config.mjs`,
-`.husky/commit-msg`, the CI pipeline file(s), and the curated root
-`package.json` scripts). Nothing else in the workspace — app/lib source,
-`project.json` targets from `mnci add` — is ever touched.
+`.husky/commit-msg`, the CI pipeline file(s), the
+`<workspace-name>.code-workspace` file, and the curated root `package.json`
+scripts). Nothing else in the workspace — app/lib source, `project.json` targets
+from `mnci add` — is ever touched, and it finishes by running Prettier over the
+result, the same way `new` and every `add` do.
+
+The `.code-workspace` file is the one partial case, and deliberately so: its
+folders, settings and extensions are regenerated, but the **`tasks` array is read
+back and carried through unchanged**. Those tasks are per-project state written by
+`mnci add`, not overlay-owned, so regenerating them wholesale would wipe every
+project's build/qa/start entry on upgrade.
 
 `upgrade` also **deletes** things, which is stronger than the overwriting it
 has always done — one more reason to run `git diff` first, as the command's own

package/dist/cli.js

@@ -150,6 +150,13 @@ var import_node_path = require("path");
 function readJson(path) {
   return JSON.parse((0, import_node_fs.readFileSync)(path, "utf8"));
 }
+function readCodeWorkspace(path) {
+  try {
+    return JSON.parse((0, import_node_fs.readFileSync)(path, "utf8").replaceAll(/,(\s*[}\]])/g, "$1"));
+  } catch {
+    return void 0;
+  }
+}
 function toJson(value) {
   return `${JSON.stringify(value, void 0, 2)}
 `;
@@ -167,9 +174,9 @@ function fileExists(path) {
 
 // src/util/names.ts
 function assertValidProjectName(name, label) {
-  if (!/^[a-z][a-z0-9-]*$/.test(name)) {
+  if (!/^[a-z][a-z0-9-]*(?:\.[a-z0-9-]+)*$/.test(name)) {
     throw new Error(
-      `${label} '${name}' is invalid \u2014 use lowercase letters, digits and hyphens, starting with a letter (e.g. 'my-project').`
+      `${label} '${name}' is invalid \u2014 use lowercase letters, digits, hyphens and dots, starting with a letter, with no leading, trailing or repeated dot (e.g. 'my-project', 'my.service').`
     );
   }
 }
@@ -234,10 +241,6 @@ function findCodeWorkspaceFile(workspaceRoot) {
     return void 0;
   }
 }
-function readCodeWorkspaceFile(path) {
-  const contents = (0, import_node_fs2.readFileSync)(path, "utf8").replaceAll(/,(\s*[}\]])/g, "$1");
-  return JSON.parse(contents);
-}
 function projectTask(name, kind) {
   const script = `${name}:${kind}`;
   const base = { label: `${name}: ${kind}`, type: "npm", script, problemMatcher: [] };
@@ -264,7 +267,7 @@ function registerProjectCommands(workspaceRoot, name, commands) {
   if (!codeWorkspacePath) {
     return;
   }
-  const workspaceFile = readCodeWorkspaceFile(codeWorkspacePath);
+  const workspaceFile = readCodeWorkspace(codeWorkspacePath) ?? {};
   const label = (task) => task.label ?? "";
   const existingTasks = (workspaceFile.tasks?.tasks ?? []).filter(
     (task) => !label(task).startsWith(`${name}: `)
@@ -1269,8 +1272,14 @@ out
 tmp
 package-lock.json
 *.lock
+.venv
+venv
+__pycache__
+.pytest_cache
+.ruff_cache
+.dart_tool
 `;
-function vscodeWorkspace(workspaceName) {
+function vscodeWorkspace(workspaceName, existingTasks) {
   return JSON.stringify(
     {
       folders: [{ path: ".", name: workspaceName }],
@@ -1308,7 +1317,10 @@ function vscodeWorkspace(workspaceName) {
           "firsttris.vscode-jest-runner"
         ]
       },
-      tasks: { version: "2.0.0", tasks: [] }
+      tasks: {
+        version: existingTasks?.version ?? "2.0.0",
+        tasks: existingTasks?.tasks ?? []
+      }
     },
     null,
     2
@@ -1350,6 +1362,12 @@ function generatorDefaults(stack) {
 }
 function mnciConfig(options) {
   return {
+    // Persisted so `mnci upgrade` can name the `<name>.code-workspace` file it
+    // rewrites. Its absence is why upgrade used to write a file literally called
+    // `undefined.code-workspace` and therefore never refreshed the real one —
+    // see `resolveWorkspaceName` in `commands/upgrade.ts`, which still needs a
+    // fallback chain for workspaces generated before this field existed.
+    workspaceName: options.workspaceName,
     scope: options.scope,
     registry: options.registry,
     agent: options.agent,
@@ -1850,10 +1868,12 @@ function applyOverlay(workspaceRoot, options) {
   writeFileEnsured((0, import_node_path10.join)(workspaceRoot, ".prettierrc.json"), PRETTIER_CONFIG);
   writeFileEnsured((0, import_node_path10.join)(workspaceRoot, ".prettierignore"), PRETTIER_IGNORE);
   removeNxScaffolding(workspaceRoot);
-  writeFileEnsured(
-    (0, import_node_path10.join)(workspaceRoot, `${options.workspaceName}.code-workspace`),
-    vscodeWorkspace(options.workspaceName)
-  );
+  const codeWorkspacePath = (0, import_node_path10.join)(workspaceRoot, `${options.workspaceName}.code-workspace`);
+  const existing = readCodeWorkspace(codeWorkspacePath);
+  writeFileEnsured(codeWorkspacePath, vscodeWorkspace(options.workspaceName, existing?.tasks));
+  if (options.workspaceName !== "undefined") {
+    (0, import_node_fs6.rmSync)((0, import_node_path10.join)(workspaceRoot, "undefined.code-workspace"), { force: true });
+  }
   const publishUrl = pythonPublishUrl(options.registry);
   if (options.ci === "azure" || options.ci === "both") {
     writeFileEnsured(
@@ -1970,6 +1990,7 @@ async function runNew(name, options) {
 }
 
 // src/commands/upgrade.ts
+var import_node_fs7 = require("fs");
 var import_node_path12 = require("path");
 function resolveRegistry2(options, persisted) {
   if (options.registry === "azure-artifacts" || options.organization && options.artifactsFeed) {
@@ -1994,7 +2015,22 @@ function resolveRegistry2(options, persisted) {
     "No registry found in nx.json's persisted config. Pass --registry npm or --registry azure-artifacts (with --organization/--project/--artifacts-feed)."
   );
 }
-function resolveOverlayOptions(options, persisted) {
+function resolveWorkspaceName(workspaceRoot, persisted) {
+  if (persisted.workspaceName) {
+    return persisted.workspaceName;
+  }
+  try {
+    const existing = (0, import_node_fs7.readdirSync)(workspaceRoot).find(
+      (file) => file.endsWith(".code-workspace") && file !== "undefined.code-workspace"
+    );
+    if (existing) {
+      return existing.replace(/\.code-workspace$/, "");
+    }
+  } catch {
+  }
+  return (0, import_node_path12.basename)(workspaceRoot);
+}
+function resolveOverlayOptions(workspaceRoot, options, persisted) {
   const scope = options.scope ?? persisted.scope;
   if (!scope) {
     throw new Error("No npm scope found in nx.json's persisted config. Pass --scope explicitly.");
@@ -2019,7 +2055,15 @@ function resolveOverlayOptions(options, persisted) {
       "No testRunner found in nx.json's persisted config. Pass --test-runner explicitly."
     );
   }
-  return { scope, registry, agent, variableGroup, ci, stack: { testRunner } };
+  return {
+    workspaceName: resolveWorkspaceName(workspaceRoot, persisted),
+    scope,
+    registry,
+    agent,
+    variableGroup,
+    ci,
+    stack: { testRunner }
+  };
 }
 function runUpgrade(workspaceRoot, options) {
   if (!fileExists((0, import_node_path12.join)(workspaceRoot, "nx.json"))) {
@@ -2028,11 +2072,12 @@ function runUpgrade(workspaceRoot, options) {
     );
   }
   const persisted = readMnciConfig(workspaceRoot);
-  const resolved = resolveOverlayOptions(options, persisted);
+  const resolved = resolveOverlayOptions(workspaceRoot, options, persisted);
   logger.step(
     "Re-applying the MoNecromanCI overlay (release config, .npmrc, commitlint, pipeline, stack)"
   );
   applyOverlay(workspaceRoot, resolved);
+  runPrettier(workspaceRoot);
   logger.success("Done. Review the changes with `git diff` before committing.");
 }
 
@@ -2059,7 +2104,7 @@ async function runInteractive() {
 }
 
 // src/util/versionChecker.ts
-var import_node_fs7 = require("fs");
+var import_node_fs8 = require("fs");
 var import_node_path14 = require("path");
 var import_cross_spawn2 = __toESM(require("cross-spawn"));
 var PACKAGE_NAME = "@mnci/cli";
@@ -2117,7 +2162,7 @@ function releaseTriple(version) {
 function readCliVersion(packageDirectory) {
   try {
     const manifestPath = (0, import_node_path14.join)(packageDirectory, "..", "package.json");
-    const manifest = JSON.parse((0, import_node_fs7.readFileSync)(manifestPath, "utf8"));
+    const manifest = JSON.parse((0, import_node_fs8.readFileSync)(manifestPath, "utf8"));
     return manifest.version ?? "0.0.0";
   } catch {
     return "0.0.0";