nx 23.2.0-beta.1 → 23.2.0-beta.2

package/dist/src/project-graph/project-graph.js

@@ -244,6 +244,7 @@ async function createProjectGraphAndSourceMapsAsync(opts = {
                     track: true,
                     ...(analytics_1.customDimensions && {
                         [analytics_1.customDimensions.projectCount]: Object.keys(currentProjectGraph.nodes).length,
+                        [analytics_1.customDimensions.sampleRate]: analytics_1.PERF_SPAN_SAMPLE_RATE,
                     }),
                 },
             });
@@ -310,6 +311,7 @@ async function createProjectGraphAndSourceMapsAsync(opts = {
                     ...(analytics_1.customDimensions && {
                         [analytics_1.customDimensions.projectCount]: Object.keys(res.projectGraph.nodes)
                             .length,
+                        [analytics_1.customDimensions.sampleRate]: analytics_1.PERF_SPAN_SAMPLE_RATE,
                     }),
                 },
             });
@@ -333,6 +335,7 @@ async function createProjectGraphAndSourceMapsAsync(opts = {
                     track: true,
                     ...(analytics_1.customDimensions && {
                         [analytics_1.customDimensions.projectCount]: Object.keys(projectGraphAndSourceMaps.projectGraph.nodes).length,
+                        [analytics_1.customDimensions.sampleRate]: analytics_1.PERF_SPAN_SAMPLE_RATE,
                     }),
                 },
             });

package/dist/src/tasks-runner/life-cycle.d.ts

@@ -44,7 +44,7 @@ export interface LifeCycle {
     startTasks?(task: Task[], metadata: TaskMetadata): void | Promise<void>;
     endTasks?(taskResults: TaskResult[], metadata: TaskMetadata): void | Promise<void>;
     printTaskTerminalOutput?(task: Task, status: TaskStatus, output: string): void;
-    registerRunningTask?(taskId: string, parserAndWriter: ExternalObject<[any, any]>): void;
+    registerRunningTask?(taskId: string, ptyHandles: ExternalObject<[any, any, any]>): void;
     registerRunningTaskWithEmptyParser?(taskId: string): void;
     appendTaskOutput?(taskId: string, output: string, isPtyTask: boolean): void;
     setTaskStatus?(taskId: string, status: NativeTaskStatus): void;
@@ -72,7 +72,7 @@ export declare class CompositeLifeCycle implements LifeCycle {
     startTasks(tasks: Task[], metadata: TaskMetadata): Promise<void>;
     endTasks(taskResults: TaskResult[], metadata: TaskMetadata): Promise<void>;
     printTaskTerminalOutput(task: Task, status: TaskStatus, output: string): void;
-    registerRunningTask(taskId: string, parserAndWriter: ExternalObject<[any, any]>): void;
+    registerRunningTask(taskId: string, ptyHandles: ExternalObject<[any, any, any]>): void;
     registerRunningTaskWithEmptyParser(taskId: string): void;
     appendTaskOutput(taskId: string, output: string, isPtyTask: boolean): void;
     setTaskStatus(taskId: string, status: NativeTaskStatus): void;

package/dist/src/tasks-runner/life-cycle.js

@@ -67,10 +67,10 @@ class CompositeLifeCycle {
             }
         }
     }
-    registerRunningTask(taskId, parserAndWriter) {
+    registerRunningTask(taskId, ptyHandles) {
         for (let l of this.lifeCycles) {
             if (l.registerRunningTask) {
-                l.registerRunningTask(taskId, parserAndWriter);
+                l.registerRunningTask(taskId, ptyHandles);
             }
         }
     }

package/dist/src/tasks-runner/pseudo-terminal.d.ts

@@ -47,7 +47,7 @@ export declare class PseudoTtyProcess implements RunningTask {
     onOutput(callback: (message: string) => void): void;
     getPid(): number | undefined;
     kill(s?: NodeJS.Signals): Promise<void>;
-    getParserAndWriter(): import("../native").ExternalObject<[import("../native").ParserArc, import("../native").WriterArc]>;
+    getPtyHandles(): import("../native").ExternalObject<[import("../native").ParserArc, import("../native").WriterArc, import("../native").MasterArc]>;
 }
 export declare class PseudoTtyProcessWithSend extends PseudoTtyProcess {
     rustPseudoTerminal: RustPseudoTerminal;

package/dist/src/tasks-runner/pseudo-terminal.js

@@ -150,8 +150,8 @@ class PseudoTtyProcess {
             }
         }
     }
-    getParserAndWriter() {
-        return this.childProcess.getParserAndWriter();
+    getPtyHandles() {
+        return this.childProcess.getPtyHandles();
     }
 }
 exports.PseudoTtyProcess = PseudoTtyProcess;

package/dist/src/tasks-runner/task-orchestrator.d.ts

@@ -35,6 +35,7 @@ export declare class TaskOrchestrator {
     private reverseTaskDeps;
     private initializingTaskIds;
     private processedTasks;
+    private cacheMissedHashes;
     private completedTasks;
     private waitingForTasks;
     private pendingDiscreteWorkers;
@@ -100,7 +101,9 @@ export declare class TaskOrchestrator {
      * The coordinator relies on this running unconditionally (when cache
      * is enabled): tasks dispatched in step 5 via runTaskDirectly skip
      * their own cache lookup on the assumption that this has already
-     * confirmed them as misses. Don't add length-based bails.
+     * confirmed them as misses. Excluding cacheMissedHashes preserves that
+     * invariant — every dispatched hash was queried exactly once — but
+     * don't add other length-based bails.
      */
     private resolveCachedTasksBulk;
     /**

package/dist/src/tasks-runner/task-orchestrator.js

@@ -79,6 +79,12 @@ class TaskOrchestrator {
         // underlying real tasks become the anchors.
         this.initializingTaskIds = (0, utils_1.expandInitiatingTasksThroughNoop)(this.initiatingTasks, this.taskGraph, this.projectGraph);
         this.processedTasks = new Map();
+        // Hashes confirmed absent from the cache this run. A confirmed miss can
+        // only become a hit when the task itself runs — and then it leaves the
+        // schedule — so a missed hash never needs re-querying. Without this, a
+        // miss waiting for a worker slot is re-queried (including the remote
+        // retrieval) on every coordinator cycle.
+        this.cacheMissedHashes = new Set();
         this.completedTasks = new Map();
         this.waitingForTasks = [];
         this.pendingDiscreteWorkers = new Set();
@@ -324,9 +330,12 @@ class TaskOrchestrator {
      * inside DbCache.getBatch.
      */
     async fetchCacheHits(tasks) {
-        const batchResults = await this.cache.getBatch(tasks);
+        const tasksToQuery = tasks.filter((t) => t.hash && !this.cacheMissedHashes.has(t.hash));
+        if (tasksToQuery.length === 0)
+            return [];
+        const batchResults = await this.cache.getBatch(tasksToQuery);
         const cacheHits = [];
-        for (const task of tasks) {
+        for (const task of tasksToQuery) {
             const cachedResult = batchResults.get(task.hash);
             // Replay a cached result only under the same condition it was cached
             // under (shouldCacheTaskResult): successes always, failures only when
@@ -335,6 +344,9 @@ class TaskOrchestrator {
             if (cachedResult && this.shouldCacheTaskResult(task, cachedResult.code)) {
                 cacheHits.push({ task, cachedResult });
             }
+            else {
+                this.cacheMissedHashes.add(task.hash);
+            }
         }
         return cacheHits;
     }
@@ -396,14 +408,19 @@ class TaskOrchestrator {
      * The coordinator relies on this running unconditionally (when cache
      * is enabled): tasks dispatched in step 5 via runTaskDirectly skip
      * their own cache lookup on the assumption that this has already
-     * confirmed them as misses. Don't add length-based bails.
+     * confirmed them as misses. Excluding cacheMissedHashes preserves that
+     * invariant — every dispatched hash was queried exactly once — but
+     * don't add other length-based bails.
      */
     async resolveCachedTasksBulk() {
         const { scheduledTasks } = this.tasksSchedule.getAllScheduledTasks();
         const candidates = [];
         for (const id of scheduledTasks) {
             const task = this.taskGraph.tasks[id];
-            if (task.hash && !task.continuous && task.cache) {
+            if (task.hash &&
+                !this.cacheMissedHashes.has(task.hash) &&
+                !task.continuous &&
+                task.cache) {
                 candidates.push(task);
             }
         }
@@ -790,7 +807,7 @@ class TaskOrchestrator {
                 else if (this.tuiEnabled) {
                     if (runningTask instanceof pseudo_terminal_1.PseudoTtyProcess) {
                         // This is an external of a the pseudo terminal where a task is running and can be passed to the TUI
-                        this.options.lifeCycle.registerRunningTask(task.id, runningTask.getParserAndWriter());
+                        this.options.lifeCycle.registerRunningTask(task.id, runningTask.getPtyHandles());
                         runningTask.onOutput((output) => {
                             this.options.lifeCycle.appendTaskOutput(task.id, output, true);
                         });
@@ -839,7 +856,7 @@ class TaskOrchestrator {
             if (this.tuiEnabled) {
                 if (runningTask instanceof pseudo_terminal_1.PseudoTtyProcess) {
                     // This is an external of a the pseudo terminal where a task is running and can be passed to the TUI
-                    this.options.lifeCycle.registerRunningTask(task.id, runningTask.getParserAndWriter());
+                    this.options.lifeCycle.registerRunningTask(task.id, runningTask.getPtyHandles());
                     runningTask.onOutput((output) => {
                         this.options.lifeCycle.appendTaskOutput(task.id, output, true);
                     });

package/dist/src/utils/acknowledge-build-scripts.js

@@ -7,6 +7,7 @@ const yaml_1 = require("yaml");
 const semver_1 = require("semver");
 const package_manager_1 = require("./package-manager");
 const fileutils_1 = require("./fileutils");
+const json_1 = require("./json");
 const PNPM_WORKSPACE_FILE = 'pnpm-workspace.yaml';
 /**
  * Records build-script decisions for dependencies that are about to be
@@ -42,23 +43,24 @@ function acknowledgePnpmBuildScripts(treeOrRoot, entries) {
     // A file that doesn't parse cleanly or whose root isn't a mapping is
     // malformed for pnpm; leave it alone rather than crashing or replacing the
     // user's content. pnpm's own error on the file is the actionable signal.
+    // Empty and comment-only files have no contents at all; setIn creates the
+    // mapping for them while keeping whatever comments they carry.
     if (parsed.errors.length > 0 ||
         (parsed.contents != null && !(parsed.contents instanceof yaml_1.YAMLMap))) {
         return;
     }
-    const doc = parsed.contents instanceof yaml_1.YAMLMap ? parsed : new yaml_1.Document({});
     let changed = false;
     for (const [pkg, allowed] of Object.entries(entries)) {
         // Only a real boolean is a user decision. pnpm's non-strict installs stub
         // undecided packages with a placeholder string ("set this to true or
         // false"), which would fail the next strict install if left in place.
-        if (typeof doc.getIn(['allowBuilds', pkg]) !== 'boolean') {
-            doc.setIn(['allowBuilds', pkg], allowed);
+        if (typeof parsed.getIn(['allowBuilds', pkg]) !== 'boolean') {
+            parsed.setIn(['allowBuilds', pkg], allowed);
             changed = true;
         }
     }
     if (changed) {
-        host.write(PNPM_WORKSPACE_FILE, doc.toString());
+        host.write(PNPM_WORKSPACE_FILE, parsed.toString());
     }
 }
 function createHost(treeOrRoot) {
@@ -76,7 +78,7 @@ function createHost(treeOrRoot) {
         exists: (p) => treeOrRoot.exists(p),
         read: (p) => treeOrRoot.read(p, 'utf-8'),
         write: (p, c) => treeOrRoot.write(p, c),
-        readJson: (p) => JSON.parse(treeOrRoot.read(p, 'utf-8')),
+        readJson: (p) => (0, json_1.parseJson)(treeOrRoot.read(p, 'utf-8')),
     };
 }
 function getPnpmVersion(host) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "23.2.0-beta.1",
+  "version": "23.2.0-beta.2",
   "private": false,
   "type": "commonjs",
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
@@ -176,16 +176,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "23.2.0-beta.1",
-    "@nx/nx-darwin-x64": "23.2.0-beta.1",
-    "@nx/nx-freebsd-x64": "23.2.0-beta.1",
-    "@nx/nx-linux-arm-gnueabihf": "23.2.0-beta.1",
-    "@nx/nx-linux-arm64-gnu": "23.2.0-beta.1",
-    "@nx/nx-linux-arm64-musl": "23.2.0-beta.1",
-    "@nx/nx-linux-x64-gnu": "23.2.0-beta.1",
-    "@nx/nx-linux-x64-musl": "23.2.0-beta.1",
-    "@nx/nx-win32-arm64-msvc": "23.2.0-beta.1",
-    "@nx/nx-win32-x64-msvc": "23.2.0-beta.1"
+    "@nx/nx-darwin-arm64": "23.2.0-beta.2",
+    "@nx/nx-darwin-x64": "23.2.0-beta.2",
+    "@nx/nx-freebsd-x64": "23.2.0-beta.2",
+    "@nx/nx-linux-arm-gnueabihf": "23.2.0-beta.2",
+    "@nx/nx-linux-arm64-gnu": "23.2.0-beta.2",
+    "@nx/nx-linux-arm64-musl": "23.2.0-beta.2",
+    "@nx/nx-linux-x64-gnu": "23.2.0-beta.2",
+    "@nx/nx-linux-x64-musl": "23.2.0-beta.2",
+    "@nx/nx-win32-arm64-msvc": "23.2.0-beta.2",
+    "@nx/nx-win32-x64-msvc": "23.2.0-beta.2"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",