@mnci/cli 4.1.2 → 4.1.4

package/dist/cli.js

@@ -206,9 +206,63 @@ var import_node_path = require("path");
 function readJson(path) {
   return JSON.parse((0, import_node_fs.readFileSync)(path, "utf8"));
 }
+function stripJsonComments(text) {
+  let result = "";
+  let inString = false;
+  let inLineComment = false;
+  let inBlockComment = false;
+  for (let i = 0; i < text.length; i++) {
+    const char = text[i];
+    if (inLineComment) {
+      if (char === "\n") {
+        inLineComment = false;
+        result += char;
+      }
+      continue;
+    }
+    const next = text[i + 1];
+    if (inBlockComment) {
+      if (char === "*" && next === "/") {
+        inBlockComment = false;
+        i++;
+      }
+      continue;
+    }
+    if (inString) {
+      result += char;
+      if (char === "\\") {
+        result += next;
+        i++;
+        continue;
+      }
+      if (char === '"') {
+        inString = false;
+      }
+      continue;
+    }
+    if (char === '"') {
+      inString = true;
+      result += char;
+      continue;
+    }
+    if (char === "/" && next === "/") {
+      inLineComment = true;
+      i++;
+      continue;
+    }
+    if (char === "/" && next === "*") {
+      inBlockComment = true;
+      i++;
+      continue;
+    }
+    result += char;
+  }
+  return result;
+}
 function readCodeWorkspace(path) {
   try {
-    return JSON.parse((0, import_node_fs.readFileSync)(path, "utf8").replaceAll(/,(\s*[}\]])/g, "$1"));
+    const withoutComments = stripJsonComments((0, import_node_fs.readFileSync)(path, "utf8"));
+    return JSON.parse(withoutComments.replaceAll(/,(\s*[}\]])/g, "$1"));
   } catch {
     return void 0;
   }
@@ -745,7 +799,7 @@ var FLUTTER_PUB_GET_GUARD = `node -e "const fs=require('node:fs');if(!fs.existsS
 var NPM_AUDIT_STEP = `node -e "const cp=require('node:child_process');const r=cp.spawnSync('npm',['audit','--json'],{encoding:'utf8',shell:process.platform==='win32',maxBuffer:33554432});let d;try{d=JSON.parse(r.stdout)}catch{console.log('npm audit produced no JSON (exit '+r.status+') - not blocking on a broken audit.');process.exit(0)}const all=Object.values(d.vulnerabilities||{});const BLOCK=['critical','high','moderate'];const act=all.filter(v=>v.fixAvailable&&BLOCK.includes(v.severity));const rest=all.filter(v=>!act.includes(v));for(const v of rest)console.log('  note ['+v.severity+'] '+v.name+(v.fixAvailable?' - fix available, below the blocking threshold':' - NO fix available upstream, nothing to do here'));if(act.length===0){console.log('npm audit - '+all.length+' advisory(ies), none actionable at moderate or above.');process.exit(0)}for(const v of act)console.log('  BLOCKING ['+v.severity+'] '+v.name+' - fix available'+(v.fixAvailable&&v.fixAvailable.isSemVerMajor?' (semver-major)':''));console.log('Each has a published fix. Add a targeted overrides entry in package.json rather than npm audit fix --force.');process.exit(1)"`;
 var VERIFY_TARGETS = "lint,typecheck,test,build";
 var AFFECTED_OR_ALL_GUARD = `node -e "const cp=require('node:child_process');const T='${VERIFY_TARGETS}';const all=()=>process.exit(cp.spawnSync('npx nx run-many -t '+T,{stdio:'inherit',shell:true}).status ?? 1);const ref=process.env.GITHUB_BASE_REF||process.env.SYSTEM_PULLREQUEST_TARGETBRANCH||'';if(!ref){console.log('Not a pull request - verifying EVERY project.');all()}const target=ref.replace('refs/heads/','');const mergeBase=r=>{const o=cp.spawnSync('git',['merge-base',r,'HEAD'],{encoding:'utf8'});return o.status===0?o.stdout.trim():''};let base=mergeBase('origin/'+target);if(!base){console.log('No origin/'+target+' ref - fetching it to resolve a merge-base.');cp.spawnSync('git',['fetch','--no-tags','origin',target],{stdio:'inherit'});base=mergeBase('FETCH_HEAD')}if(!base){console.log('Could not resolve a merge-base with '+target+' - verifying EVERY project.');all()}console.log('Pull request against '+target+' - verifying projects affected since '+base);process.exit(cp.spawnSync('npx nx affected -t '+T+' --base='+base,{stdio:'inherit',shell:true}).status ?? 1)"`;
-var PACK_APPS_GUARD = `node -e "const fs=require('node:fs');fs.mkdirSync('dist/drop',{recursive:true});if(fs.globSync('apps/*/project.json').length===0){console.log('No apps to pack - skipping.');process.exit(0)}process.exit(require('node:child_process').spawnSync('npx nx run-many -t package',{stdio:'inherit',shell:true}).status ?? 1)"`;
+var PACK_APPS_GUARD = `node -e "const fs=require('node:fs');fs.mkdirSync('dist/drop',{recursive:true});const hasProjectJson=fs.globSync('apps/*/project.json').length>0;const hasInlineNx=fs.globSync('apps/*/package.json').some((f)=>{try{return Boolean(JSON.parse(fs.readFileSync(f,'utf8')).nx)}catch{return false}});if(!hasProjectJson&&!hasInlineNx){console.log('No apps to pack - skipping.');process.exit(0)}process.exit(require('node:child_process').spawnSync('npx nx run-many -t package',{stdio:'inherit',shell:true}).status ?? 1)"`;
 function releaseGuard(pythonPublishEnv) {
   return `node -e "const fs=require('node:fs'),cp=require('node:child_process');const hasNpm=fs.globSync('packages/*/package.json').length>0;const hasPython=fs.globSync('python-packages/*/pyproject.toml').length>0;if(!hasNpm&&!hasPython){console.log('Nothing to release - skipping.');process.exit(0)}const env={...process.env};${pythonPublishEnv}process.exit(cp.spawnSync('npx nx release --yes',{stdio:'inherit',shell:true,env}).status ?? 1)"`;
 }
@@ -1419,10 +1473,13 @@ var ROLLUP_ARG_ONE_WITH_SOURCE_MAPS = [
   ""
 ].join("\n");
 function hasRollupSourceMaps(config) {
-  return config.includes("sourceMap: true");
+  return /sourceMap\s*:\s*true\b/.test(config);
+}
+function canRepairRollupConfig(config) {
+  return config.includes(ROLLUP_ARG_ONE_BOUNDARY);
 }
 function withRollupSourceMaps(config) {
-  if (hasRollupSourceMaps(config) || !config.includes(ROLLUP_ARG_ONE_BOUNDARY)) {
+  if (hasRollupSourceMaps(config) || !canRepairRollupConfig(config)) {
     return config;
   }
   const withCompiler = config.replace(GENERATED_COMPILER, () => SOURCE_MAP_CAPABLE_COMPILER);
@@ -1451,6 +1508,28 @@ function repairRollupSourceMaps(workspaceRoot) {
   }
   return changed;
 }
+function resolveRequireTarget(fromDir, specifier) {
+  const base = (0, import_node_path3.join)(fromDir, specifier);
+  return [base, `${base}.cjs`, `${base}.js`].find((candidate) => fileExists(candidate));
+}
+function resolveRollupConfigText(configPath, visited = /* @__PURE__ */ new Set()) {
+  if (visited.has(configPath)) {
+    return "";
+  }
+  visited.add(configPath);
+  let text;
+  try {
+    text = (0, import_node_fs3.readFileSync)(configPath, "utf8");
+  } catch {
+    return "";
+  }
+  const specifiers = Array.from(
+    text.matchAll(/require\((['"])(\.[^'"]*)\1\)/g),
+    (match) => match[2]
+  );
+  const requiredText = specifiers.map((specifier) => resolveRequireTarget((0, import_node_path3.dirname)(configPath), specifier)).filter((target) => target !== void 0).map((target) => resolveRollupConfigText(target, visited));
+  return [text, ...requiredText].join("\n");
+}
 var SOURCEMAP_PATH_TRANSFORM = [
   "    // Added by MoNecromanCI. rollup hands sourcemapPathTransform an OS-NATIVE",
   "    // path with one parent segment too many, so `sources` resolve to nothing",
@@ -3457,18 +3536,19 @@ function checkRollupSourceMaps(workspaceRoot) {
     cwd: workspaceRoot
   }).map((config) => toPosix2(config));
   return configs.flatMap((relativePath) => {
+    const configPath = (0, import_node_path14.join)(workspaceRoot, relativePath);
     let config;
     try {
-      config = (0, import_node_fs8.readFileSync)((0, import_node_path14.join)(workspaceRoot, relativePath), "utf8");
+      config = (0, import_node_fs8.readFileSync)(configPath, "utf8");
     } catch {
       return [];
     }
     return [
       {
         check: `source maps enabled in ${relativePath}`,
-        ok: hasRollupSourceMaps(config),
+        ok: hasRollupSourceMaps(resolveRollupConfigText(configPath)),
         detail: "rollup emits no .js.map without it, so a breakpoint in a .ts file can never bind",
-        remedy: "run `mnci upgrade`, which adds it to every rollup config"
+        remedy: canRepairRollupConfig(config) ? "run `mnci upgrade`, which adds it to every rollup config" : "this config delegates via require() to a shared base mnci does not own \u2014 add `sourceMap: true` to withNx's first argument there by hand; `mnci upgrade` cannot repair a config in this shape"
       }
     ];
   });