nx 21.5.0-beta.0 → 21.5.0-beta.1

package/src/tasks-runner/task-graph-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"task-graph-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/task-graph-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAQ,SAAS,EAAE,MAAM,sBAAsB,CAAC;AA0BvD;;;GAGG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE;IAC/B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACvC,sBAAsB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CACnD,GAAG,MAAM,EAAE,GAAG,IAAI,CAYlB;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE;IAChC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACvC,sBAAsB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CACnD,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAerB;AA2BD,wBAAgB,WAAW,CAAC,KAAK,EAAE;IACjC,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CACxC,GAAG,IAAI,CAWP;AAED,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,YAAY,QAyC3B;AAED,wBAAgB,2CAA2C,CACzD,SAAS,EAAE,SAAS,QAkBrB;AAkBD,wBAAgB,YAAY,CAAC,SAAS,EAAE,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC,CAU9D"}
+{"version":3,"file":"task-graph-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/task-graph-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAQ,SAAS,EAAE,MAAM,sBAAsB,CAAC;AA0BvD;;;GAGG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE;IAC/B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACvC,sBAAsB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CACnD,GAAG,MAAM,EAAE,GAAG,IAAI,CAYlB;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE;IAChC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACvC,sBAAsB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CACnD,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAerB;AA2BD,wBAAgB,WAAW,CAAC,KAAK,EAAE;IACjC,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CACxC,GAAG,IAAI,CAWP;AAED,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,YAAY,QAyC3B;AAED,wBAAgB,2CAA2C,CACzD,SAAS,EAAE,SAAS,QAgCrB;AAwCD,wBAAgB,YAAY,CAAC,SAAS,EAAE,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC,CAU9D"}

package/src/tasks-runner/task-graph-utils.js

@@ -117,15 +117,24 @@ function validateNoAtomizedTasks(taskGraph, projectGraph) {
     process.exit(1);
 }
 function assertTaskGraphDoesNotContainInvalidTargets(taskGraph) {
-    const invalidTasks = [];
+    const nonParallelTasksThatDependOnContinuousTasks = [];
+    const nonParallelContinuousTasksThatAreDependedOn = [];
     for (const task of Object.values(taskGraph.tasks)) {
         if (task.parallelism === false &&
             taskGraph.continuousDependencies[task.id].length > 0) {
-            invalidTasks.push(task);
+            nonParallelTasksThatDependOnContinuousTasks.push(task);
         }
+        for (const dependency of taskGraph.continuousDependencies[task.id]) {
+            if (taskGraph.tasks[dependency].parallelism === false) {
+                nonParallelContinuousTasksThatAreDependedOn.push(taskGraph.tasks[dependency]);
+            }
+        }
+    }
+    if (nonParallelTasksThatDependOnContinuousTasks.length > 0) {
+        throw new NonParallelTaskDependsOnContinuousTasksError(nonParallelTasksThatDependOnContinuousTasks, taskGraph);
     }
-    if (invalidTasks.length > 0) {
-        throw new NonParallelTaskDependsOnContinuousTasksError(invalidTasks, taskGraph);
+    if (nonParallelContinuousTasksThatAreDependedOn.length > 0) {
+        throw new DependingOnNonParallelContinuousTaskError(nonParallelContinuousTasksThatAreDependedOn, taskGraph);
     }
 }
 class NonParallelTaskDependsOnContinuousTasksError extends Error {
@@ -139,6 +148,20 @@ class NonParallelTaskDependsOnContinuousTasksError extends Error {
         this.name = 'NonParallelTaskDependsOnContinuousTasksError';
     }
 }
+class DependingOnNonParallelContinuousTaskError extends Error {
+    constructor(invalidTasks, taskGraph) {
+        let message = 'The following continuous tasks do not support parallelism but are depended on:';
+        for (const task of invalidTasks) {
+            const dependents = Object.keys(taskGraph.continuousDependencies).filter((parentTaskId) => taskGraph.continuousDependencies[parentTaskId].includes(task.id));
+            message += `\n - ${task.id} <- ${dependents.join(', ')}`;
+        }
+        message +=
+            '\nParallelism must be enabled for a continuous task if it is depended on, as the tasks that depend on it will run in parallel with it.';
+        super(message);
+        this.invalidTasks = invalidTasks;
+        this.name = 'DependingOnNonParallelContinuousTaskError';
+    }
+}
 function getLeafTasks(taskGraph) {
     const reversed = reverseTaskGraph(taskGraph);
     const leafTasks = new Set();

package/src/utils/promised-based-queue.d.ts

@@ -3,5 +3,12 @@ export declare class PromisedBasedQueue {
     private promise;
     sendToQueue(fn: () => Promise<any>): Promise<any>;
     isEmpty(): boolean;
+    /**
+     * Used to decrement the internal counter representing the number of active promises in the queue.
+     * This is useful for retrying a failed daemon message, as we want to be able to shut the daemon down
+     * without marking the promise that represents the failed message as settled. To do so, we store
+     * the promise in a separate variable and only resolve or reject it later.
+     */
+    decrementQueueCounter(): void;
 }
 //# sourceMappingURL=promised-based-queue.d.ts.map

package/src/utils/promised-based-queue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"promised-based-queue.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/promised-based-queue.ts"],"names":[],"mappings":"AAAA,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,OAAO,CAAyB;IAExC,WAAW,CAAC,EAAE,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC;IA8BjD,OAAO;CAGR"}
+{"version":3,"file":"promised-based-queue.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/promised-based-queue.ts"],"names":[],"mappings":"AAAA,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,OAAO,CAAyB;IAExC,WAAW,CAAC,EAAE,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC;IA8BjD,OAAO;IAIP;;;;;OAKG;IACH,qBAAqB;CAGtB"}

package/src/utils/promised-based-queue.js

@@ -39,5 +39,14 @@ class PromisedBasedQueue {
     isEmpty() {
         return this.counter === 0;
     }
+    /**
+     * Used to decrement the internal counter representing the number of active promises in the queue.
+     * This is useful for retrying a failed daemon message, as we want to be able to shut the daemon down
+     * without marking the promise that represents the failed message as settled. To do so, we store
+     * the promise in a separate variable and only resolve or reject it later.
+     */
+    decrementQueueCounter() {
+        this.counter--;
+    }
 }
 exports.PromisedBasedQueue = PromisedBasedQueue;