@nrwl/nx-cloud 15.2.0-beta.1 → 15.2.0-beta.3
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/lib/core/models/run-context.model.d.ts +2 -2
- package/lib/core/runners/distributed-agent/distributed-agent.impl.js +7 -22
- package/lib/core/runners/distributed-agent/distributed-agent.impl.js.map +1 -1
- package/lib/core/runners/distributed-agent/execute-tasks.d.ts +8 -1
- package/lib/core/runners/distributed-agent/execute-tasks.js +2 -3
- package/lib/core/runners/distributed-agent/execute-tasks.js.map +1 -1
- package/lib/core/runners/distributed-agent/invoke-tasks-using-nx-imperative-api.d.ts +9 -0
- package/lib/core/runners/distributed-agent/invoke-tasks-using-nx-imperative-api.js +50 -0
- package/lib/core/runners/distributed-agent/invoke-tasks-using-nx-imperative-api.js.map +1 -0
- package/lib/core/runners/distributed-agent/invoke-tasks-using-run-many.d.ts +9 -0
- package/lib/core/runners/distributed-agent/invoke-tasks-using-run-many.js +97 -0
- package/lib/core/runners/distributed-agent/invoke-tasks-using-run-many.js.map +1 -0
- package/lib/nx-cloud-tasks-runner.js +9 -1
- package/lib/nx-cloud-tasks-runner.js.map +1 -1
- package/lib/utilities/nx-imports.js +9 -2
- package/lib/utilities/nx-imports.js.map +1 -1
- package/lib/utilities/serializer-overrides.d.ts +1 -0
- package/lib/utilities/serializer-overrides.js +2 -1
- package/lib/utilities/serializer-overrides.js.map +1 -1
- package/package.json +1 -1
- package/lib/core/runners/distributed-agent/invoke-tasks.d.ts +0 -8
- package/lib/core/runners/distributed-agent/invoke-tasks.js +0 -58
- package/lib/core/runners/distributed-agent/invoke-tasks.js.map +0 -1
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { CacheUrls } from './cache-urls.model';
|
|
2
|
-
export
|
|
2
|
+
export type TaskStatus = 'success' | 'failure' | 'skipped' | 'local-cache-kept-existing' | 'local-cache' | 'cache' | 'remote-cache';
|
|
3
3
|
export interface TaskResult {
|
|
4
4
|
task: Task;
|
|
5
5
|
status: TaskStatus;
|
|
@@ -117,7 +117,7 @@ export interface Task {
|
|
|
117
117
|
};
|
|
118
118
|
};
|
|
119
119
|
}
|
|
120
|
-
export
|
|
120
|
+
export type RunContext = {
|
|
121
121
|
statuses: {
|
|
122
122
|
[hash: string]: 'remote-cache-hit' | 'cache-miss';
|
|
123
123
|
};
|
|
@@ -24,7 +24,9 @@ const dte_artifact_storage_1 = require("../../../utilities/dte-artifact-storage"
|
|
|
24
24
|
const file_storage_1 = require("../../file-storage/file-storage");
|
|
25
25
|
const e2e_encryption_1 = require("../../file-storage/e2e-encryption");
|
|
26
26
|
const error_reporter_api_1 = require("../../api/error-reporter.api");
|
|
27
|
-
const
|
|
27
|
+
const invoke_tasks_using_run_many_1 = require("./invoke-tasks-using-run-many");
|
|
28
|
+
const invoke_tasks_using_nx_imperative_api_1 = require("./invoke-tasks-using-nx-imperative-api");
|
|
29
|
+
const { output, initTasksRunner, workspaceRoot, } = require('../../../utilities/nx-imports');
|
|
28
30
|
const args = yargsParser(process.argv, {
|
|
29
31
|
array: ['targets'],
|
|
30
32
|
default: {},
|
|
@@ -69,7 +71,10 @@ function startAgent() {
|
|
|
69
71
|
const encryption = new e2e_encryption_1.E2EEncryption(environment_1.ENCRYPTION_KEY || options.encryptionKey);
|
|
70
72
|
const errorReporter = new error_reporter_api_1.ErrorReporterApi(options);
|
|
71
73
|
const dteArtifactStorage = new dte_artifact_storage_1.DteArtifactStorage(new file_storage_1.FileStorage(encryption, errorReporter, true, false), (0, environment_1.getNxCacheDirectory)(options));
|
|
72
|
-
|
|
74
|
+
const invokeTasks = initTasksRunner
|
|
75
|
+
? yield (0, invoke_tasks_using_nx_imperative_api_1.invokeTasksUsingNxImperativeApi)(options)
|
|
76
|
+
: yield (0, invoke_tasks_using_run_many_1.invokeTasksUsingRunMany)(options);
|
|
77
|
+
return (0, execute_tasks_1.executeTasks)(agentName, api, dteArtifactStorage, invokeTasks, args.targets)
|
|
73
78
|
.then((res) => __awaiter(this, void 0, void 0, function* () {
|
|
74
79
|
yield (0, metric_logger_1.submitRunMetrics)(options);
|
|
75
80
|
return res;
|
|
@@ -81,26 +86,6 @@ function startAgent() {
|
|
|
81
86
|
});
|
|
82
87
|
}
|
|
83
88
|
exports.startAgent = startAgent;
|
|
84
|
-
function completedTasksReader(options) {
|
|
85
|
-
const cacheDirectory = (0, environment_1.getNxCacheDirectory)(options);
|
|
86
|
-
return (distributedExecutionId) => {
|
|
87
|
-
const errorMessage = `Command execution failed (distributed task execution: ${distributedExecutionId}). Tasks hashes haven\'t been recorded.`;
|
|
88
|
-
let completedTasks;
|
|
89
|
-
try {
|
|
90
|
-
const taskHashesFile = `${cacheDirectory}/tasks-hashes-${distributedExecutionId}`;
|
|
91
|
-
completedTasks = JSON.parse((0, fs_1.readFileSync)(taskHashesFile).toString());
|
|
92
|
-
// remove it such that if the next command crashes we don't read an obsolete file
|
|
93
|
-
(0, fs_1.unlinkSync)(taskHashesFile);
|
|
94
|
-
}
|
|
95
|
-
catch (e) {
|
|
96
|
-
throw new Error(errorMessage);
|
|
97
|
-
}
|
|
98
|
-
if (completedTasks.length == 0) {
|
|
99
|
-
throw new Error(errorMessage);
|
|
100
|
-
}
|
|
101
|
-
return completedTasks;
|
|
102
|
-
};
|
|
103
|
-
}
|
|
104
89
|
function getAgentName() {
|
|
105
90
|
if (process.env.NX_AGENT_NAME !== undefined) {
|
|
106
91
|
return process.env.NX_AGENT_NAME;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"distributed-agent.impl.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/distributed-agent/distributed-agent.impl.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2BAOY;AACZ,yDAAyD;AACzD,4CAA4C;AAC5C,gEAIwC;AACxC,oEAAoE;AACpE,6FAAuF;AACvF,uFAAiF;AACjF,6EAAuE;AAEvE,mEAA8D;AAC9D,mDAA+C;AAC/C,kFAA6E;AAC7E,kEAA8D;AAC9D,sEAAkE;AAClE,qEAAgE;
|
|
1
|
+
{"version":3,"file":"distributed-agent.impl.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/distributed-agent/distributed-agent.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,10 @@
|
|
|
1
1
|
import { DistributedAgentApi } from './distributed-agent.api';
|
|
2
|
+
import { TaskToExecute } from '../../models/distributed-agent';
|
|
2
3
|
import { DteArtifactStorage } from '../../../utilities/dte-artifact-storage';
|
|
3
|
-
export declare function executeTasks(agentName: string, api: DistributedAgentApi, dteArtifactStorage: DteArtifactStorage,
|
|
4
|
+
export declare function executeTasks(agentName: string, api: DistributedAgentApi, dteArtifactStorage: DteArtifactStorage, invokeTasks: (executionId: string, tasks: TaskToExecute[], maxParallel: number) => Promise<{
|
|
5
|
+
completedTasks: {
|
|
6
|
+
taskId: string;
|
|
7
|
+
hash: string;
|
|
8
|
+
}[];
|
|
9
|
+
completedStatusCode: number;
|
|
10
|
+
}>, targets: string[]): Promise<void>;
|
|
@@ -13,9 +13,8 @@ exports.executeTasks = void 0;
|
|
|
13
13
|
const create_unchanged_value_timeout_1 = require("../../../utilities/create-unchanged-value-timeout");
|
|
14
14
|
const environment_1 = require("../../../utilities/environment");
|
|
15
15
|
const waiter_1 = require("../../../utilities/waiter");
|
|
16
|
-
const invoke_tasks_1 = require("./invoke-tasks");
|
|
17
16
|
const { output } = require('../../../utilities/nx-imports');
|
|
18
|
-
function executeTasks(agentName, api, dteArtifactStorage,
|
|
17
|
+
function executeTasks(agentName, api, dteArtifactStorage, invokeTasks, targets) {
|
|
19
18
|
return __awaiter(this, void 0, void 0, function* () {
|
|
20
19
|
let completedStatusCode = 0;
|
|
21
20
|
let apiResponse = null;
|
|
@@ -102,7 +101,7 @@ function executeTasks(agentName, api, dteArtifactStorage, completedTaskReader, t
|
|
|
102
101
|
processedTasks[t.taskId] = true;
|
|
103
102
|
}
|
|
104
103
|
}
|
|
105
|
-
const r =
|
|
104
|
+
const r = yield invokeTasks(apiResponse.executionId, apiResponse.tasks, apiResponse.maxParallel);
|
|
106
105
|
for (const t of r.completedTasks) {
|
|
107
106
|
processedTasks[t.taskId] = true;
|
|
108
107
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute-tasks.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/distributed-agent/execute-tasks.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"execute-tasks.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/distributed-agent/execute-tasks.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { CloudTaskRunnerOptions } from '../../models/cloud-task-runner-options';
|
|
2
|
+
import { TaskToExecute } from '../../models/distributed-agent';
|
|
3
|
+
export declare function invokeTasksUsingNxImperativeApi(options: CloudTaskRunnerOptions): Promise<(executionId: string, tasksToExecute: TaskToExecute[], parallel: number) => Promise<{
|
|
4
|
+
completedTasks: {
|
|
5
|
+
taskId: string;
|
|
6
|
+
hash: string;
|
|
7
|
+
}[];
|
|
8
|
+
completedStatusCode: number;
|
|
9
|
+
}>>;
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.invokeTasksUsingNxImperativeApi = void 0;
|
|
13
|
+
const { initTasksRunner } = require('../../../utilities/nx-imports');
|
|
14
|
+
const parser = require("yargs-parser");
|
|
15
|
+
const serializer_overrides_1 = require("../../../utilities/serializer-overrides");
|
|
16
|
+
function invokeTasksUsingNxImperativeApi(options) {
|
|
17
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
18
|
+
const tasksRunner = yield initTasksRunner(options);
|
|
19
|
+
return (executionId, tasksToExecute, parallel) => __awaiter(this, void 0, void 0, function* () {
|
|
20
|
+
const tasks = tasksToExecute.map((t) => {
|
|
21
|
+
const params = parser(t.params, {
|
|
22
|
+
configuration: {
|
|
23
|
+
'camel-case-expansion': false,
|
|
24
|
+
'dot-notation': true,
|
|
25
|
+
},
|
|
26
|
+
});
|
|
27
|
+
return {
|
|
28
|
+
id: t.taskId,
|
|
29
|
+
target: {
|
|
30
|
+
project: t.projectName,
|
|
31
|
+
target: t.target,
|
|
32
|
+
configuration: t.configuration,
|
|
33
|
+
},
|
|
34
|
+
overrides: Object.assign(Object.assign({}, params), { __overrides_unparsed__: (0, serializer_overrides_1.unparse)(params) }),
|
|
35
|
+
};
|
|
36
|
+
});
|
|
37
|
+
const r = yield tasksRunner.invoke({ tasks, parallel });
|
|
38
|
+
const completedTasks = Object.values(r.taskGraph.tasks);
|
|
39
|
+
return {
|
|
40
|
+
completedTasks: completedTasks.map((t) => ({
|
|
41
|
+
taskId: t.id,
|
|
42
|
+
hash: t.hash,
|
|
43
|
+
})),
|
|
44
|
+
completedStatusCode: r.status,
|
|
45
|
+
};
|
|
46
|
+
});
|
|
47
|
+
});
|
|
48
|
+
}
|
|
49
|
+
exports.invokeTasksUsingNxImperativeApi = invokeTasksUsingNxImperativeApi;
|
|
50
|
+
//# sourceMappingURL=invoke-tasks-using-nx-imperative-api.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"invoke-tasks-using-nx-imperative-api.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/distributed-agent/invoke-tasks-using-nx-imperative-api.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,MAAM,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAC;AACrE,uCAAuC;AACvC,kFAAkE;AAElE,SAAsB,+BAA+B,CACnD,OAA+B;;QAE/B,MAAM,WAAW,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;QACnD,OAAO,CACL,WAAmB,EACnB,cAA+B,EAC/B,QAAgB,EAIf,EAAE;YACH,MAAM,KAAK,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBACrC,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE;oBAC9B,aAAa,EAAE;wBACb,sBAAsB,EAAE,KAAK;wBAC7B,cAAc,EAAE,IAAI;qBACrB;iBACF,CAAC,CAAC;gBAEH,OAAO;oBACL,EAAE,EAAE,CAAC,CAAC,MAAM;oBACZ,MAAM,EAAE;wBACN,OAAO,EAAE,CAAC,CAAC,WAAW;wBACtB,MAAM,EAAE,CAAC,CAAC,MAAM;wBAChB,aAAa,EAAE,CAAC,CAAC,aAAa;qBAC/B;oBACD,SAAS,kCACJ,MAAM,KACT,sBAAsB,EAAE,IAAA,8BAAO,EAAC,MAAM,CAAC,GACxC;iBACF,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,MAAM,CAAC,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;YACxD,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YACxD,OAAO;gBACL,cAAc,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC;oBAC9C,MAAM,EAAE,CAAC,CAAC,EAAE;oBACZ,IAAI,EAAE,CAAC,CAAC,IAAI;iBACb,CAAC,CAAC;gBACH,mBAAmB,EAAE,CAAC,CAAC,MAAM;aAC9B,CAAC;QACJ,CAAC,CAAA,CAAC;IACJ,CAAC;CAAA;AA5CD,0EA4CC"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { TaskToExecute } from '../../models/distributed-agent';
|
|
2
|
+
import { CloudTaskRunnerOptions } from '../../models/cloud-task-runner-options';
|
|
3
|
+
export declare function invokeTasksUsingRunMany(options: CloudTaskRunnerOptions): Promise<(executionId: string, tasksToExecute: TaskToExecute[], parallel: number) => Promise<{
|
|
4
|
+
completedTasks: {
|
|
5
|
+
taskId: string;
|
|
6
|
+
hash: string;
|
|
7
|
+
}[];
|
|
8
|
+
completedStatusCode: number;
|
|
9
|
+
}>>;
|
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.invokeTasksUsingRunMany = void 0;
|
|
13
|
+
const environment_1 = require("../../../utilities/environment");
|
|
14
|
+
const child_process_1 = require("child_process");
|
|
15
|
+
const fs_1 = require("fs");
|
|
16
|
+
const { output } = require('../../../utilities/nx-imports');
|
|
17
|
+
function invokeTasksUsingRunMany(options) {
|
|
18
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
19
|
+
const readCompleted = completedTasksReader(options);
|
|
20
|
+
return function invokeTasksUsingRunMany(executionId, tasksToExecute, parallel) {
|
|
21
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
22
|
+
let completedStatusCode = 0;
|
|
23
|
+
const completedTasks = [];
|
|
24
|
+
for (const g of groupByTarget(tasksToExecute)) {
|
|
25
|
+
const config = g.configuration
|
|
26
|
+
? `--configuration=${g.configuration}`
|
|
27
|
+
: ``;
|
|
28
|
+
const parallelStr = parallel > 1 ? ` --parallel --max-parallel=${parallel}` : ``;
|
|
29
|
+
// TODO use pnpx or yarn when needed
|
|
30
|
+
const command = `npx nx run-many --target=${g.target} ${config} --projects=${g.projects.join(',')} ${g.params}${parallelStr}`;
|
|
31
|
+
if (environment_1.VERBOSE_LOGGING) {
|
|
32
|
+
output.note({
|
|
33
|
+
title: `Executing: '${command}'`,
|
|
34
|
+
});
|
|
35
|
+
}
|
|
36
|
+
try {
|
|
37
|
+
(0, child_process_1.execSync)(command, {
|
|
38
|
+
stdio: ['ignore', 'inherit', 'inherit'],
|
|
39
|
+
env: Object.assign(Object.assign({}, process.env), { NX_CACHE_FAILURES: 'true', NX_CLOUD_DISTRIBUTED_EXECUTION_ID: executionId, NX_STREAM_OUTPUT: 'true', NX_PREFIX_OUTPUT: 'true' }),
|
|
40
|
+
});
|
|
41
|
+
completedTasks.push(...readCompleted(executionId));
|
|
42
|
+
}
|
|
43
|
+
catch (e) {
|
|
44
|
+
if (e.status === environment_1.DISTRIBUTED_TASK_EXECUTION_INTERNAL_ERROR_STATUS_CODE) {
|
|
45
|
+
throw e;
|
|
46
|
+
}
|
|
47
|
+
else {
|
|
48
|
+
completedStatusCode = 1;
|
|
49
|
+
completedTasks.push(...readCompleted(executionId));
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
return { completedStatusCode, completedTasks };
|
|
54
|
+
});
|
|
55
|
+
};
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
exports.invokeTasksUsingRunMany = invokeTasksUsingRunMany;
|
|
59
|
+
function groupByTarget(tasks) {
|
|
60
|
+
const res = [];
|
|
61
|
+
tasks.forEach((t) => {
|
|
62
|
+
const r = res.find((rr) => rr.target === t.target && rr.configuration === t.configuration);
|
|
63
|
+
if (r) {
|
|
64
|
+
r.projects.push(t.projectName);
|
|
65
|
+
}
|
|
66
|
+
else {
|
|
67
|
+
res.push({
|
|
68
|
+
target: t.target,
|
|
69
|
+
projects: [t.projectName],
|
|
70
|
+
params: t.params,
|
|
71
|
+
configuration: t.configuration,
|
|
72
|
+
});
|
|
73
|
+
}
|
|
74
|
+
});
|
|
75
|
+
return res;
|
|
76
|
+
}
|
|
77
|
+
function completedTasksReader(options) {
|
|
78
|
+
const cacheDirectory = (0, environment_1.getNxCacheDirectory)(options);
|
|
79
|
+
return (distributedExecutionId) => {
|
|
80
|
+
const errorMessage = `Command execution failed (distributed task execution: ${distributedExecutionId}). Tasks hashes haven\'t been recorded.`;
|
|
81
|
+
let completedTasks;
|
|
82
|
+
try {
|
|
83
|
+
const taskHashesFile = `${cacheDirectory}/tasks-hashes-${distributedExecutionId}`;
|
|
84
|
+
completedTasks = JSON.parse((0, fs_1.readFileSync)(taskHashesFile).toString());
|
|
85
|
+
// remove it such that if the next command crashes we don't read an obsolete file
|
|
86
|
+
(0, fs_1.unlinkSync)(taskHashesFile);
|
|
87
|
+
}
|
|
88
|
+
catch (e) {
|
|
89
|
+
throw new Error(errorMessage);
|
|
90
|
+
}
|
|
91
|
+
if (completedTasks.length == 0) {
|
|
92
|
+
throw new Error(errorMessage);
|
|
93
|
+
}
|
|
94
|
+
return completedTasks;
|
|
95
|
+
};
|
|
96
|
+
}
|
|
97
|
+
//# sourceMappingURL=invoke-tasks-using-run-many.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"invoke-tasks-using-run-many.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/distributed-agent/invoke-tasks-using-run-many.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,15 @@ const { tasksRunner, output, runnerReturnsPromise, } = require('./utilities/nx-i
|
|
|
17
17
|
const nxCloudTasksRunner = (tasks, options, context) => {
|
|
18
18
|
const nxArgs = context.nxArgs;
|
|
19
19
|
const noAccessTokenDefined = !environment_1.ACCESS_TOKEN && !options.accessToken;
|
|
20
|
-
const noCloud = nxArgs['cloud'] === false;
|
|
20
|
+
const noCloud = nxArgs['cloud'] === false || options.skipNxCache;
|
|
21
|
+
if (options.skipNxCache) {
|
|
22
|
+
output.warn({
|
|
23
|
+
title: '--skip-nx-cache disables the connection to Nx Cloud for the current run.',
|
|
24
|
+
bodyLines: [
|
|
25
|
+
'The remote cache will not be read from or written to during this run.',
|
|
26
|
+
],
|
|
27
|
+
});
|
|
28
|
+
}
|
|
21
29
|
if (noAccessTokenDefined || noCloud) {
|
|
22
30
|
return tasksRunner(tasks, options, context);
|
|
23
31
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nx-cloud-tasks-runner.js","sourceRoot":"","sources":["../../../../../libs/nx-packages/nx-cloud/lib/nx-cloud-tasks-runner.ts"],"names":[],"mappings":";;;;;;;;;;;AACA,yDAKiC;AACjC,6CAA+E;AAC/E,4FAA4F;AAE5F,2GAAiG;AAEjG,MAAM,EACJ,WAAW,EACX,MAAM,EACN,oBAAoB,GACrB,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;AAEtC,MAAM,kBAAkB,GAAQ,CAC9B,KAAa,EACb,OAA+B,EAC/B,OAAY,EACP,EAAE;IACP,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAE9B,MAAM,oBAAoB,GAAG,CAAC,0BAAY,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;IACnE,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"nx-cloud-tasks-runner.js","sourceRoot":"","sources":["../../../../../libs/nx-packages/nx-cloud/lib/nx-cloud-tasks-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,17 +12,23 @@ try {
|
|
|
12
12
|
const { getDependencyConfigs } = require('nx/src/tasks-runner/utils');
|
|
13
13
|
const tasksRunner = require('nx/tasks-runners/default').default;
|
|
14
14
|
const { CompositeLifeCycle } = require('nx/src/tasks-runner/life-cycle');
|
|
15
|
+
let initTasksRunner = null;
|
|
16
|
+
try {
|
|
17
|
+
initTasksRunner = require('nx/src/index').initTasksRunner;
|
|
18
|
+
}
|
|
19
|
+
catch (e) { }
|
|
15
20
|
exports.runnerReturnsPromise = true;
|
|
16
21
|
exports.output = output;
|
|
17
22
|
exports.workspaceRoot = workspaceRoot;
|
|
18
23
|
exports.tasksRunner = tasksRunner;
|
|
19
24
|
exports.CompositeLifeCycle = CompositeLifeCycle;
|
|
20
25
|
exports.getDependencyConfigs = getDependencyConfigs;
|
|
26
|
+
exports.initTasksRunner = initTasksRunner;
|
|
21
27
|
}
|
|
22
|
-
catch (
|
|
28
|
+
catch (e) {
|
|
23
29
|
const { output } = require('@nrwl/workspace/src/utilities/output');
|
|
24
30
|
const { appRootPath } = require('@nrwl/tao/src/utils/app-root');
|
|
25
|
-
const { getDependencyConfigs,
|
|
31
|
+
const { getDependencyConfigs, } = require('@nrwl/workspace/src/tasks-runner/utils');
|
|
26
32
|
const { tasksRunnerV2, } = require('@nrwl/workspace/src/tasks-runner/tasks-runner-v2');
|
|
27
33
|
let CompositeLifeCycle;
|
|
28
34
|
try {
|
|
@@ -36,6 +42,7 @@ try {
|
|
|
36
42
|
exports.tasksRunner = tasksRunnerV2;
|
|
37
43
|
exports.CompositeLifeCycle = CompositeLifeCycle;
|
|
38
44
|
exports.getDependencyConfigs = getDependencyConfigs;
|
|
45
|
+
exports.initTasksRunner = null;
|
|
39
46
|
}
|
|
40
47
|
}
|
|
41
48
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nx-imports.js","sourceRoot":"","sources":["../../../../../../libs/nx-packages/nx-cloud/lib/utilities/nx-imports.ts"],"names":[],"mappings":";AAAA,IAAI;IACF,IAAI;QACF,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;QAClD,IAAI,aAAa,CAAC;QAClB,IAAI;YACF,aAAa,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC,aAAa,CAAC;SAChE;QAAC,OAAO,EAAE,EAAE;YACX,aAAa,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAC,aAAa,CAAC;SACtE;QACD,MAAM,EAAE,oBAAoB,EAAE,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;QACtE,MAAM,WAAW,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC,OAAO,CAAC;QAChE,MAAM,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC,gCAAgC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"nx-imports.js","sourceRoot":"","sources":["../../../../../../libs/nx-packages/nx-cloud/lib/utilities/nx-imports.ts"],"names":[],"mappings":";AAAA,IAAI;IACF,IAAI;QACF,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;QAClD,IAAI,aAAa,CAAC;QAClB,IAAI;YACF,aAAa,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC,aAAa,CAAC;SAChE;QAAC,OAAO,EAAE,EAAE;YACX,aAAa,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAC,aAAa,CAAC;SACtE;QACD,MAAM,EAAE,oBAAoB,EAAE,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;QACtE,MAAM,WAAW,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC,OAAO,CAAC;QAChE,MAAM,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC,gCAAgC,CAAC,CAAC;QACzE,IAAI,eAAe,GAAG,IAAI,CAAC;QAE3B,IAAI;YACF,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC,eAAe,CAAC;SAC3D;QAAC,OAAO,CAAC,EAAE,GAAE;QAEd,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;QACpC,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;QACxB,OAAO,CAAC,aAAa,GAAG,aAAa,CAAC;QACtC,OAAO,CAAC,WAAW,GAAG,WAAW,CAAC;QAClC,OAAO,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAChD,OAAO,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;QACpD,OAAO,CAAC,eAAe,GAAG,eAAe,CAAC;KAC3C;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,sCAAsC,CAAC,CAAC;QACnE,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,8BAA8B,CAAC,CAAC;QAChE,MAAM,EACJ,oBAAoB,GACrB,GAAG,OAAO,CAAC,wCAAwC,CAAC,CAAC;QACtD,MAAM,EACJ,aAAa,GACd,GAAG,OAAO,CAAC,kDAAkD,CAAC,CAAC;QAEhE,IAAI,kBAAkB,CAAC;QACvB,IAAI;YACF,kBAAkB;gBAChB,OAAO,CAAC,6CAA6C,CAAC,CAAC,kBAAkB,CAAC;SAC7E;QAAC,OAAO,CAAC,EAAE,GAAE;QAEd,OAAO,CAAC,oBAAoB,GAAG,KAAK,CAAC;QACrC,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;QACxB,OAAO,CAAC,aAAa,GAAG,WAAW,CAAC;QACpC,OAAO,CAAC,WAAW,GAAG,aAAa,CAAC;QACpC,OAAO,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAChD,OAAO,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;QACpD,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;KAChC;CACF;AAAC,OAAO,CAAC,EAAE;IACV,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,KAAK,MAAM,EAAE;QAC7C,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;KAChB;IACD,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAChC,OAAO,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;IACzD,OAAO,CAAC,KAAK,CACX,uFAAuF,CACxF,CAAC;IACF,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAClB,OAAO,CAAC,KAAK,CACX,qGAAqG,CACtG,CAAC;IACF,OAAO,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;IACzD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;CACjB"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.serializeOverrides = void 0;
|
|
3
|
+
exports.unparse = exports.serializeOverrides = void 0;
|
|
4
4
|
function serializeOverrides(task) {
|
|
5
5
|
return task.overrides.__overrides_unparsed__
|
|
6
6
|
? task.overrides.__overrides_unparsed__.join(' ')
|
|
@@ -15,6 +15,7 @@ function unparse(options) {
|
|
|
15
15
|
}
|
|
16
16
|
return unparsed;
|
|
17
17
|
}
|
|
18
|
+
exports.unparse = unparse;
|
|
18
19
|
function unparseOption(key, value, unparsed) {
|
|
19
20
|
if (value === true) {
|
|
20
21
|
unparsed.push(`--${key}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serializer-overrides.js","sourceRoot":"","sources":["../../../../../../libs/nx-packages/nx-cloud/lib/utilities/serializer-overrides.ts"],"names":[],"mappings":";;;AAEA,SAAgB,kBAAkB,CAAC,IAAU;IAC3C,OAAO,IAAI,CAAC,SAAS,CAAC,sBAAsB;QAC1C,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,sBAAsB,CAAC,IAAI,CAAC,GAAG,CAAC;QACjD,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACxC,CAAC;AAJD,gDAIC;AAED,
|
|
1
|
+
{"version":3,"file":"serializer-overrides.js","sourceRoot":"","sources":["../../../../../../libs/nx-packages/nx-cloud/lib/utilities/serializer-overrides.ts"],"names":[],"mappings":";;;AAEA,SAAgB,kBAAkB,CAAC,IAAU;IAC3C,OAAO,IAAI,CAAC,SAAS,CAAC,sBAAsB;QAC1C,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,sBAAsB,CAAC,IAAI,CAAC,GAAG,CAAC;QACjD,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACxC,CAAC;AAJD,gDAIC;AAED,SAAgB,OAAO,CAAC,OAAe;IACrC,MAAM,QAAQ,GAAG,EAAE,CAAC;IACpB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;QACtC,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;QAC3B,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;KACrC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AARD,0BAQC;AAED,SAAS,aAAa,CAAC,GAAW,EAAE,KAAU,EAAE,QAAkB;IAChE,IAAI,KAAK,KAAK,IAAI,EAAE;QAClB,QAAQ,CAAC,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;KAC3B;SAAM,IAAI,KAAK,KAAK,KAAK,EAAE;QAC1B,QAAQ,CAAC,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC,CAAC;KAC9B;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QAC/B,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,GAAG,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;KAC7D;SAAM,IACL,OAAO,KAAK,KAAK,QAAQ;QACzB,+BAA+B,CAAC,KAAK,CAAC,EACtC;QACA,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,CAAA,IAAI,CAAC,CAAC;QACtD,QAAQ,CAAC,IAAI,CAAC,KAAK,GAAG,KAAK,SAAS,GAAG,CAAC,CAAC;KAC1C;SAAM,IAAI,KAAK,IAAI,IAAI,EAAE;QACxB,QAAQ,CAAC,IAAI,CAAC,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC,CAAC;KACpC;AACH,CAAC;AAED,SAAS,+BAA+B,CAAC,GAAW;IAClD,OAAO,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;AACrE,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
import { TaskToExecute } from '../../models/distributed-agent';
|
|
2
|
-
export declare function invokeTasksUsingRunMany(completedTaskReader: (id: string) => any, executionId: string, tasks: TaskToExecute[], maxParallel: number): {
|
|
3
|
-
completedTasks: {
|
|
4
|
-
taskId: string;
|
|
5
|
-
hash: string;
|
|
6
|
-
}[];
|
|
7
|
-
completedStatusCode: number;
|
|
8
|
-
};
|
|
@@ -1,58 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.invokeTasksUsingRunMany = void 0;
|
|
4
|
-
const environment_1 = require("../../../utilities/environment");
|
|
5
|
-
const child_process_1 = require("child_process");
|
|
6
|
-
const { output } = require('../../../utilities/nx-imports');
|
|
7
|
-
function invokeTasksUsingRunMany(completedTaskReader, executionId, tasks, maxParallel) {
|
|
8
|
-
let completedStatusCode = 0;
|
|
9
|
-
const completedTasks = [];
|
|
10
|
-
for (const g of groupByTarget(tasks)) {
|
|
11
|
-
const config = g.configuration ? `--configuration=${g.configuration}` : ``;
|
|
12
|
-
const parallel = maxParallel > 1 ? ` --parallel --max-parallel=${maxParallel}` : ``;
|
|
13
|
-
// TODO use pnpx or yarn when needed
|
|
14
|
-
const command = `npx nx run-many --target=${g.target} ${config} --projects=${g.projects.join(',')} ${g.params}${parallel}`;
|
|
15
|
-
if (environment_1.VERBOSE_LOGGING) {
|
|
16
|
-
output.note({
|
|
17
|
-
title: `Executing: '${command}'`,
|
|
18
|
-
});
|
|
19
|
-
}
|
|
20
|
-
try {
|
|
21
|
-
(0, child_process_1.execSync)(command, {
|
|
22
|
-
stdio: ['ignore', 'inherit', 'inherit'],
|
|
23
|
-
env: Object.assign(Object.assign({}, process.env), { NX_CACHE_FAILURES: 'true', NX_CLOUD_DISTRIBUTED_EXECUTION_ID: executionId, NX_STREAM_OUTPUT: 'true', NX_PREFIX_OUTPUT: 'true' }),
|
|
24
|
-
});
|
|
25
|
-
completedTasks.push(...completedTaskReader(executionId));
|
|
26
|
-
}
|
|
27
|
-
catch (e) {
|
|
28
|
-
if (e.status === environment_1.DISTRIBUTED_TASK_EXECUTION_INTERNAL_ERROR_STATUS_CODE) {
|
|
29
|
-
throw e;
|
|
30
|
-
}
|
|
31
|
-
else {
|
|
32
|
-
completedStatusCode = 1;
|
|
33
|
-
completedTasks.push(...completedTaskReader(executionId));
|
|
34
|
-
}
|
|
35
|
-
}
|
|
36
|
-
}
|
|
37
|
-
return { completedStatusCode, completedTasks };
|
|
38
|
-
}
|
|
39
|
-
exports.invokeTasksUsingRunMany = invokeTasksUsingRunMany;
|
|
40
|
-
function groupByTarget(tasks) {
|
|
41
|
-
const res = [];
|
|
42
|
-
tasks.forEach((t) => {
|
|
43
|
-
const r = res.find((rr) => rr.target === t.target && rr.configuration === t.configuration);
|
|
44
|
-
if (r) {
|
|
45
|
-
r.projects.push(t.projectName);
|
|
46
|
-
}
|
|
47
|
-
else {
|
|
48
|
-
res.push({
|
|
49
|
-
target: t.target,
|
|
50
|
-
projects: [t.projectName],
|
|
51
|
-
params: t.params,
|
|
52
|
-
configuration: t.configuration,
|
|
53
|
-
});
|
|
54
|
-
}
|
|
55
|
-
});
|
|
56
|
-
return res;
|
|
57
|
-
}
|
|
58
|
-
//# sourceMappingURL=invoke-tasks.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"invoke-tasks.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/distributed-agent/invoke-tasks.ts"],"names":[],"mappings":";;;AACA,gEAGwC;AACxC,iDAAyC;AAEzC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAC;AAE5D,SAAgB,uBAAuB,CACrC,mBAAwC,EACxC,WAAmB,EACnB,KAAsB,EACtB,WAAmB;IAKnB,IAAI,mBAAmB,GAAG,CAAC,CAAC;IAC5B,MAAM,cAAc,GAAG,EAAW,CAAC;IACnC,KAAK,MAAM,CAAC,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE;QACpC,MAAM,MAAM,GAAG,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3E,MAAM,QAAQ,GACZ,WAAW,GAAG,CAAC,CAAC,CAAC,CAAC,8BAA8B,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAErE,oCAAoC;QACpC,MAAM,OAAO,GAAG,4BACd,CAAC,CAAC,MACJ,IAAI,MAAM,eAAe,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,QAAQ,EAAE,CAAC;QAEvE,IAAI,6BAAe,EAAE;YACnB,MAAM,CAAC,IAAI,CAAC;gBACV,KAAK,EAAE,eAAe,OAAO,GAAG;aACjC,CAAC,CAAC;SACJ;QACD,IAAI;YACF,IAAA,wBAAQ,EAAC,OAAO,EAAE;gBAChB,KAAK,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,CAAC;gBACvC,GAAG,kCACE,OAAO,CAAC,GAAG,KACd,iBAAiB,EAAE,MAAM,EACzB,iCAAiC,EAAE,WAAW,EAC9C,gBAAgB,EAAE,MAAM,EACxB,gBAAgB,EAAE,MAAM,GACzB;aACF,CAAC,CAAC;YACH,cAAc,CAAC,IAAI,CAAC,GAAG,mBAAmB,CAAC,WAAW,CAAC,CAAC,CAAC;SAC1D;QAAC,OAAO,CAAM,EAAE;YACf,IAAI,CAAC,CAAC,MAAM,KAAK,mEAAqD,EAAE;gBACtE,MAAM,CAAC,CAAC;aACT;iBAAM;gBACL,mBAAmB,GAAG,CAAC,CAAC;gBACxB,cAAc,CAAC,IAAI,CAAC,GAAG,mBAAmB,CAAC,WAAW,CAAC,CAAC,CAAC;aAC1D;SACF;KACF;IACD,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,CAAC;AACjD,CAAC;AAhDD,0DAgDC;AAED,SAAS,aAAa,CAAC,KAAsB;IAC3C,MAAM,GAAG,GAAG,EAAoB,CAAC;IACjC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAClB,MAAM,CAAC,GAAG,GAAG,CAAC,IAAI,CAChB,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,aAAa,KAAK,CAAC,CAAC,aAAa,CACvE,CAAC;QACF,IAAI,CAAC,EAAE;YACL,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;SAChC;aAAM;YACL,GAAG,CAAC,IAAI,CAAC;gBACP,MAAM,EAAE,CAAC,CAAC,MAAM;gBAChB,QAAQ,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;gBACzB,MAAM,EAAE,CAAC,CAAC,MAAM;gBAChB,aAAa,EAAE,CAAC,CAAC,aAAa;aAC/B,CAAC,CAAC;SACJ;IACH,CAAC,CAAC,CAAC;IACH,OAAO,GAAG,CAAC;AACb,CAAC"}
|