nx 14.6.2 → 14.7.0-beta.0
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.md +1 -1
- package/package.json +4 -4
- package/src/daemon/client/client.d.ts +3 -0
- package/src/daemon/client/client.js +49 -18
- package/src/daemon/client/client.js.map +1 -1
- package/src/daemon/server/handle-output-contents.d.ts +15 -0
- package/src/daemon/server/handle-output-contents.js +42 -0
- package/src/daemon/server/handle-output-contents.js.map +1 -0
- package/src/daemon/server/output-watcher.d.ts +2 -0
- package/src/daemon/server/output-watcher.js +140 -0
- package/src/daemon/server/output-watcher.js.map +1 -0
- package/src/daemon/server/server.js +7 -0
- package/src/daemon/server/server.js.map +1 -1
- package/src/hasher/hash-task.js +7 -2
- package/src/hasher/hash-task.js.map +1 -1
- package/src/tasks-runner/cache.d.ts +0 -17
- package/src/tasks-runner/cache.js +2 -196
- package/src/tasks-runner/cache.js.map +1 -1
- package/src/tasks-runner/default-tasks-runner.js +1 -1
- package/src/tasks-runner/default-tasks-runner.js.map +1 -1
- package/src/tasks-runner/task-orchestrator.d.ts +5 -1
- package/src/tasks-runner/task-orchestrator.js +29 -15
- package/src/tasks-runner/task-orchestrator.js.map +1 -1
- package/src/utils/collapse-expanded-outputs.d.ts +1 -0
- package/src/utils/collapse-expanded-outputs.js +43 -0
- package/src/utils/collapse-expanded-outputs.js.map +1 -0
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
-
|
|
6
|
+
# [14.7.0-beta.0](https://github.com/nrwl/nx/compare/14.6.3...14.7.0-beta.0) (2022-09-06)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package nx
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nx",
|
|
3
|
-
"version": "14.
|
|
3
|
+
"version": "14.7.0-beta.0",
|
|
4
4
|
"description": "Smart, Fast and Extensible Build System",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -31,8 +31,8 @@
|
|
|
31
31
|
},
|
|
32
32
|
"homepage": "https://nx.dev",
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@nrwl/cli": "14.
|
|
35
|
-
"@nrwl/tao": "14.
|
|
34
|
+
"@nrwl/cli": "14.7.0-beta.0",
|
|
35
|
+
"@nrwl/tao": "14.7.0-beta.0",
|
|
36
36
|
"@parcel/watcher": "2.0.4",
|
|
37
37
|
"chalk": "4.1.0",
|
|
38
38
|
"chokidar": "^3.5.1",
|
|
@@ -106,5 +106,5 @@
|
|
|
106
106
|
"executors": "./executors.json",
|
|
107
107
|
"main": "./bin/nx.js",
|
|
108
108
|
"typings": "./bin/nx.d.ts",
|
|
109
|
-
"gitHead": "
|
|
109
|
+
"gitHead": "8c78beaa74c0c0c4d1c7a3512b6e9e18843bbd5a"
|
|
110
110
|
}
|
|
@@ -5,9 +5,12 @@ import { NxJsonConfiguration } from 'nx/src/config/nx-json';
|
|
|
5
5
|
export declare class DaemonClient {
|
|
6
6
|
private readonly nxJson;
|
|
7
7
|
constructor(nxJson: NxJsonConfiguration);
|
|
8
|
+
private _enabled;
|
|
8
9
|
enabled(): boolean;
|
|
9
10
|
getProjectGraph(): Promise<ProjectGraph>;
|
|
10
11
|
processInBackground(requirePath: string, data: any): Promise<any>;
|
|
12
|
+
recordOutputsHash(outputs: string[], hash: string): Promise<any>;
|
|
13
|
+
outputsHashesMatch(outputs: string[], hash: string): Promise<any>;
|
|
11
14
|
}
|
|
12
15
|
export declare function startInBackground(): Promise<ChildProcess['pid']>;
|
|
13
16
|
export declare function startInCurrentProcess(): void;
|
|
@@ -21,25 +21,28 @@ class DaemonClient {
|
|
|
21
21
|
}
|
|
22
22
|
enabled() {
|
|
23
23
|
var _a, _b, _c;
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
24
|
+
if (this._enabled === undefined) {
|
|
25
|
+
const useDaemonProcessOption = (_c = (_b = (_a = this.nxJson.tasksRunnerOptions) === null || _a === void 0 ? void 0 : _a['default']) === null || _b === void 0 ? void 0 : _b.options) === null || _c === void 0 ? void 0 : _c.useDaemonProcess;
|
|
26
|
+
const env = process.env.NX_DAEMON;
|
|
27
|
+
// env takes precedence
|
|
28
|
+
// option=true,env=false => no daemon
|
|
29
|
+
// option=false,env=undefined => no daemon
|
|
30
|
+
// option=false,env=false => no daemon
|
|
31
|
+
// option=undefined,env=undefined => daemon
|
|
32
|
+
// option=true,env=true => daemon
|
|
33
|
+
// option=false,env=true => daemon
|
|
34
|
+
if ((0, is_ci_1.isCI)() ||
|
|
35
|
+
isDocker() ||
|
|
36
|
+
(0, tmp_dir_1.isDaemonDisabled)() ||
|
|
37
|
+
(useDaemonProcessOption === undefined && env === 'false') ||
|
|
38
|
+
(useDaemonProcessOption === true && env === 'false') ||
|
|
39
|
+
(useDaemonProcessOption === false && env === undefined) ||
|
|
40
|
+
(useDaemonProcessOption === false && env === 'false')) {
|
|
41
|
+
this._enabled = false;
|
|
42
|
+
}
|
|
43
|
+
this._enabled = true;
|
|
41
44
|
}
|
|
42
|
-
return
|
|
45
|
+
return this._enabled;
|
|
43
46
|
}
|
|
44
47
|
getProjectGraph() {
|
|
45
48
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -62,6 +65,34 @@ class DaemonClient {
|
|
|
62
65
|
});
|
|
63
66
|
});
|
|
64
67
|
}
|
|
68
|
+
recordOutputsHash(outputs, hash) {
|
|
69
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
70
|
+
if (!(yield isServerAvailable())) {
|
|
71
|
+
yield startInBackground();
|
|
72
|
+
}
|
|
73
|
+
return sendMessageToDaemon({
|
|
74
|
+
type: 'RECORD_OUTPUTS_HASH',
|
|
75
|
+
data: {
|
|
76
|
+
outputs,
|
|
77
|
+
hash,
|
|
78
|
+
},
|
|
79
|
+
});
|
|
80
|
+
});
|
|
81
|
+
}
|
|
82
|
+
outputsHashesMatch(outputs, hash) {
|
|
83
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
84
|
+
if (!(yield isServerAvailable())) {
|
|
85
|
+
yield startInBackground();
|
|
86
|
+
}
|
|
87
|
+
return sendMessageToDaemon({
|
|
88
|
+
type: 'OUTPUTS_HASHES_MATCH',
|
|
89
|
+
data: {
|
|
90
|
+
outputs,
|
|
91
|
+
hash,
|
|
92
|
+
},
|
|
93
|
+
});
|
|
94
|
+
});
|
|
95
|
+
}
|
|
65
96
|
}
|
|
66
97
|
exports.DaemonClient = DaemonClient;
|
|
67
98
|
function isDocker() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/client/client.ts"],"names":[],"mappings":";;;;AAAA,+DAA2D;AAC3D,iDAA+D;AAC/D,2BAAsD;AACtD,uCAAyD;AACzD,6BAA8B;AAC9B,+BAA4B;AAC5B,2CAAyC;AACzC,+CAA4C;AAC5C,oCAGkB;AAClB,kDAAwE;AACxE,wCAIoB;AAEpB,6CAAyC;AAGzC,MAAM,mBAAmB,mCACpB,OAAO,CAAC,GAAG,KACd,qBAAqB,EAAE,OAAO,EAC9B,yBAAyB,EAAE,OAAO,GACnC,CAAC;AAEF,MAAa,YAAY;IACvB,YAA6B,MAA2B;QAA3B,WAAM,GAAN,MAAM,CAAqB;IAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/client/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { HandlerResult } from './server';
|
|
2
|
+
export declare function handleRecordOutputsHash(payload: {
|
|
3
|
+
type: string;
|
|
4
|
+
data: {
|
|
5
|
+
outputs: string[];
|
|
6
|
+
hash: string;
|
|
7
|
+
};
|
|
8
|
+
}): Promise<HandlerResult>;
|
|
9
|
+
export declare function handleOutputsHashesMatch(payload: {
|
|
10
|
+
type: string;
|
|
11
|
+
data: {
|
|
12
|
+
outputs: string[];
|
|
13
|
+
hash: string;
|
|
14
|
+
};
|
|
15
|
+
}): Promise<HandlerResult>;
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.handleOutputsHashesMatch = exports.handleRecordOutputsHash = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const output_watcher_1 = require("./output-watcher");
|
|
6
|
+
function handleRecordOutputsHash(payload) {
|
|
7
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
8
|
+
try {
|
|
9
|
+
yield (0, output_watcher_1.recordOutputsHash)(payload.data.outputs, payload.data.hash);
|
|
10
|
+
return {
|
|
11
|
+
description: 'recordOutputsHash',
|
|
12
|
+
response: '{}',
|
|
13
|
+
};
|
|
14
|
+
}
|
|
15
|
+
catch (e) {
|
|
16
|
+
return {
|
|
17
|
+
description: 'recordOutputsHash failed',
|
|
18
|
+
error: new Error(`Critical error when recording metadata about outputs: '${e.message}'.`),
|
|
19
|
+
};
|
|
20
|
+
}
|
|
21
|
+
});
|
|
22
|
+
}
|
|
23
|
+
exports.handleRecordOutputsHash = handleRecordOutputsHash;
|
|
24
|
+
function handleOutputsHashesMatch(payload) {
|
|
25
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
26
|
+
try {
|
|
27
|
+
const res = yield (0, output_watcher_1.outputsHashesMatch)(payload.data.outputs, payload.data.hash);
|
|
28
|
+
return {
|
|
29
|
+
response: JSON.stringify(res),
|
|
30
|
+
description: 'outputsHashesMatch',
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
catch (e) {
|
|
34
|
+
return {
|
|
35
|
+
description: 'outputsHashesMatch failed',
|
|
36
|
+
error: new Error(`Critical error when verifying the contents of the outputs haven't changed: '${e.message}'.`),
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
});
|
|
40
|
+
}
|
|
41
|
+
exports.handleOutputsHashesMatch = handleOutputsHashesMatch;
|
|
42
|
+
//# sourceMappingURL=handle-output-contents.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"handle-output-contents.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/server/handle-output-contents.ts"],"names":[],"mappings":";;;;AACA,qDAAyE;AAEzE,SAAsB,uBAAuB,CAAC,OAG7C;;QACC,IAAI;YACF,MAAM,IAAA,kCAAiB,EAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjE,OAAO;gBACL,WAAW,EAAE,mBAAmB;gBAChC,QAAQ,EAAE,IAAI;aACf,CAAC;SACH;QAAC,OAAO,CAAC,EAAE;YACV,OAAO;gBACL,WAAW,EAAE,0BAA0B;gBACvC,KAAK,EAAE,IAAI,KAAK,CACd,0DAA0D,CAAC,CAAC,OAAO,IAAI,CACxE;aACF,CAAC;SACH;IACH,CAAC;CAAA;AAlBD,0DAkBC;AAED,SAAsB,wBAAwB,CAAC,OAG9C;;QACC,IAAI;YACF,MAAM,GAAG,GAAG,MAAM,IAAA,mCAAkB,EAClC,OAAO,CAAC,IAAI,CAAC,OAAO,EACpB,OAAO,CAAC,IAAI,CAAC,IAAI,CAClB,CAAC;YACF,OAAO;gBACL,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC;gBAC7B,WAAW,EAAE,oBAAoB;aAClC,CAAC;SACH;QAAC,OAAO,CAAC,EAAE;YACV,OAAO;gBACL,WAAW,EAAE,2BAA2B;gBACxC,KAAK,EAAE,IAAI,KAAK,CACd,+EAA+E,CAAC,CAAC,OAAO,IAAI,CAC7F;aACF,CAAC;SACH;IACH,CAAC;CAAA;AArBD,4DAqBC"}
|
|
@@ -0,0 +1,140 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.outputsHashesMatch = exports.recordOutputsHash = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const fs_extra_1 = require("fs-extra");
|
|
6
|
+
const path_1 = require("path");
|
|
7
|
+
const fastGlob = require("fast-glob");
|
|
8
|
+
const workspace_root_1 = require("../../utils/workspace-root");
|
|
9
|
+
const logger_1 = require("./logger");
|
|
10
|
+
const collapse_expanded_outputs_1 = require("../../utils/collapse-expanded-outputs");
|
|
11
|
+
const watcher = require('@parcel/watcher');
|
|
12
|
+
/**
|
|
13
|
+
* We cannot start a file watcher right away because the IO write that has just
|
|
14
|
+
* completed hasn't triggered the event yet.
|
|
15
|
+
*
|
|
16
|
+
* If we start the file watcher without the delay, we will see an invalidation
|
|
17
|
+
* of the write that is the write itself.
|
|
18
|
+
*/
|
|
19
|
+
const FILE_WATCHING_DELAY = 1000;
|
|
20
|
+
const errors = {};
|
|
21
|
+
const subscriptions = {};
|
|
22
|
+
const recordedHashes = {};
|
|
23
|
+
const numberOfExpandedOutputs = {};
|
|
24
|
+
function recordOutputsHash(_outputs, hash) {
|
|
25
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
26
|
+
const outputs = yield normalizeOutputs(_outputs);
|
|
27
|
+
numberOfExpandedOutputs[hash] = outputs.length;
|
|
28
|
+
yield removeSubscriptionsForOutputs(outputs);
|
|
29
|
+
// skip any recording. errors disable the optimization with the file restoration.
|
|
30
|
+
if (anyErrorsAssociatedWithOutputs(outputs)) {
|
|
31
|
+
return;
|
|
32
|
+
}
|
|
33
|
+
for (const output of outputs) {
|
|
34
|
+
recordedHashes[output] = hash;
|
|
35
|
+
}
|
|
36
|
+
yield createSubscriptionsForOutputs(outputs);
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
exports.recordOutputsHash = recordOutputsHash;
|
|
40
|
+
function outputsHashesMatch(_outputs, hash) {
|
|
41
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
42
|
+
const outputs = yield normalizeOutputs(_outputs);
|
|
43
|
+
if (outputs.length !== numberOfExpandedOutputs[hash])
|
|
44
|
+
return false;
|
|
45
|
+
for (const output of outputs) {
|
|
46
|
+
if (recordedHashes[output] !== hash)
|
|
47
|
+
return false;
|
|
48
|
+
}
|
|
49
|
+
return true;
|
|
50
|
+
});
|
|
51
|
+
}
|
|
52
|
+
exports.outputsHashesMatch = outputsHashesMatch;
|
|
53
|
+
function anyErrorsAssociatedWithOutputs(outputs) {
|
|
54
|
+
for (const output of outputs) {
|
|
55
|
+
if (errors[output])
|
|
56
|
+
return true;
|
|
57
|
+
}
|
|
58
|
+
return false;
|
|
59
|
+
}
|
|
60
|
+
/**
|
|
61
|
+
* A subscription that starts in FILE_WATCHING_DELAY but is
|
|
62
|
+
* cancelable before that as well.
|
|
63
|
+
*/
|
|
64
|
+
function delayedSubscription(output) {
|
|
65
|
+
let subscription;
|
|
66
|
+
const handle = setTimeout(() => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
67
|
+
subscription = watcher.subscribe(output, (err) => {
|
|
68
|
+
if (err) {
|
|
69
|
+
logger_1.serverLogger.watcherLog(`File watcher '${output}' threw an error.`);
|
|
70
|
+
console.error(err);
|
|
71
|
+
errors[output] = err;
|
|
72
|
+
if (subscriptions[output]) {
|
|
73
|
+
subscriptions[output].unsubscribe();
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
recordedHashes[output] = undefined;
|
|
77
|
+
});
|
|
78
|
+
}), FILE_WATCHING_DELAY);
|
|
79
|
+
return {
|
|
80
|
+
unsubscribe: () => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
81
|
+
if (subscription) {
|
|
82
|
+
yield (yield subscription).unsubscribe();
|
|
83
|
+
}
|
|
84
|
+
else {
|
|
85
|
+
clearTimeout(handle);
|
|
86
|
+
}
|
|
87
|
+
}),
|
|
88
|
+
};
|
|
89
|
+
}
|
|
90
|
+
// reduce files to folders and expand globs
|
|
91
|
+
function normalizeOutputs(outputs) {
|
|
92
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
93
|
+
return (yield Promise.all(outputs.map((o) => normalizeOutput(o, true)))).flat();
|
|
94
|
+
});
|
|
95
|
+
}
|
|
96
|
+
function normalizeOutput(output, expand) {
|
|
97
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
98
|
+
try {
|
|
99
|
+
const res = yield (0, fs_extra_1.lstat)((0, path_1.join)(workspace_root_1.workspaceRoot, output));
|
|
100
|
+
if (res.isFile()) {
|
|
101
|
+
return [(0, path_1.dirname)(output)];
|
|
102
|
+
}
|
|
103
|
+
else if (res.isDirectory()) {
|
|
104
|
+
return [output];
|
|
105
|
+
}
|
|
106
|
+
else {
|
|
107
|
+
return [];
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
catch (e) {
|
|
111
|
+
if (expand) {
|
|
112
|
+
const expanded = (0, collapse_expanded_outputs_1.collapseExpandedOutputs)(yield fastGlob(output, { cwd: workspace_root_1.workspaceRoot, dot: true }));
|
|
113
|
+
return (yield Promise.all(expanded.map((e) => normalizeOutput(e, false)))).flat();
|
|
114
|
+
}
|
|
115
|
+
else {
|
|
116
|
+
return [];
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
});
|
|
120
|
+
}
|
|
121
|
+
function createSubscriptionsForOutputs(normalizedOutputs) {
|
|
122
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
123
|
+
for (const output of normalizedOutputs) {
|
|
124
|
+
subscriptions[output] = delayedSubscription(output);
|
|
125
|
+
}
|
|
126
|
+
});
|
|
127
|
+
}
|
|
128
|
+
function removeSubscriptionsForOutputs(outputs) {
|
|
129
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
130
|
+
const unsubscribes = [];
|
|
131
|
+
for (const output of outputs) {
|
|
132
|
+
if (subscriptions[output]) {
|
|
133
|
+
unsubscribes.push(subscriptions[output].unsubscribe());
|
|
134
|
+
}
|
|
135
|
+
delete subscriptions[output];
|
|
136
|
+
}
|
|
137
|
+
yield Promise.all(unsubscribes);
|
|
138
|
+
});
|
|
139
|
+
}
|
|
140
|
+
//# sourceMappingURL=output-watcher.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"output-watcher.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/server/output-watcher.ts"],"names":[],"mappings":";;;;AAAA,uCAAiC;AACjC,+BAAqC;AACrC,sCAAsC;AACtC,+DAA2D;AAC3D,qCAAwC;AACxC,qFAAgF;AAEhF,MAAM,OAAO,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAE3C;;;;;;GAMG;AACH,MAAM,mBAAmB,GAAG,IAAI,CAAC;AAEjC,MAAM,MAAM,GAAG,EAAiC,CAAC;AACjD,MAAM,aAAa,GAAG,EAAqD,CAAC;AAC5E,MAAM,cAAc,GAAG,EAAkC,CAAC;AAC1D,MAAM,uBAAuB,GAAG,EAAgC,CAAC;AAEjE,SAAsB,iBAAiB,CAAC,QAAkB,EAAE,IAAY;;QACtE,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACjD,uBAAuB,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;QAE/C,MAAM,6BAA6B,CAAC,OAAO,CAAC,CAAC;QAE7C,iFAAiF;QACjF,IAAI,8BAA8B,CAAC,OAAO,CAAC,EAAE;YAC3C,OAAO;SACR;QAED,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,cAAc,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;SAC/B;QACD,MAAM,6BAA6B,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;CAAA;AAfD,8CAeC;AAED,SAAsB,kBAAkB,CAAC,QAAkB,EAAE,IAAY;;QACvE,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACjD,IAAI,OAAO,CAAC,MAAM,KAAK,uBAAuB,CAAC,IAAI,CAAC;YAAE,OAAO,KAAK,CAAC;QACnE,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,IAAI,cAAc,CAAC,MAAM,CAAC,KAAK,IAAI;gBAAE,OAAO,KAAK,CAAC;SACnD;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CAAA;AAPD,gDAOC;AAED,SAAS,8BAA8B,CAAC,OAAiB;IACvD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,IAAI,MAAM,CAAC,MAAM,CAAC;YAAE,OAAO,IAAI,CAAC;KACjC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;GAGG;AACH,SAAS,mBAAmB,CAAC,MAAc;IACzC,IAAI,YAAY,CAAC;IACjB,MAAM,MAAM,GAAG,UAAU,CAAC,GAAS,EAAE;QACnC,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE;YAC/C,IAAI,GAAG,EAAE;gBACP,qBAAY,CAAC,UAAU,CAAC,iBAAiB,MAAM,mBAAmB,CAAC,CAAC;gBACpE,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACnB,MAAM,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC;gBACrB,IAAI,aAAa,CAAC,MAAM,CAAC,EAAE;oBACzB,aAAa,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC;iBACrC;aACF;YACD,cAAc,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;QACrC,CAAC,CAAC,CAAC;IACL,CAAC,CAAA,EAAE,mBAAmB,CAAC,CAAC;IAExB,OAAO;QACL,WAAW,EAAE,GAAS,EAAE;YACtB,IAAI,YAAY,EAAE;gBAChB,MAAM,CAAC,MAAM,YAAY,CAAC,CAAC,WAAW,EAAE,CAAC;aAC1C;iBAAM;gBACL,YAAY,CAAC,MAAM,CAAC,CAAC;aACtB;QACH,CAAC,CAAA;KACF,CAAC;AACJ,CAAC;AAED,2CAA2C;AAC3C,SAAe,gBAAgB,CAAC,OAAiB;;QAC/C,OAAO,CACL,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAChE,CAAC,IAAI,EAAE,CAAC;IACX,CAAC;CAAA;AAED,SAAe,eAAe,CAC5B,MAAc,EACd,MAAe;;QAEf,IAAI;YACF,MAAM,GAAG,GAAG,MAAM,IAAA,gBAAK,EAAC,IAAA,WAAI,EAAC,8BAAa,EAAE,MAAM,CAAC,CAAC,CAAC;YACrD,IAAI,GAAG,CAAC,MAAM,EAAE,EAAE;gBAChB,OAAO,CAAC,IAAA,cAAO,EAAC,MAAM,CAAC,CAAC,CAAC;aAC1B;iBAAM,IAAI,GAAG,CAAC,WAAW,EAAE,EAAE;gBAC5B,OAAO,CAAC,MAAM,CAAC,CAAC;aACjB;iBAAM;gBACL,OAAO,EAAE,CAAC;aACX;SACF;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,MAAM,EAAE;gBACV,MAAM,QAAQ,GAAG,IAAA,mDAAuB,EACtC,MAAM,QAAQ,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,8BAAa,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAC1D,CAAC;gBACF,OAAO,CACL,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAClE,CAAC,IAAI,EAAE,CAAC;aACV;iBAAM;gBACL,OAAO,EAAE,CAAC;aACX;SACF;IACH,CAAC;CAAA;AAED,SAAe,6BAA6B,CAAC,iBAA2B;;QACtE,KAAK,MAAM,MAAM,IAAI,iBAAiB,EAAE;YACtC,aAAa,CAAC,MAAM,CAAC,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;SACrD;IACH,CAAC;CAAA;AAED,SAAe,6BAA6B,CAAC,OAAiB;;QAC5D,MAAM,YAAY,GAAG,EAAE,CAAC;QACxB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,IAAI,aAAa,CAAC,MAAM,CAAC,EAAE;gBACzB,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;aACxD;YACD,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC;SAC9B;QACD,MAAM,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAClC,CAAC;CAAA"}
|
|
@@ -16,6 +16,7 @@ const hashing_impl_1 = require("../../hasher/hashing-impl");
|
|
|
16
16
|
const file_hasher_1 = require("../../hasher/file-hasher");
|
|
17
17
|
const handle_request_project_graph_1 = require("./handle-request-project-graph");
|
|
18
18
|
const handle_process_in_background_1 = require("./handle-process-in-background");
|
|
19
|
+
const handle_output_contents_1 = require("./handle-output-contents");
|
|
19
20
|
let watcherSubscription;
|
|
20
21
|
let performanceObserver;
|
|
21
22
|
let watcherError;
|
|
@@ -66,6 +67,12 @@ function handleMessage(socket, data) {
|
|
|
66
67
|
else if (payload.type === 'PROCESS_IN_BACKGROUND') {
|
|
67
68
|
yield handleResult(socket, yield (0, handle_process_in_background_1.handleProcessInBackground)(payload));
|
|
68
69
|
}
|
|
70
|
+
else if (payload.type === 'RECORD_OUTPUTS_HASH') {
|
|
71
|
+
yield handleResult(socket, yield (0, handle_output_contents_1.handleRecordOutputsHash)(payload));
|
|
72
|
+
}
|
|
73
|
+
else if (payload.type === 'OUTPUTS_HASHES_MATCH') {
|
|
74
|
+
yield handleResult(socket, yield (0, handle_output_contents_1.handleOutputsHashesMatch)(payload));
|
|
75
|
+
}
|
|
69
76
|
else {
|
|
70
77
|
yield (0, shutdown_utils_1.respondWithErrorAndExit)(socket, `Invalid payload from the client`, new Error(`Unsupported payload sent to daemon server: ${unparsedPayload}`));
|
|
71
78
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/server/server.ts"],"names":[],"mappings":";;;;AAAA,+DAA2D;AAC3D,6BAAmD;AACnD,+BAA4B;AAC5B,2CAAiD;AACjD,kDAIyB;AACzB,qCAAwC;AACxC,qDAM0B;AAC1B,uCAKmB;AACnB,uGAAsF;AACtF,2BAA0C;AAC1C,4DAAwD;AACxD,0DAA6D;AAC7D,iFAA2E;AAC3E,iFAA2E;
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/server/server.ts"],"names":[],"mappings":";;;;AAAA,+DAA2D;AAC3D,6BAAmD;AACnD,+BAA4B;AAC5B,2CAAiD;AACjD,kDAIyB;AACzB,qCAAwC;AACxC,qDAM0B;AAC1B,uCAKmB;AACnB,uGAAsF;AACtF,2BAA0C;AAC1C,4DAAwD;AACxD,0DAA6D;AAC7D,iFAA2E;AAC3E,iFAA2E;AAC3E,qEAGkC;AAElC,IAAI,mBAAoD,CAAC;AACzD,IAAI,mBAAoD,CAAC;AACzD,IAAI,YAA+B,CAAC;AAQpC,MAAM,MAAM,GAAG,IAAA,kBAAY,EAAC,CAAO,MAAM,EAAE,EAAE;IAC3C,IAAA,uCAAsB,EAAC,uBAAuB,CAAC,CAAC;IAChD,IAAI,CAAC,mBAAmB,EAAE;QACxB,mBAAmB,GAAG,IAAI,gCAAmB,CAAC,CAAC,IAAI,EAAE,EAAE;YACrD,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;YACnC,qBAAY,CAAC,GAAG,CAAC,mBAAmB,KAAK,CAAC,IAAI,GAAG,EAAE,GAAG,KAAK,CAAC,QAAQ,IAAI,CAAC,CAAC;QAC5E,CAAC,CAAC,CAAC;QACH,mBAAmB,CAAC,OAAO,CAAC,EAAE,UAAU,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;KAC1D;IAED,IAAI,OAAO,GAAG,EAAE,CAAC;IACjB,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAO,IAAI,EAAE,EAAE;QAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC9B,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE;YAClE,OAAO,IAAI,KAAK,CAAC;SAClB;aAAM;YACL,OAAO,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YAChD,MAAM,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;SACtC;IACH,CAAC,CAAA,CAAC,CAAC;AACL,CAAC,CAAA,CAAC,CAAC;AAEH,SAAe,aAAa,CAAC,MAAM,EAAE,IAAI;;QACvC,IAAI,YAAY,EAAE;YAChB,MAAM,IAAA,wCAAuB,EAC3B,MAAM,EACN,wCAAwC,8BAAa,IAAI,EACzD,YAAY,CACb,CAAC;SACH;QAED,IAAI,eAAe,EAAE,EAAE;YACrB,MAAM,IAAA,wCAAuB,EAAC,MAAM,EAAE,oBAAoB,EAAE;gBAC1D,IAAI,EAAE,EAAE;gBACR,OAAO,EAAE,oBAAoB;aAC9B,CAAC,CAAC;SACJ;QAED,IAAA,uCAAsB,EAAC,uBAAuB,CAAC,CAAC;QAEhD,MAAM,eAAe,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QACxC,IAAI,OAAO,CAAC;QACZ,IAAI;YACF,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;SACvC;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAA,wCAAuB,EAC3B,MAAM,EACN,iCAAiC,EACjC,IAAI,KAAK,CAAC,8CAA8C,eAAe,EAAE,CAAC,CAC3E,CAAC;SACH;QAED,IAAI,OAAO,CAAC,IAAI,KAAK,uBAAuB,EAAE;YAC5C,MAAM,YAAY,CAAC,MAAM,EAAE,MAAM,IAAA,wDAAyB,GAAE,CAAC,CAAC;SAC/D;aAAM,IAAI,OAAO,CAAC,IAAI,KAAK,uBAAuB,EAAE;YACnD,MAAM,YAAY,CAAC,MAAM,EAAE,MAAM,IAAA,wDAAyB,EAAC,OAAO,CAAC,CAAC,CAAC;SACtE;aAAM,IAAI,OAAO,CAAC,IAAI,KAAK,qBAAqB,EAAE;YACjD,MAAM,YAAY,CAAC,MAAM,EAAE,MAAM,IAAA,gDAAuB,EAAC,OAAO,CAAC,CAAC,CAAC;SACpE;aAAM,IAAI,OAAO,CAAC,IAAI,KAAK,sBAAsB,EAAE;YAClD,MAAM,YAAY,CAAC,MAAM,EAAE,MAAM,IAAA,iDAAwB,EAAC,OAAO,CAAC,CAAC,CAAC;SACrE;aAAM;YACL,MAAM,IAAA,wCAAuB,EAC3B,MAAM,EACN,iCAAiC,EACjC,IAAI,KAAK,CAAC,8CAA8C,eAAe,EAAE,CAAC,CAC3E,CAAC;SACH;IACH,CAAC;CAAA;AAED,SAAe,YAAY,CAAC,MAAc,EAAE,EAAiB;;QAC3D,IAAI,EAAE,CAAC,KAAK,EAAE;YACZ,MAAM,IAAA,wCAAuB,EAAC,MAAM,EAAE,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;SACjE;aAAM;YACL,MAAM,IAAA,gCAAe,EAAC,MAAM,EAAE,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC;SAC5D;IACH,CAAC;CAAA;AAED,SAAS,uBAAuB;IAC9B,IAAA,+CAA8B,EAAC;QAC7B,MAAM;QACN,mBAAmB;QACnB,MAAM,EAAE,GAAG,6CAA4B,kBAAkB;KAC1D,CAAC,CAAC;AACL,CAAC;AAED,OAAO;KACJ,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,CACjB,IAAA,+CAA8B,EAAC;IAC7B,MAAM;IACN,mBAAmB;IACnB,MAAM,EAAE,yBAAyB;CAClC,CAAC,CACH;KACA,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,CAClB,IAAA,+CAA8B,EAAC;IAC7B,MAAM;IACN,mBAAmB;IACnB,MAAM,EAAE,0BAA0B;CACnC,CAAC,CACH;KACA,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,CACjB,IAAA,+CAA8B,EAAC;IAC7B,MAAM;IACN,mBAAmB;IACnB,MAAM,EAAE,yBAAyB;CAClC,CAAC,CACH,CAAC;AAEJ,IAAI,gBAAoC,CAAC;AAEzC,SAAS,eAAe;IACtB,MAAM,IAAI,GAAG,IAAI,0BAAW,EAAE,CAAC;IAC/B,MAAM,UAAU,GAAG;QACjB,IAAA,WAAI,EAAC,8BAAa,EAAE,mBAAmB,CAAC;QACxC,IAAA,WAAI,EAAC,8BAAa,EAAE,WAAW,CAAC;QAChC,IAAA,WAAI,EAAC,8BAAa,EAAE,gBAAgB,CAAC;KACtC;SACE,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,eAAU,EAAC,IAAI,CAAC,CAAC;SAClC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IACtC,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAC3C,IAAI,gBAAgB,IAAI,OAAO,IAAI,gBAAgB,EAAE;QACnD,gBAAgB,GAAG,OAAO,CAAC;QAC3B,OAAO,IAAI,CAAC;KACb;SAAM;QACL,gBAAgB,GAAG,OAAO,CAAC;QAC3B,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,sBAAsB,GAAwC,CAClE,GAAG,EACH,YAAY,EACZ,EAAE;IACF,IAAI,YAAY,EAAE;QAChB,qBAAY,CAAC,UAAU,CACrB,iFAAiF,CAClF,CAAC;QACF,OAAO;KACR;IAED,IAAI;QACF,IAAA,uCAAsB,EAAC,uBAAuB,CAAC,CAAC;QAEhD,IAAI,eAAe,EAAE,EAAE;YACrB,MAAM,IAAA,+CAA8B,EAAC;gBACnC,MAAM;gBACN,mBAAmB;gBACnB,MAAM,EAAE,mBAAmB;aAC5B,CAAC,CAAC;YACH,OAAO;SACR;QAED,IAAI,GAAG,IAAI,CAAC,YAAY,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE;YAChD,qBAAY,CAAC,UAAU,CAAC,0BAA0B,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;YACjE,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnB,YAAY,GAAG,GAAG,CAAC;YACnB,OAAO;SACR;QAED,qBAAY,CAAC,UAAU,CAAC,IAAA,yCAA+B,EAAC,YAAY,CAAC,CAAC,CAAC;QAEvE,MAAM,WAAW,GAAG,EAAE,CAAC;QACvB,MAAM,YAAY,GAAG,EAAE,CAAC;QACxB,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE;YAChC,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAC3B,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aAC/B;iBAAM;gBACL,IAAI;oBACF,MAAM,CAAC,GAAG,IAAA,aAAQ,EAAC,IAAA,WAAI,EAAC,8BAAa,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;oBACpD,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE,EAAE;wBACpB,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;qBAC9B;iBACF;gBAAC,OAAO,CAAC,EAAE;oBACV,+DAA+D;iBAChE;aACF;SACF;QACD,IAAA,mEAAyB,EAAC,WAAW,EAAE,YAAY,CAAC,CAAC;KACtD;IAAC,OAAO,GAAG,EAAE;QACZ,qBAAY,CAAC,UAAU,CAAC,kBAAkB,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;QACzD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnB,YAAY,GAAG,GAAG,CAAC;KACpB;AACH,CAAC,CAAA,CAAC;AAEF,SAAsB,WAAW;;QAC/B,2GAA2G;QAC3G,IAAI,CAAC,wBAAS,EAAE;YACd,IAAA,+BAAgB,GAAE,CAAC;SACpB;QACD,MAAM,+BAAiB,CAAC,iBAAiB,EAAE,CAAC;QAC5C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,IAAI;gBACF,MAAM,CAAC,MAAM,CAAC,kCAAmB,EAAE,GAAS,EAAE;oBAC5C,IAAI;wBACF,qBAAY,CAAC,GAAG,CAAC,yBAAyB,kCAAmB,EAAE,CAAC,CAAC;wBACjE,kDAAkD;wBAClD,eAAe,EAAE,CAAC;wBAElB,IAAI,CAAC,mBAAmB,EAAE;4BACxB,mBAAmB,GAAG,MAAM,IAAA,qCAA2B,EACrD,MAAM,EACN,sBAAsB,CACvB,CAAC;4BACF,qBAAY,CAAC,UAAU,CACrB,iCAAiC,8BAAa,EAAE,CACjD,CAAC;yBACH;wBACD,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC;qBACxB;oBAAC,OAAO,GAAG,EAAE;wBACZ,MAAM,CAAC,GAAG,CAAC,CAAC;qBACb;gBACH,CAAC,CAAA,CAAC,CAAC;aACJ;YAAC,OAAO,GAAG,EAAE;gBACZ,MAAM,CAAC,GAAG,CAAC,CAAC;aACb;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CAAA;AAhCD,kCAgCC;AAED,SAAsB,UAAU;;QAC9B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACnB,IAAI,GAAG,EAAE;oBACP;;;;uBAIG;oBACH,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,uBAAuB,CAAC,EAAE;wBACpD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;qBACpB;iBACF;gBAED,IAAA,+BAAgB,GAAE,CAAC;gBACnB,OAAO,OAAO,EAAE,CAAC;YACnB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;CAAA;AAlBD,gCAkBC"}
|
package/src/hasher/hash-task.js
CHANGED
|
@@ -5,9 +5,14 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const utils_1 = require("../tasks-runner/utils");
|
|
6
6
|
const project_graph_1 = require("../project-graph/project-graph");
|
|
7
7
|
function hashDependsOnOtherTasks(workspaces, hasher, projectGraph, taskGraph, task) {
|
|
8
|
-
|
|
9
|
-
|
|
8
|
+
try {
|
|
9
|
+
const customHasher = (0, utils_1.getCustomHasher)(task, workspaces, workspaces.readNxJson(), projectGraph);
|
|
10
|
+
if (customHasher)
|
|
11
|
+
return true;
|
|
12
|
+
}
|
|
13
|
+
catch (_a) {
|
|
10
14
|
return true;
|
|
15
|
+
}
|
|
11
16
|
return hasher.hashDependsOnOtherTasks(task);
|
|
12
17
|
}
|
|
13
18
|
exports.hashDependsOnOtherTasks = hashDependsOnOtherTasks;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hash-task.js","sourceRoot":"","sources":["../../../../../packages/nx/src/hasher/hash-task.ts"],"names":[],"mappings":";;;;AACA,iDAAwD;AACxD,kEAA2F;AAK3F,SAAgB,uBAAuB,CACrC,UAAsB,EACtB,MAAc,EACd,YAA0B,EAC1B,SAAoB,EACpB,IAAU;IAEV,MAAM,YAAY,GAAG,IAAA,uBAAe,EAClC,IAAI,EACJ,UAAU,EACV,UAAU,CAAC,UAAU,EAAE,EACvB,YAAY,CACb,CAAC;
|
|
1
|
+
{"version":3,"file":"hash-task.js","sourceRoot":"","sources":["../../../../../packages/nx/src/hasher/hash-task.ts"],"names":[],"mappings":";;;;AACA,iDAAwD;AACxD,kEAA2F;AAK3F,SAAgB,uBAAuB,CACrC,UAAsB,EACtB,MAAc,EACd,YAA0B,EAC1B,SAAoB,EACpB,IAAU;IAEV,IAAI;QACF,MAAM,YAAY,GAAG,IAAA,uBAAe,EAClC,IAAI,EACJ,UAAU,EACV,UAAU,CAAC,UAAU,EAAE,EACvB,YAAY,CACb,CAAC;QACF,IAAI,YAAY;YAAE,OAAO,IAAI,CAAC;KAC/B;IAAC,WAAM;QACN,OAAO,IAAI,CAAC;KACb;IACD,OAAO,MAAM,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;AAC9C,CAAC;AAnBD,0DAmBC;AAED,SAAsB,QAAQ,CAC5B,UAAsB,EACtB,MAAc,EACd,YAA0B,EAC1B,SAAoB,EACpB,IAAU;;QAEV,MAAM,YAAY,GAAG,IAAA,uBAAe,EAClC,IAAI,EACJ,UAAU,EACV,UAAU,CAAC,UAAU,EAAE,EACvB,YAAY,CACb,CAAC;QACF,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,YAAY;YAC5C,CAAC,CAAC,YAAY,CAAC,IAAI,EAAE;gBACjB,MAAM;gBACN,YAAY;gBACZ,SAAS;gBACT,eAAe,EACb,IAAA,yDAAyC,EAAC,YAAY,CAAC;aAC1D,CAAC;YACJ,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3B,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC;QAClB,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC;IAC7B,CAAC;CAAA;AAxBD,4BAwBC"}
|
|
@@ -15,7 +15,6 @@ export declare class Cache {
|
|
|
15
15
|
root: string;
|
|
16
16
|
cachePath: string;
|
|
17
17
|
terminalOutputsDir: string;
|
|
18
|
-
latestOutputsHashesDir: string;
|
|
19
18
|
useFsExtraToCopyAndRemove: boolean;
|
|
20
19
|
constructor(options: DefaultTasksRunnerOptions);
|
|
21
20
|
removeOldCacheRecords(): void;
|
|
@@ -23,29 +22,13 @@ export declare class Cache {
|
|
|
23
22
|
put(task: Task, terminalOutput: string | null, outputs: string[], code: number): Promise<void>;
|
|
24
23
|
copyFilesFromCache(hash: string, cachedResult: CachedResult, outputs: string[]): Promise<void>;
|
|
25
24
|
temporaryOutputPath(task: Task): string;
|
|
26
|
-
removeRecordedOutputsHashes(outputs: string[]): Promise<void>;
|
|
27
|
-
shouldCopyOutputsFromCache(taskWithCachedResult: TaskWithCachedResult, outputs: string[]): Promise<boolean>;
|
|
28
25
|
private expandOutputsInWorkspace;
|
|
29
26
|
private expandOutputsInCache;
|
|
30
27
|
private _expandOutputs;
|
|
31
28
|
private copy;
|
|
32
29
|
private remove;
|
|
33
|
-
private recordOutputsHash;
|
|
34
|
-
private areLatestOutputsHashesDifferentThanTaskHash;
|
|
35
|
-
private getLatestRecordedHashForTask;
|
|
36
|
-
private haveOutputsBeenAddedOrRemoved;
|
|
37
|
-
private getFilesInDirectory;
|
|
38
|
-
private visitDirectory;
|
|
39
|
-
private getFileNameWithLatestRecordedHashForOutput;
|
|
40
|
-
private getLatestOutputHashFilename;
|
|
41
30
|
private getFromLocalDir;
|
|
42
31
|
private createCacheDir;
|
|
43
32
|
private createTerminalOutputsDir;
|
|
44
|
-
private ensureLatestOutputsHashesDir;
|
|
45
33
|
private tryAndRetry;
|
|
46
34
|
}
|
|
47
|
-
/**
|
|
48
|
-
* Collapse Expanded Outputs back into a smaller set of directories/files to track
|
|
49
|
-
* Note: DO NOT USE, Only exported for unit testing
|
|
50
|
-
* */
|
|
51
|
-
export declare function collapseExpandedOutputs(expandedOutputs: string[]): string[];
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.Cache = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const workspace_root_1 = require("../utils/workspace-root");
|
|
6
6
|
const fs_extra_1 = require("fs-extra");
|
|
@@ -15,7 +15,6 @@ class Cache {
|
|
|
15
15
|
this.root = workspace_root_1.workspaceRoot;
|
|
16
16
|
this.cachePath = this.createCacheDir();
|
|
17
17
|
this.terminalOutputsDir = this.createTerminalOutputsDir();
|
|
18
|
-
this.latestOutputsHashesDir = this.ensureLatestOutputsHashesDir();
|
|
19
18
|
this.useFsExtraToCopyAndRemove = (0, os_1.platform)() === 'win32';
|
|
20
19
|
}
|
|
21
20
|
removeOldCacheRecords() {
|
|
@@ -70,7 +69,6 @@ class Cache {
|
|
|
70
69
|
yield (0, fs_extra_1.writeFile)((0, path_1.join)(td, 'terminalOutput'), terminalOutput !== null && terminalOutput !== void 0 ? terminalOutput : 'no terminal output');
|
|
71
70
|
yield (0, fs_extra_1.mkdir)((0, path_1.join)(td, 'outputs'));
|
|
72
71
|
const expandedOutputs = yield this.expandOutputsInWorkspace(outputs);
|
|
73
|
-
const collapsedOutputs = collapseExpandedOutputs(expandedOutputs);
|
|
74
72
|
yield Promise.all(expandedOutputs.map((f) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
75
73
|
const src = (0, path_1.join)(this.root, f);
|
|
76
74
|
if (yield (0, fs_extra_1.pathExists)(src)) {
|
|
@@ -90,7 +88,6 @@ class Cache {
|
|
|
90
88
|
if (this.options.remoteCache) {
|
|
91
89
|
yield this.options.remoteCache.store(task.hash, this.cachePath);
|
|
92
90
|
}
|
|
93
|
-
yield this.recordOutputsHash(collapsedOutputs, task.hash);
|
|
94
91
|
if (terminalOutput) {
|
|
95
92
|
const outputPath = this.temporaryOutputPath(task);
|
|
96
93
|
yield (0, fs_extra_1.writeFile)(outputPath, terminalOutput);
|
|
@@ -102,8 +99,6 @@ class Cache {
|
|
|
102
99
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
103
100
|
return this.tryAndRetry(() => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
104
101
|
const expandedOutputs = yield this.expandOutputsInCache(outputs, cachedResult);
|
|
105
|
-
const collapsedOutputs = collapseExpandedOutputs(expandedOutputs);
|
|
106
|
-
yield this.removeRecordedOutputsHashes(collapsedOutputs);
|
|
107
102
|
yield Promise.all(expandedOutputs.map((f) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
108
103
|
const cached = (0, path_1.join)(cachedResult.outputsPath, f);
|
|
109
104
|
if (yield (0, fs_extra_1.pathExists)(cached)) {
|
|
@@ -116,38 +111,12 @@ class Cache {
|
|
|
116
111
|
yield this.copy(cached, src);
|
|
117
112
|
}
|
|
118
113
|
})));
|
|
119
|
-
yield this.recordOutputsHash(collapsedOutputs, hash);
|
|
120
114
|
}));
|
|
121
115
|
});
|
|
122
116
|
}
|
|
123
117
|
temporaryOutputPath(task) {
|
|
124
118
|
return (0, path_1.join)(this.terminalOutputsDir, task.hash);
|
|
125
119
|
}
|
|
126
|
-
removeRecordedOutputsHashes(outputs) {
|
|
127
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
128
|
-
yield Promise.all(outputs.map((output) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
129
|
-
const hashFile = this.getFileNameWithLatestRecordedHashForOutput(output);
|
|
130
|
-
try {
|
|
131
|
-
yield (0, fs_extra_1.unlink)(hashFile);
|
|
132
|
-
}
|
|
133
|
-
catch (_a) { }
|
|
134
|
-
})));
|
|
135
|
-
});
|
|
136
|
-
}
|
|
137
|
-
shouldCopyOutputsFromCache(taskWithCachedResult, outputs) {
|
|
138
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
139
|
-
const [outputsInCache, outputsInWorkspace] = yield Promise.all([
|
|
140
|
-
this.expandOutputsInCache(outputs, taskWithCachedResult.cachedResult),
|
|
141
|
-
this.expandOutputsInWorkspace(outputs),
|
|
142
|
-
]);
|
|
143
|
-
const collapsedOutputsInCache = collapseExpandedOutputs(outputsInCache);
|
|
144
|
-
const [latestHashesDifferent, outputMissing] = yield Promise.all([
|
|
145
|
-
this.areLatestOutputsHashesDifferentThanTaskHash(collapsedOutputsInCache, taskWithCachedResult),
|
|
146
|
-
this.haveOutputsBeenAddedOrRemoved(taskWithCachedResult, outputsInCache, outputsInWorkspace),
|
|
147
|
-
]);
|
|
148
|
-
return latestHashesDifferent || outputMissing;
|
|
149
|
-
});
|
|
150
|
-
}
|
|
151
120
|
expandOutputsInWorkspace(outputs) {
|
|
152
121
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
153
122
|
return this._expandOutputs(outputs, workspace_root_1.workspaceRoot);
|
|
@@ -164,7 +133,7 @@ class Cache {
|
|
|
164
133
|
if (yield (0, fs_extra_1.pathExists)((0, path_1.join)(cwd, entry))) {
|
|
165
134
|
return entry;
|
|
166
135
|
}
|
|
167
|
-
return fastGlob(entry, { cwd });
|
|
136
|
+
return fastGlob(entry, { cwd, dot: true });
|
|
168
137
|
})))).flat();
|
|
169
138
|
});
|
|
170
139
|
}
|
|
@@ -204,122 +173,6 @@ class Cache {
|
|
|
204
173
|
});
|
|
205
174
|
});
|
|
206
175
|
}
|
|
207
|
-
recordOutputsHash(outputs, hash) {
|
|
208
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
209
|
-
yield (0, fs_extra_1.mkdir)(this.latestOutputsHashesDir, { recursive: true });
|
|
210
|
-
yield Promise.all(outputs.map((output) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
211
|
-
const hashFile = this.getFileNameWithLatestRecordedHashForOutput(output);
|
|
212
|
-
try {
|
|
213
|
-
yield (0, fs_extra_1.writeFile)(hashFile, hash);
|
|
214
|
-
}
|
|
215
|
-
catch (_a) { }
|
|
216
|
-
})));
|
|
217
|
-
});
|
|
218
|
-
}
|
|
219
|
-
areLatestOutputsHashesDifferentThanTaskHash(outputs, { task }) {
|
|
220
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
221
|
-
const latestExistingOutputHashes = (yield (0, fs_extra_1.readdir)(this.latestOutputsHashesDir)).map((m) => m.substring(0, m.length - 5));
|
|
222
|
-
// Purposely blocking
|
|
223
|
-
for (const output of outputs) {
|
|
224
|
-
const latestOutputFilename = this.getLatestOutputHashFilename(output);
|
|
225
|
-
const conflicts = latestExistingOutputHashes.filter((w) => {
|
|
226
|
-
// This is the exact same output
|
|
227
|
-
return (w !== latestOutputFilename &&
|
|
228
|
-
// This is an child of the output
|
|
229
|
-
(latestOutputFilename.startsWith(w) ||
|
|
230
|
-
// This is a parent of the output
|
|
231
|
-
w.startsWith(latestOutputFilename)));
|
|
232
|
-
});
|
|
233
|
-
if (conflicts.length > 0) {
|
|
234
|
-
// Clean up the conflicts
|
|
235
|
-
yield Promise.all(conflicts.map((conflict) => (0, fs_extra_1.unlink)((0, path_1.join)(this.latestOutputsHashesDir, conflict + '.hash'))));
|
|
236
|
-
return true;
|
|
237
|
-
}
|
|
238
|
-
const hash = yield this.getLatestRecordedHashForTask(output);
|
|
239
|
-
if (!!hash && hash !== task.hash) {
|
|
240
|
-
return true;
|
|
241
|
-
}
|
|
242
|
-
}
|
|
243
|
-
return false;
|
|
244
|
-
});
|
|
245
|
-
}
|
|
246
|
-
getLatestRecordedHashForTask(output) {
|
|
247
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
248
|
-
try {
|
|
249
|
-
return yield (0, fs_extra_1.readFile)(this.getFileNameWithLatestRecordedHashForOutput(output), 'utf-8');
|
|
250
|
-
}
|
|
251
|
-
catch (_a) {
|
|
252
|
-
return null;
|
|
253
|
-
}
|
|
254
|
-
});
|
|
255
|
-
}
|
|
256
|
-
haveOutputsBeenAddedOrRemoved(result, cachedOutputs, workspaceFiles) {
|
|
257
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
258
|
-
const workspaceSet = new Set(workspaceFiles);
|
|
259
|
-
for (const path of cachedOutputs) {
|
|
260
|
-
if (!(yield (0, fs_extra_1.pathExists)((0, path_1.join)(workspace_root_1.workspaceRoot, path)))) {
|
|
261
|
-
return true;
|
|
262
|
-
}
|
|
263
|
-
if (!workspaceSet.has(path)) {
|
|
264
|
-
return true;
|
|
265
|
-
}
|
|
266
|
-
const isDirectory = (yield (0, fs_extra_1.lstat)(path)).isDirectory();
|
|
267
|
-
if (isDirectory) {
|
|
268
|
-
const [cachedFiles, workspaceFiles] = yield Promise.all([
|
|
269
|
-
this.getFilesInDirectory((0, path_1.join)(result.cachedResult.outputsPath, path)),
|
|
270
|
-
this.getFilesInDirectory((0, path_1.join)(workspace_root_1.workspaceRoot, path)),
|
|
271
|
-
]);
|
|
272
|
-
if (workspaceFiles.size !== cachedFiles.size) {
|
|
273
|
-
return true;
|
|
274
|
-
}
|
|
275
|
-
for (const file of cachedFiles) {
|
|
276
|
-
if (!workspaceFiles.has(file)) {
|
|
277
|
-
return true;
|
|
278
|
-
}
|
|
279
|
-
workspaceFiles.delete(file);
|
|
280
|
-
}
|
|
281
|
-
if (workspaceFiles.size !== 0) {
|
|
282
|
-
return true;
|
|
283
|
-
}
|
|
284
|
-
}
|
|
285
|
-
workspaceSet.delete(path);
|
|
286
|
-
}
|
|
287
|
-
if (workspaceSet.size !== 0) {
|
|
288
|
-
return true;
|
|
289
|
-
}
|
|
290
|
-
return false;
|
|
291
|
-
});
|
|
292
|
-
}
|
|
293
|
-
getFilesInDirectory(path) {
|
|
294
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
295
|
-
const paths = new Set();
|
|
296
|
-
yield this.visitDirectory(path, (entry) => {
|
|
297
|
-
paths.add((0, path_1.relative)(path, entry));
|
|
298
|
-
});
|
|
299
|
-
return paths;
|
|
300
|
-
});
|
|
301
|
-
}
|
|
302
|
-
visitDirectory(path, visitor) {
|
|
303
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
304
|
-
const children = yield (0, fs_extra_1.readdir)((0, path_1.join)(path), {
|
|
305
|
-
withFileTypes: true,
|
|
306
|
-
});
|
|
307
|
-
yield Promise.all(children.map((child) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
308
|
-
if (child.isFile()) {
|
|
309
|
-
visitor((0, path_1.join)(path, child.name));
|
|
310
|
-
}
|
|
311
|
-
else if (child.isDirectory()) {
|
|
312
|
-
yield this.visitDirectory((0, path_1.join)(path, child.name), visitor);
|
|
313
|
-
}
|
|
314
|
-
})));
|
|
315
|
-
});
|
|
316
|
-
}
|
|
317
|
-
getFileNameWithLatestRecordedHashForOutput(output) {
|
|
318
|
-
return (0, path_1.join)(this.latestOutputsHashesDir, `${this.getLatestOutputHashFilename(output)}.hash`);
|
|
319
|
-
}
|
|
320
|
-
getLatestOutputHashFilename(output) {
|
|
321
|
-
return output.split(path_1.sep).join('-');
|
|
322
|
-
}
|
|
323
176
|
getFromLocalDir(task) {
|
|
324
177
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
325
178
|
const tdCommit = (0, path_1.join)(this.cachePath, `${task.hash}.commit`);
|
|
@@ -351,11 +204,6 @@ class Cache {
|
|
|
351
204
|
(0, fs_extra_1.mkdirSync)(path, { recursive: true });
|
|
352
205
|
return path;
|
|
353
206
|
}
|
|
354
|
-
ensureLatestOutputsHashesDir() {
|
|
355
|
-
const path = (0, path_1.join)(this.cachePath, 'latestOutputsHashes');
|
|
356
|
-
(0, fs_extra_1.mkdirSync)(path, { recursive: true });
|
|
357
|
-
return path;
|
|
358
|
-
}
|
|
359
207
|
tryAndRetry(fn) {
|
|
360
208
|
let attempts = 0;
|
|
361
209
|
const baseTimeout = 100;
|
|
@@ -377,46 +225,4 @@ class Cache {
|
|
|
377
225
|
}
|
|
378
226
|
}
|
|
379
227
|
exports.Cache = Cache;
|
|
380
|
-
/**
|
|
381
|
-
* Heuristic to prevent writing too many hash files
|
|
382
|
-
*/
|
|
383
|
-
const MAX_OUTPUTS_TO_CHECK_HASHES = 5;
|
|
384
|
-
/**
|
|
385
|
-
* Collapse Expanded Outputs back into a smaller set of directories/files to track
|
|
386
|
-
* Note: DO NOT USE, Only exported for unit testing
|
|
387
|
-
* */
|
|
388
|
-
function collapseExpandedOutputs(expandedOutputs) {
|
|
389
|
-
var _a;
|
|
390
|
-
const tree = [];
|
|
391
|
-
// Create a Tree of directories/files
|
|
392
|
-
for (const output of expandedOutputs) {
|
|
393
|
-
const pathParts = [];
|
|
394
|
-
pathParts.unshift(output);
|
|
395
|
-
let dir = (0, path_1.dirname)(output);
|
|
396
|
-
while (dir !== (0, path_1.dirname)(dir)) {
|
|
397
|
-
pathParts.unshift(dir);
|
|
398
|
-
dir = (0, path_1.dirname)(dir);
|
|
399
|
-
}
|
|
400
|
-
for (let i = 0; i < pathParts.length; i++) {
|
|
401
|
-
(_a = tree[i]) !== null && _a !== void 0 ? _a : (tree[i] = new Set());
|
|
402
|
-
tree[i].add(pathParts[i]);
|
|
403
|
-
}
|
|
404
|
-
}
|
|
405
|
-
// Find a level in the tree that has too many outputs
|
|
406
|
-
if (tree.length === 0) {
|
|
407
|
-
return [];
|
|
408
|
-
}
|
|
409
|
-
let j = 0;
|
|
410
|
-
let level = tree[j];
|
|
411
|
-
for (j = 0; j < tree.length; j++) {
|
|
412
|
-
level = tree[j];
|
|
413
|
-
if (level.size > MAX_OUTPUTS_TO_CHECK_HASHES) {
|
|
414
|
-
break;
|
|
415
|
-
}
|
|
416
|
-
}
|
|
417
|
-
// Return the level before the level with too many outputs
|
|
418
|
-
// If the first level has too many outputs, return that one.
|
|
419
|
-
return Array.from(tree[Math.max(0, j - 1)]);
|
|
420
|
-
}
|
|
421
|
-
exports.collapseExpandedOutputs = collapseExpandedOutputs;
|
|
422
228
|
//# sourceMappingURL=cache.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/cache.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/cache.ts"],"names":[],"mappings":";;;;AAAA,4DAAwD;AACxD,uCASkB;AAClB,+BAA8C;AAE9C,iDAAgD;AAChD,8DAAoD;AACpD,2BAA8B;AAE9B,sCAAsC;AAUtC,MAAa,KAAK;IAMhB,YAA6B,OAAkC;QAAlC,YAAO,GAAP,OAAO,CAA2B;QAL/D,SAAI,GAAG,8BAAa,CAAC;QACrB,cAAS,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAClC,uBAAkB,GAAG,IAAI,CAAC,wBAAwB,EAAE,CAAC;QACrD,8BAAyB,GAAG,IAAA,aAAQ,GAAE,KAAK,OAAO,CAAC;IAEe,CAAC;IAEnE,qBAAqB;QACnB;;;WAGG;QACH,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;QAChE,IAAI,kBAAkB,EAAE;YACtB,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,+BAA+B,CAAC,CAAC;YACpE,IAAI;gBACF,MAAM,CAAC,GAAG,IAAA,qBAAK,EAAC,MAAM,EAAE,CAAC,UAAU,EAAE,IAAI,IAAI,CAAC,SAAS,GAAG,CAAC,EAAE;oBAC3D,KAAK,EAAE,QAAQ;oBACf,QAAQ,EAAE,IAAI;iBACf,CAAC,CAAC;gBACH,CAAC,CAAC,KAAK,EAAE,CAAC;aACX;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,GAAG,CAAC,kDAAkD,CAAC,CAAC;gBAChE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;aACxB;SACF;IACH,CAAC;IAEK,GAAG,CAAC,IAAU;;YAClB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;YAE7C,IAAI,GAAG,EAAE;gBACP,uCAAY,GAAG,KAAE,MAAM,EAAE,KAAK,IAAG;aAClC;iBAAM,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;gBACnC,oDAAoD;gBACpD,uBAAuB;gBACvB,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;gBACnE,6BAA6B;gBAC7B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;gBAC9C,OAAO,IAAI,CAAC,CAAC,iCAAM,IAAI,KAAE,MAAM,EAAE,IAAI,IAAG,CAAC,CAAC,IAAI,CAAC;aAChD;iBAAM;gBACL,OAAO,IAAI,CAAC;aACb;QACH,CAAC;KAAA;IAEK,GAAG,CACP,IAAU,EACV,cAA6B,EAC7B,OAAiB,EACjB,IAAY;;YAEZ,OAAO,IAAI,CAAC,WAAW,CAAC,GAAS,EAAE;gBACjC,MAAM,EAAE,GAAG,IAAA,WAAI,EAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC3C,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,IAAI,CAAC,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,SAAS,CAAC,CAAC;gBAE7D,iEAAiE;gBACjE,MAAM,IAAA,iBAAM,EAAC,QAAQ,CAAC,CAAC;gBACvB,MAAM,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAEtB,MAAM,IAAA,gBAAK,EAAC,EAAE,CAAC,CAAC;gBAChB,MAAM,IAAA,oBAAS,EACb,IAAA,WAAI,EAAC,EAAE,EAAE,gBAAgB,CAAC,EAC1B,cAAc,aAAd,cAAc,cAAd,cAAc,GAAI,oBAAoB,CACvC,CAAC;gBAEF,MAAM,IAAA,gBAAK,EAAC,IAAA,WAAI,EAAC,EAAE,EAAE,SAAS,CAAC,CAAC,CAAC;gBACjC,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC;gBAErE,MAAM,OAAO,CAAC,GAAG,CACf,eAAe,CAAC,GAAG,CAAC,CAAO,CAAC,EAAE,EAAE;oBAC9B,MAAM,GAAG,GAAG,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;oBAC/B,IAAI,MAAM,IAAA,qBAAU,EAAC,GAAG,CAAC,EAAE;wBACzB,MAAM,MAAM,GAAG,CAAC,MAAM,IAAA,gBAAK,EAAC,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;wBAE3C,MAAM,MAAM,GAAG,IAAA,WAAI,EAAC,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;wBACtC,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,IAAA,cAAO,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;wBACpD,MAAM,IAAA,gBAAK,EAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;wBAC5C,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;qBAC9B;gBACH,CAAC,CAAA,CAAC,CACH,CAAC;gBACF,uEAAuE;gBACvE,kEAAkE;gBAClE,2EAA2E;gBAC3E,iCAAiC;gBACjC,MAAM,IAAA,oBAAS,EAAC,IAAA,WAAI,EAAC,EAAE,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;gBACnD,MAAM,IAAA,oBAAS,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;gBAElC,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;oBAC5B,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;iBACjE;gBAED,IAAI,cAAc,EAAE;oBAClB,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;oBAClD,MAAM,IAAA,oBAAS,EAAC,UAAU,EAAE,cAAc,CAAC,CAAC;iBAC7C;YACH,CAAC,CAAA,CAAC,CAAC;QACL,CAAC;KAAA;IAEK,kBAAkB,CACtB,IAAY,EACZ,YAA0B,EAC1B,OAAiB;;YAEjB,OAAO,IAAI,CAAC,WAAW,CAAC,GAAS,EAAE;gBACjC,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,oBAAoB,CACrD,OAAO,EACP,YAAY,CACb,CAAC;gBACF,MAAM,OAAO,CAAC,GAAG,CACf,eAAe,CAAC,GAAG,CAAC,CAAO,CAAC,EAAE,EAAE;oBAC9B,MAAM,MAAM,GAAG,IAAA,WAAI,EAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;oBACjD,IAAI,MAAM,IAAA,qBAAU,EAAC,MAAM,CAAC,EAAE;wBAC5B,MAAM,MAAM,GAAG,CAAC,MAAM,IAAA,gBAAK,EAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;wBAC9C,MAAM,GAAG,GAAG,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;wBAC/B,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;wBACvB,sDAAsD;wBACtD,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,IAAA,cAAO,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;wBACpD,MAAM,IAAA,gBAAK,EAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;wBAC5C,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;qBAC9B;gBACH,CAAC,CAAA,CAAC,CACH,CAAC;YACJ,CAAC,CAAA,CAAC,CAAC;QACL,CAAC;KAAA;IAED,mBAAmB,CAAC,IAAU;QAC5B,OAAO,IAAA,WAAI,EAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IAClD,CAAC;IAEa,wBAAwB,CAAC,OAAiB;;YACtD,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,8BAAa,CAAC,CAAC;QACrD,CAAC;KAAA;IAEa,oBAAoB,CAChC,OAAiB,EACjB,YAA0B;;YAE1B,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC;QAChE,CAAC;KAAA;IAEa,cAAc,CAAC,OAAiB,EAAE,GAAW;;YACzD,OAAO,CACL,MAAM,OAAO,CAAC,GAAG,CACf,OAAO,CAAC,GAAG,CAAC,CAAO,KAAK,EAAE,EAAE;gBAC1B,IAAI,MAAM,IAAA,qBAAU,EAAC,IAAA,WAAI,EAAC,GAAG,EAAE,KAAK,CAAC,CAAC,EAAE;oBACtC,OAAO,KAAK,CAAC;iBACd;gBACD,OAAO,QAAQ,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;YAC7C,CAAC,CAAA,CAAC,CACH,CACF,CAAC,IAAI,EAAE,CAAC;QACX,CAAC;KAAA;IAEa,IAAI,CAAC,GAAW,EAAE,WAAmB;;YACjD,IAAI,IAAI,CAAC,yBAAyB,EAAE;gBAClC,OAAO,IAAA,eAAI,EAAC,GAAG,EAAE,WAAW,CAAC,CAAC;aAC/B;YACD,OAAO,IAAI,OAAO,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;gBAC9B,IAAA,wBAAQ,EAAC,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,IAAA,cAAO,EAAC,WAAW,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE;oBAC1D,IAAI,CAAC,KAAK,EAAE;wBACV,GAAG,EAAE,CAAC;qBACP;yBAAM;wBACL,IAAI,CAAC,yBAAyB,GAAG,IAAI,CAAC;wBACtC,IAAA,eAAI,EAAC,GAAG,EAAE,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;qBACvC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC;KAAA;IAEa,MAAM,CAAC,IAAY;;YAC/B,IAAI,IAAI,CAAC,yBAAyB,EAAE;gBAClC,OAAO,IAAA,iBAAM,EAAC,IAAI,CAAC,CAAC;aACrB;YAED,OAAO,IAAI,OAAO,CAAO,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;gBACpC,IAAA,wBAAQ,EAAC,IAAI,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE;oBACtC,IAAI,CAAC,KAAK,EAAE;wBACV,GAAG,EAAE,CAAC;qBACP;yBAAM;wBACL,IAAI,CAAC,yBAAyB,GAAG,IAAI,CAAC;wBACtC,IAAA,iBAAM,EAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;qBAC7B;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC;KAAA;IAEa,eAAe,CAAC,IAAU;;YACtC,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,IAAI,CAAC,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,SAAS,CAAC,CAAC;YAC7D,MAAM,EAAE,GAAG,IAAA,WAAI,EAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAE3C,IAAI,MAAM,IAAA,qBAAU,EAAC,QAAQ,CAAC,EAAE;gBAC9B,MAAM,cAAc,GAAG,MAAM,IAAA,mBAAQ,EACnC,IAAA,WAAI,EAAC,EAAE,EAAE,gBAAgB,CAAC,EAC1B,OAAO,CACR,CAAC;gBACF,IAAI,IAAI,GAAG,CAAC,CAAC;gBACb,IAAI;oBACF,IAAI,GAAG,MAAM,CAAC,MAAM,IAAA,mBAAQ,EAAC,IAAA,WAAI,EAAC,EAAE,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;iBAC1D;gBAAC,WAAM,GAAE;gBACV,OAAO;oBACL,cAAc;oBACd,WAAW,EAAE,IAAA,WAAI,EAAC,EAAE,EAAE,SAAS,CAAC;oBAChC,IAAI;iBACL,CAAC;aACH;iBAAM;gBACL,OAAO,IAAI,CAAC;aACb;QACH,CAAC;KAAA;IAEO,cAAc;QACpB,IAAA,oBAAS,EAAC,0BAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACzC,OAAO,0BAAQ,CAAC;IAClB,CAAC;IAEO,wBAAwB;QAC9B,MAAM,IAAI,GAAG,IAAA,WAAI,EAAC,IAAI,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;QACrD,IAAA,oBAAS,EAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACrC,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,WAAW,CAAI,EAAoB;QACzC,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,MAAM,WAAW,GAAG,GAAG,CAAC;QACxB,MAAM,IAAI,GAAG,GAAS,EAAE;YACtB,IAAI;gBACF,QAAQ,EAAE,CAAC;gBACX,OAAO,MAAM,EAAE,EAAE,CAAC;aACnB;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,QAAQ,KAAK,EAAE,EAAE;oBACnB,yCAAyC;oBACzC,MAAM,CAAC,CAAC;iBACT;gBACD,MAAM,IAAI,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,WAAW,GAAG,QAAQ,CAAC,CAAC,CAAC;gBACpE,OAAO,MAAM,IAAI,EAAE,CAAC;aACrB;QACH,CAAC,CAAA,CAAC;QACF,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC;CACF;AAhPD,sBAgPC"}
|
|
@@ -30,7 +30,7 @@ function runAllTasks(tasks, options, context) {
|
|
|
30
30
|
perf_hooks_1.performance.mark('task-graph-created');
|
|
31
31
|
perf_hooks_1.performance.measure('nx-prep-work', 'init-local', 'task-graph-created');
|
|
32
32
|
perf_hooks_1.performance.measure('graph-creation', 'command-execution-begins', 'task-graph-created');
|
|
33
|
-
const orchestrator = new task_orchestrator_1.TaskOrchestrator(context.hasher, context.initiatingProject, context.projectGraph, context.taskGraph, options, (_a = context.nxArgs) === null || _a === void 0 ? void 0 : _a.nxBail);
|
|
33
|
+
const orchestrator = new task_orchestrator_1.TaskOrchestrator(context.hasher, context.initiatingProject, context.projectGraph, context.taskGraph, options, (_a = context.nxArgs) === null || _a === void 0 ? void 0 : _a.nxBail, context.daemon);
|
|
34
34
|
return orchestrator.run();
|
|
35
35
|
});
|
|
36
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-tasks-runner.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/default-tasks-runner.ts"],"names":[],"mappings":";;;;AACA,2DAAuD;AACvD,2CAAyC;
|
|
1
|
+
{"version":3,"file":"default-tasks-runner.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/default-tasks-runner.ts"],"names":[],"mappings":";;;;AACA,2DAAuD;AACvD,2CAAyC;AA0BlC,MAAM,kBAAkB,GAE3B,CACF,KAAa,EACb,OAAkC,EAClC,OASC,EACsC,EAAE;IACzC,IACG,OAAe,CAAC,UAAU,CAAC,KAAK,OAAO;QACvC,OAAe,CAAC,UAAU,CAAC,KAAK,KAAK,EACtC;QACC,OAAe,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;KAClC;SAAM,IACJ,OAAe,CAAC,UAAU,CAAC,KAAK,MAAM;QACtC,OAAe,CAAC,UAAU,CAAC,KAAK,IAAI;QACpC,OAAe,CAAC,UAAU,CAAC,KAAK,SAAS,EAC1C;QACC,OAAe,CAAC,UAAU,CAAC,GAAG,MAAM,CAAE,OAAe,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;KAC7E;IAED,OAAO,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC;IACjC,IAAI;QACF,OAAO,MAAM,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;KACnD;YAAS;QACR,OAAO,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;KAChC;AACH,CAAC,CAAA,CAAC;AAnCW,QAAA,kBAAkB,sBAmC7B;AAEF,SAAe,WAAW,CACxB,KAAa,EACb,OAAkC,EAClC,OAQC;;;QAED,yCAAyC;QACzC,wBAAW,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAEvC,wBAAW,CAAC,OAAO,CAAC,cAAc,EAAE,YAAY,EAAE,oBAAoB,CAAC,CAAC;QACxE,wBAAW,CAAC,OAAO,CACjB,gBAAgB,EAChB,0BAA0B,EAC1B,oBAAoB,CACrB,CAAC;QAEF,MAAM,YAAY,GAAG,IAAI,oCAAgB,CACvC,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,iBAAiB,EACzB,OAAO,CAAC,YAAY,EACpB,OAAO,CAAC,SAAS,EACjB,OAAO,EACP,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,EACtB,OAAO,CAAC,MAAM,CACf,CAAC;QAEF,OAAO,YAAY,CAAC,GAAG,EAAE,CAAC;;CAC3B;AAED,kBAAe,0BAAkB,CAAC"}
|
|
@@ -3,6 +3,7 @@ import { DefaultTasksRunnerOptions } from './default-tasks-runner';
|
|
|
3
3
|
import { TaskStatus } from './tasks-runner';
|
|
4
4
|
import { ProjectGraph } from '../config/project-graph';
|
|
5
5
|
import { TaskGraph } from '../config/task-graph';
|
|
6
|
+
import { DaemonClient } from '../daemon/client/client';
|
|
6
7
|
export declare class TaskOrchestrator {
|
|
7
8
|
private readonly hasher;
|
|
8
9
|
private readonly initiatingProject;
|
|
@@ -10,6 +11,7 @@ export declare class TaskOrchestrator {
|
|
|
10
11
|
private readonly taskGraph;
|
|
11
12
|
private readonly options;
|
|
12
13
|
private readonly bail;
|
|
14
|
+
private readonly daemon;
|
|
13
15
|
private cache;
|
|
14
16
|
private workspace;
|
|
15
17
|
private forkedProcessTaskRunner;
|
|
@@ -20,7 +22,7 @@ export declare class TaskOrchestrator {
|
|
|
20
22
|
private waitingForTasks;
|
|
21
23
|
private groups;
|
|
22
24
|
private bailed;
|
|
23
|
-
constructor(hasher: Hasher, initiatingProject: string | undefined, projectGraph: ProjectGraph, taskGraph: TaskGraph, options: DefaultTasksRunnerOptions, bail: boolean);
|
|
25
|
+
constructor(hasher: Hasher, initiatingProject: string | undefined, projectGraph: ProjectGraph, taskGraph: TaskGraph, options: DefaultTasksRunnerOptions, bail: boolean, daemon: DaemonClient);
|
|
24
26
|
run(): Promise<{
|
|
25
27
|
[id: string]: TaskStatus;
|
|
26
28
|
}>;
|
|
@@ -38,4 +40,6 @@ export declare class TaskOrchestrator {
|
|
|
38
40
|
private shouldCacheTaskResult;
|
|
39
41
|
private closeGroup;
|
|
40
42
|
private openGroup;
|
|
43
|
+
private shouldCopyOutputsFromCache;
|
|
44
|
+
private recordOutputContents;
|
|
41
45
|
}
|
|
@@ -11,13 +11,14 @@ const utils_1 = require("./utils");
|
|
|
11
11
|
const tasks_schedule_1 = require("./tasks-schedule");
|
|
12
12
|
class TaskOrchestrator {
|
|
13
13
|
// endregion internal state
|
|
14
|
-
constructor(hasher, initiatingProject, projectGraph, taskGraph, options, bail) {
|
|
14
|
+
constructor(hasher, initiatingProject, projectGraph, taskGraph, options, bail, daemon) {
|
|
15
15
|
this.hasher = hasher;
|
|
16
16
|
this.initiatingProject = initiatingProject;
|
|
17
17
|
this.projectGraph = projectGraph;
|
|
18
18
|
this.taskGraph = taskGraph;
|
|
19
19
|
this.options = options;
|
|
20
20
|
this.bail = bail;
|
|
21
|
+
this.daemon = daemon;
|
|
21
22
|
this.cache = new cache_1.Cache(this.options);
|
|
22
23
|
this.workspace = new workspaces_1.Workspaces(workspace_root_1.workspaceRoot);
|
|
23
24
|
this.forkedProcessTaskRunner = new forked_process_task_runner_1.ForkedProcessTaskRunner(this.options);
|
|
@@ -88,7 +89,7 @@ class TaskOrchestrator {
|
|
|
88
89
|
return null;
|
|
89
90
|
const outputs = (0, utils_1.getOutputs)(this.projectGraph.nodes, task);
|
|
90
91
|
const shouldCopyOutputsFromCache = !!outputs.length &&
|
|
91
|
-
(yield this.
|
|
92
|
+
(yield this.shouldCopyOutputsFromCache(outputs, task.hash));
|
|
92
93
|
if (shouldCopyOutputsFromCache) {
|
|
93
94
|
yield this.cache.copyFilesFromCache(task.hash, cachedResult, outputs);
|
|
94
95
|
}
|
|
@@ -115,18 +116,13 @@ class TaskOrchestrator {
|
|
|
115
116
|
// Run tasks that were not cached
|
|
116
117
|
if (results.length !== taskEntries.length) {
|
|
117
118
|
const unrunTaskGraph = (0, utils_1.removeTasksFromTaskGraph)(batch.taskGraph, results.map(({ task }) => task.id));
|
|
118
|
-
// cache prep
|
|
119
|
-
for (const task of Object.values(unrunTaskGraph.tasks)) {
|
|
120
|
-
const taskOutputs = (0, utils_1.getOutputs)(this.projectGraph.nodes, task);
|
|
121
|
-
yield this.cache.removeRecordedOutputsHashes(taskOutputs);
|
|
122
|
-
}
|
|
123
119
|
const batchResults = yield this.runBatch({
|
|
124
120
|
executorName: batch.executorName,
|
|
125
121
|
taskGraph: unrunTaskGraph,
|
|
126
122
|
});
|
|
127
123
|
results.push(...batchResults);
|
|
128
124
|
}
|
|
129
|
-
yield this.postRunSteps(results, { groupId });
|
|
125
|
+
yield this.postRunSteps(tasks, results, { groupId });
|
|
130
126
|
const tasksCompleted = taskEntries.filter(([taskId]) => this.completedTasks[taskId]);
|
|
131
127
|
// Batch is still not done, run it again
|
|
132
128
|
if (tasksCompleted.length !== taskEntries.length) {
|
|
@@ -166,8 +162,6 @@ class TaskOrchestrator {
|
|
|
166
162
|
// the task wasn't cached
|
|
167
163
|
if (results.length === 0) {
|
|
168
164
|
// cache prep
|
|
169
|
-
const taskOutputs = (0, utils_1.getOutputs)(this.projectGraph.nodes, task);
|
|
170
|
-
yield this.cache.removeRecordedOutputsHashes(taskOutputs);
|
|
171
165
|
const { code, terminalOutput } = yield this.runTaskInForkedProcess(task);
|
|
172
166
|
results.push({
|
|
173
167
|
task,
|
|
@@ -175,7 +169,7 @@ class TaskOrchestrator {
|
|
|
175
169
|
terminalOutput,
|
|
176
170
|
});
|
|
177
171
|
}
|
|
178
|
-
yield this.postRunSteps(results, { groupId });
|
|
172
|
+
yield this.postRunSteps([task], results, { groupId });
|
|
179
173
|
});
|
|
180
174
|
}
|
|
181
175
|
runTaskInForkedProcess(task) {
|
|
@@ -214,8 +208,11 @@ class TaskOrchestrator {
|
|
|
214
208
|
this.options.lifeCycle.startTasks(tasks, metadata);
|
|
215
209
|
});
|
|
216
210
|
}
|
|
217
|
-
postRunSteps(results, { groupId }) {
|
|
211
|
+
postRunSteps(tasks, results, { groupId }) {
|
|
218
212
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
213
|
+
for (const task of tasks) {
|
|
214
|
+
yield this.recordOutputContents(task);
|
|
215
|
+
}
|
|
219
216
|
// cache the results
|
|
220
217
|
yield Promise.all(results
|
|
221
218
|
.filter(({ status }) => status !== 'local-cache' &&
|
|
@@ -230,9 +227,7 @@ class TaskOrchestrator {
|
|
|
230
227
|
: 1, outputs: (0, utils_1.getOutputs)(this.projectGraph.nodes, result.task) })))
|
|
231
228
|
.filter(({ task, code }) => this.shouldCacheTaskResult(task, code))
|
|
232
229
|
.filter(({ terminalOutput, outputs }) => terminalOutput || outputs)
|
|
233
|
-
.map(({ task, code, terminalOutput, outputs }) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
234
|
-
yield this.cache.put(task, terminalOutput, outputs, code);
|
|
235
|
-
})));
|
|
230
|
+
.map(({ task, code, terminalOutput, outputs }) => tslib_1.__awaiter(this, void 0, void 0, function* () { return this.cache.put(task, terminalOutput, outputs, code); })));
|
|
236
231
|
this.options.lifeCycle.endTasks(results.map((result) => {
|
|
237
232
|
const code = result.status === 'success' ||
|
|
238
233
|
result.status === 'local-cache' ||
|
|
@@ -308,6 +303,25 @@ class TaskOrchestrator {
|
|
|
308
303
|
openGroup(id) {
|
|
309
304
|
this.groups[id] = false;
|
|
310
305
|
}
|
|
306
|
+
shouldCopyOutputsFromCache(outputs, hash) {
|
|
307
|
+
var _a;
|
|
308
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
309
|
+
if ((_a = this.daemon) === null || _a === void 0 ? void 0 : _a.enabled()) {
|
|
310
|
+
return !(yield this.daemon.outputsHashesMatch(outputs, hash));
|
|
311
|
+
}
|
|
312
|
+
else {
|
|
313
|
+
return true;
|
|
314
|
+
}
|
|
315
|
+
});
|
|
316
|
+
}
|
|
317
|
+
recordOutputContents(task) {
|
|
318
|
+
var _a;
|
|
319
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
320
|
+
if ((_a = this.daemon) === null || _a === void 0 ? void 0 : _a.enabled()) {
|
|
321
|
+
return this.daemon.recordOutputsHash((0, utils_1.getOutputs)(this.projectGraph.nodes, task), task.hash);
|
|
322
|
+
}
|
|
323
|
+
});
|
|
324
|
+
}
|
|
311
325
|
}
|
|
312
326
|
exports.TaskOrchestrator = TaskOrchestrator;
|
|
313
327
|
//# sourceMappingURL=task-orchestrator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-orchestrator.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/task-orchestrator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"task-orchestrator.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/task-orchestrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function collapseExpandedOutputs(expandedOutputs: string[]): string[];
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.collapseExpandedOutputs = void 0;
|
|
4
|
+
const path_1 = require("path");
|
|
5
|
+
/**
|
|
6
|
+
* Heuristic to prevent writing too many hash files
|
|
7
|
+
*/
|
|
8
|
+
const MAX_OUTPUTS_TO_CHECK_HASHES = 3;
|
|
9
|
+
function collapseExpandedOutputs(expandedOutputs) {
|
|
10
|
+
var _a;
|
|
11
|
+
const tree = [];
|
|
12
|
+
// Create a Tree of directories/files
|
|
13
|
+
for (const output of expandedOutputs) {
|
|
14
|
+
const pathParts = [];
|
|
15
|
+
pathParts.unshift(output);
|
|
16
|
+
let dir = (0, path_1.dirname)(output);
|
|
17
|
+
while (dir !== (0, path_1.dirname)(dir)) {
|
|
18
|
+
pathParts.unshift(dir);
|
|
19
|
+
dir = (0, path_1.dirname)(dir);
|
|
20
|
+
}
|
|
21
|
+
for (let i = 0; i < pathParts.length; i++) {
|
|
22
|
+
(_a = tree[i]) !== null && _a !== void 0 ? _a : (tree[i] = new Set());
|
|
23
|
+
tree[i].add(pathParts[i]);
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
// Find a level in the tree that has too many outputs
|
|
27
|
+
if (tree.length === 0) {
|
|
28
|
+
return [];
|
|
29
|
+
}
|
|
30
|
+
let j = 0;
|
|
31
|
+
let level = tree[j];
|
|
32
|
+
for (j = 0; j < tree.length; j++) {
|
|
33
|
+
level = tree[j];
|
|
34
|
+
if (level.size > MAX_OUTPUTS_TO_CHECK_HASHES) {
|
|
35
|
+
break;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
// Return the level before the level with too many outputs
|
|
39
|
+
// If the first level has too many outputs, return that one.
|
|
40
|
+
return Array.from(tree[Math.max(0, j - 1)]);
|
|
41
|
+
}
|
|
42
|
+
exports.collapseExpandedOutputs = collapseExpandedOutputs;
|
|
43
|
+
//# sourceMappingURL=collapse-expanded-outputs.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"collapse-expanded-outputs.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/collapse-expanded-outputs.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAE/B;;GAEG;AACH,MAAM,2BAA2B,GAAG,CAAC,CAAC;AAEtC,SAAgB,uBAAuB,CAAC,eAAyB;;IAC/D,MAAM,IAAI,GAAkB,EAAE,CAAC;IAE/B,qCAAqC;IACrC,KAAK,MAAM,MAAM,IAAI,eAAe,EAAE;QACpC,MAAM,SAAS,GAAG,EAAE,CAAC;QACrB,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC1B,IAAI,GAAG,GAAG,IAAA,cAAO,EAAC,MAAM,CAAC,CAAC;QAC1B,OAAO,GAAG,KAAK,IAAA,cAAO,EAAC,GAAG,CAAC,EAAE;YAC3B,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAEvB,GAAG,GAAG,IAAA,cAAO,EAAC,GAAG,CAAC,CAAC;SACpB;QAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACzC,MAAA,IAAI,CAAC,CAAC,qCAAN,IAAI,CAAC,CAAC,IAAM,IAAI,GAAG,EAAU,EAAC;YAC9B,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;SAC3B;KACF;IAED,qDAAqD;IACrD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QACrB,OAAO,EAAE,CAAC;KACX;IAED,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,IAAI,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAChC,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QAChB,IAAI,KAAK,CAAC,IAAI,GAAG,2BAA2B,EAAE;YAC5C,MAAM;SACP;KACF;IAED,0DAA0D;IAC1D,4DAA4D;IAC5D,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AAC9C,CAAC;AArCD,0DAqCC"}
|