@calmo/task-runner 1.1.1 → 1.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (37) hide show
  1. package/CHANGELOG.md +26 -0
  2. package/GEMINI.md +2 -1
  3. package/README.md +5 -0
  4. package/coverage/TaskGraphValidator.ts.html +463 -0
  5. package/coverage/TaskRunner.ts.html +244 -67
  6. package/coverage/coverage-final.json +2 -1
  7. package/coverage/index.html +24 -9
  8. package/coverage/lcov-report/TaskGraphValidator.ts.html +463 -0
  9. package/coverage/lcov-report/TaskRunner.ts.html +244 -67
  10. package/coverage/lcov-report/index.html +24 -9
  11. package/coverage/lcov.info +214 -103
  12. package/dist/TaskGraph.d.ts +18 -0
  13. package/dist/TaskGraph.js +2 -0
  14. package/dist/TaskGraph.js.map +1 -0
  15. package/dist/TaskGraphValidator.d.ts +17 -0
  16. package/dist/TaskGraphValidator.js +103 -0
  17. package/dist/TaskGraphValidator.js.map +1 -0
  18. package/dist/TaskRunner.d.ts +1 -0
  19. package/dist/TaskRunner.js +88 -32
  20. package/dist/TaskRunner.js.map +1 -1
  21. package/dist/contracts/ITaskGraphValidator.d.ts +13 -0
  22. package/dist/contracts/ITaskGraphValidator.js +2 -0
  23. package/dist/contracts/ITaskGraphValidator.js.map +1 -0
  24. package/dist/contracts/ValidationError.d.ts +11 -0
  25. package/dist/contracts/ValidationError.js +2 -0
  26. package/dist/contracts/ValidationError.js.map +1 -0
  27. package/dist/contracts/ValidationResult.d.ts +10 -0
  28. package/dist/contracts/ValidationResult.js +2 -0
  29. package/dist/contracts/ValidationResult.js.map +1 -0
  30. package/package.json +1 -1
  31. package/src/TaskGraph.ts +19 -0
  32. package/src/TaskGraphValidator.ts +126 -0
  33. package/src/TaskRunner.ts +85 -26
  34. package/src/contracts/ITaskGraphValidator.ts +14 -0
  35. package/src/contracts/ValidationError.ts +11 -0
  36. package/src/contracts/ValidationResult.ts +11 -0
  37. package/test-report.xml +51 -23
@@ -1,108 +1,219 @@
1
1
  TN:
2
+ SF:src/TaskGraphValidator.ts
3
+ FN:17,(anonymous_0)
4
+ FN:49,(anonymous_1)
5
+ FN:96,(anonymous_2)
6
+ FNF:3
7
+ FNH:3
8
+ FNDA:29,(anonymous_0)
9
+ FNDA:7,(anonymous_1)
10
+ FNDA:51,(anonymous_2)
11
+ DA:18,29
12
+ DA:21,29
13
+ DA:22,29
14
+ DA:23,61
15
+ DA:24,3
16
+ DA:30,58
17
+ DA:35,29
18
+ DA:36,61
19
+ DA:37,41
20
+ DA:38,5
21
+ DA:49,29
22
+ DA:51,29
23
+ DA:52,4
24
+ DA:59,25
25
+ DA:60,25
26
+ DA:61,54
27
+ DA:64,25
28
+ DA:65,25
29
+ DA:67,25
30
+ DA:68,49
31
+ DA:69,3
32
+ DA:72,46
33
+ DA:73,46
34
+ DA:76,4
35
+ DA:77,4
36
+ DA:78,4
37
+ DA:80,4
38
+ DA:86,4
39
+ DA:90,25
40
+ DA:103,51
41
+ DA:104,51
42
+ DA:105,51
43
+ DA:107,51
44
+ DA:108,51
45
+ DA:109,33
46
+ DA:113,5
47
+ DA:114,28
48
+ DA:117,4
49
+ DA:118,4
50
+ DA:122,42
51
+ DA:123,42
52
+ DA:124,42
53
+ LF:42
54
+ LH:42
55
+ BRDA:23,0,0,3
56
+ BRDA:23,0,1,58
57
+ BRDA:37,1,0,5
58
+ BRDA:37,1,1,36
59
+ BRDA:51,2,0,4
60
+ BRDA:51,2,1,25
61
+ BRDA:68,3,0,3
62
+ BRDA:68,3,1,46
63
+ BRDA:73,4,0,4
64
+ BRDA:73,4,1,42
65
+ BRDA:109,5,0,5
66
+ BRDA:109,5,1,28
67
+ BRDA:110,6,0,33
68
+ BRDA:110,6,1,5
69
+ BRDA:114,7,0,4
70
+ BRDA:114,7,1,24
71
+ BRF:16
72
+ BRH:16
73
+ end_of_record
74
+ TN:
2
75
  SF:src/TaskRunner.ts
3
- FN:58,(anonymous_0)
4
- FN:65,(anonymous_1)
5
- FN:85,(anonymous_2)
6
- FN:101,(anonymous_3)
7
- FN:130,(anonymous_4)
8
- FN:137,(anonymous_5)
9
- FN:140,(anonymous_6)
10
- FN:143,(anonymous_7)
11
- FN:152,(anonymous_8)
12
- FN:169,(anonymous_9)
13
- FN:170,(anonymous_10)
14
- FN:177,(anonymous_11)
15
- FNF:12
16
- FNH:12
17
- FNDA:19,(anonymous_0)
76
+ FN:61,(anonymous_0)
77
+ FN:68,(anonymous_1)
78
+ FN:88,(anonymous_2)
79
+ FN:104,(anonymous_3)
80
+ FN:133,(anonymous_4)
81
+ FN:136,(anonymous_5)
82
+ FN:155,(anonymous_6)
83
+ FN:187,(anonymous_7)
84
+ FN:189,(anonymous_8)
85
+ FN:196,(anonymous_9)
86
+ FN:209,(anonymous_10)
87
+ FN:213,(anonymous_11)
88
+ FN:222,(anonymous_12)
89
+ FN:239,(anonymous_13)
90
+ FNF:14
91
+ FNH:14
92
+ FNDA:22,(anonymous_0)
18
93
  FNDA:12,(anonymous_1)
19
94
  FNDA:2,(anonymous_2)
20
- FNDA:94,(anonymous_3)
21
- FNDA:18,(anonymous_4)
22
- FNDA:80,(anonymous_5)
23
- FNDA:57,(anonymous_6)
24
- FNDA:42,(anonymous_7)
25
- FNDA:45,(anonymous_8)
26
- FNDA:6,(anonymous_9)
27
- FNDA:3,(anonymous_10)
28
- FNDA:27,(anonymous_11)
29
- DA:52,19
30
- DA:53,19
31
- DA:58,19
32
- DA:69,12
33
- DA:72,11
34
- DA:75,12
35
- DA:89,2
36
- DA:90,1
37
- DA:105,94
38
- DA:108,94
39
- DA:109,13
40
- DA:110,13
41
- DA:111,13
42
- DA:114,1
43
- DA:131,18
44
- DA:133,18
45
- DA:135,18
46
- DA:136,26
47
- DA:137,80
48
- DA:140,26
49
- DA:141,57
50
- DA:142,57
51
- DA:143,42
52
- DA:148,26
53
- DA:149,57
54
- DA:150,56
55
- DA:151,57
56
- DA:152,45
57
- DA:154,57
58
- DA:155,7
59
- DA:159,7
60
- DA:160,7
61
- DA:164,26
62
- DA:169,6
63
- DA:170,3
64
- DA:171,3
65
- DA:176,23
66
- DA:178,27
67
- DA:179,27
68
- DA:180,27
69
- DA:181,27
70
- DA:182,25
71
- DA:184,2
72
- DA:189,27
73
- DA:190,27
74
- DA:191,27
75
- DA:197,15
76
- DA:198,15
77
- LF:48
78
- LH:48
79
- BRDA:69,0,0,11
80
- BRDA:69,0,1,1
81
- BRDA:89,1,0,1
82
- BRDA:89,1,1,1
83
- BRDA:108,2,0,13
84
- BRDA:108,2,1,81
85
- BRDA:137,3,0,80
86
- BRDA:137,3,1,57
87
- BRDA:141,4,0,57
88
- BRDA:141,4,1,19
89
- BRDA:143,5,0,42
90
- BRDA:143,5,1,19
91
- BRDA:149,6,0,1
92
- BRDA:149,6,1,56
93
- BRDA:150,7,0,56
94
- BRDA:150,7,1,19
95
- BRDA:152,8,0,45
96
- BRDA:152,8,1,19
97
- BRDA:154,9,0,7
98
- BRDA:154,9,1,50
99
- BRDA:164,10,0,3
100
- BRDA:164,10,1,23
101
- BRDA:165,11,0,26
102
- BRDA:165,11,1,6
103
- BRDA:165,11,2,6
104
- BRDA:186,12,0,1
105
- BRDA:186,12,1,1
106
- BRF:27
107
- BRH:27
95
+ FNDA:88,(anonymous_3)
96
+ FNDA:21,(anonymous_4)
97
+ FNDA:43,(anonymous_5)
98
+ FNDA:6,(anonymous_6)
99
+ FNDA:35,(anonymous_7)
100
+ FNDA:98,(anonymous_8)
101
+ FNDA:39,(anonymous_9)
102
+ FNDA:98,(anonymous_10)
103
+ FNDA:29,(anonymous_11)
104
+ FNDA:26,(anonymous_12)
105
+ FNDA:26,(anonymous_13)
106
+ DA:54,22
107
+ DA:55,22
108
+ DA:56,22
109
+ DA:61,22
110
+ DA:72,12
111
+ DA:75,11
112
+ DA:78,12
113
+ DA:92,2
114
+ DA:93,1
115
+ DA:108,88
116
+ DA:111,88
117
+ DA:112,13
118
+ DA:113,13
119
+ DA:114,13
120
+ DA:117,1
121
+ DA:135,21
122
+ DA:136,43
123
+ DA:142,21
124
+ DA:143,21
125
+ DA:145,6
126
+ DA:146,6
127
+ DA:148,6
128
+ DA:149,6
129
+ DA:150,6
130
+ DA:153,2
131
+ DA:155,6
132
+ DA:156,2
133
+ DA:160,2
134
+ DA:161,2
135
+ DA:162,2
136
+ DA:165,2
137
+ DA:166,2
138
+ DA:167,2
139
+ DA:173,6
140
+ DA:174,6
141
+ DA:175,6
142
+ DA:178,6
143
+ DA:181,15
144
+ DA:183,15
145
+ DA:184,15
146
+ DA:187,15
147
+ DA:188,35
148
+ DA:189,98
149
+ DA:193,35
150
+ DA:194,49
151
+ DA:195,49
152
+ DA:196,39
153
+ DA:198,49
154
+ DA:199,6
155
+ DA:203,6
156
+ DA:204,6
157
+ DA:209,35
158
+ DA:210,98
159
+ DA:211,43
160
+ DA:212,98
161
+ DA:213,29
162
+ DA:218,35
163
+ DA:219,26
164
+ DA:220,26
165
+ DA:222,26
166
+ DA:223,26
167
+ DA:224,26
168
+ DA:225,24
169
+ DA:227,2
170
+ DA:232,26
171
+ DA:233,26
172
+ DA:234,26
173
+ DA:239,26
174
+ DA:240,26
175
+ DA:242,26
176
+ DA:247,15
177
+ DA:249,15
178
+ DA:251,20
179
+ DA:253,20
180
+ DA:256,15
181
+ DA:257,15
182
+ LF:76
183
+ LH:76
184
+ BRDA:72,0,0,11
185
+ BRDA:72,0,1,1
186
+ BRDA:92,1,0,1
187
+ BRDA:92,1,1,1
188
+ BRDA:111,2,0,13
189
+ BRDA:111,2,1,75
190
+ BRDA:138,3,0,43
191
+ BRDA:138,3,1,21
192
+ BRDA:143,4,0,6
193
+ BRDA:143,4,1,15
194
+ BRDA:150,5,0,2
195
+ BRDA:150,5,1,2
196
+ BRDA:150,5,2,2
197
+ BRDA:189,6,0,98
198
+ BRDA:189,6,1,50
199
+ BRDA:194,7,0,49
200
+ BRDA:194,7,1,18
201
+ BRDA:196,8,0,39
202
+ BRDA:196,8,1,18
203
+ BRDA:198,9,0,6
204
+ BRDA:198,9,1,43
205
+ BRDA:210,10,0,55
206
+ BRDA:210,10,1,43
207
+ BRDA:210,11,0,98
208
+ BRDA:210,11,1,44
209
+ BRDA:211,12,0,43
210
+ BRDA:211,12,1,18
211
+ BRDA:213,13,0,29
212
+ BRDA:213,13,1,12
213
+ BRDA:229,14,0,1
214
+ BRDA:229,14,1,1
215
+ BRDA:249,15,0,15
216
+ BRDA:249,15,1,20
217
+ BRF:33
218
+ BRH:33
108
219
  end_of_record
@@ -0,0 +1,18 @@
1
+ /**
2
+ * Represents a single task in the task graph.
3
+ */
4
+ export interface Task {
5
+ /** Unique identifier for the task. */
6
+ id: string;
7
+ /** An array of task IDs that this task directly depends on. */
8
+ dependencies: string[];
9
+ /** Allows for any other properties specific to the task's payload or configuration. */
10
+ [key: string]: unknown;
11
+ }
12
+ /**
13
+ * Represents the entire collection of tasks and their interdependencies.
14
+ */
15
+ export interface TaskGraph {
16
+ /** An array of tasks that make up the graph. */
17
+ tasks: Task[];
18
+ }
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=TaskGraph.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"TaskGraph.js","sourceRoot":"","sources":["../src/TaskGraph.ts"],"names":[],"mappings":""}
@@ -0,0 +1,17 @@
1
+ import { ITaskGraphValidator } from "./contracts/ITaskGraphValidator.js";
2
+ import { ValidationResult } from "./contracts/ValidationResult.js";
3
+ import { TaskGraph } from "./TaskGraph.js";
4
+ export declare class TaskGraphValidator implements ITaskGraphValidator {
5
+ /**
6
+ * Validates a given task graph for structural integrity.
7
+ * Checks for:
8
+ * 1. Duplicate task IDs.
9
+ * 2. Missing dependencies (tasks that depend on non-existent IDs).
10
+ * 3. Circular dependencies (cycles in the graph).
11
+ *
12
+ * @param taskGraph The task graph to validate.
13
+ * @returns A ValidationResult object indicating the outcome of the validation.
14
+ */
15
+ validate(taskGraph: TaskGraph): ValidationResult;
16
+ private detectCycle;
17
+ }
@@ -0,0 +1,103 @@
1
+ export class TaskGraphValidator {
2
+ /**
3
+ * Validates a given task graph for structural integrity.
4
+ * Checks for:
5
+ * 1. Duplicate task IDs.
6
+ * 2. Missing dependencies (tasks that depend on non-existent IDs).
7
+ * 3. Circular dependencies (cycles in the graph).
8
+ *
9
+ * @param taskGraph The task graph to validate.
10
+ * @returns A ValidationResult object indicating the outcome of the validation.
11
+ */
12
+ validate(taskGraph) {
13
+ const errors = [];
14
+ // 1. Check for duplicate tasks
15
+ const taskIds = new Set();
16
+ for (const task of taskGraph.tasks) {
17
+ if (taskIds.has(task.id)) {
18
+ errors.push({
19
+ type: "duplicate_task",
20
+ message: `Duplicate task detected with ID: ${task.id}`,
21
+ details: { taskId: task.id }
22
+ });
23
+ }
24
+ else {
25
+ taskIds.add(task.id);
26
+ }
27
+ }
28
+ // 2. Check for missing dependencies
29
+ for (const task of taskGraph.tasks) {
30
+ for (const dependenceId of task.dependencies) {
31
+ if (!taskIds.has(dependenceId)) {
32
+ errors.push({
33
+ type: "missing_dependency",
34
+ message: `Task '${task.id}' depends on missing task '${dependenceId}'`,
35
+ details: { taskId: task.id, missingDependencyId: dependenceId }
36
+ });
37
+ }
38
+ }
39
+ }
40
+ // 3. Check for cycles
41
+ // Only run cycle detection if there are no missing dependencies, otherwise we might chase non-existent nodes.
42
+ const hasMissingDependencies = errors.some(e => e.type === "missing_dependency");
43
+ if (hasMissingDependencies) {
44
+ return {
45
+ isValid: errors.length === 0,
46
+ errors
47
+ };
48
+ }
49
+ // Build adjacency list
50
+ const adjacencyList = new Map();
51
+ for (const task of taskGraph.tasks) {
52
+ adjacencyList.set(task.id, task.dependencies);
53
+ }
54
+ const visited = new Set();
55
+ const recursionStack = new Set();
56
+ for (const task of taskGraph.tasks) {
57
+ if (visited.has(task.id)) {
58
+ continue;
59
+ }
60
+ const path = [];
61
+ if (this.detectCycle(task.id, path, visited, recursionStack, adjacencyList)) {
62
+ // Extract the actual cycle from the path
63
+ // The path might look like A -> B -> C -> B (if we started at A and found cycle B-C-B)
64
+ const cycleStart = path[path.length - 1];
65
+ const cycleStartIndex = path.indexOf(cycleStart);
66
+ const cyclePath = path.slice(cycleStartIndex);
67
+ errors.push({
68
+ type: "cycle",
69
+ message: `Cycle detected: ${cyclePath.join(" -> ")}`,
70
+ details: { cyclePath }
71
+ });
72
+ // Break after first cycle found to avoid spamming similar errors
73
+ break;
74
+ }
75
+ }
76
+ return {
77
+ isValid: errors.length === 0,
78
+ errors
79
+ };
80
+ }
81
+ detectCycle(taskId, path, visited, recursionStack, adjacencyList) {
82
+ visited.add(taskId);
83
+ recursionStack.add(taskId);
84
+ path.push(taskId);
85
+ const dependencies = adjacencyList.get(taskId);
86
+ for (const dependenceId of dependencies) {
87
+ if (!visited.has(dependenceId) &&
88
+ this.detectCycle(dependenceId, path, visited, recursionStack, adjacencyList)) {
89
+ return true;
90
+ }
91
+ else if (recursionStack.has(dependenceId)) {
92
+ // Cycle detected
93
+ // Add the dependency to complete the visual cycle
94
+ path.push(dependenceId);
95
+ return true;
96
+ }
97
+ }
98
+ recursionStack.delete(taskId);
99
+ path.pop();
100
+ return false;
101
+ }
102
+ }
103
+ //# sourceMappingURL=TaskGraphValidator.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"TaskGraphValidator.js","sourceRoot":"","sources":["../src/TaskGraphValidator.ts"],"names":[],"mappings":"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"}
@@ -37,6 +37,7 @@ export declare class TaskRunner<TContext> {
37
37
  private context;
38
38
  private running;
39
39
  private listeners;
40
+ private validator;
40
41
  /**
41
42
  * @param context The shared context object to be passed to each task.
42
43
  */
@@ -1,3 +1,4 @@
1
+ import { TaskGraphValidator } from "./TaskGraphValidator.js";
1
2
  /**
2
3
  * The main class that orchestrates the execution of a list of tasks
3
4
  * based on their dependencies, with support for parallel execution.
@@ -7,6 +8,7 @@ export class TaskRunner {
7
8
  context;
8
9
  running = new Set();
9
10
  listeners = {};
11
+ validator = new TaskGraphValidator();
10
12
  /**
11
13
  * @param context The shared context object to be passed to each task.
12
14
  */
@@ -64,18 +66,56 @@ export class TaskRunner {
64
66
  * and values are the corresponding TaskResult objects.
65
67
  */
66
68
  async execute(steps) {
69
+ // Validate the task graph before execution
70
+ const taskGraph = {
71
+ tasks: steps.map((step) => ({
72
+ id: step.name,
73
+ dependencies: step.dependencies ?? [],
74
+ })),
75
+ };
76
+ const validationResult = this.validator.validate(taskGraph);
77
+ if (!validationResult.isValid) {
78
+ // Construct error message compatible with legacy tests
79
+ const affectedTasks = new Set();
80
+ const errorDetails = [];
81
+ for (const error of validationResult.errors) {
82
+ errorDetails.push(error.message);
83
+ switch (error.type) {
84
+ case "cycle": {
85
+ // details is { cyclePath: string[] }
86
+ const path = error.details.cyclePath;
87
+ // The last element duplicates the first in the path representation, so valid unique tasks are slice(0, -1) or just all as Set handles uniq
88
+ path.forEach((t) => affectedTasks.add(t));
89
+ break;
90
+ }
91
+ case "missing_dependency": {
92
+ // details is { taskId: string, missingDependencyId: string }
93
+ const d = error.details;
94
+ affectedTasks.add(d.taskId);
95
+ break;
96
+ }
97
+ case "duplicate_task": {
98
+ const d = error.details;
99
+ affectedTasks.add(d.taskId);
100
+ break;
101
+ }
102
+ }
103
+ }
104
+ // Legacy error format: "Circular dependency or missing dependency detected. Unable to run tasks: A, B"
105
+ const taskList = Array.from(affectedTasks).join(", ");
106
+ const legacyMessage = `Circular dependency or missing dependency detected. Unable to run tasks: ${taskList}`;
107
+ const detailedMessage = `Task graph validation failed: ${errorDetails.join("; ")}`;
108
+ // Combine them to satisfy both legacy tests (checking for legacy message) and new requirements (clear details)
109
+ throw new Error(`${legacyMessage} | ${detailedMessage}`);
110
+ }
67
111
  this.emit("workflowStart", { context: this.context, steps });
68
112
  const results = new Map();
69
- while (results.size < steps.length) {
113
+ const executingPromises = new Set();
114
+ // Helper to process pending steps and launch ready ones
115
+ const processPendingSteps = () => {
70
116
  const pendingSteps = steps.filter((step) => !results.has(step.name) && !this.running.has(step.name));
71
- const readySteps = pendingSteps.filter((step) => {
72
- const deps = step.dependencies ?? [];
73
- return deps.every((dep) => results.has(dep) && results.get(dep)?.status === "success");
74
- });
75
- // Skip tasks with failed dependencies
117
+ // 1. Identify and mark skipped tasks
76
118
  for (const step of pendingSteps) {
77
- if (results.has(step.name))
78
- continue;
79
119
  const deps = step.dependencies ?? [];
80
120
  const failedDep = deps.find((dep) => results.has(dep) && results.get(dep)?.status !== "success");
81
121
  if (failedDep) {
@@ -87,32 +127,48 @@ export class TaskRunner {
87
127
  this.emit("taskSkipped", { step, result });
88
128
  }
89
129
  }
90
- if (readySteps.length === 0 &&
91
- this.running.size === 0 &&
92
- results.size < steps.length) {
93
- const unrunnableSteps = steps.filter((s) => !results.has(s.name));
94
- const unrunnableStepNames = unrunnableSteps.map((s) => s.name);
95
- throw new Error(`Circular dependency or missing dependency detected. Unable to run tasks: ${unrunnableStepNames.join(", ")}`);
96
- }
97
- await Promise.all(readySteps.map(async (step) => {
130
+ // Re-filter pending steps as some might have been skipped above
131
+ const readySteps = steps.filter((step) => {
132
+ if (results.has(step.name) || this.running.has(step.name))
133
+ return false;
134
+ const deps = step.dependencies ?? [];
135
+ return deps.every((dep) => results.has(dep) && results.get(dep)?.status === "success");
136
+ });
137
+ // 2. Launch ready tasks
138
+ for (const step of readySteps) {
98
139
  this.running.add(step.name);
99
140
  this.emit("taskStart", { step });
100
- try {
101
- const result = await step.run(this.context);
102
- results.set(step.name, result);
103
- }
104
- catch (e) {
105
- results.set(step.name, {
106
- status: "failure",
107
- error: e instanceof Error ? e.message : String(e),
108
- });
109
- }
110
- finally {
111
- this.running.delete(step.name);
112
- const result = results.get(step.name);
113
- this.emit("taskEnd", { step, result });
114
- }
115
- }));
141
+ const taskPromise = (async () => {
142
+ try {
143
+ const result = await step.run(this.context);
144
+ results.set(step.name, result);
145
+ }
146
+ catch (e) {
147
+ results.set(step.name, {
148
+ status: "failure",
149
+ error: e instanceof Error ? e.message : String(e),
150
+ });
151
+ }
152
+ finally {
153
+ this.running.delete(step.name);
154
+ const result = results.get(step.name);
155
+ this.emit("taskEnd", { step, result });
156
+ }
157
+ })();
158
+ // Wrap the task promise to ensure we can track it in the Set
159
+ const trackedPromise = taskPromise.then(() => {
160
+ executingPromises.delete(trackedPromise);
161
+ });
162
+ executingPromises.add(trackedPromise);
163
+ }
164
+ };
165
+ // Initial check to start independent tasks
166
+ processPendingSteps();
167
+ while (results.size < steps.length && executingPromises.size > 0) {
168
+ // Wait for the next task to finish
169
+ await Promise.race(executingPromises);
170
+ // After a task finishes, check for new work
171
+ processPendingSteps();
116
172
  }
117
173
  this.emit("workflowEnd", { context: this.context, results });
118
174
  return results;
@@ -1 +1 @@
1
- {"version":3,"file":"TaskRunner.js","sourceRoot":"","sources":["../src/TaskRunner.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"TaskRunner.js","sourceRoot":"","sources":["../src/TaskRunner.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AA6C7D;;;;GAIG;AACH,MAAM,OAAO,UAAU;IAQD;IAPZ,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAC5B,SAAS,GAA0B,EAAE,CAAC;IACtC,SAAS,GAAG,IAAI,kBAAkB,EAAE,CAAC;IAE7C;;OAEG;IACH,YAAoB,OAAiB;QAAjB,YAAO,GAAP,OAAO,CAAU;IAAG,CAAC;IAEzC;;;;OAIG;IACI,EAAE,CACP,KAAQ,EACR,QAA0C;QAE1C,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3B,4EAA4E;YAC5E,iEAAiE;YACjE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,IAAI,GAAG,EAAyC,CAAC;QAC3E,CAAC;QACD,oFAAoF;QACnF,IAAI,CAAC,SAAS,CAAC,KAAK,CAA2C,CAAC,GAAG,CAClE,QAAQ,CACT,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACI,GAAG,CACR,KAAQ,EACR,QAA0C;QAE1C,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,SAAS,CAAC,KAAK,CAA2C,CAAC,MAAM,CACrE,QAAQ,CACT,CAAC;QACJ,CAAC;IACH,CAAC;IAED;;;;OAIG;IACK,IAAI,CACV,KAAQ,EACR,IAAsC;QAEtC,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAEzB,CAAC;QACd,IAAI,SAAS,EAAE,CAAC;YACd,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;gBACjC,IAAI,CAAC;oBACH,QAAQ,CAAC,IAAI,CAAC,CAAC;gBACjB,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,2CAA2C;oBAC3C,OAAO,CAAC,KAAK,CACX,+BAA+B,MAAM,CAAC,KAAK,CAAC,GAAG,EAC/C,KAAK,CACN,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,OAAO,CAAC,KAA2B;QACvC,2CAA2C;QAC3C,MAAM,SAAS,GAAc;YAC3B,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBAC1B,EAAE,EAAE,IAAI,CAAC,IAAI;gBACb,YAAY,EAAE,IAAI,CAAC,YAAY,IAAI,EAAE;aACtC,CAAC,CAAC;SACJ,CAAC;QAEF,MAAM,gBAAgB,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC5D,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC;YAC9B,uDAAuD;YACvD,MAAM,aAAa,GAAG,IAAI,GAAG,EAAU,CAAC;YACxC,MAAM,YAAY,GAAa,EAAE,CAAC;YAElC,KAAK,MAAM,KAAK,IAAI,gBAAgB,CAAC,MAAM,EAAE,CAAC;gBAC5C,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBACjC,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;oBACnB,KAAK,OAAO,CAAC,CAAC,CAAC;wBACb,qCAAqC;wBACrC,MAAM,IAAI,GAAI,KAAK,CAAC,OAAmC,CAAC,SAAS,CAAC;wBAClE,2IAA2I;wBAC3I,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;wBAC1C,MAAM;oBACR,CAAC;oBACD,KAAK,oBAAoB,CAAC,CAAC,CAAC;wBAC1B,6DAA6D;wBAC7D,MAAM,CAAC,GAAG,KAAK,CAAC,OAA6B,CAAC;wBAC9C,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;wBAC5B,MAAM;oBACR,CAAC;oBACD,KAAK,gBAAgB,CAAC,CAAC,CAAC;wBACtB,MAAM,CAAC,GAAG,KAAK,CAAC,OAA6B,CAAC;wBAC9C,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;wBAC5B,MAAM;oBACR,CAAC;gBACH,CAAC;YACH,CAAC;YAED,uGAAuG;YACvG,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACtD,MAAM,aAAa,GAAG,4EAA4E,QAAQ,EAAE,CAAC;YAC7G,MAAM,eAAe,GAAG,iCAAiC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAEnF,+GAA+G;YAC/G,MAAM,IAAI,KAAK,CAAC,GAAG,aAAa,MAAM,eAAe,EAAE,CAAC,CAAC;QAC3D,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;QAE7D,MAAM,OAAO,GAAG,IAAI,GAAG,EAAsB,CAAC;QAC9C,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAiB,CAAC;QAEnD,wDAAwD;QACxD,MAAM,mBAAmB,GAAG,GAAG,EAAE;YAC/B,MAAM,YAAY,GAAG,KAAK,CAAC,MAAM,CAC/B,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAClE,CAAC;YAEF,qCAAqC;YACrC,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE,CAAC;gBAChC,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC;gBACrC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CACzB,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,MAAM,KAAK,SAAS,CACpE,CAAC;gBACF,IAAI,SAAS,EAAE,CAAC;oBACd,MAAM,MAAM,GAAe;wBACzB,MAAM,EAAE,SAAS;wBACjB,OAAO,EAAE,qCAAqC,SAAS,EAAE;qBAC1D,CAAC;oBACF,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;oBAC/B,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;gBAC7C,CAAC;YACH,CAAC;YAED,gEAAgE;YAChE,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;gBACvC,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;oBAAE,OAAO,KAAK,CAAC;gBACxE,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC;gBACrC,OAAO,IAAI,CAAC,KAAK,CACf,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,MAAM,KAAK,SAAS,CACpE,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,wBAAwB;YACxB,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;gBAC9B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC5B,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;gBAEjC,MAAM,WAAW,GAAG,CAAC,KAAK,IAAI,EAAE;oBAC9B,IAAI,CAAC;wBACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;wBAC5C,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;oBACjC,CAAC;oBAAC,OAAO,CAAC,EAAE,CAAC;wBACX,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE;4BACrB,MAAM,EAAE,SAAS;4BACjB,KAAK,EAAE,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;yBAClD,CAAC,CAAC;oBACL,CAAC;4BAAS,CAAC;wBACT,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;wBAC/B,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAE,CAAC;wBACvC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;oBACzC,CAAC;gBACH,CAAC,CAAC,EAAE,CAAC;gBAEL,6DAA6D;gBAC7D,MAAM,cAAc,GAAG,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE;oBAC3C,iBAAiB,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;gBAC3C,CAAC,CAAC,CAAC;gBACH,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YACxC,CAAC;QACH,CAAC,CAAC;QAEF,2CAA2C;QAC3C,mBAAmB,EAAE,CAAC;QAEtB,OAAO,OAAO,CAAC,IAAI,GAAG,KAAK,CAAC,MAAM,IAAI,iBAAiB,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;YACjE,mCAAmC;YACnC,MAAM,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YACtC,4CAA4C;YAC5C,mBAAmB,EAAE,CAAC;QACxB,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QAC7D,OAAO,OAAO,CAAC;IACjB,CAAC;CACF"}