nx 19.8.0-canary.20240912-b6140d4 → 19.8.0-canary.20240914-dc821ab

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

@@ -4,6 +4,7 @@ exports.TasksSchedule = void 0;
 const utils_1 = require("./utils");
 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) {
         this.projectGraph = projectGraph;
@@ -12,12 +13,16 @@ class TasksSchedule {
         this.notScheduledTaskGraph = this.taskGraph;
         this.reverseTaskDeps = (0, utils_1.calculateReverseDeps)(this.taskGraph);
         this.reverseProjectGraph = (0, operators_1.reverse)(this.projectGraph);
+        this.taskHistory = (0, task_history_1.getTaskHistory)();
         this.scheduledBatches = [];
         this.scheduledTasks = [];
         this.runningTasks = new Set();
         this.completedTasks = new Set();
         this.scheduleRequestsExecutionChain = Promise.resolve();
     }
+    async init() {
+        this.estimatedTaskTimings = await this.taskHistory.getEstimatedTaskTimings(Object.values(this.taskGraph.tasks).map((t) => t.target));
+    }
     async scheduleNextTasks() {
         this.scheduleRequestsExecutionChain =
             this.scheduleRequestsExecutionChain.then(() => this.scheduleTasks());
@@ -81,10 +86,23 @@ class TasksSchedule {
             // Most likely tasks with no dependencies such as test
             const project1 = this.taskGraph.tasks[taskId1].target.project;
             const project2 = this.taskGraph.tasks[taskId2].target.project;
-            return ((0, project_graph_utils_1.findAllProjectNodeDependencies)(project2, this.reverseProjectGraph)
-                .length -
-                (0, project_graph_utils_1.findAllProjectNodeDependencies)(project1, this.reverseProjectGraph)
-                    .length);
+            const project1NodeDependencies = (0, project_graph_utils_1.findAllProjectNodeDependencies)(project1, this.reverseProjectGraph).length;
+            const project2NodeDependencies = (0, project_graph_utils_1.findAllProjectNodeDependencies)(project2, this.reverseProjectGraph).length;
+            const dependenciesDiff = project2NodeDependencies - project1NodeDependencies;
+            if (dependenciesDiff !== 0) {
+                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
+                return 1;
+            }
+            return task2Timing - task1Timing;
         });
         this.runningTasks.add(taskId);
     }

package/src/utils/handle-errors.d.ts

@@ -0,0 +1 @@
+export declare function handleErrors(isVerbose: boolean, fn: Function): Promise<number>;

package/src/utils/handle-errors.js

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleErrors = handleErrors;
+const client_1 = require("../daemon/client/client");
+const logger_1 = require("./logger");
+const output_1 = require("./output");
+async function handleErrors(isVerbose, fn) {
+    try {
+        const result = await fn();
+        if (typeof result === 'number') {
+            return result;
+        }
+        return 0;
+    }
+    catch (err) {
+        err ||= new Error('Unknown error caught');
+        if (err.constructor.name === 'UnsuccessfulWorkflowExecution') {
+            logger_1.logger.error('The generator workflow failed. See above.');
+        }
+        else if (err.name === 'ProjectGraphError') {
+            const projectGraphError = err;
+            let title = projectGraphError.message;
+            if (projectGraphError.cause &&
+                typeof projectGraphError.cause === 'object' &&
+                'message' in projectGraphError.cause) {
+                title += ' ' + projectGraphError.cause.message + '.';
+            }
+            if (isVerbose) {
+                title += ' See errors below.';
+            }
+            const bodyLines = isVerbose
+                ? formatErrorStackAndCause(projectGraphError)
+                : ['Pass --verbose to see the stacktraces.'];
+            output_1.output.error({
+                title,
+                bodyLines: bodyLines,
+            });
+        }
+        else {
+            const lines = (err.message ? err.message : err.toString()).split('\n');
+            const bodyLines = lines.slice(1);
+            if (isVerbose) {
+                bodyLines.push(...formatErrorStackAndCause(err));
+            }
+            else if (err.stack) {
+                bodyLines.push('Pass --verbose to see the stacktrace.');
+            }
+            output_1.output.error({
+                title: lines[0],
+                bodyLines,
+            });
+        }
+        if (client_1.daemonClient.enabled()) {
+            client_1.daemonClient.reset();
+        }
+        return 1;
+    }
+}
+function formatErrorStackAndCause(error) {
+    return [
+        error.stack || error.message,
+        ...(error.cause && typeof error.cause === 'object'
+            ? [
+                'Caused by:',
+                'stack' in error.cause
+                    ? error.cause.stack.toString()
+                    : error.cause.toString(),
+            ]
+            : []),
+    ];
+}

package/src/utils/nx-cloud-utils.d.ts

@@ -1,4 +1,3 @@
 import { NxJsonConfiguration } from '../config/nx-json';
 export declare function isNxCloudUsed(nxJson: NxJsonConfiguration): boolean;
 export declare function getNxCloudUrl(nxJson: NxJsonConfiguration): string;
-export declare function getNxCloudToken(nxJson: NxJsonConfiguration): string;

package/src/utils/nx-cloud-utils.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isNxCloudUsed = isNxCloudUsed;
 exports.getNxCloudUrl = getNxCloudUrl;
-exports.getNxCloudToken = getNxCloudToken;
 function isNxCloudUsed(nxJson) {
     return (!!process.env.NX_CLOUD_ACCESS_TOKEN ||
         !!nxJson.nxCloudAccessToken ||
@@ -17,12 +16,3 @@ function getNxCloudUrl(nxJson) {
         throw new Error('nx-cloud runner not found in nx.json');
     return cloudRunner?.options?.url ?? nxJson.nxCloudUrl ?? 'https://nx.app';
 }
-function getNxCloudToken(nxJson) {
-    const cloudRunner = Object.values(nxJson.tasksRunnerOptions ?? {}).find((r) => r.runner == '@nrwl/nx-cloud' || r.runner == 'nx-cloud');
-    if (!cloudRunner &&
-        !(nxJson.nxCloudAccessToken || process.env.NX_CLOUD_ACCESS_TOKEN))
-        throw new Error('nx-cloud runner not found in nx.json');
-    return (process.env.NX_CLOUD_ACCESS_TOKEN ??
-        cloudRunner?.options.accessToken ??
-        nxJson.nxCloudAccessToken);
-}

package/src/utils/params.d.ts

@@ -79,7 +79,6 @@ export type Options = {
     '--'?: Unmatched[];
     [k: string]: string | number | boolean | string[] | Unmatched[] | undefined;
 };
-export declare function handleErrors(isVerbose: boolean, fn: Function): Promise<number>;
 export declare function convertToCamelCase(parsed: {
     [k: string]: any;
 }, schema: Schema): Options;

package/src/utils/params.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SchemaError = void 0;
-exports.handleErrors = handleErrors;
 exports.convertToCamelCase = convertToCamelCase;
 exports.coerceTypesInOptions = coerceTypesInOptions;
 exports.convertAliases = convertAliases;
@@ -15,55 +14,6 @@ exports.warnDeprecations = warnDeprecations;
 exports.convertSmartDefaultsIntoNamedParams = convertSmartDefaultsIntoNamedParams;
 exports.getPromptsForSchema = getPromptsForSchema;
 const logger_1 = require("./logger");
-const output_1 = require("./output");
-const client_1 = require("../daemon/client/client");
-async function handleErrors(isVerbose, fn) {
-    try {
-        const result = await fn();
-        if (typeof result === 'number') {
-            return result;
-        }
-        return 0;
-    }
-    catch (err) {
-        err ||= new Error('Unknown error caught');
-        if (err.constructor.name === 'UnsuccessfulWorkflowExecution') {
-            logger_1.logger.error('The generator workflow failed. See above.');
-        }
-        else if (err.name === 'ProjectGraphError') {
-            const projectGraphError = err;
-            let title = projectGraphError.message;
-            if (isVerbose) {
-                title += ' See errors below.';
-            }
-            const bodyLines = isVerbose
-                ? [projectGraphError.stack]
-                : ['Pass --verbose to see the stacktraces.'];
-            output_1.output.error({
-                title,
-                bodyLines: bodyLines,
-            });
-        }
-        else {
-            const lines = (err.message ? err.message : err.toString()).split('\n');
-            const bodyLines = lines.slice(1);
-            if (err.stack && !isVerbose) {
-                bodyLines.push('Pass --verbose to see the stacktrace.');
-            }
-            output_1.output.error({
-                title: lines[0],
-                bodyLines,
-            });
-            if (err.stack && isVerbose) {
-                logger_1.logger.info(err.stack);
-            }
-        }
-        if (client_1.daemonClient.enabled()) {
-            client_1.daemonClient.reset();
-        }
-        return 1;
-    }
-}
 function camelCase(input) {
     if (input.indexOf('-') > 1) {
         return input

package/src/utils/plugins/plugin-capabilities.js

@@ -41,10 +41,13 @@ async function getPluginCapabilities(workspaceRoot, pluginName, projects, includ
             projectGraphExtension: pluginModule &&
                 ('processProjectGraph' in pluginModule ||
                     'createNodes' in pluginModule ||
+                    'createNodesV2' in pluginModule ||
+                    'createMetadata' in pluginModule ||
                     'createDependencies' in pluginModule),
             projectInference: pluginModule &&
                 ('projectFilePatterns' in pluginModule ||
-                    'createNodes' in pluginModule),
+                    'createNodes' in pluginModule ||
+                    'createNodesV2' in pluginModule),
         };
     }
     catch {

package/src/utils/task-history.d.ts

@@ -1,6 +1,17 @@
-import { NxTaskHistory, TaskRun } from '../native';
+import { NxTaskHistory, TaskRun, TaskTarget } from '../native';
 export declare class TaskHistory {
     taskHistory: NxTaskHistory;
+    /**
+     * This function returns estimated timings per task
+     * @param targets
+     * @returns a map where key is task id (project:target:configuration), value is average time of historical runs
+     */
+    getEstimatedTaskTimings(targets: TaskTarget[]): Promise<Record<string, number>>;
     getFlakyTasks(hashes: string[]): Promise<string[]>;
     recordTaskRuns(taskRuns: TaskRun[]): Promise<void>;
 }
+/**
+ * This function returns the singleton instance of TaskHistory
+ * @returns singleton instance of TaskHistory
+ */
+export declare function getTaskHistory(): TaskHistory;

package/src/utils/task-history.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaskHistory = void 0;
+exports.getTaskHistory = getTaskHistory;
 const client_1 = require("../daemon/client/client");
 const is_on_daemon_1 = require("../daemon/is-on-daemon");
 const native_1 = require("../native");
@@ -9,6 +10,17 @@ class TaskHistory {
     constructor() {
         this.taskHistory = new native_1.NxTaskHistory((0, db_connection_1.getDbConnection)());
     }
+    /**
+     * This function returns estimated timings per task
+     * @param targets
+     * @returns a map where key is task id (project:target:configuration), value is average time of historical runs
+     */
+    async getEstimatedTaskTimings(targets) {
+        if ((0, is_on_daemon_1.isOnDaemon)() || !client_1.daemonClient.enabled()) {
+            return this.taskHistory.getEstimatedTaskTimings(targets);
+        }
+        return await client_1.daemonClient.getEstimatedTaskTimings(targets);
+    }
     async getFlakyTasks(hashes) {
         if ((0, is_on_daemon_1.isOnDaemon)() || !client_1.daemonClient.enabled()) {
             return this.taskHistory.getFlakyTasks(hashes);
@@ -23,3 +35,14 @@ class TaskHistory {
     }
 }
 exports.TaskHistory = TaskHistory;
+let taskHistory;
+/**
+ * This function returns the singleton instance of TaskHistory
+ * @returns singleton instance of TaskHistory
+ */
+function getTaskHistory() {
+    if (!taskHistory) {
+        taskHistory = new TaskHistory();
+    }
+    return taskHistory;
+}