@mnci/cli 4.2.2 → 4.2.3

package/README.md

@@ -135,6 +135,32 @@ chain breaks, and the map comes out valid-looking and **empty** — `sources: []
 Measured on a real package: swc gave 0 sources, babel gave 9. Revert the swap
 once Nx passes `sourceMaps` through; ROADMAP 7d has the one-line upstream fix.
 
+Re-measured against the exact toolchain `mnci new` pins today (Nx 23.2.0,
+`@swc/core` 1.15.8): `@nx/rollup`'s swc plugin still does **not** pass
+`sourceMaps` to `transform()` — read straight from the installed package, not
+assumed — yet a real build with `compiler: 'swc'` left unmodified now emits a
+map with real `sources`/`sourcesContent`, and tracing a generated position
+through it with `@jridgewell/trace-mapping` resolves to the correct original
+line and column. So the empty-map failure this section exists to route around
+did not reproduce on the current pinned versions, even though the documented
+root cause (the plugin's own missing `sourceMaps` option) is still there
+verbatim. That is not the revert condition stated above — nothing upstream
+changed the call this section is about — so the swap stays in place as a
+safety net rather than being removed on an unexplained, unpinned-by-upstream
+behavior change that a future `@swc/core` patch could revert without notice.
+**A real, separate bug in the swap itself was found and fixed**, independent
+of the above: it matched `compiler: 'swc'` with a plain string, one space
+after the colon. `@stylistic/key-spacing` (aligned on value) — which
+`eslint --fix` applies to every mnci-generated file — pads that column out to
+whatever the object's longest key is, so on any config reached after even one
+lint pass (most concretely: `mnci upgrade` repairing a project whose `add`
+partially failed) the literal silently stopped matching and the swap
+silently no-op'd, while `sourceMap: true` and `sourcemapPathTransform` — added
+by separate, whitespace-tolerant repairs — went in regardless. `mnci doctor`'s
+check did not catch it either, since it only verifies the flag, not the
+compiler. Confirmed end to end and fixed with the same whitespace-tolerant
+approach `sourceMap: true`'s own guard already used.
+
 **The paths are wrong twice over.** rollup hands `sourcemapPathTransform` a
 path like `..\..\src\index.ts` for a map in `dist/` — one parent segment too
 many, so it resolves above the project to a file that does not exist, and

package/dist/cli.js

@@ -1392,6 +1392,24 @@ function removeNxScaffolding(workspaceRoot) {
 function removeIfPresent(path) {
   (0, import_node_fs2.rmSync)(path, { recursive: true, force: true });
 }
+function ensureEslintCacheIgnored(workspaceRoot) {
+  const gitignorePath = (0, import_node_path2.join)(workspaceRoot, ".gitignore");
+  if (!fileExists(gitignorePath)) {
+    return;
+  }
+  const current = (0, import_node_fs2.readFileSync)(gitignorePath, "utf8");
+  if (current.split("\n").some((line) => line.trim() === ".eslintcache")) {
+    return;
+  }
+  const withoutTrailingBlankLines = current.replace(/\n+$/, "");
+  const separator = withoutTrailingBlankLines.length > 0 ? "\n\n" : "";
+  writeFileEnsured(
+    gitignorePath,
+    `${withoutTrailingBlankLines}${separator}# Added by MoNecromanCI: \`npm run format\`/\`lint\` run \`eslint --cache\`.
+.eslintcache
+`
+  );
+}
 function removeProjectEslintConfigs(workspaceRoot) {
   const matches = (0, import_node_fs2.globSync)("{apps,libs,packages}/*/eslint.config.{js,mjs,cjs,ts,mts,cts}", {
     cwd: workspaceRoot
@@ -1468,6 +1486,7 @@ function applyOverlay(workspaceRoot, options, onProgress = () => {
   markExecutable(hookPath);
   onProgress("eslint.config.mjs \u2014 the shared lint AND formatting opinion");
   writeFileEnsured((0, import_node_path2.join)(workspaceRoot, "eslint.config.mjs"), ESLINT_CONFIG);
+  ensureEslintCacheIgnored(workspaceRoot);
   for (const retired of RETIRED_FORMATTER_FILES) {
     removeIfPresent((0, import_node_path2.join)(workspaceRoot, retired));
   }
@@ -1528,6 +1547,23 @@ function ensurePlugin(workspaceRoot, packageName) {
   logger.step(`Installing Nx plugin ${packageName}`);
   runNx(["add", packageName], workspaceRoot);
 }
+function runGeneratorAndRepair(workspaceRoot, nxArguments, markerPath, repair) {
+  let installFailure;
+  try {
+    runNx(nxArguments, workspaceRoot);
+  } catch (error) {
+    installFailure = error instanceof Error ? error : new Error(String(error));
+  }
+  if (!fileExists(markerPath)) {
+    throw installFailure ?? new Error(`unreachable: runNx did not throw and ${markerPath} is missing`);
+  }
+  repair();
+  if (installFailure) {
+    throw new Error(
+      `The project was generated and mnci's own repairs were applied, but the underlying Nx generator's install step still failed (${installFailure.message}). Fix the install error above (commonly resolved by 'npm install' with a newer npm major), then verify with 'mnci doctor'.`
+    );
+  }
+}
 function markPrivate(manifestPath) {
   const manifest = readJson(manifestPath);
   writeFileEnsured(manifestPath, toJson({ ...manifest, private: true }));
@@ -1547,13 +1583,15 @@ var ROLLUP_CONFIG_PLACEHOLDER = [
   "    // output: { sourcemap: true },",
   "  }"
 ].join("\n");
-var GENERATED_COMPILER = "    compiler: 'swc',";
-var SOURCE_MAP_CAPABLE_COMPILER = [
-  "    // Swapped from swc by MoNecromanCI. @nx/rollup runs swc without",
-  "    // sourceMaps, so it returns no map and the bundle's map comes out empty -",
-  "    // valid-looking, and useless for debugging. See ROADMAP.",
-  "    compiler: 'babel',"
-].join("\n");
+var GENERATED_COMPILER_PATTERN = /^( {4})compiler\s*:\s*'swc',$/m;
+function sourceMapCapableCompiler(indent) {
+  return [
+    `${indent}// Swapped from swc by MoNecromanCI. @nx/rollup runs swc without`,
+    `${indent}// sourceMaps, so it returns no map and the bundle's map comes out empty -`,
+    `${indent}// valid-looking, and useless for debugging. See ROADMAP.`,
+    `${indent}compiler: 'babel',`
+  ].join("\n");
+}
 var ROLLUP_ARG_ONE_BOUNDARY = ["  },", "  {", ""].join("\n");
 var ROLLUP_ARG_ONE_WITH_SOURCE_MAPS = [
   "    // Added by MoNecromanCI: without this rollup emits no .js.map at all, so",
@@ -1573,7 +1611,10 @@ function withRollupSourceMaps(config) {
   if (hasRollupSourceMaps(config) || !canRepairRollupConfig(config)) {
     return config;
   }
-  const withCompiler = config.replace(GENERATED_COMPILER, () => SOURCE_MAP_CAPABLE_COMPILER);
+  const withCompiler = config.replace(
+    GENERATED_COMPILER_PATTERN,
+    (_match, indent) => sourceMapCapableCompiler(indent)
+  );
   const withFlag = withCompiler.replace(
     ROLLUP_ARG_ONE_BOUNDARY,
     () => ROLLUP_ARG_ONE_WITH_SOURCE_MAPS
@@ -1648,13 +1689,24 @@ var ROLLUP_CONFIG_WITH_DTS_FIX = [
   "    // mnci also points `types` past this stub, so nothing depends on it being",
   "    // correct; this makes the emitted file correct too. Remove once Nx fixes the",
   "    // plugin - its own devkit already exports normalizePath for exactly this.",
+  "    //",
+  "    // The second half fixes a separate defect in the REAL declarations `types`",
+  '    // points at: tsconfig.lib.json declares under moduleResolution "bundler",',
+  '    // where a bare relative specifier ("./lib/align") is valid, so every emitted',
+  "    // .d.ts keeps the source's own extensionless imports verbatim. A consumer on",
+  '    // "moduleResolution": "nodenext" - the workspace root default - requires an',
+  "    // explicit extension on every relative specifier and gets TS2834 (or,",
+  "    // combined with skipLibCheck, a silent zero-export module) instead. Declared",
+  "    // extensions are left untouched; only a bare relative specifier gets .js",
+  "    // appended, matching what tsc itself emits under node16/nodenext.",
   "    plugins: [",
   "      {",
   "        name: 'mnci-normalise-declaration-specifiers',",
   "        writeBundle (outputOptions) {",
-  "          const { readFileSync, writeFileSync } = require('node:fs')",
+  "          const { readdirSync, readFileSync, writeFileSync } = require('node:fs')",
   "          const { join } = require('node:path')",
-  "          const stub = join(outputOptions.dir ?? './dist', 'index.d.ts')",
+  "          const dir = outputOptions.dir ?? './dist'",
+  "          const stub = join(dir, 'index.d.ts')",
   "          let source",
   "          try {",
   "            source = readFileSync(stub, 'utf8')",
@@ -1668,6 +1720,31 @@ var ROLLUP_CONFIG_WITH_DTS_FIX = [
   "          const separator = String.fromCodePoint(92, 92)",
   "          const normalised = source.replaceAll(separator, '/')",
   "          if (normalised !== source) writeFileSync(stub, normalised)",
+  "",
+  String.raw`          const bareRelativeSpecifier = /from(\s+)(['"])(\.[^'"]+?)\2/g`,
+  String.raw`          const hasExtension = /\.(?:mjs|cjs|jsx?|json)$/`,
+  "          let entries",
+  "          try {",
+  "            entries = readdirSync(dir, { recursive: true, withFileTypes: true })",
+  "          } catch {",
+  "            return",
+  "          }",
+  "          for (const entry of entries) {",
+  "            if (!entry.name.endsWith('.d.ts')) continue",
+  "            const filePath = join(entry.parentPath ?? entry.path, entry.name)",
+  "            let declaration",
+  "            try {",
+  "              declaration = readFileSync(filePath, 'utf8')",
+  "            } catch {",
+  "              continue",
+  "            }",
+  "            const withExtensions = declaration.replace(",
+  "              bareRelativeSpecifier,",
+  "              (match, space, quote, specifier) =>",
+  "                hasExtension.test(specifier) ? match : `from${space}${quote}${specifier}.js${quote}`,",
+  "            )",
+  "            if (withExtensions !== declaration) writeFileSync(filePath, withExtensions)",
+  "          }",
   "        }",
   "      }",
   "    ]",
@@ -2538,7 +2615,10 @@ function addNodeFunctionApp(workspaceRoot, name, stack) {
 var import_node_path8 = require("path");
 async function addNpmLib(workspaceRoot, name, options, kindProvided, stack) {
   const scope = options.scope ?? (kindProvided ? defaultScope(workspaceRoot) : await promptText("npm scope for the published package", defaultScope(workspaceRoot)));
-  runNx(
+  const projectRoot = (0, import_node_path8.join)(workspaceRoot, "packages", name);
+  const manifestPath = (0, import_node_path8.join)(projectRoot, "package.json");
+  runGeneratorAndRepair(
+    workspaceRoot,
     [
       "g",
       "@nx/js:lib",
@@ -2550,15 +2630,16 @@ async function addNpmLib(workspaceRoot, name, options, kindProvided, stack) {
       "--linter=none",
       "--no-interactive"
     ],
-    workspaceRoot
+    manifestPath,
+    () => {
+      markPublic(manifestPath);
+      repairPublishableManifest(manifestPath);
+      repairDeclarationSpecifiers(projectRoot);
+      writeProjectReadme(projectRoot, `${scope}/${name}`, stack.testRunner);
+      removeGeneratedEslintConfig(workspaceRoot, `packages/${name}`);
+      registerProjectCommands(workspaceRoot, name, { build: true });
+    }
   );
-  const manifestPath = (0, import_node_path8.join)(workspaceRoot, "packages", name, "package.json");
-  markPublic(manifestPath);
-  repairPublishableManifest(manifestPath);
-  repairDeclarationSpecifiers((0, import_node_path8.join)(workspaceRoot, `packages/${name}`));
-  writeProjectReadme((0, import_node_path8.join)(workspaceRoot, `packages/${name}`), `${scope}/${name}`, stack.testRunner);
-  removeGeneratedEslintConfig(workspaceRoot, `packages/${name}`);
-  registerProjectCommands(workspaceRoot, name, { build: true });
 }
 
 // src/commands/add/python.ts
@@ -2862,7 +2943,10 @@ var REACT_LIB_BUNDLER = "rollup";
 async function addReactLib(workspaceRoot, name, options, kindProvided, stack) {
   ensurePlugin(workspaceRoot, "@nx/react");
   const scope = options.scope ?? (kindProvided ? defaultScope(workspaceRoot) : await promptText("npm scope for the published package", defaultScope(workspaceRoot)));
-  runNx(
+  const projectRoot = (0, import_node_path11.join)(workspaceRoot, "packages", name);
+  const publishableManifest = (0, import_node_path11.join)(projectRoot, "package.json");
+  runGeneratorAndRepair(
+    workspaceRoot,
     [
       "g",
       "@nx/react:library",
@@ -2875,19 +2959,23 @@ async function addReactLib(workspaceRoot, name, options, kindProvided, stack) {
       "--linter=none",
       "--no-interactive"
     ],
-    workspaceRoot
+    publishableManifest,
+    () => {
+      markPublic(publishableManifest);
+      repairPublishableManifest(publishableManifest);
+      repairDeclarationSpecifiers(projectRoot);
+      writeProjectReadme(projectRoot, `${scope}/${name}`, stack.testRunner);
+      removeGeneratedEslintConfig(workspaceRoot, `packages/${name}`);
+      registerProjectCommands(workspaceRoot, name, { build: true });
+    }
   );
-  const publishableManifest = (0, import_node_path11.join)(workspaceRoot, "packages", name, "package.json");
-  markPublic(publishableManifest);
-  repairPublishableManifest(publishableManifest);
-  repairDeclarationSpecifiers((0, import_node_path11.join)(workspaceRoot, "packages", name));
-  writeProjectReadme((0, import_node_path11.join)(workspaceRoot, "packages", name), `${scope}/${name}`, stack.testRunner);
-  removeGeneratedEslintConfig(workspaceRoot, `packages/${name}`);
-  registerProjectCommands(workspaceRoot, name, { build: true });
 }
 function addReactInternalLib(workspaceRoot, name, stack) {
   ensurePlugin(workspaceRoot, "@nx/react");
-  runNx(
+  const projectRoot = (0, import_node_path11.join)(workspaceRoot, "libs", name);
+  const privateManifest = (0, import_node_path11.join)(projectRoot, "package.json");
+  runGeneratorAndRepair(
+    workspaceRoot,
     [
       "g",
       "@nx/react:library",
@@ -2898,15 +2986,16 @@ function addReactInternalLib(workspaceRoot, name, stack) {
       "--linter=none",
       "--no-interactive"
     ],
-    workspaceRoot
+    privateManifest,
+    () => {
+      markPrivate(privateManifest);
+      repairPublishableManifest(privateManifest);
+      repairDeclarationSpecifiers(projectRoot);
+      writeProjectReadme(projectRoot, name, stack.testRunner);
+      removeGeneratedEslintConfig(workspaceRoot, `libs/${name}`);
+      registerProjectCommands(workspaceRoot, name, { build: true });
+    }
   );
-  const privateManifest = (0, import_node_path11.join)(workspaceRoot, "libs", name, "package.json");
-  markPrivate(privateManifest);
-  repairPublishableManifest(privateManifest);
-  repairDeclarationSpecifiers((0, import_node_path11.join)(workspaceRoot, "libs", name));
-  writeProjectReadme((0, import_node_path11.join)(workspaceRoot, "libs", name), name, stack.testRunner);
-  removeGeneratedEslintConfig(workspaceRoot, `libs/${name}`);
-  registerProjectCommands(workspaceRoot, name, { build: true });
 }
 
 // src/commands/sync.ts