lage 1.7.8 → 1.8.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.
- package/CHANGELOG.json +31 -1
- package/CHANGELOG.md +18 -2
- package/lib/cli.js +0 -5
- package/lib/cli.js.map +1 -1
- package/lib/command/run.js +0 -8
- package/lib/command/run.js.map +1 -1
- package/lib/config/getConfig.js +0 -2
- package/lib/config/getConfig.js.map +1 -1
- package/lib/context.d.ts +1 -1
- package/lib/context.js +0 -2
- package/lib/context.js.map +1 -1
- package/lib/task/Pipeline.d.ts +0 -4
- package/lib/task/Pipeline.js +6 -34
- package/lib/task/Pipeline.js.map +1 -1
- package/lib/task/WrappedTarget.js +1 -1
- package/lib/task/WrappedTarget.js.map +1 -1
- package/lib/types/CliOptions.d.ts +0 -4
- package/lib/types/ConfigOptions.d.ts +0 -7
- package/lib/types/RunContext.d.ts +0 -2
- package/package.json +2 -4
- package/lib/command/worker.d.ts +0 -3
- package/lib/command/worker.js +0 -123
- package/lib/command/worker.js.map +0 -1
- package/lib/task/DistributedTask.d.ts +0 -20
- package/lib/task/DistributedTask.js +0 -50
- package/lib/task/DistributedTask.js.map +0 -1
- package/lib/task/WorkerQueue.d.ts +0 -23
- package/lib/task/WorkerQueue.js +0 -113
- package/lib/task/WorkerQueue.js.map +0 -1
package/CHANGELOG.json
CHANGED
|
@@ -2,7 +2,37 @@
|
|
|
2
2
|
"name": "lage",
|
|
3
3
|
"entries": [
|
|
4
4
|
{
|
|
5
|
-
"date": "Wed,
|
|
5
|
+
"date": "Wed, 31 Aug 2022 19:31:26 GMT",
|
|
6
|
+
"tag": "lage_v1.8.0",
|
|
7
|
+
"version": "1.8.0",
|
|
8
|
+
"comments": {
|
|
9
|
+
"minor": [
|
|
10
|
+
{
|
|
11
|
+
"author": "kchau@microsoft.com",
|
|
12
|
+
"package": "lage",
|
|
13
|
+
"commit": "2bced4ff1337ac476a1e95c86b0a077b2c942216",
|
|
14
|
+
"comment": "Get rid of experimental distributed mode"
|
|
15
|
+
}
|
|
16
|
+
]
|
|
17
|
+
}
|
|
18
|
+
},
|
|
19
|
+
{
|
|
20
|
+
"date": "Thu, 25 Aug 2022 19:01:34 GMT",
|
|
21
|
+
"tag": "lage_v1.7.9",
|
|
22
|
+
"version": "1.7.9",
|
|
23
|
+
"comments": {
|
|
24
|
+
"patch": [
|
|
25
|
+
{
|
|
26
|
+
"author": "renovate@whitesourcesoftware.com",
|
|
27
|
+
"package": "lage",
|
|
28
|
+
"commit": "9f99ae972fdf5740a5b78e494bfb984536767d1b",
|
|
29
|
+
"comment": "Update dependency beachball to v2.30.1"
|
|
30
|
+
}
|
|
31
|
+
]
|
|
32
|
+
}
|
|
33
|
+
},
|
|
34
|
+
{
|
|
35
|
+
"date": "Wed, 24 Aug 2022 22:26:03 GMT",
|
|
6
36
|
"tag": "lage_v1.7.8",
|
|
7
37
|
"version": "1.7.8",
|
|
8
38
|
"comments": {
|
package/CHANGELOG.md
CHANGED
|
@@ -1,12 +1,28 @@
|
|
|
1
1
|
# Change Log - lage
|
|
2
2
|
|
|
3
|
-
This log was last generated on Wed,
|
|
3
|
+
This log was last generated on Wed, 31 Aug 2022 19:31:26 GMT and should not be manually modified.
|
|
4
4
|
|
|
5
5
|
<!-- Start content -->
|
|
6
6
|
|
|
7
|
+
## 1.8.0
|
|
8
|
+
|
|
9
|
+
Wed, 31 Aug 2022 19:31:26 GMT
|
|
10
|
+
|
|
11
|
+
### Minor changes
|
|
12
|
+
|
|
13
|
+
- Get rid of experimental distributed mode (kchau@microsoft.com)
|
|
14
|
+
|
|
15
|
+
## 1.7.9
|
|
16
|
+
|
|
17
|
+
Thu, 25 Aug 2022 19:01:34 GMT
|
|
18
|
+
|
|
19
|
+
### Patches
|
|
20
|
+
|
|
21
|
+
- Update dependency beachball to v2.30.1 (renovate@whitesourcesoftware.com)
|
|
22
|
+
|
|
7
23
|
## 1.7.8
|
|
8
24
|
|
|
9
|
-
Wed, 24 Aug 2022 22:
|
|
25
|
+
Wed, 24 Aug 2022 22:26:03 GMT
|
|
10
26
|
|
|
11
27
|
### Patches
|
|
12
28
|
|
package/lib/cli.js
CHANGED
|
@@ -9,7 +9,6 @@ const info_1 = require("./command/info");
|
|
|
9
9
|
const initReporters_1 = require("./logger/initReporters");
|
|
10
10
|
const version_1 = require("./command/version");
|
|
11
11
|
const cache_1 = require("./command/cache");
|
|
12
|
-
const worker_1 = require("./command/worker");
|
|
13
12
|
const graph_1 = require("./command/graph");
|
|
14
13
|
// Parse CLI args
|
|
15
14
|
const cwd = process.cwd();
|
|
@@ -32,10 +31,6 @@ try {
|
|
|
32
31
|
case "version":
|
|
33
32
|
(0, version_1.version)();
|
|
34
33
|
break;
|
|
35
|
-
case "experiment-worker":
|
|
36
|
-
logger_1.logger.info(`Lage worker - let's make it`);
|
|
37
|
-
(0, worker_1.worker)(cwd, config);
|
|
38
|
-
break;
|
|
39
34
|
default:
|
|
40
35
|
logger_1.logger.info(`Lage task runner - let's make it`);
|
|
41
36
|
(0, run_1.run)(cwd, config, reporters);
|
package/lib/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;AAAA,kDAA+C;AAC/C,yCAAsC;AACtC,uCAAoC;AACpC,yCAAsC;AACtC,qCAAkC;AAClC,yCAAsC;AACtC,0DAAuD;AACvD,+CAA4C;AAC5C,2CAAwC;AACxC,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;AAAA,kDAA+C;AAC/C,yCAAsC;AACtC,uCAAoC;AACpC,yCAAsC;AACtC,qCAAkC;AAClC,yCAAsC;AACtC,0DAAuD;AACvD,+CAA4C;AAC5C,2CAAwC;AACxC,2CAAwC;AAExC,iBAAiB;AACjB,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;AAC1B,IAAI;IACF,MAAM,MAAM,GAAG,IAAA,qBAAS,EAAC,GAAG,CAAC,CAAC;IAC9B,MAAM,SAAS,GAAG,IAAA,6BAAa,EAAC,MAAM,CAAC,CAAC;IAExC,QAAQ,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QACzB,KAAK,OAAO;YACV,IAAA,aAAK,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YACnB,MAAM;QAER,KAAK,MAAM;YACT,IAAA,WAAI,EAAC,GAAG,CAAC,CAAC;YACV,MAAM;QAER,KAAK,MAAM;YACT,IAAA,WAAI,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAClB,MAAM;QAER,KAAK,OAAO;YACV,IAAA,aAAK,EAAC,GAAG,CAAC,CAAC;YACX,MAAM;QAER,KAAK,SAAS;YACZ,IAAA,iBAAO,GAAE,CAAC;YACV,MAAM;QAER;YACE,eAAM,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;YAChD,IAAA,SAAG,EAAC,GAAG,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;YAC5B,MAAM;KACT;CACF;AAAC,OAAO,CAAC,EAAE;IACV,IAAA,mBAAQ,EAAC,CAAC,IAAK,CAAS,CAAC,OAAO,CAAC,CAAC;CACnC"}
|
package/lib/command/run.js
CHANGED
|
@@ -15,7 +15,6 @@ const Pipeline_1 = require("../task/Pipeline");
|
|
|
15
15
|
* @param reporters
|
|
16
16
|
*/
|
|
17
17
|
async function run(cwd, config, reporters) {
|
|
18
|
-
var _a;
|
|
19
18
|
const context = (0, context_1.createContext)(config);
|
|
20
19
|
const workspace = (0, getWorkspace_1.getWorkspace)(cwd, config);
|
|
21
20
|
const { profiler } = context;
|
|
@@ -23,12 +22,8 @@ async function run(cwd, config, reporters) {
|
|
|
23
22
|
context.measures.start = process.hrtime();
|
|
24
23
|
// die faster if an abort signal is seen
|
|
25
24
|
abortSignal_1.signal.addEventListener("abort", async () => {
|
|
26
|
-
var _a;
|
|
27
25
|
aborted = true;
|
|
28
26
|
NpmScriptTask_1.NpmScriptTask.killAllActiveProcesses();
|
|
29
|
-
if (config.dist) {
|
|
30
|
-
await ((_a = context === null || context === void 0 ? void 0 : context.workerQueue) === null || _a === void 0 ? void 0 : _a.close());
|
|
31
|
-
}
|
|
32
27
|
(0, displayReportAndExit_1.displayReportAndExit)(reporters, context);
|
|
33
28
|
});
|
|
34
29
|
try {
|
|
@@ -60,9 +55,6 @@ async function run(cwd, config, reporters) {
|
|
|
60
55
|
}
|
|
61
56
|
}
|
|
62
57
|
if (!aborted) {
|
|
63
|
-
if (config.dist) {
|
|
64
|
-
await ((_a = context === null || context === void 0 ? void 0 : context.workerQueue) === null || _a === void 0 ? void 0 : _a.close());
|
|
65
|
-
}
|
|
66
58
|
(0, displayReportAndExit_1.displayReportAndExit)(reporters, context);
|
|
67
59
|
}
|
|
68
60
|
}
|
package/lib/command/run.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/command/run.ts"],"names":[],"mappings":";;;AAAA,4DAAyD;AACzD,sCAAmC;AAEnC,qDAA6C;AAC7C,kEAA+D;AAC/D,wCAA2C;AAC3C,yDAAsD;AAEtD,+CAA4C;AAE5C;;;;;GAKG;AACI,KAAK,UAAU,GAAG,CAAC,GAAW,EAAE,MAAc,EAAE,SAAqB
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/command/run.ts"],"names":[],"mappings":";;;AAAA,4DAAyD;AACzD,sCAAmC;AAEnC,qDAA6C;AAC7C,kEAA+D;AAC/D,wCAA2C;AAC3C,yDAAsD;AAEtD,+CAA4C;AAE5C;;;;;GAKG;AACI,KAAK,UAAU,GAAG,CAAC,GAAW,EAAE,MAAc,EAAE,SAAqB;IAC1E,MAAM,OAAO,GAAG,IAAA,uBAAa,EAAC,MAAM,CAAC,CAAC;IACtC,MAAM,SAAS,GAAG,IAAA,2BAAY,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAE5C,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAE7B,IAAI,OAAO,GAAG,KAAK,CAAC;IAEpB,OAAO,CAAC,QAAQ,CAAC,KAAK,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAE1C,wCAAwC;IACxC,oBAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,KAAK,IAAI,EAAE;QAC1C,OAAO,GAAG,IAAI,CAAC;QACf,6BAAa,CAAC,sBAAsB,EAAE,CAAC;QACvC,IAAA,2CAAoB,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,IAAI;QACF,MAAM,QAAQ,GAAG,IAAI,mBAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QACjD,MAAM,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;KAC7B;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QAErB,IAAI,CAAC,IAAK,CAAS,CAAC,KAAK,EAAE;YACzB,eAAM,CAAC,KAAK,CAAC,YAAY,GAAI,CAAS,CAAC,KAAK,CAAC,CAAC;SAC/C;aAAM,IAAI,CAAC,IAAK,CAAS,CAAC,OAAO,EAAE;YAClC,eAAM,CAAC,KAAK,CAAC,YAAY,GAAI,CAAS,CAAC,OAAO,CAAC,CAAC;SACjD;aAAM;YACL,eAAM,CAAC,KAAK,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC;SAChC;KACF;IAED,IAAI,MAAM,CAAC,OAAO,EAAE;QAClB,IAAI;YACF,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC;YACtC,eAAM,CAAC,IAAI,CAAC,8BAA8B,WAAW,EAAE,CAAC,CAAC;SAC1D;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YACrB,IAAI,CAAC,IAAK,CAAS,CAAC,OAAO,EAAE;gBAC3B,eAAM,CAAC,KAAK,CAAC,mDAAoD,CAAS,CAAC,OAAO,EAAE,CAAC,CAAC;aACvF;SACF;KACF;IAED,IAAI,CAAC,OAAO,EAAE;QACZ,IAAA,2CAAoB,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;KAC1C;AACH,CAAC;AA/CD,kBA+CC"}
|
package/lib/config/getConfig.js
CHANGED
|
@@ -70,8 +70,6 @@ function getConfig(cwd) {
|
|
|
70
70
|
prune: parsedArgs.prune,
|
|
71
71
|
logLevel: parsedArgs.logLevel,
|
|
72
72
|
loggerOptions: (configResults === null || configResults === void 0 ? void 0 : configResults.config.loggerOptions) || {},
|
|
73
|
-
dist,
|
|
74
|
-
workerQueueOptions: (configResults === null || configResults === void 0 ? void 0 : configResults.config.workerQueueOptions) || {},
|
|
75
73
|
};
|
|
76
74
|
}
|
|
77
75
|
exports.getConfig = getConfig;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getConfig.js","sourceRoot":"","sources":["../../src/config/getConfig.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"getConfig.js","sourceRoot":"","sources":["../../src/config/getConfig.ts"],"names":[],"mappings":"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"}
|
package/lib/context.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { Config } from "./types/Config";
|
|
2
2
|
import { RunContext } from "./types/RunContext";
|
|
3
|
-
export declare function createContext(config: Pick<Config, "concurrency" | "profile"
|
|
3
|
+
export declare function createContext(config: Pick<Config, "concurrency" | "profile">): RunContext;
|
package/lib/context.js
CHANGED
|
@@ -8,7 +8,6 @@ const p_profiler_1 = __importDefault(require("p-profiler"));
|
|
|
8
8
|
const path_1 = require("path");
|
|
9
9
|
const os_1 = require("os");
|
|
10
10
|
const fs_1 = require("fs");
|
|
11
|
-
const WorkerQueue_1 = require("./task/WorkerQueue");
|
|
12
11
|
function createContext(config) {
|
|
13
12
|
const { concurrency, profile } = config;
|
|
14
13
|
const useCustomProfilePath = typeof profile === "string";
|
|
@@ -32,7 +31,6 @@ function createContext(config) {
|
|
|
32
31
|
},
|
|
33
32
|
targets: new Map(),
|
|
34
33
|
profiler,
|
|
35
|
-
workerQueue: config.dist ? new WorkerQueue_1.WorkerQueue(config) : undefined,
|
|
36
34
|
};
|
|
37
35
|
}
|
|
38
36
|
exports.createContext = createContext;
|
package/lib/context.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":";;;;;;AAEA,4DAAkC;AAClC,+BAAqC;AACrC,2BAA4B;AAC5B,2BAA+B;
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":";;;;;;AAEA,4DAAkC;AAClC,+BAAqC;AACrC,2BAA4B;AAC5B,2BAA+B;AAE/B,SAAgB,aAAa,CAAC,MAA+C;IAC3E,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IAExC,MAAM,oBAAoB,GAAG,OAAO,OAAO,KAAK,QAAQ,CAAC;IAEzD,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,CAAC,CAAC,IAAA,cAAO,EAAC,OAAiB,CAAC,CAAC,CAAC,CAAC,IAAA,WAAI,EAAC,IAAA,WAAM,GAAE,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;IAEjH,IAAA,cAAS,EAAC,iBAAiB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAElD,MAAM,QAAQ,GAAG,IAAI,oBAAQ,CAC3B,oBAAoB;QAClB,CAAC,CAAC;YACE,WAAW;YACX,gBAAgB,EAAE,OAAiB;SACpC;QACH,CAAC,CAAC;YACE,WAAW;YACX,MAAM,EAAE,MAAM;YACd,MAAM,EAAE,iBAAiB;SAC1B,CACN,CAAC;IAEF,OAAO;QACL,QAAQ,EAAE;YACR,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;YACb,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;YAChB,aAAa,EAAE,EAAE;SAClB;QACD,OAAO,EAAE,IAAI,GAAG,EAAE;QAClB,QAAQ;KACT,CAAC;AACJ,CAAC;AA/BD,sCA+BC"}
|
package/lib/task/Pipeline.d.ts
CHANGED
|
@@ -7,9 +7,6 @@ import { Workspace } from "../types/Workspace";
|
|
|
7
7
|
export declare const START_TARGET_ID = "__start";
|
|
8
8
|
/**
|
|
9
9
|
* Pipeline class represents lage's understanding of the dependency graphs and wraps the promise graph implementations to execute tasks in order
|
|
10
|
-
*
|
|
11
|
-
* Distributed notes:
|
|
12
|
-
* - for doing distributed work, the WrapperTask will instead place the PipelineTarget info into a worker queue
|
|
13
10
|
*/
|
|
14
11
|
export declare class Pipeline {
|
|
15
12
|
private workspace;
|
|
@@ -26,7 +23,6 @@ export declare class Pipeline {
|
|
|
26
23
|
/** Internal cache of context */
|
|
27
24
|
context: RunContext | undefined;
|
|
28
25
|
constructor(workspace: Workspace, config: Config);
|
|
29
|
-
private runTask;
|
|
30
26
|
/**
|
|
31
27
|
* NPM Tasks are blindly placed in the task dependency graph, but we skip doing work if the package does not contain the specific npm task
|
|
32
28
|
* @param task
|
package/lib/task/Pipeline.js
CHANGED
|
@@ -11,13 +11,9 @@ const path_1 = __importDefault(require("path"));
|
|
|
11
11
|
const getPipelinePackages_1 = require("./getPipelinePackages");
|
|
12
12
|
const taskId_1 = require("./taskId");
|
|
13
13
|
const WrappedTarget_1 = require("./WrappedTarget");
|
|
14
|
-
const DistributedTask_1 = require("./DistributedTask");
|
|
15
14
|
exports.START_TARGET_ID = "__start";
|
|
16
15
|
/**
|
|
17
16
|
* Pipeline class represents lage's understanding of the dependency graphs and wraps the promise graph implementations to execute tasks in order
|
|
18
|
-
*
|
|
19
|
-
* Distributed notes:
|
|
20
|
-
* - for doing distributed work, the WrapperTask will instead place the PipelineTarget info into a worker queue
|
|
21
17
|
*/
|
|
22
18
|
class Pipeline {
|
|
23
19
|
constructor(workspace, config) {
|
|
@@ -44,16 +40,6 @@ class Pipeline {
|
|
|
44
40
|
this.graph = (0, generateTopologicalGraph_1.generateTopologicGraph)(workspace);
|
|
45
41
|
this.loadConfig(config);
|
|
46
42
|
}
|
|
47
|
-
runTask(id, cwd, run) {
|
|
48
|
-
if (this.config.dist) {
|
|
49
|
-
return (args) => {
|
|
50
|
-
var _a;
|
|
51
|
-
const task = new DistributedTask_1.DistributedTask(id, cwd, this.config, (_a = this.context) === null || _a === void 0 ? void 0 : _a.workerQueue, args.logger);
|
|
52
|
-
task.run();
|
|
53
|
-
};
|
|
54
|
-
}
|
|
55
|
-
return run;
|
|
56
|
-
}
|
|
57
43
|
/**
|
|
58
44
|
* NPM Tasks are blindly placed in the task dependency graph, but we skip doing work if the package does not contain the specific npm task
|
|
59
45
|
* @param task
|
|
@@ -66,15 +52,8 @@ class Pipeline {
|
|
|
66
52
|
return;
|
|
67
53
|
}
|
|
68
54
|
return (args) => {
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
const distributedTask = new DistributedTask_1.DistributedTask((0, taskId_1.getTargetId)(info.name, task), path_1.default.dirname(info.packageJsonPath), this.config, (_b = this.context) === null || _b === void 0 ? void 0 : _b.workerQueue, args.logger);
|
|
72
|
-
return distributedTask.run();
|
|
73
|
-
}
|
|
74
|
-
else {
|
|
75
|
-
const npmTask = new NpmScriptTask_1.NpmScriptTask(task, info, this.config, args.logger);
|
|
76
|
-
return npmTask.run();
|
|
77
|
-
}
|
|
55
|
+
const npmTask = new NpmScriptTask_1.NpmScriptTask(task, info, this.config, args.logger);
|
|
56
|
+
return npmTask.run();
|
|
78
57
|
};
|
|
79
58
|
}
|
|
80
59
|
/**
|
|
@@ -137,22 +116,20 @@ class Pipeline {
|
|
|
137
116
|
if (target.type === "global") {
|
|
138
117
|
const targetId = `${id}.${index}`;
|
|
139
118
|
return [
|
|
140
|
-
Object.assign(Object.assign({}, target), { id: targetId, cache: target.cache !== false, cwd: this.workspace.root, task: id, run:
|
|
119
|
+
Object.assign(Object.assign({}, target), { id: targetId, cache: target.cache !== false, cwd: this.workspace.root, task: id, run: () => { } }),
|
|
141
120
|
];
|
|
142
121
|
}
|
|
143
122
|
else if (id.includes("#")) {
|
|
144
123
|
const { packageName: pkg, task } = (0, taskId_1.getPackageAndTask)(id);
|
|
145
124
|
return [
|
|
146
|
-
Object.assign(Object.assign({}, target), { id, cache: target.cache !== false, task: id, cwd: path_1.default.dirname(this.packageInfos[pkg].packageJsonPath), packageName: pkg, run: this.
|
|
147
|
-
this.maybeRunNpmTask(task, this.packageInfos[pkg]) }),
|
|
125
|
+
Object.assign(Object.assign({}, target), { id, cache: target.cache !== false, task: id, cwd: path_1.default.dirname(this.packageInfos[pkg].packageJsonPath), packageName: pkg, run: this.maybeRunNpmTask(task, this.packageInfos[pkg]) }),
|
|
148
126
|
];
|
|
149
127
|
}
|
|
150
128
|
else {
|
|
151
129
|
const packages = Object.entries(this.packageInfos);
|
|
152
130
|
return packages.map(([pkg, _info]) => {
|
|
153
131
|
const targetId = (0, taskId_1.getTargetId)(pkg, id);
|
|
154
|
-
return Object.assign(Object.assign({}, target), { id: targetId, cache: target.cache !== false, task: id, cwd: path_1.default.dirname(this.packageInfos[pkg].packageJsonPath), packageName: pkg, run: this.
|
|
155
|
-
this.maybeRunNpmTask(id, this.packageInfos[pkg]) });
|
|
132
|
+
return Object.assign(Object.assign({}, target), { id: targetId, cache: target.cache !== false, task: id, cwd: path_1.default.dirname(this.packageInfos[pkg].packageJsonPath), packageName: pkg, run: this.maybeRunNpmTask(id, this.packageInfos[pkg]) });
|
|
156
133
|
});
|
|
157
134
|
}
|
|
158
135
|
}
|
|
@@ -371,7 +348,6 @@ class Pipeline {
|
|
|
371
348
|
* any incoming changes to the library.
|
|
372
349
|
*/
|
|
373
350
|
async run(context) {
|
|
374
|
-
var _a;
|
|
375
351
|
this.context = context;
|
|
376
352
|
const nodeMap = new Map();
|
|
377
353
|
const targetGraph = this.generateTargetGraph();
|
|
@@ -391,12 +367,8 @@ class Pipeline {
|
|
|
391
367
|
});
|
|
392
368
|
}
|
|
393
369
|
}
|
|
394
|
-
// Initialize the worker queue if in distributed mode
|
|
395
|
-
if (this.config.dist) {
|
|
396
|
-
await ((_a = context.workerQueue) === null || _a === void 0 ? void 0 : _a.initializeAsMaster(targetGraph.length * 2));
|
|
397
|
-
}
|
|
398
370
|
await (0, p_graph_1.default)(nodeMap, targetGraph).run({
|
|
399
|
-
concurrency: this.config.
|
|
371
|
+
concurrency: this.config.concurrency,
|
|
400
372
|
continue: this.config.continue,
|
|
401
373
|
});
|
|
402
374
|
}
|
package/lib/task/Pipeline.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Pipeline.js","sourceRoot":"","sources":["../../src/task/Pipeline.ts"],"names":[],"mappings":";;;;;;AACA,oFAA+E;AAC/E,mDAAgD;AAMhD,sDAAgD;AAChD,gDAAwB;AACxB,+DAA4D;AAC5D,qCAA0D;AAC1D,mDAAgD;AAChD,uDAAoD;AAEvC,QAAA,eAAe,GAAG,SAAS,CAAC;AAEzC;;;;;GAKG;AACH,MAAa,QAAQ;IA8BnB,YAAoB,SAAoB,EAAU,MAAc;QAA5C,cAAS,GAAT,SAAS,CAAW;QAAU,WAAM,GAAN,MAAM,CAAQ;QA7BxD,qCAAgC,GAAkD,IAAI,GAAG,EAAE,CAAC;QAEpG,6EAA6E;QAC7E,YAAO,GAAgC,IAAI,GAAG,CAAC;YAC7C;gBACE,uBAAe;gBACf;oBACE,EAAE,EAAE,uBAAe;oBACnB,GAAG,EAAE,EAAE;oBACP,GAAG,EAAE,GAAG,EAAE,GAAE,CAAC;oBACb,IAAI,EAAE,uBAAe;oBACrB,MAAM,EAAE,IAAI;oBACZ,KAAK,EAAE,KAAK;iBACb;aACF;SACF,CAAC,CAAC;QAEH,kEAAkE;QAClE,iBAAY,GAAuB,EAAE,CAAC;QAYpC,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC,WAAW,CAAC;QAC1C,IAAI,CAAC,KAAK,GAAG,IAAA,iDAAsB,EAAC,SAAS,CAAC,CAAC;QAC/C,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAC1B,CAAC;IAEO,OAAO,CAAC,EAAU,EAAE,GAAW,EAAE,GAA2B;QAClE,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE;YACpB,OAAO,CAAC,IAAc,EAAE,EAAE;;gBACxB,MAAM,IAAI,GAAG,IAAI,iCAAe,CAAC,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,MAAA,IAAI,CAAC,OAAO,0CAAE,WAAY,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;gBAChG,IAAI,CAAC,GAAG,EAAE,CAAC;YACb,CAAC,CAAC;SACH;QAED,OAAO,GAAG,CAAC;IACb,CAAC;IAED;;;;;OAKG;IACK,eAAe,CAAC,IAAY,EAAE,IAAiB;;QACrD,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAG,IAAI,CAAC,CAAA,EAAE;YACzB,OAAO;SACR;QAED,OAAO,CAAC,IAAc,EAAE,EAAE;;YACxB,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,KAAI,MAAA,IAAI,CAAC,OAAO,0CAAE,WAAY,CAAA,EAAE;gBAClD,MAAM,eAAe,GAAG,IAAI,iCAAe,CACzC,IAAA,oBAAW,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,EAC5B,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,EAClC,IAAI,CAAC,MAAM,EACX,MAAA,IAAI,CAAC,OAAO,0CAAE,WAAY,EAC1B,IAAI,CAAC,MAAM,CACZ,CAAC;gBACF,OAAO,eAAe,CAAC,GAAG,EAAE,CAAC;aAC9B;iBAAM;gBACL,MAAM,OAAO,GAAG,IAAI,6BAAa,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;gBACxE,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC;aACtB;QACH,CAAC,CAAC;IACJ,CAAC;IAED;;OAEG;IACK,qBAAqB,CAAC,WAAmB,EAAE,IAAY,EAAE,IAAc;QAC7E,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QAC5C,MAAM,EAAE,GAAG,IAAA,oBAAW,EAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QAE1C,OAAO;YACL,EAAE;YACF,IAAI;YACJ,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK;YACxB,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU;YAC/C,WAAW,EAAE,WAAW;YACxB,GAAG,EAAE,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,eAAe,CAAC;YACjE,GAAG,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC;YACrC,qFAAqF;YACrF,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAE,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI;SACrF,CAAC;IACJ,CAAC;IAED;;OAEG;IACK,sBAAsB,CAAC,EAAU,EAAE,IAAc;QACvD,wCAAwC;QACxC,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,IAAA,0BAAiB,EAAC,EAAE,CAAC,CAAC;QACpD,MAAM,OAAO,GAAqB,EAAE,CAAC;QACrC,IAAI,QAAQ,GAAa,EAAE,CAAC;QAE5B,IAAI,WAAW,EAAE;YACf,oEAAoE;YACpE,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SAC5B;aAAM;YACL,sDAAsD;YACtD,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;SACzE;QAED,KAAK,MAAM,iBAAiB,IAAI,QAAQ,EAAE;YACxC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;SACzE;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;;;OAIG;IACK,sBAAsB,CAAC,OAA4B;QACzD,MAAM,OAAO,GAAG,OAAO,CAAC;YACtB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI;SACzB,CAAC,CAAC;QAEH,OAAO,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IACtD,CAAC;IAED;;;;OAIG;IACK,uBAAuB,CAAC,EAAU,EAAE,KAAa,EAAE,MAAoB;QAC7E,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC5B,MAAM,QAAQ,GAAG,GAAG,EAAE,IAAI,KAAK,EAAE,CAAC;YAClC,OAAO;gDAEA,MAAM,KACT,EAAE,EAAE,QAAQ,EACZ,KAAK,EAAE,MAAM,CAAC,KAAK,KAAK,KAAK,EAC7B,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,EACxB,IAAI,EAAE,EAAE,EACR,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC;aAE7E,CAAC;SACH;aAAM,IAAI,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YAC3B,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,IAAA,0BAAiB,EAAC,EAAE,CAAC,CAAC;YACzD,OAAO;gDAEA,MAAM,KAET,EAAE,EACF,KAAK,EAAE,MAAM,CAAC,KAAK,KAAK,KAAK,EAC7B,IAAI,EAAE,EAAE,EACR,GAAG,EAAE,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,GAAI,CAAC,CAAC,eAAe,CAAC,EAC1D,WAAW,EAAE,GAAG,EAChB,GAAG,EACD,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,GAAI,CAAC,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC;wBACnF,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,GAAI,CAAC,CAAC;aAExD,CAAC;SACH;aAAM;YACL,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACnD,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;gBACnC,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBACtC,uCACK,MAAM,KAET,EAAE,EAAE,QAAQ,EACZ,KAAK,EAAE,MAAM,CAAC,KAAK,KAAK,KAAK,EAC7B,IAAI,EAAE,EAAE,EACR,GAAG,EAAE,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,eAAe,CAAC,EACzD,WAAW,EAAE,GAAG,EAChB,GAAG,EACD,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC;wBACxF,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,IAClD;YACJ,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;IAED;;;;OAIG;IACH,mBAAmB,CAAC,EAAU,EAAE,gBAA+D;QAC7F,oCAAoC;QACpC,IAAI,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE;YACnC,MAAM,OAAO,GAAG,IAAI,CAAC,sBAAsB,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAC;YAElE,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;gBAC5B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAG,EAAE,MAAM,CAAC,CAAC;aACtC;SACF;aAAM;YACL,sCAAsC;YACtC,MAAM,OAAO,GAAG,OAAO,gBAAgB,KAAK,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC;YAE5H,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;gBAChC,MAAM,eAAe,GAAG,IAAI,CAAC,uBAAuB,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;gBAExE,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE;oBAC5C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,EAAE,cAAc,CAAC,CAAC;iBACrD;YACH,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;IAED;;OAEG;IACH,eAAe;QACb,MAAM,OAAO,GAAG,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QAE3C,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,GAAG,MAAM,CAAC;YAEzC,iEAAiE;YACjE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,uBAAe,EAAE,EAAE,CAAC,CAAC,CAAC;YAE9C,iDAAiD;YACjD,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC9B,SAAS;aACV;YAED;;;;;;;;;;;;eAYG;YACH,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;gBACtB,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;oBACrB,2BAA2B;oBAC3B,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;iBACnC;qBAAM,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,WAAW,EAAE;oBAC7C,gCAAgC;oBAChC,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC,GAAG,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC;wBACnD,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,8BAA8B,CAAC,WAAW,CAAC,CAAC,CAAC;wBACxE,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,YAAY,CAAC,CAAC;oBAE1D,MAAM,aAAa,GAAG,OAAO;yBAC1B,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE;wBACjB,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,iBAAiB,EAAE,GAAG,MAAM,CAAC;wBAExD,OAAO,IAAI,KAAK,OAAO,IAAI,aAAa,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,iBAAiB,CAAC,CAAC;oBAC1F,CAAC,CAAC;yBACD,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;oBAE9B,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE;wBACxC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,CAAC;qBAC5C;iBACF;qBAAM,IAAI,WAAW,EAAE;oBACtB,4GAA4G;oBAC5G,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAA,oBAAW,EAAC,WAAW,EAAE,GAAG,CAAC,CAAC,EAAE;wBACnD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,IAAA,oBAAW,EAAC,WAAW,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;qBACpE;iBACF;qBAAM,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;oBAC/B,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;oBAEjG,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE;wBACxC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,CAAC;qBAC5C;iBACF;qBAAM;oBACL,MAAM,IAAI,KAAK,CAAC,qCAAqC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;iBACnE;aACF;SACF;IACH,CAAC;IAED;;;;OAIG;IACH,8BAA8B,CAAC,WAAmB;;QAChD,MAAM,YAAY,GAAG,IAAI,CAAC,gCAAgC,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC5E,IAAI,YAAY,EAAE;YAChB,OAAO,YAAY,KAAK,kBAAkB;gBACxC,CAAC,CAAC,uEAAuE;oBACvE,mFAAmF;oBACnF,EAAE;oBACF,wFAAwF;oBACxF,aAAa;oBACb,IAAI,GAAG,EAAE;gBACX,CAAC,CAAC,uEAAuE;oBACvE,YAAY,CAAC;SAClB;aAAM;YACL,sDAAsD;YAEtD,yEAAyE;YACzE,oCAAoC;YACpC,IAAI,CAAC,gCAAgC,CAAC,GAAG,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC;YAE3E,IAAI,qBAAqB,GAAG,MAAA,MAAA,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,0CAAE,YAAY,mCAAI,EAAE,CAAC;YAExE,sEAAsE;YACtE,wCAAwC;YACxC,IAAI,gBAAgB,GAAG,IAAI,GAAG,CAAS,qBAAqB,CAAC,CAAC;YAC9D,KAAK,IAAI,mBAAmB,IAAI,qBAAqB,EAAE;gBACrD,KAAK,IAAI,uBAAuB,IAAI,IAAI,CAAC,8BAA8B,CAAC,mBAAmB,CAAC,EAAE;oBAC5F,gBAAgB,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;iBAC/C;aACF;YAED,8BAA8B;YAC9B,IAAI,CAAC,gCAAgC,CAAC,GAAG,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;YACzE,OAAO,gBAAgB,CAAC;SACzB;IACH,CAAC;IAED,mBAAmB;QACjB,MAAM,KAAK,GAAG,IAAA,yCAAmB,EAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAC/D,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;QAElC,MAAM,WAAW,GAAuB,EAAE,CAAC;QAE3C,MAAM,KAAK,GAAa,EAAE,CAAC;QAE3B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,eAAe;YACf,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;gBACvB,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAA,oBAAW,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC,EAAE;oBAC5C,KAAK,CAAC,IAAI,CAAC,IAAA,oBAAW,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;oBACnC,WAAW,CAAC,IAAI,CAAC,CAAC,uBAAe,EAAE,IAAA,oBAAW,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;iBAC7D;aACF;YAED,gDAAgD;YAChD,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE;gBAC1C,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;oBAC/C,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;oBACtB,WAAW,CAAC,IAAI,CAAC,CAAC,uBAAe,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;iBAChD;aACF;SACF;QAED,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;QAElC,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,MAAM,EAAE,GAAG,KAAK,CAAC,KAAK,EAAG,CAAC;YAE1B,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;gBACnB,SAAS;aACV;YAED,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAEhB,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,IAAA,0BAAiB,EAAC,EAAE,CAAC,CAAC;YAEpD,IAAI,CAAC,WAAW,EAAE;gBAChB,qDAAqD;gBACrD,KAAK,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,YAAY,EAAE;oBAC1C,IAAI,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;wBACpB,MAAM,UAAU,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;wBACpC,IAAI,UAAU,KAAK,IAAI,EAAE;4BACvB,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;4BAE7B,IAAI,IAAI,EAAE;gCACR,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;6BAClB;yBACF;qBACF;iBACF;aACF;iBAAM;gBACL,cAAc;gBACd,KAAK,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,YAAY,EAAE;oBAC1C,IAAI,EAAE,KAAK,EAAE,EAAE;wBACb,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;wBAE7B,IAAI,IAAI,EAAE;4BACR,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;yBAClB;qBACF;iBACF;aACF;SACF;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,UAAU,CAAC,MAAc;QACvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,KAAK,MAAM,CAAC,EAAE,EAAE,gBAAgB,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;YACzE,IAAI,CAAC,mBAAmB,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAC;SAChD;QAED,2CAA2C;QAC3C,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;QACrC,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE;YAC1C,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;SAC7B;QAED,UAAU,CAAC,GAAG,CAAC,uBAAe,CAAC,CAAC;QAEhC,MAAM,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QAElF,KAAK,MAAM,OAAO,IAAI,eAAe,EAAE;YACrC,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAAC,IAAI,OAAO,EAAE,CAAC,CAAC,CAAC;SACpD;QAED,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IAEO,iBAAiB,CAAC,MAAsB;;QAC9C,OAAO,MAAM,CAAC,QAAQ,KAAK,SAAS;YAClC,CAAC,CAAC,MAAM,CAAC,QAAQ;YACjB,CAAC,CAAC,MAAA,MAAA,IAAI,CAAC,MAAM,CAAC,UAAU,0CAAE,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,KAAK,MAAM,CAAC,WAAW,IAAI,QAAQ,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC,0CAAE,QAAQ,CAAC;IACrI,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,GAAG,CAAC,OAAmB;;QAC3B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QAEvB,MAAM,OAAO,GAAkB,IAAI,GAAG,EAAE,CAAC;QACzC,MAAM,WAAW,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAE/C,KAAK,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,WAAW,EAAE;YACpC,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC;YAC3C,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAE,CAAC;YAEvC,KAAK,MAAM,MAAM,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE;gBAC3C,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE;oBACrB,GAAG,EAAE,GAAG,EAAE;wBACR,IAAI,MAAM,CAAC,EAAE,KAAK,uBAAe,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE;4BAChD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;yBAC1B;wBAED,MAAM,WAAW,GAAG,IAAI,6BAAa,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;wBACzF,OAAO,WAAW,CAAC,GAAG,EAAE,CAAC;oBAC3B,CAAC;oBACD,QAAQ,EAAE,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC;iBACzC,CAAC,CAAC;aACJ;SACF;QAED,qDAAqD;QACrD,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE;YACpB,MAAM,CAAA,MAAA,OAAO,CAAC,WAAW,0CAAE,kBAAkB,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA,CAAC;SACvE;QAED,MAAM,IAAA,iBAAM,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC,GAAG,CAAC;YACrC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW;YAC5E,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ;SAC/B,CAAC,CAAC;IACL,CAAC;CACF;AAndD,4BAmdC"}
|
|
1
|
+
{"version":3,"file":"Pipeline.js","sourceRoot":"","sources":["../../src/task/Pipeline.ts"],"names":[],"mappings":";;;;;;AACA,oFAA+E;AAC/E,mDAAgD;AAMhD,sDAAgD;AAChD,gDAAwB;AACxB,+DAA4D;AAC5D,qCAA0D;AAC1D,mDAAgD;AAEnC,QAAA,eAAe,GAAG,SAAS,CAAC;AAEzC;;GAEG;AACH,MAAa,QAAQ;IA8BnB,YAAoB,SAAoB,EAAU,MAAc;QAA5C,cAAS,GAAT,SAAS,CAAW;QAAU,WAAM,GAAN,MAAM,CAAQ;QA7BxD,qCAAgC,GAAkD,IAAI,GAAG,EAAE,CAAC;QAEpG,6EAA6E;QAC7E,YAAO,GAAgC,IAAI,GAAG,CAAC;YAC7C;gBACE,uBAAe;gBACf;oBACE,EAAE,EAAE,uBAAe;oBACnB,GAAG,EAAE,EAAE;oBACP,GAAG,EAAE,GAAG,EAAE,GAAE,CAAC;oBACb,IAAI,EAAE,uBAAe;oBACrB,MAAM,EAAE,IAAI;oBACZ,KAAK,EAAE,KAAK;iBACb;aACF;SACF,CAAC,CAAC;QAEH,kEAAkE;QAClE,iBAAY,GAAuB,EAAE,CAAC;QAYpC,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC,WAAW,CAAC;QAC1C,IAAI,CAAC,KAAK,GAAG,IAAA,iDAAsB,EAAC,SAAS,CAAC,CAAC;QAC/C,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAC1B,CAAC;IAED;;;;;OAKG;IACK,eAAe,CAAC,IAAY,EAAE,IAAiB;;QACrD,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAG,IAAI,CAAC,CAAA,EAAE;YACzB,OAAO;SACR;QAED,OAAO,CAAC,IAAc,EAAE,EAAE;YACxB,MAAM,OAAO,GAAG,IAAI,6BAAa,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YACxE,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC;QACvB,CAAC,CAAC;IACJ,CAAC;IAED;;OAEG;IACK,qBAAqB,CAAC,WAAmB,EAAE,IAAY,EAAE,IAAc;QAC7E,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QAC5C,MAAM,EAAE,GAAG,IAAA,oBAAW,EAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QAE1C,OAAO;YACL,EAAE;YACF,IAAI;YACJ,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK;YACxB,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU;YAC/C,WAAW,EAAE,WAAW;YACxB,GAAG,EAAE,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,eAAe,CAAC;YACjE,GAAG,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC;YACrC,qFAAqF;YACrF,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAE,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI;SACrF,CAAC;IACJ,CAAC;IAED;;OAEG;IACK,sBAAsB,CAAC,EAAU,EAAE,IAAc;QACvD,wCAAwC;QACxC,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,IAAA,0BAAiB,EAAC,EAAE,CAAC,CAAC;QACpD,MAAM,OAAO,GAAqB,EAAE,CAAC;QACrC,IAAI,QAAQ,GAAa,EAAE,CAAC;QAE5B,IAAI,WAAW,EAAE;YACf,oEAAoE;YACpE,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SAC5B;aAAM;YACL,sDAAsD;YACtD,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;SACzE;QAED,KAAK,MAAM,iBAAiB,IAAI,QAAQ,EAAE;YACxC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;SACzE;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;;;OAIG;IACK,sBAAsB,CAAC,OAA4B;QACzD,MAAM,OAAO,GAAG,OAAO,CAAC;YACtB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI;SACzB,CAAC,CAAC;QAEH,OAAO,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IACtD,CAAC;IAED;;;;OAIG;IACK,uBAAuB,CAAC,EAAU,EAAE,KAAa,EAAE,MAAoB;QAC7E,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC5B,MAAM,QAAQ,GAAG,GAAG,EAAE,IAAI,KAAK,EAAE,CAAC;YAClC,OAAO;gDAEA,MAAM,KACT,EAAE,EAAE,QAAQ,EACZ,KAAK,EAAE,MAAM,CAAC,KAAK,KAAK,KAAK,EAC7B,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,EACxB,IAAI,EAAE,EAAE,EACR,GAAG,EAAE,GAAG,EAAE,GAAE,CAAC;aAEhB,CAAC;SACH;aAAM,IAAI,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YAC3B,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,IAAA,0BAAiB,EAAC,EAAE,CAAC,CAAC;YACzD,OAAO;gDAEA,MAAM,KAET,EAAE,EACF,KAAK,EAAE,MAAM,CAAC,KAAK,KAAK,KAAK,EAC7B,IAAI,EAAE,EAAE,EACR,GAAG,EAAE,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,GAAI,CAAC,CAAC,eAAe,CAAC,EAC1D,WAAW,EAAE,GAAG,EAChB,GAAG,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,GAAI,CAAC,CAAC;aAE3D,CAAC;SACH;aAAM;YACL,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACnD,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;gBACnC,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBACtC,uCACK,MAAM,KAET,EAAE,EAAE,QAAQ,EACZ,KAAK,EAAE,MAAM,CAAC,KAAK,KAAK,KAAK,EAC7B,IAAI,EAAE,EAAE,EACR,GAAG,EAAE,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,eAAe,CAAC,EACzD,WAAW,EAAE,GAAG,EAChB,GAAG,EAAE,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,IACrD;YACJ,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;IAED;;;;OAIG;IACH,mBAAmB,CAAC,EAAU,EAAE,gBAA+D;QAC7F,oCAAoC;QACpC,IAAI,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE;YACnC,MAAM,OAAO,GAAG,IAAI,CAAC,sBAAsB,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAC;YAElE,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;gBAC5B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAG,EAAE,MAAM,CAAC,CAAC;aACtC;SACF;aAAM;YACL,sCAAsC;YACtC,MAAM,OAAO,GAAG,OAAO,gBAAgB,KAAK,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC;YAE5H,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;gBAChC,MAAM,eAAe,GAAG,IAAI,CAAC,uBAAuB,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;gBAExE,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE;oBAC5C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,EAAE,cAAc,CAAC,CAAC;iBACrD;YACH,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;IAED;;OAEG;IACH,eAAe;QACb,MAAM,OAAO,GAAG,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QAE3C,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,GAAG,MAAM,CAAC;YAEzC,iEAAiE;YACjE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,uBAAe,EAAE,EAAE,CAAC,CAAC,CAAC;YAE9C,iDAAiD;YACjD,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC9B,SAAS;aACV;YAED;;;;;;;;;;;;eAYG;YACH,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;gBACtB,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;oBACrB,2BAA2B;oBAC3B,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;iBACnC;qBAAM,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,WAAW,EAAE;oBAC7C,gCAAgC;oBAChC,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC,GAAG,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC;wBACnD,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,8BAA8B,CAAC,WAAW,CAAC,CAAC,CAAC;wBACxE,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,YAAY,CAAC,CAAC;oBAE1D,MAAM,aAAa,GAAG,OAAO;yBAC1B,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE;wBACjB,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,iBAAiB,EAAE,GAAG,MAAM,CAAC;wBAExD,OAAO,IAAI,KAAK,OAAO,IAAI,aAAa,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,iBAAiB,CAAC,CAAC;oBAC1F,CAAC,CAAC;yBACD,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;oBAE9B,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE;wBACxC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,CAAC;qBAC5C;iBACF;qBAAM,IAAI,WAAW,EAAE;oBACtB,4GAA4G;oBAC5G,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAA,oBAAW,EAAC,WAAW,EAAE,GAAG,CAAC,CAAC,EAAE;wBACnD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,IAAA,oBAAW,EAAC,WAAW,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;qBACpE;iBACF;qBAAM,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;oBAC/B,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;oBAEjG,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE;wBACxC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,CAAC;qBAC5C;iBACF;qBAAM;oBACL,MAAM,IAAI,KAAK,CAAC,qCAAqC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;iBACnE;aACF;SACF;IACH,CAAC;IAED;;;;OAIG;IACH,8BAA8B,CAAC,WAAmB;;QAChD,MAAM,YAAY,GAAG,IAAI,CAAC,gCAAgC,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC5E,IAAI,YAAY,EAAE;YAChB,OAAO,YAAY,KAAK,kBAAkB;gBACxC,CAAC,CAAC,uEAAuE;oBACvE,mFAAmF;oBACnF,EAAE;oBACF,wFAAwF;oBACxF,aAAa;oBACb,IAAI,GAAG,EAAE;gBACX,CAAC,CAAC,uEAAuE;oBACvE,YAAY,CAAC;SAClB;aAAM;YACL,sDAAsD;YAEtD,yEAAyE;YACzE,oCAAoC;YACpC,IAAI,CAAC,gCAAgC,CAAC,GAAG,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC;YAE3E,IAAI,qBAAqB,GAAG,MAAA,MAAA,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,0CAAE,YAAY,mCAAI,EAAE,CAAC;YAExE,sEAAsE;YACtE,wCAAwC;YACxC,IAAI,gBAAgB,GAAG,IAAI,GAAG,CAAS,qBAAqB,CAAC,CAAC;YAC9D,KAAK,IAAI,mBAAmB,IAAI,qBAAqB,EAAE;gBACrD,KAAK,IAAI,uBAAuB,IAAI,IAAI,CAAC,8BAA8B,CAAC,mBAAmB,CAAC,EAAE;oBAC5F,gBAAgB,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;iBAC/C;aACF;YAED,8BAA8B;YAC9B,IAAI,CAAC,gCAAgC,CAAC,GAAG,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;YACzE,OAAO,gBAAgB,CAAC;SACzB;IACH,CAAC;IAED,mBAAmB;QACjB,MAAM,KAAK,GAAG,IAAA,yCAAmB,EAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAC/D,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;QAElC,MAAM,WAAW,GAAuB,EAAE,CAAC;QAE3C,MAAM,KAAK,GAAa,EAAE,CAAC;QAE3B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,eAAe;YACf,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;gBACvB,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAA,oBAAW,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC,EAAE;oBAC5C,KAAK,CAAC,IAAI,CAAC,IAAA,oBAAW,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;oBACnC,WAAW,CAAC,IAAI,CAAC,CAAC,uBAAe,EAAE,IAAA,oBAAW,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;iBAC7D;aACF;YAED,gDAAgD;YAChD,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE;gBAC1C,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;oBAC/C,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;oBACtB,WAAW,CAAC,IAAI,CAAC,CAAC,uBAAe,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;iBAChD;aACF;SACF;QAED,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;QAElC,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,MAAM,EAAE,GAAG,KAAK,CAAC,KAAK,EAAG,CAAC;YAE1B,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;gBACnB,SAAS;aACV;YAED,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAEhB,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,IAAA,0BAAiB,EAAC,EAAE,CAAC,CAAC;YAEpD,IAAI,CAAC,WAAW,EAAE;gBAChB,qDAAqD;gBACrD,KAAK,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,YAAY,EAAE;oBAC1C,IAAI,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;wBACpB,MAAM,UAAU,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;wBACpC,IAAI,UAAU,KAAK,IAAI,EAAE;4BACvB,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;4BAE7B,IAAI,IAAI,EAAE;gCACR,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;6BAClB;yBACF;qBACF;iBACF;aACF;iBAAM;gBACL,cAAc;gBACd,KAAK,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,YAAY,EAAE;oBAC1C,IAAI,EAAE,KAAK,EAAE,EAAE;wBACb,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;wBAE7B,IAAI,IAAI,EAAE;4BACR,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;yBAClB;qBACF;iBACF;aACF;SACF;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,UAAU,CAAC,MAAc;QACvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,KAAK,MAAM,CAAC,EAAE,EAAE,gBAAgB,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;YACzE,IAAI,CAAC,mBAAmB,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAC;SAChD;QAED,2CAA2C;QAC3C,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;QACrC,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE;YAC1C,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;SAC7B;QAED,UAAU,CAAC,GAAG,CAAC,uBAAe,CAAC,CAAC;QAEhC,MAAM,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QAElF,KAAK,MAAM,OAAO,IAAI,eAAe,EAAE;YACrC,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAAC,IAAI,OAAO,EAAE,CAAC,CAAC,CAAC;SACpD;QAED,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IAEO,iBAAiB,CAAC,MAAsB;;QAC9C,OAAO,MAAM,CAAC,QAAQ,KAAK,SAAS;YAClC,CAAC,CAAC,MAAM,CAAC,QAAQ;YACjB,CAAC,CAAC,MAAA,MAAA,IAAI,CAAC,MAAM,CAAC,UAAU,0CAAE,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,KAAK,MAAM,CAAC,WAAW,IAAI,QAAQ,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC,0CAAE,QAAQ,CAAC;IACrI,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,GAAG,CAAC,OAAmB;QAC3B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QAEvB,MAAM,OAAO,GAAkB,IAAI,GAAG,EAAE,CAAC;QACzC,MAAM,WAAW,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAE/C,KAAK,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,WAAW,EAAE;YACpC,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC;YAC3C,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAE,CAAC;YAEvC,KAAK,MAAM,MAAM,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE;gBAC3C,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE;oBACrB,GAAG,EAAE,GAAG,EAAE;wBACR,IAAI,MAAM,CAAC,EAAE,KAAK,uBAAe,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE;4BAChD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;yBAC1B;wBAED,MAAM,WAAW,GAAG,IAAI,6BAAa,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;wBACzF,OAAO,WAAW,CAAC,GAAG,EAAE,CAAC;oBAC3B,CAAC;oBACD,QAAQ,EAAE,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC;iBACzC,CAAC,CAAC;aACJ;SACF;QAED,MAAM,IAAA,iBAAM,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC,GAAG,CAAC;YACrC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW;YACpC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ;SAC/B,CAAC,CAAC;IACL,CAAC;CACF;AApbD,4BAobC"}
|
|
@@ -72,7 +72,7 @@ class WrappedTarget {
|
|
|
72
72
|
const { target, context, config, logger } = this;
|
|
73
73
|
try {
|
|
74
74
|
const { hash, cacheHit } = await this.getCache();
|
|
75
|
-
const cacheEnabled = target.cache && config.cache && hash
|
|
75
|
+
const cacheEnabled = target.cache && config.cache && hash;
|
|
76
76
|
this.onStart();
|
|
77
77
|
// skip if cache hit!
|
|
78
78
|
if (cacheHit) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WrappedTarget.js","sourceRoot":"","sources":["../../src/task/WrappedTarget.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"WrappedTarget.js","sourceRoot":"","sources":["../../src/task/WrappedTarget.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,6 @@ import { CacheOptions } from "./CacheOptions";
|
|
|
2
2
|
import { Priority } from "./Priority";
|
|
3
3
|
import { PipelineDefinition } from "./PipelineDefinition";
|
|
4
4
|
import { LoggerOptions } from "./LoggerOptions";
|
|
5
|
-
import { QueueOptions } from "bullmq";
|
|
6
5
|
export declare type NpmClient = "npm" | "yarn" | "pnpm";
|
|
7
6
|
export interface ConfigOptions {
|
|
8
7
|
/**
|
|
@@ -46,10 +45,4 @@ export interface ConfigOptions {
|
|
|
46
45
|
* Options that will be sent to all log reporters.
|
|
47
46
|
*/
|
|
48
47
|
loggerOptions: LoggerOptions;
|
|
49
|
-
/**
|
|
50
|
-
* Worker queue settings
|
|
51
|
-
*/
|
|
52
|
-
workerQueueOptions: QueueOptions & {
|
|
53
|
-
timeoutSeconds: number;
|
|
54
|
-
};
|
|
55
48
|
}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import Profiler from "p-profiler";
|
|
2
|
-
import { WorkerQueue } from "../task/WorkerQueue";
|
|
3
2
|
import { LoggableTarget } from "./PipelineDefinition";
|
|
4
3
|
export interface Measures {
|
|
5
4
|
start: [number, number];
|
|
@@ -11,5 +10,4 @@ export interface RunContext {
|
|
|
11
10
|
measures: Measures;
|
|
12
11
|
targets: Map<string, LoggableTarget>;
|
|
13
12
|
profiler: Profiler;
|
|
14
|
-
workerQueue: WorkerQueue | undefined;
|
|
15
13
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "lage",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.8.1",
|
|
4
4
|
"description": "A monorepo task runner",
|
|
5
5
|
"repository": {
|
|
6
6
|
"url": "https://github.com/microsoft/lage"
|
|
@@ -37,12 +37,10 @@
|
|
|
37
37
|
"backfill-cache": "^5.6.1",
|
|
38
38
|
"backfill-config": "^6.3.0",
|
|
39
39
|
"backfill-logger": "^5.1.3",
|
|
40
|
-
"bullmq": "^1.50.2",
|
|
41
40
|
"chalk": "^4.0.0",
|
|
42
41
|
"cosmiconfig": "^6.0.0",
|
|
43
42
|
"execa": "^4.0.3",
|
|
44
43
|
"fast-glob": "^3.2.2",
|
|
45
|
-
"ioredis": "^4.28.0",
|
|
46
44
|
"npmlog": "^4.1.2",
|
|
47
45
|
"p-graph": "^1.1.1",
|
|
48
46
|
"p-limit": "^3.1.0",
|
|
@@ -61,7 +59,7 @@
|
|
|
61
59
|
"@types/npmlog": "4.1.4",
|
|
62
60
|
"@types/p-queue": "3.2.1",
|
|
63
61
|
"@types/yargs-parser": "15.0.0",
|
|
64
|
-
"beachball": "2.
|
|
62
|
+
"beachball": "2.30.1",
|
|
65
63
|
"gh-pages": "2.2.0",
|
|
66
64
|
"jest": "^27.2.0",
|
|
67
65
|
"ts-jest": "^27.0.5",
|
package/lib/command/worker.d.ts
DELETED
package/lib/command/worker.js
DELETED
|
@@ -1,123 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.worker = void 0;
|
|
7
|
-
const backfill_1 = require("../cache/backfill");
|
|
8
|
-
const getDepsForTarget_1 = require("../task/getDepsForTarget");
|
|
9
|
-
const taskId_1 = require("../task/taskId");
|
|
10
|
-
const getWorkspace_1 = require("../workspace/getWorkspace");
|
|
11
|
-
const WorkerQueue_1 = require("../task/WorkerQueue");
|
|
12
|
-
const logger_1 = require("../logger");
|
|
13
|
-
const Pipeline_1 = require("../task/Pipeline");
|
|
14
|
-
const TaskLogger_1 = require("../logger/TaskLogger");
|
|
15
|
-
const p_limit_1 = __importDefault(require("p-limit"));
|
|
16
|
-
/** Arbitrary parallel limit for network downloads of caches */
|
|
17
|
-
const NetworkParallelLimit = 15;
|
|
18
|
-
/** Worker command */
|
|
19
|
-
async function worker(cwd, config) {
|
|
20
|
-
logger_1.logger.verbose("worker started");
|
|
21
|
-
const workspace = (0, getWorkspace_1.getWorkspace)(cwd, config);
|
|
22
|
-
const pipeline = new Pipeline_1.Pipeline(workspace, config);
|
|
23
|
-
const networkLimit = (0, p_limit_1.default)(NetworkParallelLimit);
|
|
24
|
-
/** the worker queue processor */
|
|
25
|
-
const processor = async (job) => {
|
|
26
|
-
const id = job.name;
|
|
27
|
-
const { packageName, task } = (0, taskId_1.getPackageAndTask)(id);
|
|
28
|
-
if (!pipeline.targets.has(id)) {
|
|
29
|
-
logger_1.logger.info(`pipeline doesn't have ${id}`);
|
|
30
|
-
return;
|
|
31
|
-
}
|
|
32
|
-
const target = pipeline.targets.get(id);
|
|
33
|
-
const deps = (0, getDepsForTarget_1.getDepsForTarget)(id, pipeline.dependencies);
|
|
34
|
-
const taskLogger = new TaskLogger_1.TaskLogger(packageName || "[GLOBAL]", task);
|
|
35
|
-
taskLogger.info(`[${job.id}] started`);
|
|
36
|
-
// Step 1. Fetch all dependent cached outputs
|
|
37
|
-
await Promise.all(deps
|
|
38
|
-
.filter((d) => d !== Pipeline_1.START_TARGET_ID)
|
|
39
|
-
.map((depTargetId) => {
|
|
40
|
-
return networkLimit(() => getCache(pipeline.targets.get(depTargetId), workspace.root, config));
|
|
41
|
-
}));
|
|
42
|
-
taskLogger.info(`[${job.id}] restored all dependent cache`);
|
|
43
|
-
// Step 2. Fetch this job cache (maybe from a previous run)
|
|
44
|
-
const cacheResult = await getCache(target, workspace.root, config);
|
|
45
|
-
if (cacheResult.cacheHit) {
|
|
46
|
-
taskLogger.info(`[${job.id}] skipped`);
|
|
47
|
-
return { hash: cacheResult.hash, id: target.id, cwd: target.cwd, outputGlob: target.outputGlob };
|
|
48
|
-
}
|
|
49
|
-
// Step 3. Try running the task based on the target ID from the queue
|
|
50
|
-
try {
|
|
51
|
-
let result;
|
|
52
|
-
if (target.run) {
|
|
53
|
-
if (target.packageName) {
|
|
54
|
-
result = target.run({
|
|
55
|
-
packageName: target.packageName,
|
|
56
|
-
config,
|
|
57
|
-
cwd: target.cwd,
|
|
58
|
-
options: target.options,
|
|
59
|
-
taskName: (0, taskId_1.getPackageAndTask)(target.id).task,
|
|
60
|
-
logger: taskLogger,
|
|
61
|
-
});
|
|
62
|
-
}
|
|
63
|
-
else {
|
|
64
|
-
result = target.run({
|
|
65
|
-
config,
|
|
66
|
-
cwd: target.cwd,
|
|
67
|
-
options: target.options,
|
|
68
|
-
logger: taskLogger,
|
|
69
|
-
});
|
|
70
|
-
}
|
|
71
|
-
}
|
|
72
|
-
if (result && typeof result["then"] === "function") {
|
|
73
|
-
await result;
|
|
74
|
-
}
|
|
75
|
-
// Step 4. Save the cache remotely (unconditionally)
|
|
76
|
-
await saveCache(cacheResult.hash, target, config);
|
|
77
|
-
taskLogger.info(`[${job.id}] done`);
|
|
78
|
-
return { hash: cacheResult.hash, id: target.id, cwd: target.cwd, outputGlob: target.outputGlob };
|
|
79
|
-
}
|
|
80
|
-
catch (e) {
|
|
81
|
-
// Step 4a. If there is an error, we report the output in a message as an Error. This gets sent
|
|
82
|
-
// across the redis server via the queue, so there will be a size limit to it
|
|
83
|
-
taskLogger.error(`[${job.id}] failed`);
|
|
84
|
-
throw new Error(taskLogger
|
|
85
|
-
.getLogs()
|
|
86
|
-
.map((e) => e.msg)
|
|
87
|
-
.join("\n"));
|
|
88
|
-
}
|
|
89
|
-
};
|
|
90
|
-
// After all the setup, we initialize the worker processor with the queue library
|
|
91
|
-
const workerQueue = new WorkerQueue_1.WorkerQueue(config);
|
|
92
|
-
await workerQueue.initializeAsWorker(processor);
|
|
93
|
-
logger_1.logger.verbose("worker queue initialized");
|
|
94
|
-
}
|
|
95
|
-
exports.worker = worker;
|
|
96
|
-
/********************************************
|
|
97
|
-
* Utilities to support caching of the worker
|
|
98
|
-
*********************************************/
|
|
99
|
-
/**
|
|
100
|
-
*
|
|
101
|
-
* @param target
|
|
102
|
-
* @param config
|
|
103
|
-
* @returns
|
|
104
|
-
*/
|
|
105
|
-
function getCacheOptions(target, config) {
|
|
106
|
-
return Object.assign(Object.assign({}, config.cacheOptions), { outputGlob: target.outputGlob || config.cacheOptions.outputGlob });
|
|
107
|
-
}
|
|
108
|
-
async function getCache(target, root, config) {
|
|
109
|
-
let hash = null;
|
|
110
|
-
let cacheHit = false;
|
|
111
|
-
const { id, cwd } = target;
|
|
112
|
-
const cacheOptions = getCacheOptions(target, config);
|
|
113
|
-
hash = await (0, backfill_1.cacheHash)(id, cwd, root, cacheOptions, config.args);
|
|
114
|
-
if (hash && !config.resetCache) {
|
|
115
|
-
cacheHit = await (0, backfill_1.cacheFetch)(hash, id, cwd, config.cacheOptions);
|
|
116
|
-
}
|
|
117
|
-
return { hash, cacheHit };
|
|
118
|
-
}
|
|
119
|
-
async function saveCache(hash, target, config) {
|
|
120
|
-
const cacheOptions = getCacheOptions(target, config);
|
|
121
|
-
await (0, backfill_1.cachePut)(hash, target.cwd, cacheOptions);
|
|
122
|
-
}
|
|
123
|
-
//# sourceMappingURL=worker.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../src/command/worker.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,20 +0,0 @@
|
|
|
1
|
-
import { TaskLogger } from "../logger/TaskLogger";
|
|
2
|
-
import { Config } from "../types/Config";
|
|
3
|
-
import { WorkerQueue } from "./WorkerQueue";
|
|
4
|
-
interface JobResults {
|
|
5
|
-
hash: string;
|
|
6
|
-
id: string;
|
|
7
|
-
cwd: string;
|
|
8
|
-
outputGlob: string[];
|
|
9
|
-
}
|
|
10
|
-
export declare class DistributedTask {
|
|
11
|
-
id: string;
|
|
12
|
-
private cwd;
|
|
13
|
-
private config;
|
|
14
|
-
private workerQueue;
|
|
15
|
-
private logger;
|
|
16
|
-
constructor(id: string, cwd: string, config: Config, workerQueue: WorkerQueue, logger: TaskLogger);
|
|
17
|
-
getRemoteCache(remoteJobResults: JobResults): Promise<void>;
|
|
18
|
-
run(): Promise<void>;
|
|
19
|
-
}
|
|
20
|
-
export {};
|
|
@@ -1,50 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.DistributedTask = void 0;
|
|
4
|
-
const backfill_1 = require("../cache/backfill");
|
|
5
|
-
class DistributedTask {
|
|
6
|
-
constructor(id, cwd, config, workerQueue, logger) {
|
|
7
|
-
this.id = id;
|
|
8
|
-
this.cwd = cwd;
|
|
9
|
-
this.config = config;
|
|
10
|
-
this.workerQueue = workerQueue;
|
|
11
|
-
this.logger = logger;
|
|
12
|
-
}
|
|
13
|
-
async getRemoteCache(remoteJobResults) {
|
|
14
|
-
if (!remoteJobResults) {
|
|
15
|
-
return;
|
|
16
|
-
}
|
|
17
|
-
const { hash, id, cwd, outputGlob } = remoteJobResults;
|
|
18
|
-
if (hash && id && cwd) {
|
|
19
|
-
const cacheOptions = Object.assign(Object.assign({}, this.config.cacheOptions), { outputGlob: outputGlob || this.config.cacheOptions.outputGlob });
|
|
20
|
-
await (0, backfill_1.cacheFetch)(hash, id, cwd, cacheOptions);
|
|
21
|
-
}
|
|
22
|
-
}
|
|
23
|
-
async run() {
|
|
24
|
-
const { id, logger } = this;
|
|
25
|
-
return new Promise(async (resolve, reject) => {
|
|
26
|
-
if (await this.workerQueue.closing()) {
|
|
27
|
-
return;
|
|
28
|
-
}
|
|
29
|
-
const job = await this.workerQueue.addJob(id);
|
|
30
|
-
if (job) {
|
|
31
|
-
const completeHandler = async ({ jobId, returnvalue }) => {
|
|
32
|
-
job.off("completed", completeHandler);
|
|
33
|
-
job.off("failed", failedHandler);
|
|
34
|
-
await this.getRemoteCache(Object.assign(Object.assign({}, returnvalue), { cwd: this.cwd }));
|
|
35
|
-
resolve();
|
|
36
|
-
};
|
|
37
|
-
const failedHandler = ({ jobId, failedReason }) => {
|
|
38
|
-
job.off("completed", completeHandler);
|
|
39
|
-
job.off("failed", failedHandler);
|
|
40
|
-
logger.error(failedReason);
|
|
41
|
-
reject();
|
|
42
|
-
};
|
|
43
|
-
job.on("completed", completeHandler);
|
|
44
|
-
job.on("failed", failedHandler);
|
|
45
|
-
}
|
|
46
|
-
});
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
|
-
exports.DistributedTask = DistributedTask;
|
|
50
|
-
//# sourceMappingURL=DistributedTask.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"DistributedTask.js","sourceRoot":"","sources":["../../src/task/DistributedTask.ts"],"names":[],"mappings":";;;AAEA,gDAA+C;AAU/C,MAAa,eAAe;IAC1B,YACS,EAAU,EACT,GAAW,EACX,MAAc,EACd,WAAwB,EACxB,MAAkB;QAJnB,OAAE,GAAF,EAAE,CAAQ;QACT,QAAG,GAAH,GAAG,CAAQ;QACX,WAAM,GAAN,MAAM,CAAQ;QACd,gBAAW,GAAX,WAAW,CAAa;QACxB,WAAM,GAAN,MAAM,CAAY;IACzB,CAAC;IAEJ,KAAK,CAAC,cAAc,CAAC,gBAA4B;QAC/C,IAAI,CAAC,gBAAgB,EAAE;YACrB,OAAO;SACR;QAED,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,gBAAgB,CAAC;QAEvD,IAAI,IAAI,IAAI,EAAE,IAAI,GAAG,EAAE;YACrB,MAAM,YAAY,mCACb,IAAI,CAAC,MAAM,CAAC,YAAY,KAC3B,UAAU,EAAE,UAAU,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU,GAC9D,CAAC;YACF,MAAM,IAAA,qBAAU,EAAC,IAAI,EAAE,EAAE,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC;SAC/C;IACH,CAAC;IAED,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QAE5B,OAAO,IAAI,OAAO,CAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;YACjD,IAAI,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE;gBACpC,OAAO;aACR;YAED,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAE9C,IAAI,GAAG,EAAE;gBACP,MAAM,eAAe,GAAG,KAAK,EAAE,EAAE,KAAK,EAAE,WAAW,EAA8C,EAAE,EAAE;oBACnG,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;oBACtC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;oBACjC,MAAM,IAAI,CAAC,cAAc,iCAAM,WAAW,KAAE,GAAG,EAAE,IAAI,CAAC,GAAG,IAAG,CAAC;oBAC7D,OAAO,EAAE,CAAC;gBACZ,CAAC,CAAC;gBAEF,MAAM,aAAa,GAA4D,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,EAAE;oBACzG,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;oBACtC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;oBACjC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;oBAC3B,MAAM,EAAE,CAAC;gBACX,CAAC,CAAC;gBAEF,GAAG,CAAC,EAAE,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;gBACrC,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;aACjC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAvDD,0CAuDC"}
|
|
@@ -1,23 +0,0 @@
|
|
|
1
|
-
/// <reference types="node" />
|
|
2
|
-
import { Queue, Worker } from "bullmq";
|
|
3
|
-
import { EventEmitter } from "events";
|
|
4
|
-
import { Config } from "../types/Config";
|
|
5
|
-
export declare type WorkerQueueProcessor = (job: WorkerQueueJob) => Promise<any>;
|
|
6
|
-
export interface WorkerQueueJob {
|
|
7
|
-
name: string;
|
|
8
|
-
id: string;
|
|
9
|
-
}
|
|
10
|
-
export declare class WorkerQueue {
|
|
11
|
-
private config;
|
|
12
|
-
private coordinatorRedis;
|
|
13
|
-
private workerQueue;
|
|
14
|
-
private worker;
|
|
15
|
-
private queueEvents;
|
|
16
|
-
private mode;
|
|
17
|
-
constructor(config: Pick<Config, "workerQueueOptions" | "concurrency">);
|
|
18
|
-
initializeAsWorker(workerQueueProcessor: WorkerQueueProcessor): Promise<Worker>;
|
|
19
|
-
initializeAsMaster(maxTargets?: number): Promise<Queue<any, any, string>>;
|
|
20
|
-
addJob(id: string, jobData?: any): Promise<EventEmitter | undefined>;
|
|
21
|
-
closing(): Promise<void | undefined>;
|
|
22
|
-
close(): Promise<void>;
|
|
23
|
-
}
|
package/lib/task/WorkerQueue.js
DELETED
|
@@ -1,113 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.WorkerQueue = void 0;
|
|
7
|
-
const bullmq_1 = require("bullmq");
|
|
8
|
-
const events_1 = require("events");
|
|
9
|
-
const ioredis_1 = __importDefault(require("ioredis"));
|
|
10
|
-
const logger_1 = require("../logger");
|
|
11
|
-
const workerQueueId = `lage:${process.env.LAGE_WORKER_QUEUE_ID || "default"}`;
|
|
12
|
-
const workerPubSubChannel = `lage_pubsub_${process.env.LAGE_WORKER_QUEUE_ID || "default"}`;
|
|
13
|
-
class WorkerQueue {
|
|
14
|
-
constructor(config) {
|
|
15
|
-
this.config = config;
|
|
16
|
-
const redisOptions = config.workerQueueOptions.connection;
|
|
17
|
-
this.coordinatorRedis = new ioredis_1.default(redisOptions);
|
|
18
|
-
}
|
|
19
|
-
async initializeAsWorker(workerQueueProcessor) {
|
|
20
|
-
if (this.mode) {
|
|
21
|
-
throw new Error(`WorkerQueue already initialized as ${this.mode}!`);
|
|
22
|
-
}
|
|
23
|
-
this.mode = "worker";
|
|
24
|
-
const { config } = this;
|
|
25
|
-
// Convert the simpler workerQueueProcessor to a full-fledged bullmq processor
|
|
26
|
-
const processor = workerQueueProcessor;
|
|
27
|
-
this.worker = new bullmq_1.Worker(workerQueueId, processor, {
|
|
28
|
-
connection: config.workerQueueOptions.connection,
|
|
29
|
-
sharedConnection: true,
|
|
30
|
-
concurrency: config.concurrency,
|
|
31
|
-
});
|
|
32
|
-
const pubSubListener = async (channel, message) => {
|
|
33
|
-
if (workerPubSubChannel === channel) {
|
|
34
|
-
if (message === "done") {
|
|
35
|
-
await this.worker.close(true);
|
|
36
|
-
await this.worker.disconnect();
|
|
37
|
-
this.coordinatorRedis.off("message", pubSubListener);
|
|
38
|
-
await this.coordinatorRedis.unsubscribe(workerPubSubChannel);
|
|
39
|
-
await this.coordinatorRedis.quit();
|
|
40
|
-
this.coordinatorRedis.disconnect();
|
|
41
|
-
}
|
|
42
|
-
}
|
|
43
|
-
};
|
|
44
|
-
await this.coordinatorRedis.subscribe(workerPubSubChannel);
|
|
45
|
-
this.coordinatorRedis.on("message", pubSubListener);
|
|
46
|
-
await this.worker.waitUntilReady();
|
|
47
|
-
return this.worker;
|
|
48
|
-
}
|
|
49
|
-
async initializeAsMaster(maxTargets = 500) {
|
|
50
|
-
if (this.mode) {
|
|
51
|
-
throw new Error(`WorkerQueue already initialized as ${this.mode}!`);
|
|
52
|
-
}
|
|
53
|
-
this.mode = "master";
|
|
54
|
-
const { config } = this;
|
|
55
|
-
if (!this.workerQueue) {
|
|
56
|
-
logger_1.logger.verbose("[dist] creating work queue ");
|
|
57
|
-
this.workerQueue = new bullmq_1.Queue(workerQueueId, Object.assign({}, config.workerQueueOptions));
|
|
58
|
-
logger_1.logger.verbose("[dist] clearing work queue");
|
|
59
|
-
await this.workerQueue.drain(false);
|
|
60
|
-
await this.workerQueue.clean(0, 3000);
|
|
61
|
-
await this.workerQueue.waitUntilReady();
|
|
62
|
-
this.queueEvents = new bullmq_1.QueueEvents(workerQueueId);
|
|
63
|
-
this.queueEvents.setMaxListeners(maxTargets);
|
|
64
|
-
logger_1.logger.verbose("[dist] work queue ready");
|
|
65
|
-
}
|
|
66
|
-
return this.workerQueue;
|
|
67
|
-
}
|
|
68
|
-
async addJob(id, jobData) {
|
|
69
|
-
if (this.workerQueue && this.queueEvents) {
|
|
70
|
-
const job = await this.workerQueue.add(id, jobData !== null && jobData !== void 0 ? jobData : {});
|
|
71
|
-
const emitter = new events_1.EventEmitter();
|
|
72
|
-
const completeHandler = async ({ jobId, returnvalue }) => {
|
|
73
|
-
if (job.id === jobId) {
|
|
74
|
-
this.queueEvents.off("completed", completeHandler);
|
|
75
|
-
this.queueEvents.off("failed", failedHandler);
|
|
76
|
-
emitter.emit("completed", { jobId, returnvalue });
|
|
77
|
-
}
|
|
78
|
-
};
|
|
79
|
-
const failedHandler = ({ jobId, failedReason }) => {
|
|
80
|
-
if (job.id === jobId) {
|
|
81
|
-
this.queueEvents.off("completed", completeHandler);
|
|
82
|
-
this.queueEvents.off("failed", failedHandler);
|
|
83
|
-
emitter.emit("failed", { jobId, failedReason });
|
|
84
|
-
}
|
|
85
|
-
};
|
|
86
|
-
this.queueEvents.on("completed", completeHandler);
|
|
87
|
-
this.queueEvents.on("failed", failedHandler);
|
|
88
|
-
return emitter;
|
|
89
|
-
}
|
|
90
|
-
}
|
|
91
|
-
async closing() {
|
|
92
|
-
var _a;
|
|
93
|
-
return await ((_a = this.workerQueue) === null || _a === void 0 ? void 0 : _a.closing);
|
|
94
|
-
}
|
|
95
|
-
async close() {
|
|
96
|
-
if (this.coordinatorRedis) {
|
|
97
|
-
await this.coordinatorRedis.publish(workerPubSubChannel, "done");
|
|
98
|
-
await this.coordinatorRedis.quit();
|
|
99
|
-
this.coordinatorRedis.disconnect();
|
|
100
|
-
}
|
|
101
|
-
if (this.workerQueue) {
|
|
102
|
-
await this.workerQueue.drain(false);
|
|
103
|
-
await this.workerQueue.close();
|
|
104
|
-
await this.workerQueue.disconnect();
|
|
105
|
-
}
|
|
106
|
-
if (this.queueEvents) {
|
|
107
|
-
await this.queueEvents.close();
|
|
108
|
-
}
|
|
109
|
-
logger_1.logger.verbose("[dist] closed work queue");
|
|
110
|
-
}
|
|
111
|
-
}
|
|
112
|
-
exports.WorkerQueue = WorkerQueue;
|
|
113
|
-
//# sourceMappingURL=WorkerQueue.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"WorkerQueue.js","sourceRoot":"","sources":["../../src/task/WorkerQueue.ts"],"names":[],"mappings":"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"}
|