nx 14.2.0-beta.0 → 14.2.0-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +1 -1
- package/package.json +4 -4
- package/src/command-line/nx-commands.js +15 -0
- package/src/command-line/nx-commands.js.map +1 -1
- package/src/command-line/print-affected.js +6 -8
- package/src/command-line/print-affected.js.map +1 -1
- package/src/tasks-runner/create-task-graph.d.ts +21 -0
- package/src/tasks-runner/create-task-graph.js +138 -0
- package/src/tasks-runner/create-task-graph.js.map +1 -0
- package/src/tasks-runner/default-tasks-runner.js +3 -6
- package/src/tasks-runner/default-tasks-runner.js.map +1 -1
- package/src/tasks-runner/forked-process-task-runner.js +2 -0
- package/src/tasks-runner/forked-process-task-runner.js.map +1 -1
- package/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.js +12 -12
- package/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.js.map +1 -1
- package/src/tasks-runner/run-command.d.ts +0 -12
- package/src/tasks-runner/run-command.js +23 -191
- package/src/tasks-runner/run-command.js.map +1 -1
- package/src/tasks-runner/task-graph-utils.d.ts +3 -0
- package/src/tasks-runner/task-graph-utils.js +56 -0
- package/src/tasks-runner/task-graph-utils.js.map +1 -0
- package/src/tasks-runner/tasks-runner.d.ts +2 -1
- package/src/utils/command-line-utils.d.ts +1 -0
- package/src/utils/command-line-utils.js +1 -0
- package/src/utils/command-line-utils.js.map +1 -1
- package/src/utils/output.d.ts +1 -1
- package/src/utils/output.js +2 -2
- package/src/utils/output.js.map +1 -1
- package/src/tasks-runner/task-graph-creator.d.ts +0 -13
- package/src/tasks-runner/task-graph-creator.js +0 -71
- package/src/tasks-runner/task-graph-creator.js.map +0 -1
|
@@ -2,22 +2,10 @@ import { TasksRunner } from './tasks-runner';
|
|
|
2
2
|
import { NxArgs } from '../utils/command-line-utils';
|
|
3
3
|
import { ProjectGraph, ProjectGraphProjectNode } from '../config/project-graph';
|
|
4
4
|
import { NxJsonConfiguration } from '../config/nx-json';
|
|
5
|
-
import { Task } from '../config/task-graph';
|
|
6
|
-
import { TargetDependencyConfig } from '../config/workspace-json-project-json';
|
|
7
5
|
export declare function runCommand(projectsToRun: ProjectGraphProjectNode[], projectGraph: ProjectGraph, { nxJson }: {
|
|
8
6
|
nxJson: NxJsonConfiguration;
|
|
9
7
|
}, nxArgs: NxArgs, overrides: any, initiatingProject: string | null): Promise<void>;
|
|
10
|
-
interface TaskParams {
|
|
11
|
-
project: ProjectGraphProjectNode;
|
|
12
|
-
target: string;
|
|
13
|
-
configuration: string;
|
|
14
|
-
overrides: Object;
|
|
15
|
-
errorIfCannotFindConfiguration: boolean;
|
|
16
|
-
}
|
|
17
|
-
export declare function createTasksForProjectToRun(projectsToRun: ProjectGraphProjectNode[], params: Omit<TaskParams, 'project' | 'errorIfCannotFindConfiguration'>, projectGraph: ProjectGraph, initiatingProject: string | null, defaultDependencyConfigs?: Record<string, (TargetDependencyConfig | string)[]>): Task[];
|
|
18
|
-
export declare function createTask({ project, target, configuration, overrides, errorIfCannotFindConfiguration, }: TaskParams): Task;
|
|
19
8
|
export declare function getRunner(nxArgs: NxArgs, nxJson: NxJsonConfiguration): {
|
|
20
9
|
tasksRunner: TasksRunner;
|
|
21
10
|
runnerOptions: any;
|
|
22
11
|
};
|
|
23
|
-
export {};
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getRunner = exports.
|
|
3
|
+
exports.getRunner = exports.runCommand = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const path_1 = require("path");
|
|
6
6
|
const app_root_1 = require("../utils/app-root");
|
|
7
7
|
const fileutils_1 = require("../utils/fileutils");
|
|
8
|
-
const project_graph_utils_1 = require("../utils/project-graph-utils");
|
|
9
8
|
const output_1 = require("../utils/output");
|
|
10
9
|
const utils_1 = require("./utils");
|
|
11
10
|
const life_cycle_1 = require("./life-cycle");
|
|
@@ -16,6 +15,8 @@ const dynamic_run_many_terminal_output_life_cycle_1 = require("./life-cycles/dyn
|
|
|
16
15
|
const task_profiling_life_cycle_1 = require("./life-cycles/task-profiling-life-cycle");
|
|
17
16
|
const is_ci_1 = require("../utils/is-ci");
|
|
18
17
|
const dynamic_run_one_terminal_output_life_cycle_1 = require("./life-cycles/dynamic-run-one-terminal-output-life-cycle");
|
|
18
|
+
const create_task_graph_1 = require("./create-task-graph");
|
|
19
|
+
const task_graph_utils_1 = require("./task-graph-utils");
|
|
19
20
|
function getTerminalOutputLifeCycle(initiatingProject, projectNames, tasks, nxArgs, overrides, runnerOptions) {
|
|
20
21
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
21
22
|
const isRunOne = initiatingProject != null;
|
|
@@ -58,12 +59,26 @@ function runCommand(projectsToRun, projectGraph, { nxJson }, nxArgs, overrides,
|
|
|
58
59
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
59
60
|
const { tasksRunner, runnerOptions } = getRunner(nxArgs, nxJson);
|
|
60
61
|
const defaultDependencyConfigs = nxJson.targetDependencies;
|
|
61
|
-
const tasks = createTasksForProjectToRun(projectsToRun, {
|
|
62
|
-
target: nxArgs.target,
|
|
63
|
-
configuration: nxArgs.configuration,
|
|
64
|
-
overrides,
|
|
65
|
-
}, projectGraph, initiatingProject, defaultDependencyConfigs);
|
|
66
62
|
const projectNames = projectsToRun.map((t) => t.name);
|
|
63
|
+
const taskGraph = (0, create_task_graph_1.createTaskGraph)(projectGraph, defaultDependencyConfigs, projectNames, [nxArgs.target], nxArgs.configuration, overrides);
|
|
64
|
+
const cycle = (0, task_graph_utils_1.findCycle)(taskGraph);
|
|
65
|
+
if (cycle) {
|
|
66
|
+
if (nxArgs.nxIgnoreCycles) {
|
|
67
|
+
output_1.output.warn({
|
|
68
|
+
title: `The task graph has a circular dependency`,
|
|
69
|
+
bodyLines: [`${cycle.join(' --> ')}`],
|
|
70
|
+
});
|
|
71
|
+
(0, task_graph_utils_1.makeAcyclic)(taskGraph);
|
|
72
|
+
}
|
|
73
|
+
else {
|
|
74
|
+
output_1.output.error({
|
|
75
|
+
title: `Could not execute command because the task graph has a circular dependency`,
|
|
76
|
+
bodyLines: [`${cycle.join(' --> ')}`],
|
|
77
|
+
});
|
|
78
|
+
process.exit(1);
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
const tasks = Object.values(taskGraph.tasks);
|
|
67
82
|
if (nxArgs.outputStyle == 'stream') {
|
|
68
83
|
process.env.NX_STREAM_OUTPUT = 'true';
|
|
69
84
|
process.env.NX_PREFIX_OUTPUT = 'true';
|
|
@@ -85,6 +100,7 @@ function runCommand(projectsToRun, projectGraph, { nxJson }, nxArgs, overrides,
|
|
|
85
100
|
projectGraph,
|
|
86
101
|
nxJson,
|
|
87
102
|
nxArgs,
|
|
103
|
+
taskGraph,
|
|
88
104
|
});
|
|
89
105
|
let anyFailures;
|
|
90
106
|
try {
|
|
@@ -136,16 +152,6 @@ function anyFailuresInObservable(obs) {
|
|
|
136
152
|
});
|
|
137
153
|
});
|
|
138
154
|
}
|
|
139
|
-
function createTasksForProjectToRun(projectsToRun, params, projectGraph, initiatingProject, defaultDependencyConfigs = {}) {
|
|
140
|
-
var _a, _b;
|
|
141
|
-
const tasksMap = new Map();
|
|
142
|
-
const seenSet = new Set();
|
|
143
|
-
for (const project of projectsToRun) {
|
|
144
|
-
addTasksForProjectTarget(Object.assign(Object.assign({ project }, params), { errorIfCannotFindConfiguration: project.name === initiatingProject }), defaultDependencyConfigs, projectGraph, (_b = (_a = project.data.targets) === null || _a === void 0 ? void 0 : _a[params.target]) === null || _b === void 0 ? void 0 : _b.executor, tasksMap, [], seenSet);
|
|
145
|
-
}
|
|
146
|
-
return Array.from(tasksMap.values());
|
|
147
|
-
}
|
|
148
|
-
exports.createTasksForProjectToRun = createTasksForProjectToRun;
|
|
149
155
|
function shouldUseDynamicLifeCycle(tasks, options, outputStyle) {
|
|
150
156
|
if (!process.stdout.isTTY)
|
|
151
157
|
return false;
|
|
@@ -156,164 +162,8 @@ function shouldUseDynamicLifeCycle(tasks, options, outputStyle) {
|
|
|
156
162
|
const noForwarding = !tasks.find((t) => (0, utils_1.shouldStreamOutput)(t, null, options));
|
|
157
163
|
return noForwarding;
|
|
158
164
|
}
|
|
159
|
-
function addTasksForProjectTarget({ project, target, configuration, overrides, errorIfCannotFindConfiguration, }, defaultDependencyConfigs = {}, projectGraph, originalTargetExecutor, tasksMap, path, seenSet) {
|
|
160
|
-
var _a, _b;
|
|
161
|
-
const task = createTask({
|
|
162
|
-
project,
|
|
163
|
-
target,
|
|
164
|
-
configuration,
|
|
165
|
-
overrides: ((_b = (_a = project.data.targets) === null || _a === void 0 ? void 0 : _a[target]) === null || _b === void 0 ? void 0 : _b.executor) === originalTargetExecutor
|
|
166
|
-
? overrides
|
|
167
|
-
: {},
|
|
168
|
-
errorIfCannotFindConfiguration,
|
|
169
|
-
});
|
|
170
|
-
const dependencyConfigs = (0, utils_1.getDependencyConfigs)({ project: project.name, target }, defaultDependencyConfigs, projectGraph);
|
|
171
|
-
if (dependencyConfigs) {
|
|
172
|
-
for (const dependencyConfig of dependencyConfigs) {
|
|
173
|
-
addTasksForProjectDependencyConfig(project, {
|
|
174
|
-
target,
|
|
175
|
-
configuration,
|
|
176
|
-
overrides,
|
|
177
|
-
}, dependencyConfig, defaultDependencyConfigs, projectGraph, originalTargetExecutor, tasksMap, path, seenSet);
|
|
178
|
-
}
|
|
179
|
-
}
|
|
180
|
-
tasksMap.set(task.id, task);
|
|
181
|
-
}
|
|
182
|
-
function createTask({ project, target, configuration, overrides, errorIfCannotFindConfiguration, }) {
|
|
183
|
-
var _a, _b;
|
|
184
|
-
if (!(0, project_graph_utils_1.projectHasTarget)(project, target)) {
|
|
185
|
-
output_1.output.error({
|
|
186
|
-
title: `Cannot find target '${target}' for project '${project.name}'`,
|
|
187
|
-
});
|
|
188
|
-
process.exit(1);
|
|
189
|
-
}
|
|
190
|
-
configuration !== null && configuration !== void 0 ? configuration : (configuration = (_b = (_a = project.data.targets) === null || _a === void 0 ? void 0 : _a[target]) === null || _b === void 0 ? void 0 : _b.defaultConfiguration);
|
|
191
|
-
const config = (0, project_graph_utils_1.projectHasTargetAndConfiguration)(project, target, configuration)
|
|
192
|
-
? configuration
|
|
193
|
-
: undefined;
|
|
194
|
-
if (errorIfCannotFindConfiguration && configuration && !config) {
|
|
195
|
-
output_1.output.error({
|
|
196
|
-
title: `Cannot find configuration '${configuration}' for project '${project.name}:${target}'`,
|
|
197
|
-
});
|
|
198
|
-
process.exit(1);
|
|
199
|
-
}
|
|
200
|
-
const qualifiedTarget = {
|
|
201
|
-
project: project.name,
|
|
202
|
-
target,
|
|
203
|
-
configuration: config,
|
|
204
|
-
};
|
|
205
|
-
return {
|
|
206
|
-
id: getId(qualifiedTarget),
|
|
207
|
-
target: qualifiedTarget,
|
|
208
|
-
projectRoot: project.data.root,
|
|
209
|
-
overrides: interpolateOverrides(overrides, project.name, project.data),
|
|
210
|
-
};
|
|
211
|
-
}
|
|
212
|
-
exports.createTask = createTask;
|
|
213
|
-
function addTasksForProjectDependencyConfig(project, { target, configuration, overrides, }, dependencyConfig, defaultDependencyConfigs, projectGraph, originalTargetExecutor, tasksMap, path, seenSet) {
|
|
214
|
-
const targetIdentifier = getId({
|
|
215
|
-
project: project.name,
|
|
216
|
-
target,
|
|
217
|
-
configuration,
|
|
218
|
-
});
|
|
219
|
-
const pathFragment = {
|
|
220
|
-
targetIdentifier,
|
|
221
|
-
hasTarget: (0, project_graph_utils_1.projectHasTarget)(project, target),
|
|
222
|
-
};
|
|
223
|
-
const newPath = [...path, pathFragment];
|
|
224
|
-
seenSet.add(targetIdentifier);
|
|
225
|
-
if (tasksMap.has(targetIdentifier)) {
|
|
226
|
-
return;
|
|
227
|
-
}
|
|
228
|
-
if (dependencyConfig.projects === 'dependencies') {
|
|
229
|
-
const dependencies = projectGraph.dependencies[project.name];
|
|
230
|
-
if (dependencies) {
|
|
231
|
-
for (const dep of dependencies) {
|
|
232
|
-
const depProject = projectGraph.nodes[dep.target];
|
|
233
|
-
if (depProject &&
|
|
234
|
-
(0, project_graph_utils_1.projectHasTarget)(depProject, dependencyConfig.target)) {
|
|
235
|
-
const depTargetId = getId({
|
|
236
|
-
project: depProject.name,
|
|
237
|
-
target: dependencyConfig.target,
|
|
238
|
-
configuration: configuration,
|
|
239
|
-
});
|
|
240
|
-
exitOnCircularDep(newPath, depTargetId);
|
|
241
|
-
if (seenSet.has(depTargetId)) {
|
|
242
|
-
continue;
|
|
243
|
-
}
|
|
244
|
-
addTasksForProjectTarget({
|
|
245
|
-
project: depProject,
|
|
246
|
-
target: dependencyConfig.target,
|
|
247
|
-
configuration,
|
|
248
|
-
overrides,
|
|
249
|
-
errorIfCannotFindConfiguration: false,
|
|
250
|
-
}, defaultDependencyConfigs, projectGraph, originalTargetExecutor, tasksMap, newPath, seenSet);
|
|
251
|
-
}
|
|
252
|
-
else {
|
|
253
|
-
if (!depProject) {
|
|
254
|
-
continue;
|
|
255
|
-
}
|
|
256
|
-
const depTargetId = getId({
|
|
257
|
-
project: depProject.name,
|
|
258
|
-
target: dependencyConfig.target,
|
|
259
|
-
configuration: configuration,
|
|
260
|
-
});
|
|
261
|
-
exitOnCircularDep(newPath, depTargetId);
|
|
262
|
-
if (seenSet.has(depTargetId)) {
|
|
263
|
-
continue;
|
|
264
|
-
}
|
|
265
|
-
addTasksForProjectDependencyConfig(depProject, { target, configuration, overrides }, dependencyConfig, defaultDependencyConfigs, projectGraph, originalTargetExecutor, tasksMap, newPath, seenSet);
|
|
266
|
-
}
|
|
267
|
-
}
|
|
268
|
-
}
|
|
269
|
-
}
|
|
270
|
-
else if ((0, project_graph_utils_1.projectHasTarget)(project, dependencyConfig.target)) {
|
|
271
|
-
addTasksForProjectTarget({
|
|
272
|
-
project,
|
|
273
|
-
target: dependencyConfig.target,
|
|
274
|
-
configuration,
|
|
275
|
-
overrides,
|
|
276
|
-
errorIfCannotFindConfiguration: false,
|
|
277
|
-
}, defaultDependencyConfigs, projectGraph, originalTargetExecutor, tasksMap, newPath, seenSet);
|
|
278
|
-
}
|
|
279
|
-
}
|
|
280
|
-
function exitOnCircularDep(path, targetIdentifier) {
|
|
281
|
-
if (path.length > 0 &&
|
|
282
|
-
path[path.length - 1].hasTarget &&
|
|
283
|
-
path.filter((p) => p.targetIdentifier === targetIdentifier).length > 0) {
|
|
284
|
-
const identifiers = path.map((p) => p.targetIdentifier);
|
|
285
|
-
output_1.output.error({
|
|
286
|
-
title: `Could not execute ${identifiers[0]} because it has a circular dependency`,
|
|
287
|
-
bodyLines: [`${[...identifiers, targetIdentifier].join(' --> ')}`],
|
|
288
|
-
});
|
|
289
|
-
process.exit(1);
|
|
290
|
-
}
|
|
291
|
-
}
|
|
292
|
-
function getId({ project, target, configuration, }) {
|
|
293
|
-
let id = `${project}:${target}`;
|
|
294
|
-
if (configuration) {
|
|
295
|
-
id += `:${configuration}`;
|
|
296
|
-
}
|
|
297
|
-
return id;
|
|
298
|
-
}
|
|
299
165
|
function getRunner(nxArgs, nxJson) {
|
|
300
166
|
let runner = nxArgs.runner;
|
|
301
|
-
//TODO: vsavkin remove in Nx 12
|
|
302
|
-
if (!nxJson.tasksRunnerOptions) {
|
|
303
|
-
const t = require('./default-tasks-runner');
|
|
304
|
-
return {
|
|
305
|
-
tasksRunner: t.defaultTasksRunner,
|
|
306
|
-
runnerOptions: nxArgs,
|
|
307
|
-
};
|
|
308
|
-
}
|
|
309
|
-
//TODO: vsavkin remove in Nx 12
|
|
310
|
-
if (!runner && !nxJson.tasksRunnerOptions.default) {
|
|
311
|
-
const t = require('./default-tasks-runner');
|
|
312
|
-
return {
|
|
313
|
-
tasksRunner: t.defaultTasksRunner,
|
|
314
|
-
runnerOptions: nxArgs,
|
|
315
|
-
};
|
|
316
|
-
}
|
|
317
167
|
runner = runner || 'default';
|
|
318
168
|
if (nxJson.tasksRunnerOptions[runner]) {
|
|
319
169
|
let modulePath = nxJson.tasksRunnerOptions[runner].runner;
|
|
@@ -344,22 +194,4 @@ function getRunner(nxArgs, nxJson) {
|
|
|
344
194
|
}
|
|
345
195
|
}
|
|
346
196
|
exports.getRunner = getRunner;
|
|
347
|
-
function interpolateOverrides(args, projectName, projectMetadata) {
|
|
348
|
-
const interpolatedArgs = Object.assign({}, args);
|
|
349
|
-
Object.entries(interpolatedArgs).forEach(([name, value]) => {
|
|
350
|
-
if (typeof value === 'string') {
|
|
351
|
-
const regex = /{project\.([^}]+)}/g;
|
|
352
|
-
interpolatedArgs[name] = value.replace(regex, (_, group) => {
|
|
353
|
-
if (group.includes('.')) {
|
|
354
|
-
throw new Error('Only top-level properties can be interpolated');
|
|
355
|
-
}
|
|
356
|
-
if (group === 'name') {
|
|
357
|
-
return projectName;
|
|
358
|
-
}
|
|
359
|
-
return projectMetadata[group];
|
|
360
|
-
});
|
|
361
|
-
}
|
|
362
|
-
});
|
|
363
|
-
return interpolatedArgs;
|
|
364
|
-
}
|
|
365
197
|
//# sourceMappingURL=run-command.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-command.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/run-command.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"run-command.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/run-command.ts"],"names":[],"mappings":";;;;AACA,+BAA4B;AAC5B,gDAAkD;AAElD,kDAAoD;AACpD,4CAAyC;AACzC,mCAA6C;AAC7C,6CAA6D;AAC7D,yHAAgH;AAChH,uHAA8G;AAC9G,mFAA6E;AAC7E,2HAA+G;AAC/G,uFAAiF;AACjF,0CAAsC;AACtC,yHAA6G;AAI7G,2DAAsD;AACtD,yDAA4D;AAE5D,SAAe,0BAA0B,CACvC,iBAAyB,EACzB,YAAsB,EACtB,KAAa,EACb,MAAc,EACd,SAAkC,EAClC,aAAkB;;QAElB,MAAM,QAAQ,GAAG,iBAAiB,IAAI,IAAI,CAAC;QAC3C,MAAM,gBAAgB,GACpB,yBAAyB,CAAC,KAAK,EAAE,aAAa,EAAE,MAAM,CAAC,WAAW,CAAC;YACnE,OAAO,CAAC,GAAG,CAAC,kBAAkB,KAAK,MAAM;YACzC,OAAO,CAAC,GAAG,CAAC,8BAA8B,KAAK,OAAO,CAAC;QAEzD,IAAI,QAAQ,EAAE;YACZ,IAAI,gBAAgB,EAAE;gBACpB,OAAO,MAAM,IAAA,8EAAiC,EAAC;oBAC7C,iBAAiB;oBACjB,KAAK;oBACL,IAAI,EAAE,MAAM;oBACZ,SAAS;iBACV,CAAC,CAAC;aACJ;YACD,OAAO;gBACL,SAAS,EAAE,IAAI,+EAAmC,CAChD,iBAAiB,EACjB,YAAY,EACZ,KAAK,EACL,MAAM,CACP;gBACD,YAAY,EAAE,OAAO,CAAC,OAAO,EAAE;aAChC,CAAC;SACH;aAAM;YACL,IAAI,gBAAgB,EAAE;gBACpB,OAAO,MAAM,IAAA,gFAAkC,EAAC;oBAC9C,YAAY;oBACZ,KAAK;oBACL,IAAI,EAAE,MAAM;oBACZ,SAAS;iBACV,CAAC,CAAC;aACJ;iBAAM;gBACL,OAAO;oBACL,SAAS,EAAE,IAAI,iFAAoC,CACjD,YAAY,EACZ,KAAK,EACL,MAAM,EACN,SAAS,CACV;oBACD,YAAY,EAAE,OAAO,CAAC,OAAO,EAAE;iBAChC,CAAC;aACH;SACF;IACH,CAAC;CAAA;AAED,SAAsB,UAAU,CAC9B,aAAwC,EACxC,YAA0B,EAC1B,EAAE,MAAM,EAAmC,EAC3C,MAAc,EACd,SAAc,EACd,iBAAgC;;QAEhC,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAEjE,MAAM,wBAAwB,GAAG,MAAM,CAAC,kBAAkB,CAAC;QAC3D,MAAM,YAAY,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACtD,MAAM,SAAS,GAAG,IAAA,mCAAe,EAC/B,YAAY,EACZ,wBAAwB,EACxB,YAAY,EACZ,CAAC,MAAM,CAAC,MAAM,CAAC,EACf,MAAM,CAAC,aAAa,EACpB,SAAS,CACV,CAAC;QAEF,MAAM,KAAK,GAAG,IAAA,4BAAS,EAAC,SAAS,CAAC,CAAC;QACnC,IAAI,KAAK,EAAE;YACT,IAAI,MAAM,CAAC,cAAc,EAAE;gBACzB,eAAM,CAAC,IAAI,CAAC;oBACV,KAAK,EAAE,0CAA0C;oBACjD,SAAS,EAAE,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;iBACtC,CAAC,CAAC;gBACH,IAAA,8BAAW,EAAC,SAAS,CAAC,CAAC;aACxB;iBAAM;gBACL,eAAM,CAAC,KAAK,CAAC;oBACX,KAAK,EAAE,4EAA4E;oBACnF,SAAS,EAAE,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;iBACtC,CAAC,CAAC;gBACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACjB;SACF;QAED,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC7C,IAAI,MAAM,CAAC,WAAW,IAAI,QAAQ,EAAE;YAClC,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,MAAM,CAAC;YACtC,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,MAAM,CAAC;SACvC;QACD,IAAI,MAAM,CAAC,WAAW,IAAI,yBAAyB,EAAE;YACnD,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,MAAM,CAAC;SACvC;QACD,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,GAAG,MAAM,0BAA0B,CAClE,iBAAiB,EACjB,YAAY,EACZ,KAAK,EACL,MAAM,EACN,SAAS,EACT,aAAa,CACd,CAAC;QACF,MAAM,UAAU,GAAG,CAAC,SAAS,CAAgB,CAAC;QAE9C,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE;YAC/B,UAAU,CAAC,IAAI,CAAC,IAAI,8CAAoB,EAAE,CAAC,CAAC;SAC7C;QAED,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE;YAC1B,UAAU,CAAC,IAAI,CAAC,IAAI,kDAAsB,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;SACrE;QAED,MAAM,mBAAmB,GAAG,WAAW,CACrC,KAAK,kCACA,aAAa,KAAE,SAAS,EAAE,IAAI,+BAAkB,CAAC,UAAU,CAAC,KACjE;YACE,iBAAiB,EACf,MAAM,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,iBAAiB;YAC7D,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,YAAY;YACZ,MAAM;YACN,MAAM;YACN,SAAS;SACV,CACF,CAAC;QAEF,IAAI,WAAW,CAAC;QAChB,IAAI;YACF,IAAK,mBAA2B,CAAC,SAAS,EAAE;gBAC1C,WAAW,GAAG,MAAM,uBAAuB,CAAC,mBAAmB,CAAC,CAAC;aAClE;iBAAM;gBACL,2BAA2B;gBAC3B,WAAW,GAAG,MAAM,oBAAoB,CAAC,mBAA0B,CAAC,CAAC;aACtE;YACD,MAAM,YAAY,CAAC;SACpB;QAAC,OAAO,CAAC,EAAE;YACV,eAAM,CAAC,KAAK,CAAC;gBACX,KAAK,EAAE,kCAAkC;aAC1C,CAAC,CAAC;YACH,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACjB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;QAED,iDAAiD;QACjD,IAAI,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;YAAG,OAAO,CAAC,KAAa,CAAC,KAAK,EAAE,CAAC;QAE3D,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACpC,CAAC;CAAA;AAnGD,gCAmGC;AAED,SAAe,oBAAoB,CACjC,OAA8C;;QAE9C,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,OAAO,CAAC,CAAC,IAAI,CACtC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,SAAS,CAC1C,CAAC;IACJ,CAAC;CAAA;AAED,SAAe,uBAAuB,CAAC,GAAQ;;QAC7C,OAAO,MAAM,IAAI,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YAC/B,IAAI,WAAW,GAAG,KAAK,CAAC;YACxB,GAAG,CAAC,SAAS,CACX,CAAC,CAAC,EAAE,EAAE;gBACJ,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE;oBACd,WAAW,GAAG,IAAI,CAAC;iBACpB;YACH,CAAC,EACD,CAAC,KAAK,EAAE,EAAE;gBACR,eAAM,CAAC,KAAK,CAAC;oBACX,KAAK,EAAE,kCAAkC;iBAC1C,CAAC,CAAC;gBACH,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACrB,GAAG,CAAC,IAAI,CAAC,CAAC;YACZ,CAAC,EACD,GAAG,EAAE;gBACH,GAAG,CAAC,WAAW,CAAC,CAAC;YACnB,CAAC,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;CAAA;AAED,SAAS,yBAAyB,CAChC,KAAa,EACb,OAAY,EACZ,WAAmB;IAEnB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK;QAAE,OAAO,KAAK,CAAC;IACxC,IAAI,IAAA,YAAI,GAAE;QAAE,OAAO,KAAK,CAAC;IACzB,IAAI,WAAW,KAAK,QAAQ,IAAI,WAAW,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAEvE,MAAM,YAAY,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,0BAAkB,EAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IAC9E,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,SAAgB,SAAS,CACvB,MAAc,EACd,MAA2B;IAK3B,IAAI,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IAC3B,MAAM,GAAG,MAAM,IAAI,SAAS,CAAC;IAC7B,IAAI,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE;QACrC,IAAI,UAAU,GAAW,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC;QAElE,IAAI,WAAW,CAAC;QAChB,IAAI,UAAU,EAAE;YACd,IAAI,IAAA,0BAAc,EAAC,UAAU,CAAC,EAAE;gBAC9B,UAAU,GAAG,IAAA,WAAI,EAAC,wBAAa,EAAE,UAAU,CAAC,CAAC;aAC9C;YAED,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;YAClC,uCAAuC;YACvC,IAAI,WAAW,CAAC,OAAO,EAAE;gBACvB,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC;aACnC;SACF;aAAM;YACL,WAAW,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC,kBAAkB,CAAC;SACpE;QAED,OAAO;YACL,WAAW;YACX,aAAa,kCACR,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,OAAO,GACzC,MAAM,CACV;SACF,CAAC;KACH;SAAM;QACL,eAAM,CAAC,KAAK,CAAC;YACX,KAAK,EAAE,2CAA2C,MAAM,EAAE;SAC3D,CAAC,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;AACH,CAAC;AAxCD,8BAwCC"}
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.makeAcyclic = exports.findCycle = void 0;
|
|
4
|
+
function _findCycle(taskGraph, taskId, visited, path) {
|
|
5
|
+
if (visited[taskId])
|
|
6
|
+
return null;
|
|
7
|
+
visited[taskId] = true;
|
|
8
|
+
for (const d of taskGraph.dependencies[taskId]) {
|
|
9
|
+
if (path.includes(d))
|
|
10
|
+
return [...path, d];
|
|
11
|
+
const cycle = _findCycle(taskGraph, d, visited, [...path, d]);
|
|
12
|
+
if (cycle)
|
|
13
|
+
return cycle;
|
|
14
|
+
}
|
|
15
|
+
return null;
|
|
16
|
+
}
|
|
17
|
+
function findCycle(taskGraph) {
|
|
18
|
+
const visited = {};
|
|
19
|
+
for (const t of Object.keys(taskGraph.dependencies)) {
|
|
20
|
+
visited[t] = false;
|
|
21
|
+
}
|
|
22
|
+
for (const t of Object.keys(taskGraph.dependencies)) {
|
|
23
|
+
const cycle = _findCycle(taskGraph, t, visited, [t]);
|
|
24
|
+
if (cycle)
|
|
25
|
+
return cycle;
|
|
26
|
+
}
|
|
27
|
+
return null;
|
|
28
|
+
}
|
|
29
|
+
exports.findCycle = findCycle;
|
|
30
|
+
function _makeAcyclic(taskGraph, taskId, visited, path) {
|
|
31
|
+
if (visited[taskId])
|
|
32
|
+
return;
|
|
33
|
+
visited[taskId] = true;
|
|
34
|
+
const deps = taskGraph.dependencies[taskId];
|
|
35
|
+
for (const d of [...deps]) {
|
|
36
|
+
if (path.includes(d)) {
|
|
37
|
+
deps.splice(deps.indexOf(d), 1);
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
40
|
+
_makeAcyclic(taskGraph, d, visited, [...path, d]);
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
return null;
|
|
44
|
+
}
|
|
45
|
+
function makeAcyclic(taskGraph) {
|
|
46
|
+
const visited = {};
|
|
47
|
+
for (const t of Object.keys(taskGraph.dependencies)) {
|
|
48
|
+
visited[t] = false;
|
|
49
|
+
}
|
|
50
|
+
for (const t of Object.keys(taskGraph.dependencies)) {
|
|
51
|
+
_makeAcyclic(taskGraph, t, visited, [t]);
|
|
52
|
+
}
|
|
53
|
+
taskGraph.roots = Object.keys(taskGraph.dependencies).filter((t) => taskGraph.dependencies[t].length === 0);
|
|
54
|
+
}
|
|
55
|
+
exports.makeAcyclic = makeAcyclic;
|
|
56
|
+
//# sourceMappingURL=task-graph-utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"task-graph-utils.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/task-graph-utils.ts"],"names":[],"mappings":";;;AAEA,SAAS,UAAU,CACjB,SAAoB,EACpB,MAAc,EACd,OAAsC,EACtC,IAAc;IAEd,IAAI,OAAO,CAAC,MAAM,CAAC;QAAE,OAAO,IAAI,CAAC;IACjC,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IAEvB,KAAK,MAAM,CAAC,IAAI,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE;QAC9C,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;YAAE,OAAO,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC;QAC1C,MAAM,KAAK,GAAG,UAAU,CAAC,SAAS,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC9D,IAAI,KAAK;YAAE,OAAO,KAAK,CAAC;KACzB;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAgB,SAAS,CAAC,SAAoB;IAC5C,MAAM,OAAO,GAAG,EAAE,CAAC;IACnB,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE;QACnD,OAAO,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;KACpB;IAED,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE;QACnD,MAAM,KAAK,GAAG,UAAU,CAAC,SAAS,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACrD,IAAI,KAAK;YAAE,OAAO,KAAK,CAAC;KACzB;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAZD,8BAYC;AAED,SAAS,YAAY,CACnB,SAAoB,EACpB,MAAc,EACd,OAAsC,EACtC,IAAc;IAEd,IAAI,OAAO,CAAC,MAAM,CAAC;QAAE,OAAO;IAC5B,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IAEvB,MAAM,IAAI,GAAG,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAC5C,KAAK,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE;QACzB,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE;YACpB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;SACjC;aAAM;YACL,YAAY,CAAC,SAAS,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;SACnD;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAgB,WAAW,CAAC,SAAoB;IAC9C,MAAM,OAAO,GAAG,EAAE,CAAC;IACnB,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE;QACnD,OAAO,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;KACpB;IACD,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE;QACnD,YAAY,CAAC,SAAS,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;KAC1C;IACD,SAAS,CAAC,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,MAAM,CAC1D,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAC9C,CAAC;AACJ,CAAC;AAXD,kCAWC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { NxJsonConfiguration } from '../config/nx-json';
|
|
2
2
|
import { ProjectGraph } from '../config/project-graph';
|
|
3
|
-
import { Task } from '../config/task-graph';
|
|
3
|
+
import { Task, TaskGraph } from '../config/task-graph';
|
|
4
4
|
import { NxArgs } from '../utils/command-line-utils';
|
|
5
5
|
export declare type TaskStatus = 'success' | 'failure' | 'skipped' | 'local-cache-kept-existing' | 'local-cache' | 'remote-cache';
|
|
6
6
|
/**
|
|
@@ -13,6 +13,7 @@ export declare type TasksRunner<T = unknown> = (tasks: Task[], options: T, conte
|
|
|
13
13
|
projectGraph: ProjectGraph;
|
|
14
14
|
nxJson: NxJsonConfiguration;
|
|
15
15
|
nxArgs: NxArgs;
|
|
16
|
+
taskGraph?: TaskGraph;
|
|
16
17
|
}) => any | Promise<{
|
|
17
18
|
[id: string]: TaskStatus;
|
|
18
19
|
}>;
|
|
@@ -34,6 +34,7 @@ export interface NxArgs {
|
|
|
34
34
|
outputStyle?: string;
|
|
35
35
|
scan?: boolean;
|
|
36
36
|
nxBail?: boolean;
|
|
37
|
+
nxIgnoreCycles?: boolean;
|
|
37
38
|
}
|
|
38
39
|
export declare function splitArgsIntoNxArgsAndOverrides(args: yargs.Arguments, mode: 'run-one' | 'run-many' | 'affected' | 'print-affected', options?: {
|
|
39
40
|
printWarnings: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command-line-utils.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/command-line-utils.ts"],"names":[],"mappings":";;;AAAA,4CAA4C;AAE5C,4DAIqC;AACrC,qCAAkC;AAElC,iDAAyC;AAEzC,SAAgB,KAAK,CAAC,IAAY;IAOhC,OAAO;QACL,IAAI;QACJ,SAAS,EAAE,WAAW,CAAC,IAAI,CAAC;QAC5B,YAAY,EAAE,cAAc,CAAC,IAAI,CAAC;QAClC,YAAY,EAAE,cAAc,CAAC,IAAI,CAAC;QAClC,QAAQ,EAAE,UAAU,CAAC,IAAI,CAAC;KAC3B,CAAC;AACJ,CAAC;AAdD,sBAcC;AAED;;GAEG;AACH,SAAS,WAAW,CAAC,GAAW;IAC9B,OAAO,aAAa,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;AAC5C,CAAC;AAED;;GAEG;AACH,SAAS,cAAc,CAAC,CAAS;IAC/B,OAAO,CAAC;SACL,OAAO,CAAC,sBAAsB,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,CAC9C,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAC7B;SACA,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC;SAC3B,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;AACjD,CAAC;AAED;;GAEG;AACH,SAAS,cAAc,CAAC,CAAS;IAC/B,OAAO,CAAC,CAAC,OAAO,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;AACzD,CAAC;AAED;;GAEG;AACH,SAAS,UAAU,CAAC,CAAS;IAC3B,OAAO,CAAC;SACL,OAAO,CAAC,mBAAmB,EAAE,OAAO,CAAC;SACrC,WAAW,EAAE;SACb,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;AAC3B,CAAC;AAED;;GAEG;AACH,SAAS,aAAa,CAAC,CAAS;IAC9B,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAChD,CAAC;AAED,MAAM,MAAM,GAAa;IACvB,QAAQ;IACR,eAAe;IACf,MAAM;IACN,QAAQ;IACR,UAAU;IACV,aAAa;IACb,SAAS;IACT,YAAY;IACZ,MAAM;IACN,UAAU;IACV,aAAa;IACb,MAAM;IACN,aAAa;IACb,QAAQ;
|
|
1
|
+
{"version":3,"file":"command-line-utils.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/command-line-utils.ts"],"names":[],"mappings":"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"}
|
package/src/utils/output.d.ts
CHANGED
|
@@ -21,7 +21,7 @@ export interface CLISuccessMessageConfig {
|
|
|
21
21
|
declare class CLIOutput {
|
|
22
22
|
readonly X_PADDING = " ";
|
|
23
23
|
cliName: string;
|
|
24
|
-
formatCommand: (
|
|
24
|
+
formatCommand: (taskId: string) => string;
|
|
25
25
|
/**
|
|
26
26
|
* Longer dash character which forms more of a continuous line when place side to side
|
|
27
27
|
* with itself, unlike the standard dash character
|
package/src/utils/output.js
CHANGED
|
@@ -15,7 +15,7 @@ class CLIOutput {
|
|
|
15
15
|
constructor() {
|
|
16
16
|
this.X_PADDING = ' ';
|
|
17
17
|
this.cliName = 'NX';
|
|
18
|
-
this.formatCommand = (
|
|
18
|
+
this.formatCommand = (taskId) => `${chalk.dim('nx run')} ${taskId}`;
|
|
19
19
|
/**
|
|
20
20
|
* Expose some color and other utility functions so that other parts of the codebase that need
|
|
21
21
|
* more fine-grained control of message bodies are still using a centralized
|
|
@@ -137,7 +137,7 @@ class CLIOutput {
|
|
|
137
137
|
}
|
|
138
138
|
logCommand(message, taskStatus) {
|
|
139
139
|
this.addNewline();
|
|
140
|
-
const commandOutput = this.formatCommand(this.normalizeMessage(message));
|
|
140
|
+
const commandOutput = chalk.dim('> ') + this.formatCommand(this.normalizeMessage(message));
|
|
141
141
|
const commandOutputWithStatus = this.addTaskStatus(taskStatus, commandOutput);
|
|
142
142
|
this.writeToStdOut(commandOutputWithStatus);
|
|
143
143
|
this.addNewline();
|
package/src/utils/output.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/output.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,2BAAyB;AACzB,mCAA+B;AAyB/B;;GAEG;AACH,MAAM,UAAU,GACd,OAAO,CAAC,GAAG,CAAC,WAAW,KAAK,EAAE,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,KAAK,MAAM,CAAC;AACvE,IAAI,IAAA,YAAI,GAAE,IAAI,CAAC,UAAU,EAAE;IACxB,KAAa,CAAC,KAAK,GAAG,CAAC,CAAC;CAC1B;AAED,MAAM,SAAS;IAAf;QACW,cAAS,GAAG,GAAG,CAAC;QACzB,YAAO,GAAG,IAAI,CAAC;QACf,kBAAa,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/output.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +0,0 @@
|
|
|
1
|
-
import { ProjectGraph } from '../config/project-graph';
|
|
2
|
-
import { Task, TaskGraph } from '../config/task-graph';
|
|
3
|
-
import { TargetDependencyConfig } from '../config/workspace-json-project-json';
|
|
4
|
-
export declare class TaskGraphCreator {
|
|
5
|
-
private readonly projectGraph;
|
|
6
|
-
private readonly defaultTargetDependencies;
|
|
7
|
-
constructor(projectGraph: ProjectGraph, defaultTargetDependencies: Record<string, (TargetDependencyConfig | string)[]>);
|
|
8
|
-
createTaskGraph(tasks: Task[]): TaskGraph;
|
|
9
|
-
private addTaskDependencies;
|
|
10
|
-
private addDependencies;
|
|
11
|
-
private findTask;
|
|
12
|
-
private addTaskToGraph;
|
|
13
|
-
}
|
|
@@ -1,71 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.TaskGraphCreator = void 0;
|
|
4
|
-
const utils_1 = require("./utils");
|
|
5
|
-
class TaskGraphCreator {
|
|
6
|
-
constructor(projectGraph, defaultTargetDependencies) {
|
|
7
|
-
this.projectGraph = projectGraph;
|
|
8
|
-
this.defaultTargetDependencies = defaultTargetDependencies;
|
|
9
|
-
}
|
|
10
|
-
createTaskGraph(tasks) {
|
|
11
|
-
const graph = {
|
|
12
|
-
roots: [],
|
|
13
|
-
tasks: {},
|
|
14
|
-
dependencies: {},
|
|
15
|
-
};
|
|
16
|
-
for (const task of tasks) {
|
|
17
|
-
this.addTaskToGraph(task, graph);
|
|
18
|
-
const dependencyConfigs = (0, utils_1.getDependencyConfigs)(task.target, this.defaultTargetDependencies, this.projectGraph);
|
|
19
|
-
if (!dependencyConfigs) {
|
|
20
|
-
continue;
|
|
21
|
-
}
|
|
22
|
-
this.addTaskDependencies(task, dependencyConfigs, tasks, graph);
|
|
23
|
-
}
|
|
24
|
-
graph.roots = Object.keys(graph.dependencies).filter((k) => graph.dependencies[k].length === 0);
|
|
25
|
-
return graph;
|
|
26
|
-
}
|
|
27
|
-
addTaskDependencies(task, dependencyConfigs, tasks, graph) {
|
|
28
|
-
for (const dependencyConfig of dependencyConfigs) {
|
|
29
|
-
if (dependencyConfig.projects === 'self') {
|
|
30
|
-
for (const t of tasks) {
|
|
31
|
-
if (t.target.project === task.target.project &&
|
|
32
|
-
t.target.target === dependencyConfig.target) {
|
|
33
|
-
graph.dependencies[task.id].push(t.id);
|
|
34
|
-
}
|
|
35
|
-
}
|
|
36
|
-
}
|
|
37
|
-
else if (dependencyConfig.projects === 'dependencies') {
|
|
38
|
-
const seen = new Set();
|
|
39
|
-
this.addDependencies(task.target.project, dependencyConfig.target, tasks, graph, task.id, seen);
|
|
40
|
-
}
|
|
41
|
-
}
|
|
42
|
-
}
|
|
43
|
-
addDependencies(project, target, tasks, graph, taskId, seen) {
|
|
44
|
-
seen.add(project);
|
|
45
|
-
const dependencies = this.projectGraph.dependencies[project];
|
|
46
|
-
if (dependencies) {
|
|
47
|
-
const projectDependencies = dependencies.map((dependency) => dependency.target);
|
|
48
|
-
for (const projectDependency of projectDependencies) {
|
|
49
|
-
if (seen.has(projectDependency)) {
|
|
50
|
-
continue;
|
|
51
|
-
}
|
|
52
|
-
const dependency = this.findTask({ project: projectDependency, target }, tasks);
|
|
53
|
-
if (dependency) {
|
|
54
|
-
graph.dependencies[taskId].push(dependency.id);
|
|
55
|
-
}
|
|
56
|
-
else {
|
|
57
|
-
this.addDependencies(projectDependency, target, tasks, graph, taskId, seen);
|
|
58
|
-
}
|
|
59
|
-
}
|
|
60
|
-
}
|
|
61
|
-
}
|
|
62
|
-
findTask({ project, target }, tasks) {
|
|
63
|
-
return tasks.find((t) => t.target.project === project && t.target.target === target);
|
|
64
|
-
}
|
|
65
|
-
addTaskToGraph(task, graph) {
|
|
66
|
-
graph.tasks[task.id] = task;
|
|
67
|
-
graph.dependencies[task.id] = [];
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
|
-
exports.TaskGraphCreator = TaskGraphCreator;
|
|
71
|
-
//# sourceMappingURL=task-graph-creator.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"task-graph-creator.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/task-graph-creator.ts"],"names":[],"mappings":";;;AAEA,mCAA+C;AAG/C,MAAa,gBAAgB;IAC3B,YACmB,YAA0B,EAC1B,yBAGhB;QAJgB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,8BAAyB,GAAzB,yBAAyB,CAGzC;IACA,CAAC;IAEJ,eAAe,CAAC,KAAa;QAC3B,MAAM,KAAK,GAAc;YACvB,KAAK,EAAE,EAAE;YACT,KAAK,EAAE,EAAE;YACT,YAAY,EAAE,EAAE;SACjB,CAAC;QACF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAEjC,MAAM,iBAAiB,GAAG,IAAA,4BAAoB,EAC5C,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,yBAAyB,EAC9B,IAAI,CAAC,YAAY,CAClB,CAAC;YAEF,IAAI,CAAC,iBAAiB,EAAE;gBACtB,SAAS;aACV;YAED,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;SACjE;QAED,KAAK,CAAC,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,MAAM,CAClD,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAC1C,CAAC;QAEF,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,mBAAmB,CACzB,IAAU,EACV,iBAA2C,EAC3C,KAAa,EACb,KAAgB;QAEhB,KAAK,MAAM,gBAAgB,IAAI,iBAAiB,EAAE;YAChD,IAAI,gBAAgB,CAAC,QAAQ,KAAK,MAAM,EAAE;gBACxC,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE;oBACrB,IACE,CAAC,CAAC,MAAM,CAAC,OAAO,KAAK,IAAI,CAAC,MAAM,CAAC,OAAO;wBACxC,CAAC,CAAC,MAAM,CAAC,MAAM,KAAK,gBAAgB,CAAC,MAAM,EAC3C;wBACA,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;qBACxC;iBACF;aACF;iBAAM,IAAI,gBAAgB,CAAC,QAAQ,KAAK,cAAc,EAAE;gBACvD,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;gBAE/B,IAAI,CAAC,eAAe,CAClB,IAAI,CAAC,MAAM,CAAC,OAAO,EACnB,gBAAgB,CAAC,MAAM,EACvB,KAAK,EACL,KAAK,EACL,IAAI,CAAC,EAAE,EACP,IAAI,CACL,CAAC;aACH;SACF;IACH,CAAC;IAEO,eAAe,CACrB,OAAe,EACf,MAAc,EACd,KAAa,EACb,KAAgB,EAChB,MAAc,EACd,IAAiB;QAEjB,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAClB,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAC7D,IAAI,YAAY,EAAE;YAChB,MAAM,mBAAmB,GAAG,YAAY,CAAC,GAAG,CAC1C,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,CAClC,CAAC;YACF,KAAK,MAAM,iBAAiB,IAAI,mBAAmB,EAAE;gBACnD,IAAI,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE;oBAC/B,SAAS;iBACV;gBACD,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAC9B,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,EAAE,EACtC,KAAK,CACN,CAAC;gBACF,IAAI,UAAU,EAAE;oBACd,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;iBAChD;qBAAM;oBACL,IAAI,CAAC,eAAe,CAClB,iBAAiB,EACjB,MAAM,EACN,KAAK,EACL,KAAK,EACL,MAAM,EACN,IAAI,CACL,CAAC;iBACH;aACF;SACF;IACH,CAAC;IAEO,QAAQ,CACd,EAAE,OAAO,EAAE,MAAM,EAAuC,EACxD,KAAa;QAEb,OAAO,KAAK,CAAC,IAAI,CACf,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,KAAK,OAAO,IAAI,CAAC,CAAC,MAAM,CAAC,MAAM,KAAK,MAAM,CAClE,CAAC;IACJ,CAAC;IAEO,cAAc,CAAC,IAAU,EAAE,KAAgB;QACjD,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC;QAC5B,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;IACnC,CAAC;CACF;AAxHD,4CAwHC"}
|