nx 22.7.0-beta.12 → 22.7.0-beta.13

package/dist/src/tasks-runner/tasks-schedule.js

@@ -6,8 +6,9 @@ const project_graph_utils_1 = require("../utils/project-graph-utils");
 const operators_1 = require("../project-graph/operators");
 const task_history_1 = require("../utils/task-history");
 class TasksSchedule {
-    constructor(projectGraph, taskGraph, options) {
+    constructor(projectGraph, projects, taskGraph, options) {
         this.projectGraph = projectGraph;
+        this.projects = projects;
         this.taskGraph = taskGraph;
         this.options = options;
         this.notScheduledTaskGraph = this.taskGraph;
@@ -50,6 +51,7 @@ class TasksSchedule {
             delete this.reverseTaskDeps[taskId];
         }
         const removedSet = new Set(taskIds);
+        this.scheduledTasks = this.scheduledTasks.filter((id) => !removedSet.has(id));
         for (const [key, deps] of Object.entries(this.reverseTaskDeps)) {
             this.reverseTaskDeps[key] = deps.filter((d) => !removedSet.has(d));
         }
@@ -96,18 +98,30 @@ class TasksSchedule {
         if (this.options.batch !== false && process.env.NX_BATCH_MODE !== 'false') {
             await this.scheduleBatches();
         }
+        const toSchedule = [];
         for (let root of this.notScheduledTaskGraph.roots) {
             if (this.canBeScheduled(root)) {
-                await this.scheduleTask(root);
+                toSchedule.push(root);
+                // Mark as running so canBeScheduled gates on parallelism for
+                // subsequent roots in this same scheduling pass.
+                this.runningTasks.add(root);
             }
         }
+        if (toSchedule.length > 0) {
+            this.scheduleTaskBatch(toSchedule);
+        }
+    }
+    scheduleTaskBatch(taskIds) {
+        this.notScheduledTaskGraph = (0, utils_1.removeTasksFromTaskGraph)(this.notScheduledTaskGraph, taskIds);
+        for (const taskId of taskIds) {
+            this.scheduledTasks.push(taskId);
+            this.runningTasks.add(taskId);
+        }
+        this.sortScheduledTasks();
     }
-    async scheduleTask(taskId) {
-        this.notScheduledTaskGraph = (0, utils_1.removeTasksFromTaskGraph)(this.notScheduledTaskGraph, [taskId]);
-        this.scheduledTasks = this.scheduledTasks
-            .concat(taskId)
-            // NOTE: sort task by most dependent on first
-            .sort((taskId1, taskId2) => {
+    sortScheduledTasks() {
+        // NOTE: sort task by most dependent on first
+        this.scheduledTasks.sort((taskId1, taskId2) => {
             // First compare the length of task dependencies.
             const taskDifference = this.reverseTaskDeps[taskId2].length -
                 this.reverseTaskDeps[taskId1].length;
@@ -125,18 +139,18 @@ class TasksSchedule {
                 return dependenciesDiff;
             }
             const task1Timing = this.estimatedTaskTimings[taskId1];
-            if (!task1Timing) {
-                // if no timing or 0, put task1 at beginning
-                return -1;
-            }
             const task2Timing = this.estimatedTaskTimings[taskId2];
-            if (!task2Timing) {
-                // if no timing or 0, put task2 at beginning
+            // Tasks with no historical timing run first (unknown duration = assume long)
+            const has1 = task1Timing != null && task1Timing !== 0;
+            const has2 = task2Timing != null && task2Timing !== 0;
+            if (!has1 && !has2)
+                return 0;
+            if (!has1)
+                return -1;
+            if (!has2)
                 return 1;
-            }
             return task2Timing - task1Timing;
         });
-        this.runningTasks.add(taskId);
     }
     async scheduleBatches() {
         const batchMap = {};
@@ -168,7 +182,7 @@ class TasksSchedule {
         if (!this.canBatchTaskBeScheduled(task, batches[rootExecutorName])) {
             return;
         }
-        const { batchImplementationFactory, preferBatch } = (0, utils_1.getExecutorForTask)(task, this.projectGraph);
+        const { batchImplementationFactory, preferBatch } = (0, utils_1.getExecutorForTask)(task, this.projects);
         const executorName = (0, utils_1.getExecutorNameForTask)(task, this.projectGraph);
         if (rootExecutorName !== executorName) {
             return;

package/dist/src/tasks-runner/utils.d.ts

@@ -1,7 +1,7 @@
 import { CustomHasher, ExecutorConfig } from '../config/misc-interfaces';
 import { ProjectGraph, ProjectGraphProjectNode } from '../config/project-graph';
 import { Task, TaskGraph } from '../config/task-graph';
-import { TargetConfiguration, TargetDependencyConfig } from '../config/workspace-json-project-json';
+import { ProjectConfiguration, TargetConfiguration, TargetDependencyConfig } from '../config/workspace-json-project-json';
 export type NormalizedTargetDependencyConfig = TargetDependencyConfig & {
     projects: string[];
 };
@@ -31,11 +31,11 @@ export declare function getOutputsForTargetAndConfiguration(target: Task['target
 export declare function interpolate(template: string, data: any): string;
 export declare function getTargetConfigurationForTask(task: Task, projectGraph: ProjectGraph): TargetConfiguration | undefined;
 export declare function getExecutorNameForTask(task: Task, projectGraph: ProjectGraph): string;
-export declare function getExecutorForTask(task: Task, projectGraph: ProjectGraph): ExecutorConfig & {
+export declare function getExecutorForTask(task: Task, projects: Record<string, ProjectConfiguration>): ExecutorConfig & {
     isNgCompat: boolean;
     isNxExecutor: boolean;
 };
-export declare function getCustomHasher(task: Task, projectGraph: ProjectGraph): CustomHasher | null;
+export declare function getCustomHasher(task: Task, projects: Record<string, ProjectConfiguration>): CustomHasher | null;
 export declare function removeTasksFromTaskGraph(graph: TaskGraph, ids: string[]): TaskGraph;
 export declare function calculateReverseDeps(taskGraph: TaskGraph): Record<string, string[]>;
 export declare function getCliPath(): string;

package/dist/src/tasks-runner/utils.js

@@ -30,7 +30,6 @@ const node_path_1 = require("node:path");
 const posix_1 = require("node:path/posix");
 const executor_utils_1 = require("../command-line/run/executor-utils");
 const native_1 = require("../native");
-const project_graph_1 = require("../project-graph/project-graph");
 const fileutils_1 = require("../utils/fileutils");
 const find_matching_projects_1 = require("../utils/find-matching-projects");
 const globs_1 = require("../utils/globs");
@@ -292,13 +291,13 @@ function getTargetConfigurationForTask(task, projectGraph) {
 function getExecutorNameForTask(task, projectGraph) {
     return getTargetConfigurationForTask(task, projectGraph)?.executor;
 }
-function getExecutorForTask(task, projectGraph) {
-    const executor = getExecutorNameForTask(task, projectGraph);
+function getExecutorForTask(task, projects) {
+    const executor = projects[task.target.project]?.targets?.[task.target.target]?.executor;
     const [nodeModule, executorName] = (0, executor_utils_1.parseExecutor)(executor);
-    return (0, executor_utils_1.getExecutorInformation)(nodeModule, executorName, workspace_root_1.workspaceRoot, (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph).projects);
+    return (0, executor_utils_1.getExecutorInformation)(nodeModule, executorName, workspace_root_1.workspaceRoot, projects);
 }
-function getCustomHasher(task, projectGraph) {
-    const factory = getExecutorForTask(task, projectGraph).hasherFactory;
+function getCustomHasher(task, projects) {
+    const factory = getExecutorForTask(task, projects).hasherFactory;
     return factory ? factory() : null;
 }
 function removeTasksFromTaskGraph(graph, ids) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "22.7.0-beta.12",
+  "version": "22.7.0-beta.13",
   "private": false,
   "type": "commonjs",
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
@@ -79,7 +79,7 @@
     "define-lazy-prop": "2.0.0",
     "delayed-stream": "1.0.0",
     "dotenv": "16.4.7",
-    "dotenv-expand": "11.0.7",
+    "dotenv-expand": "12.0.3",
     "dunder-proto": "1.0.1",
     "ejs": "5.0.1",
     "emoji-regex": "8.0.0",
@@ -171,16 +171,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "22.7.0-beta.12",
-    "@nx/nx-darwin-x64": "22.7.0-beta.12",
-    "@nx/nx-freebsd-x64": "22.7.0-beta.12",
-    "@nx/nx-linux-arm-gnueabihf": "22.7.0-beta.12",
-    "@nx/nx-linux-arm64-gnu": "22.7.0-beta.12",
-    "@nx/nx-linux-arm64-musl": "22.7.0-beta.12",
-    "@nx/nx-linux-x64-gnu": "22.7.0-beta.12",
-    "@nx/nx-linux-x64-musl": "22.7.0-beta.12",
-    "@nx/nx-win32-arm64-msvc": "22.7.0-beta.12",
-    "@nx/nx-win32-x64-msvc": "22.7.0-beta.12"
+    "@nx/nx-darwin-arm64": "22.7.0-beta.13",
+    "@nx/nx-darwin-x64": "22.7.0-beta.13",
+    "@nx/nx-freebsd-x64": "22.7.0-beta.13",
+    "@nx/nx-linux-arm-gnueabihf": "22.7.0-beta.13",
+    "@nx/nx-linux-arm64-gnu": "22.7.0-beta.13",
+    "@nx/nx-linux-arm64-musl": "22.7.0-beta.13",
+    "@nx/nx-linux-x64-gnu": "22.7.0-beta.13",
+    "@nx/nx-linux-x64-musl": "22.7.0-beta.13",
+    "@nx/nx-win32-arm64-msvc": "22.7.0-beta.13",
+    "@nx/nx-win32-x64-msvc": "22.7.0-beta.13"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/dist/src/daemon/client/exec-is-server-available.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/src/daemon/client/exec-is-server-available.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const client_1 = require("./client");
-(async () => {
-    try {
-        console.log(await client_1.daemonClient.isServerAvailable());
-    }
-    catch {
-        console.log(false);
-    }
-})();

package/dist/src/daemon/client/generate-help-output.d.ts

@@ -1 +0,0 @@
-export declare function generateDaemonHelpOutput(): string;

package/dist/src/daemon/client/generate-help-output.js

@@ -1,26 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateDaemonHelpOutput = generateDaemonHelpOutput;
-const child_process_1 = require("child_process");
-const cache_1 = require("../cache");
-const tmp_dir_1 = require("../tmp-dir");
-function generateDaemonHelpOutput() {
-    /**
-     * A workaround for cases such as yargs output where we need to synchronously
-     * get the value of this async operation.
-     */
-    const res = (0, child_process_1.spawnSync)(process.execPath, ['./exec-is-server-available.js'], {
-        cwd: __dirname,
-        windowsHide: true,
-    });
-    const isServerAvailable = res?.stdout?.toString().trim().indexOf('true') > -1;
-    if (!isServerAvailable) {
-        return 'Nx Daemon is not running.';
-    }
-    const pid = (0, cache_1.getDaemonProcessIdSync)();
-    return `Nx Daemon is currently running:
-  - Logs: ${tmp_dir_1.DAEMON_OUTPUT_LOG_FILE}${pid
-        ? `
-  - Process ID: ${pid}`
-        : ''}`;
-}