@nx/dotnet 23.2.0-beta.11 → 23.2.0-beta.12

package/dist/analyzer/analyzer-client.d.ts

@@ -1,4 +1,10 @@
 import { ProjectConfiguration } from '@nx/devkit';
+export declare const ANALYZER_CANCELLED_MESSAGE = "Analyzer run was cancelled";
+/**
+ * Cancel any in-flight analyzer process. Safe to call even if nothing is running.
+ */
+export declare function cancelPendingAnalysis(): void;
+export declare function getAnalysisTimeoutMs(): number;
 export interface AnalysisSuccessResult {
     nodesByFile: Record<string, ProjectConfiguration>;
     referencesByRoot: Record<string, {

package/dist/analyzer/analyzer-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"analyzer-client.d.ts","sourceRoot":"","sources":["../../src/analyzer/analyzer-client.ts"],"names":[],"mappings":"AAIA,OAAO,EAAyB,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAQzE,MAAM,WAAW,qBAAqB;IAEpC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;IAElD,gBAAgB,EAAE,MAAM,CACtB,MAAM,EACN;QAAE,IAAI,EAAE,MAAM,EAAE,CAAC;QAAC,gBAAgB,EAAE,MAAM,CAAA;KAAE,CAC7C,CAAC;CACH;AACD,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,KAAK,CAAC;CACd;AACD,MAAM,MAAM,cAAc,GAAG,qBAAqB,GAAG,mBAAmB,CAAC;AAEzE;;;GAGG;AACH,MAAM,WAAW,qBAAqB;IACpC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AA4ID;;;;GAIG;AACH,wBAAsB,eAAe,CACnC,KAAK,EAAE,MAAM,EAAE,EACf,OAAO,CAAC,EAAE,qBAAqB,GAC9B,OAAO,CAAC,cAAc,CAAC,CA2DzB;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,IAAI,cAAc,CASzD;AAED;;GAEG;AACH,wBAAgB,UAAU,IAAI,IAAI,CAEjC;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,cAAc,GACrB,MAAM,IAAI,mBAAmB,CAE/B;AAED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,cAAc,GACrB,MAAM,IAAI,qBAAqB,CAEjC"}
+{"version":3,"file":"analyzer-client.d.ts","sourceRoot":"","sources":["../../src/analyzer/analyzer-client.ts"],"names":[],"mappings":"AAEA,OAAO,EAIL,oBAAoB,EACrB,MAAM,YAAY,CAAC;AAmBpB,eAAO,MAAM,0BAA0B,+BAA+B,CAAC;AAIvE;;GAEG;AACH,wBAAgB,qBAAqB,IAAI,IAAI,CAK5C;AAED,wBAAgB,oBAAoB,IAAI,MAAM,CAS7C;AAED,MAAM,WAAW,qBAAqB;IAEpC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;IAElD,gBAAgB,EAAE,MAAM,CACtB,MAAM,EACN;QAAE,IAAI,EAAE,MAAM,EAAE,CAAC;QAAC,gBAAgB,EAAE,MAAM,CAAA;KAAE,CAC7C,CAAC;CACH;AACD,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,KAAK,CAAC;CACd;AACD,MAAM,MAAM,cAAc,GAAG,qBAAqB,GAAG,mBAAmB,CAAC;AAEzE;;;GAGG;AACH,MAAM,WAAW,qBAAqB;IACpC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AA4MD;;;;GAIG;AACH,wBAAsB,eAAe,CACnC,KAAK,EAAE,MAAM,EAAE,EACf,OAAO,CAAC,EAAE,qBAAqB,GAC9B,OAAO,CAAC,cAAc,CAAC,CA+DzB;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,IAAI,cAAc,CASzD;AAED;;GAEG;AACH,wBAAgB,UAAU,IAAI,IAAI,CAEjC;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,cAAc,GACrB,MAAM,IAAI,mBAAmB,CAE/B;AAED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,cAAc,GACrB,MAAM,IAAI,qBAAqB,CAEjC"}

package/dist/analyzer/analyzer-client.js

@@ -1,15 +1,44 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ANALYZER_CANCELLED_MESSAGE = void 0;
+exports.cancelPendingAnalysis = cancelPendingAnalysis;
+exports.getAnalysisTimeoutMs = getAnalysisTimeoutMs;
 exports.analyzeProjects = analyzeProjects;
 exports.readCachedAnalysisResult = readCachedAnalysisResult;
 exports.clearCache = clearCache;
 exports.isAnalysisErrorResult = isAnalysisErrorResult;
 exports.isAnalysisSuccessResult = isAnalysisSuccessResult;
-const node_child_process_1 = require("node:child_process");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
+const DEFAULT_ANALYSIS_TIMEOUT_SECONDS = (0, internal_1.isCI)() ? 600 : 120;
+// setTimeout silently clamps a delay past the 32-bit signed max to 1ms, which
+// would abort immediately — the opposite of what a large value asks for.
+const MAX_TIMEOUT_MS = 2 ** 31 - 1;
+// Thrown when a newer analysis supersedes an in-flight one. Callers swallow it
+// rather than surfacing an internal string to the user.
+exports.ANALYZER_CANCELLED_MESSAGE = 'Analyzer run was cancelled';
+let currentAbortController;
+/**
+ * Cancel any in-flight analyzer process. Safe to call even if nothing is running.
+ */
+function cancelPendingAnalysis() {
+    if (currentAbortController) {
+        currentAbortController.abort('cancelled');
+        currentAbortController = undefined;
+    }
+}
+function getAnalysisTimeoutMs() {
+    const envTimeout = process.env.NX_DOTNET_PROJECT_GRAPH_TIMEOUT;
+    if (envTimeout) {
+        const parsed = Number(envTimeout);
+        if (!Number.isNaN(parsed) && parsed > 0) {
+            return Math.min(parsed * 1000, MAX_TIMEOUT_MS);
+        }
+    }
+    return DEFAULT_ANALYSIS_TIMEOUT_SECONDS * 1000;
+}
 let cache = null;
 /**
  * Get the path to the msbuild-analyzer executable
@@ -41,7 +70,7 @@ async function calculateProjectFilesHash(files) {
  * Run the msbuild-analyzer and return the results.
  * Uses stdin for large file lists to avoid ARG_MAX issues.
  */
-function runAnalyzer(files, options) {
+async function runAnalyzer(files, options) {
     if (files.length === 0) {
         return { nodesByFile: {}, referencesByRoot: {} };
     }
@@ -72,44 +101,106 @@ function runAnalyzer(files, options) {
     //     }
     //   }
     // }
+    // Nothing here may contain a double quote: on Windows `safeSpawn` routes a bare binary
+    // name through cmd.exe, whose quoting cannot express one, so it refuses the argument.
+    // That is why the options JSON goes over stdin instead (see below).
+    const args = [analyzerPath, devkit_1.workspaceRoot];
+    // Cancel any in-flight analyzer from a previous call, then create a fresh controller.
+    cancelPendingAnalysis();
+    const controller = new AbortController();
+    currentAbortController = controller;
+    const signal = controller.signal;
+    const timeoutMs = getAnalysisTimeoutMs();
+    const timeoutSeconds = timeoutMs / 1000;
+    const timer = setTimeout(() => controller.abort(), timeoutMs);
+    let stdout = '';
+    let stderr = '';
     try {
-        let output;
-        // Prepare CLI arguments
-        const args = [analyzerPath, devkit_1.workspaceRoot];
-        // Add plugin options as JSON string if provided
-        if (options) {
-            args.push(JSON.stringify(options));
-        }
-        // Use stdin mode for large file lists to avoid ARG_MAX issues. The analyzer
-        // partitions paths by filename, so we just stream everything in one block.
-        const input = files.join('\n');
-        const result = (0, node_child_process_1.spawnSync)('dotnet', args, {
-            input,
-            encoding: 'utf-8',
-            maxBuffer: 10 * 1024 * 1024, // 10MB buffer
-            stdio: ['pipe', 'pipe', 'pipe'], // stdin, stdout, stderr
-            windowsHide: true,
-            env,
+        await new Promise((resolve, reject) => {
+            const child = (0, internal_1.safeSpawn)('dotnet', args, {
+                stdio: ['pipe', 'pipe', 'pipe'],
+                windowsHide: true,
+                env,
+            });
+            // A plugin worker torn down by `nx reset` would otherwise orphan the analyzer.
+            (0, internal_1.killChildOnHostExit)(child);
+            // On abort, kill the process tree and settle immediately — a wedged
+            // process that outlives the kill signal would otherwise keep this
+            // promise pending and the abort error would never surface.
+            const onAbort = () => {
+                if (child.pid) {
+                    (0, internal_1.killProcessTreeGraceful)(child.pid).catch(() => { });
+                }
+                reject(new Error('Analyzer aborted'));
+            };
+            signal.addEventListener('abort', onAbort, { once: true });
+            child.stdout?.setEncoding('utf-8');
+            child.stderr?.setEncoding('utf-8');
+            child.stdout?.on('data', (data) => {
+                stdout += data;
+            });
+            child.stderr?.on('data', (data) => {
+                stderr += data;
+            });
+            child.on('error', (error) => {
+                signal.removeEventListener('abort', onAbort);
+                reject(error);
+            });
+            child.on('close', (code) => {
+                signal.removeEventListener('abort', onAbort);
+                if (code === 0) {
+                    resolve();
+                }
+                else {
+                    reject(new Error(`Analyzer exited with code ${code}: ${stderr}`));
+                }
+            });
+            // Stream the options JSON, then the file list, over stdin. The first line is
+            // always written, empty when there are no options, so the analyzer never has to
+            // infer whether one was sent. The analyzer partitions paths by filename, so we
+            // just send everything in one block.
+            // EPIPE if the analyzer dies early. Surfaced via `close` only when the
+            // child also exits non-zero; a stdin error with a clean exit means the
+            // analyzer read a truncated file list.
+            child.stdin?.on('error', () => { });
+            child.stdin?.end([options ? JSON.stringify(options) : '', ...files].join('\n'));
         });
-        if (result.error) {
-            throw result.error;
+    }
+    catch (error) {
+        if (signal.reason === 'cancelled') {
+            throw new Error(exports.ANALYZER_CANCELLED_MESSAGE);
+        }
+        if (signal.aborted) {
+            throw new Error(`msbuild-analyzer timed out after ${timeoutSeconds} ${timeoutSeconds === 1 ? 'second' : 'seconds'}.\n` +
+                `  1. Set the environment variable NX_DOTNET_PROJECT_GRAPH_TIMEOUT to a higher value (in seconds) to increase the timeout.\n` +
+                `  2. If the issue persists, set NX_DOTNET_DISABLE=true to disable the .NET plugin entirely.`);
         }
-        if (result.status !== 0) {
-            throw new Error(`Analyzer exited with code ${result.status}: ${result.stderr}`);
+        const err = error;
+        const stderrAlreadyInMessage = err.message.includes(stderr);
+        if (stderr && !stderrAlreadyInMessage) {
+            devkit_1.logger.error(`msbuild-analyzer error: ${stderr}`);
         }
-        // Output stderr (includes performance logs when NX_PERF_LOGGING=true)
-        if (result.stderr) {
-            console.error(result.stderr);
+        throw new Error(`Failed to run msbuild-analyzer: ${err.message}${stderr && !stderrAlreadyInMessage ? `\n${stderr}` : ''}`);
+    }
+    finally {
+        clearTimeout(timer);
+        // Drop the settled controller so a later cancelPendingAnalysis() cannot
+        // abort a run that already finished.
+        if (currentAbortController === controller) {
+            currentAbortController = undefined;
         }
-        output = result.stdout;
-        return JSON.parse(output);
+    }
+    // Output stderr (includes performance logs when NX_PERF_LOGGING=true)
+    if (stderr) {
+        console.error(stderr);
+    }
+    try {
+        // parseJson over JSON.parse: on malformed output it reports line:column with
+        // a code frame, where JSON.parse gives only a character offset.
+        return (0, devkit_1.parseJson)(stdout);
     }
     catch (error) {
-        const err = error;
-        if (err.stderr) {
-            devkit_1.logger.error(`msbuild-analyzer error: ${err.stderr}`);
-        }
-        throw new Error(`Failed to run msbuild-analyzer: ${err.message}${err.stderr ? `\n${err.stderr}` : ''}`);
+        throw new Error(`Failed to parse msbuild-analyzer output: ${error.message}`);
     }
 }
 /**
@@ -141,7 +232,7 @@ async function analyzeProjects(files, options) {
     }
     // Run the analyzer
     try {
-        const result = runAnalyzer(files, options);
+        const result = await runAnalyzer(files, options);
         // Update local cache
         cache = {
             hash: filesHash,
@@ -162,10 +253,14 @@ async function analyzeProjects(files, options) {
         const errorResult = {
             error: err,
         };
-        cache = {
-            hash: filesHash,
-            result: errorResult,
-        };
+        // A superseded run is not a result: caching it would hand the sentinel to
+        // createDependencies via readCachedAnalysisResult().
+        if (err.message !== exports.ANALYZER_CANCELLED_MESSAGE) {
+            cache = {
+                hash: filesHash,
+                result: errorResult,
+            };
+        }
         return errorResult;
     }
 }

package/dist/plugins/create-nodes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-nodes.d.ts","sourceRoot":"","sources":["../../src/plugins/create-nodes.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EAGX,mBAAmB,EACpB,MAAM,YAAY,CAAC;AAOpB,MAAM,MAAM,2BAA2B,GAAG,OAAO,CAAC,mBAAmB,CAAC,GAAG;IACvE;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;OAGG;IACH,KAAK,CAAC,EAAE,2BAA2B,GAAG,KAAK,CAAC;IAC5C;;;OAGG;IACH,IAAI,CAAC,EAAE,2BAA2B,GAAG,KAAK,CAAC;IAC3C;;;OAGG;IACH,KAAK,CAAC,EAAE,2BAA2B,GAAG,KAAK,CAAC;IAC5C;;;OAGG;IACH,OAAO,CAAC,EAAE,2BAA2B,GAAG,KAAK,CAAC;IAC9C;;;OAGG;IACH,OAAO,CAAC,EAAE,2BAA2B,GAAG,KAAK,CAAC;IAC9C;;;OAGG;IACH,IAAI,CAAC,EAAE,2BAA2B,GAAG,KAAK,CAAC;IAC3C;;;OAGG;IACH,KAAK,CAAC,EAAE,2BAA2B,GAAG,KAAK,CAAC;IAC5C;;;OAGG;IACH,GAAG,CAAC,EAAE,2BAA2B,GAAG,KAAK,CAAC;CAC3C;AAqFD,eAAO,MAAM,WAAW,EAAE,WAAW,CAAC,mBAAmB,CA6ExD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,aAAa,kCAAc,CAAC"}
+{"version":3,"file":"create-nodes.d.ts","sourceRoot":"","sources":["../../src/plugins/create-nodes.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EAGX,mBAAmB,EACpB,MAAM,YAAY,CAAC;AAQpB,MAAM,MAAM,2BAA2B,GAAG,OAAO,CAAC,mBAAmB,CAAC,GAAG;IACvE;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;OAGG;IACH,KAAK,CAAC,EAAE,2BAA2B,GAAG,KAAK,CAAC;IAC5C;;;OAGG;IACH,IAAI,CAAC,EAAE,2BAA2B,GAAG,KAAK,CAAC;IAC3C;;;OAGG;IACH,KAAK,CAAC,EAAE,2BAA2B,GAAG,KAAK,CAAC;IAC5C;;;OAGG;IACH,OAAO,CAAC,EAAE,2BAA2B,GAAG,KAAK,CAAC;IAC9C;;;OAGG;IACH,OAAO,CAAC,EAAE,2BAA2B,GAAG,KAAK,CAAC;IAC9C;;;OAGG;IACH,IAAI,CAAC,EAAE,2BAA2B,GAAG,KAAK,CAAC;IAC3C;;;OAGG;IACH,KAAK,CAAC,EAAE,2BAA2B,GAAG,KAAK,CAAC;IAC5C;;;OAGG;IACH,GAAG,CAAC,EAAE,2BAA2B,GAAG,KAAK,CAAC;CAC3C;AAqFD,eAAO,MAAM,WAAW,EAAE,WAAW,CAAC,mBAAmB,CAqFxD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,aAAa,kCAAc,CAAC"}

package/dist/plugins/create-nodes.js

@@ -92,6 +92,14 @@ exports.createNodes = [
             };
             const result = await (0, analyzer_client_1.analyzeProjects)([...configFilePaths], analyzerOptions);
             if ((0, analyzer_client_1.isAnalysisErrorResult)(result)) {
+                if (result.error.message === analyzer_client_1.ANALYZER_CANCELLED_MESSAGE) {
+                    // Superseded by a newer analysis — silently return empty rather than
+                    // failing the user's command with an internal sentinel.
+                    // Safe only because the daemon drops this compute at its
+                    // `stalePostCreateNodes` guard before createDependencies runs; that one
+                    // would throw on the cache this run deliberately did not write.
+                    return [];
+                }
                 throw result.error;
             }
             const { nodesByFile } = result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/dotnet",
-  "version": "23.2.0-beta.11",
+  "version": "23.2.0-beta.12",
   "private": false,
   "description": "The Nx Plugin for .NET containing graph support for working with .NET projects in an Nx workspace.",
   "keywords": [
@@ -49,7 +49,7 @@
   "dependencies": {
     "tslib": "^2.3.0",
     "ignore": "^7.0.5",
-    "@nx/devkit": "23.2.0-beta.11"
+    "@nx/devkit": "23.2.0-beta.12"
   },
   "devDependencies": {
     "@types/jest": "30.0.0",
@@ -58,7 +58,7 @@
     "memfs": "^4.9.2",
     "ts-jest": "^29.4.7",
     "typescript": "~6.0.3",
-    "nx": "23.2.0-beta.11"
+    "nx": "23.2.0-beta.12"
   },
   "publishConfig": {
     "access": "public"