@nrwl/workspace 13.5.0-beta.1 → 13.5.0-beta.5
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +2 -75
- package/migrations.json +9 -0
- package/package.json +7 -7
- package/src/command-line/list.d.ts +4 -15
- package/src/command-line/list.js +2 -10
- package/src/command-line/list.js.map +1 -1
- package/src/command-line/nx-commands.js +9 -1
- package/src/command-line/nx-commands.js.map +1 -1
- package/src/command-line/report.js +0 -1
- package/src/command-line/report.js.map +1 -1
- package/src/command-line/utils.js +1 -0
- package/src/command-line/utils.js.map +1 -1
- package/src/core/affected-project-graph/locators/tsconfig-json-changes.js +8 -10
- package/src/core/affected-project-graph/locators/tsconfig-json-changes.js.map +1 -1
- package/src/core/file-map-utils.js +41 -54
- package/src/core/file-map-utils.js.map +1 -1
- package/src/core/file-utils.d.ts +1 -2
- package/src/core/file-utils.js +1 -15
- package/src/core/file-utils.js.map +1 -1
- package/src/core/hasher/hasher.js +22 -3
- package/src/core/hasher/hasher.js.map +1 -1
- package/src/core/project-graph/daemon/client/client.js +5 -2
- package/src/core/project-graph/daemon/client/client.js.map +1 -1
- package/src/core/project-graph/daemon/server/server.js +6 -0
- package/src/core/project-graph/daemon/server/server.js.map +1 -1
- package/src/core/project-graph/daemon/tmp-dir.d.ts +2 -0
- package/src/core/project-graph/daemon/tmp-dir.js +18 -3
- package/src/core/project-graph/daemon/tmp-dir.js.map +1 -1
- package/src/core/project-graph/operators.d.ts +0 -1
- package/src/core/project-graph/operators.js +1 -7
- package/src/core/project-graph/operators.js.map +1 -1
- package/src/core/project-graph/project-graph.js +48 -18
- package/src/core/project-graph/project-graph.js.map +1 -1
- package/src/core/target-project-locator.d.ts +2 -2
- package/src/core/target-project-locator.js +22 -17
- package/src/core/target-project-locator.js.map +1 -1
- package/src/executors/run-commands/run-commands.impl.js +3 -1
- package/src/executors/run-commands/run-commands.impl.js.map +1 -1
- package/src/generators/new/new.js +1 -2
- package/src/generators/new/new.js.map +1 -1
- package/src/generators/preset/files/pnpm-workspace/pnpm-workspace.yaml +2 -0
- package/src/generators/preset/preset.js +15 -12
- package/src/generators/preset/preset.js.map +1 -1
- package/src/generators/preset/schema.d.ts +2 -0
- package/src/generators/preset/schema.json +5 -0
- package/src/generators/utils/presets.d.ts +0 -1
- package/src/generators/utils/presets.js +0 -1
- package/src/generators/utils/presets.js.map +1 -1
- package/src/tasks-runner/default-tasks-runner.d.ts +1 -1
- package/src/tasks-runner/default-tasks-runner.js.map +1 -1
- package/src/tasks-runner/forked-process-task-runner.js +22 -18
- package/src/tasks-runner/forked-process-task-runner.js.map +1 -1
- package/src/tasks-runner/{life-cycles/life-cycle.d.ts → life-cycle.d.ts} +3 -4
- package/src/tasks-runner/{life-cycles/life-cycle.js → life-cycle.js} +2 -2
- package/src/tasks-runner/life-cycle.js.map +1 -0
- package/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.d.ts +1 -1
- package/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.js +23 -6
- package/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.js.map +1 -1
- package/src/tasks-runner/life-cycles/empty-terminal-output-life-cycle.d.ts +3 -3
- package/src/tasks-runner/life-cycles/empty-terminal-output-life-cycle.js +4 -1
- package/src/tasks-runner/life-cycles/empty-terminal-output-life-cycle.js.map +1 -1
- package/src/tasks-runner/life-cycles/static-run-many-terminal-output-life-cycle.d.ts +2 -3
- package/src/tasks-runner/life-cycles/static-run-many-terminal-output-life-cycle.js +4 -0
- package/src/tasks-runner/life-cycles/static-run-many-terminal-output-life-cycle.js.map +1 -1
- package/src/tasks-runner/life-cycles/static-run-one-terminal-output-life-cycle.d.ts +2 -3
- package/src/tasks-runner/life-cycles/static-run-one-terminal-output-life-cycle.js +8 -3
- package/src/tasks-runner/life-cycles/static-run-one-terminal-output-life-cycle.js.map +1 -1
- package/src/tasks-runner/life-cycles/task-profiling-life-cycle.d.ts +1 -1
- package/src/tasks-runner/life-cycles/task-timings-life-cycle.d.ts +1 -1
- package/src/tasks-runner/run-command.js +2 -2
- package/src/tasks-runner/run-command.js.map +1 -1
- package/src/tasks-runner/task-orchestrator.js +7 -5
- package/src/tasks-runner/task-orchestrator.js.map +1 -1
- package/src/tasks-runner/tasks-runner.d.ts +1 -1
- package/src/tasks-runner/tasks-runner.js.map +1 -1
- package/src/utilities/output.d.ts +2 -6
- package/src/utilities/output.js +11 -11
- package/src/utilities/output.js.map +1 -1
- package/src/utilities/plugins/community-plugins.d.ts +1 -1
- package/src/utilities/plugins/community-plugins.js +1 -2
- package/src/utilities/plugins/community-plugins.js.map +1 -1
- package/src/utilities/plugins/core-plugins.d.ts +1 -1
- package/src/utilities/plugins/core-plugins.js +1 -2
- package/src/utilities/plugins/core-plugins.js.map +1 -1
- package/src/utilities/plugins/installed-plugins.d.ts +2 -2
- package/src/utilities/plugins/installed-plugins.js +18 -13
- package/src/utilities/plugins/installed-plugins.js.map +1 -1
- package/src/utils/versions.d.ts +1 -1
- package/src/utils/versions.js +2 -2
- package/src/tasks-runner/life-cycles/life-cycle.js.map +0 -1
|
@@ -89,6 +89,9 @@ class StaticRunManyTerminalOutputLifeCycle {
|
|
|
89
89
|
else if (t.status === 'local-cache') {
|
|
90
90
|
this.cachedTasks.push(t.task);
|
|
91
91
|
}
|
|
92
|
+
else if (t.status === 'local-cache-kept-existing') {
|
|
93
|
+
this.cachedTasks.push(t.task);
|
|
94
|
+
}
|
|
92
95
|
else if (t.status === 'remote-cache') {
|
|
93
96
|
this.cachedTasks.push(t.task);
|
|
94
97
|
}
|
|
@@ -97,6 +100,7 @@ class StaticRunManyTerminalOutputLifeCycle {
|
|
|
97
100
|
printTaskTerminalOutput(task, cacheStatus, terminalOutput) {
|
|
98
101
|
const args = (0, utils_1.getCommandArgsForTask)(task);
|
|
99
102
|
output_1.output.logCommand(`${args.filter((a) => a !== 'run').join(' ')}`, cacheStatus);
|
|
103
|
+
output_1.output.addNewline();
|
|
100
104
|
process.stdout.write(terminalOutput);
|
|
101
105
|
}
|
|
102
106
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"static-run-many-terminal-output-life-cycle.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/tasks-runner/life-cycles/static-run-many-terminal-output-life-cycle.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"static-run-many-terminal-output-life-cycle.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/tasks-runner/life-cycles/static-run-many-terminal-output-life-cycle.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import type { Task } from '@nrwl/devkit';
|
|
2
|
-
import { TaskCacheStatus } from '../../utilities/output';
|
|
3
2
|
import { TaskStatus } from '../tasks-runner';
|
|
4
|
-
import type { LifeCycle } from '
|
|
3
|
+
import type { LifeCycle } from '../life-cycle';
|
|
5
4
|
/**
|
|
6
5
|
* The following life cycle's outputs are static, meaning no previous content
|
|
7
6
|
* is rewritten or modified as new outputs are added. It is therefore intended
|
|
@@ -29,5 +28,5 @@ export declare class StaticRunOneTerminalOutputLifeCycle implements LifeCycle {
|
|
|
29
28
|
status: TaskStatus;
|
|
30
29
|
code: number;
|
|
31
30
|
}[]): void;
|
|
32
|
-
printTaskTerminalOutput(task: Task,
|
|
31
|
+
printTaskTerminalOutput(task: Task, status: TaskStatus, terminalOutput: string): void;
|
|
33
32
|
}
|
|
@@ -78,16 +78,21 @@ class StaticRunOneTerminalOutputLifeCycle {
|
|
|
78
78
|
else if (t.status === 'local-cache') {
|
|
79
79
|
this.cachedTasks.push(t.task);
|
|
80
80
|
}
|
|
81
|
+
else if (t.status === 'local-cache-kept-existing') {
|
|
82
|
+
this.cachedTasks.push(t.task);
|
|
83
|
+
}
|
|
81
84
|
else if (t.status === 'remote-cache') {
|
|
82
85
|
this.cachedTasks.push(t.task);
|
|
83
86
|
}
|
|
84
87
|
}
|
|
85
88
|
}
|
|
86
|
-
printTaskTerminalOutput(task,
|
|
87
|
-
if (
|
|
89
|
+
printTaskTerminalOutput(task, status, terminalOutput) {
|
|
90
|
+
if (status === 'success' ||
|
|
91
|
+
status === 'failure' ||
|
|
88
92
|
task.target.project === this.initiatingProject) {
|
|
89
93
|
const args = (0, utils_1.getCommandArgsForTask)(task);
|
|
90
|
-
output_1.output.logCommand(`${args.filter((a) => a !== 'run').join(' ')}`,
|
|
94
|
+
output_1.output.logCommand(`${args.filter((a) => a !== 'run').join(' ')}`, status);
|
|
95
|
+
output_1.output.addNewline();
|
|
91
96
|
process.stdout.write(terminalOutput);
|
|
92
97
|
}
|
|
93
98
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"static-run-one-terminal-output-life-cycle.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/tasks-runner/life-cycles/static-run-one-terminal-output-life-cycle.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"static-run-one-terminal-output-life-cycle.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/tasks-runner/life-cycles/static-run-one-terminal-output-life-cycle.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ const fileutils_1 = require("../utilities/fileutils");
|
|
|
10
10
|
const project_graph_utils_1 = require("../utilities/project-graph-utils");
|
|
11
11
|
const output_1 = require("../utilities/output");
|
|
12
12
|
const utils_1 = require("./utils");
|
|
13
|
-
const life_cycle_1 = require("./life-
|
|
13
|
+
const life_cycle_1 = require("./life-cycle");
|
|
14
14
|
const static_run_many_terminal_output_life_cycle_1 = require("./life-cycles/static-run-many-terminal-output-life-cycle");
|
|
15
15
|
const static_run_one_terminal_output_life_cycle_1 = require("./life-cycles/static-run-one-terminal-output-life-cycle");
|
|
16
16
|
const empty_terminal_output_life_cycle_1 = require("./life-cycles/empty-terminal-output-life-cycle");
|
|
@@ -32,7 +32,7 @@ function getTerminalOutputLifeCycle(initiatingProject, terminalOutputStrategy, p
|
|
|
32
32
|
};
|
|
33
33
|
}
|
|
34
34
|
else if (shouldUseDynamicLifeCycle(tasks, runnerOptions) &&
|
|
35
|
-
process.env.NX_TASKS_RUNNER_DYNAMIC_OUTPUT
|
|
35
|
+
process.env.NX_TASKS_RUNNER_DYNAMIC_OUTPUT !== 'false') {
|
|
36
36
|
return yield (0, dynamic_run_many_terminal_output_life_cycle_1.createDynamicOutputRenderer)({
|
|
37
37
|
projectNames,
|
|
38
38
|
tasks,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-command.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/run-command.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"run-command.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/run-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,6 @@ const workspace_1 = require("@nrwl/tao/src/shared/workspace");
|
|
|
6
6
|
const perf_hooks_1 = require("perf_hooks");
|
|
7
7
|
const forked_process_task_runner_1 = require("./forked-process-task-runner");
|
|
8
8
|
const app_root_1 = require("@nrwl/tao/src/utils/app-root");
|
|
9
|
-
const output_1 = require("../utilities/output");
|
|
10
9
|
const cache_1 = require("./cache");
|
|
11
10
|
const utils_1 = require("./utils");
|
|
12
11
|
const tasks_schedule_1 = require("./tasks-schedule");
|
|
@@ -90,12 +89,15 @@ class TaskOrchestrator {
|
|
|
90
89
|
if (shouldCopyOutputsFromCache) {
|
|
91
90
|
yield this.cache.copyFilesFromCache(task.hash, cachedResult, outputs);
|
|
92
91
|
}
|
|
93
|
-
|
|
94
|
-
?
|
|
95
|
-
:
|
|
92
|
+
const status = cachedResult.remote
|
|
93
|
+
? 'remote-cache'
|
|
94
|
+
: shouldCopyOutputsFromCache
|
|
95
|
+
? 'local-cache-kept-existing'
|
|
96
|
+
: 'local-cache';
|
|
97
|
+
this.options.lifeCycle.printTaskTerminalOutput(task, status, cachedResult.terminalOutput);
|
|
96
98
|
return {
|
|
97
99
|
task,
|
|
98
|
-
status
|
|
100
|
+
status,
|
|
99
101
|
};
|
|
100
102
|
});
|
|
101
103
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-orchestrator.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/task-orchestrator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"task-orchestrator.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/task-orchestrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { Observable } from 'rxjs';
|
|
2
2
|
import type { NxJsonConfiguration, ProjectGraph, Task } from '@nrwl/devkit';
|
|
3
3
|
export type { Task } from '@nrwl/devkit';
|
|
4
|
-
export declare type TaskStatus = 'success' | 'failure' | 'skipped' | 'local-cache' | 'remote-cache';
|
|
4
|
+
export declare type TaskStatus = 'success' | 'failure' | 'skipped' | 'local-cache-kept-existing' | 'local-cache' | 'remote-cache';
|
|
5
5
|
/**
|
|
6
6
|
* @deprecated Return Promise<{[id: string]: TaskStatus}> from the tasks runner
|
|
7
7
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tasks-runner.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/tasks-runner.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"tasks-runner.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/tasks-runner.ts"],"names":[],"mappings":";;;AAcA;;;;GAIG;AACH,IAAY,iBAIX;AAJD,WAAY,iBAAiB;IAC3B,qDAAgC,CAAA;IAChC,uDAAkC,CAAA;IAClC,qEAAgD,CAAA;AAClD,CAAC,EAJW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAI5B"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import * as chalk from 'chalk';
|
|
2
|
+
import { TaskStatus } from '@nrwl/workspace/src/tasks-runner/tasks-runner';
|
|
2
3
|
export interface CLIErrorMessageConfig {
|
|
3
4
|
title: string;
|
|
4
5
|
bodyLines?: string[];
|
|
@@ -17,11 +18,6 @@ export interface CLISuccessMessageConfig {
|
|
|
17
18
|
title: string;
|
|
18
19
|
bodyLines?: string[];
|
|
19
20
|
}
|
|
20
|
-
export declare enum TaskCacheStatus {
|
|
21
|
-
NoCache = "[no cache]",
|
|
22
|
-
MatchedExistingOutput = "[existing outputs match the cache, left as is]",
|
|
23
|
-
RetrievedFromCache = "[retrieved from cache]"
|
|
24
|
-
}
|
|
25
21
|
declare class CLIOutput {
|
|
26
22
|
readonly X_PADDING = " ";
|
|
27
23
|
/**
|
|
@@ -56,7 +52,7 @@ declare class CLIOutput {
|
|
|
56
52
|
note({ title, bodyLines }: CLINoteMessageConfig): void;
|
|
57
53
|
success({ title, bodyLines }: CLISuccessMessageConfig): void;
|
|
58
54
|
logSingleLine(message: string): void;
|
|
59
|
-
logCommand(message: string,
|
|
55
|
+
logCommand(message: string, taskStatus?: TaskStatus): void;
|
|
60
56
|
log({ title, bodyLines, color }: CLIWarnMessageConfig & {
|
|
61
57
|
color?: string;
|
|
62
58
|
}): void;
|
package/src/utilities/output.js
CHANGED
|
@@ -1,15 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.output =
|
|
3
|
+
exports.output = void 0;
|
|
4
4
|
const chalk = require("chalk");
|
|
5
5
|
const os_1 = require("os");
|
|
6
6
|
const is_ci_1 = require("./is_ci");
|
|
7
|
-
var TaskCacheStatus;
|
|
8
|
-
(function (TaskCacheStatus) {
|
|
9
|
-
TaskCacheStatus["NoCache"] = "[no cache]";
|
|
10
|
-
TaskCacheStatus["MatchedExistingOutput"] = "[existing outputs match the cache, left as is]";
|
|
11
|
-
TaskCacheStatus["RetrievedFromCache"] = "[retrieved from cache]";
|
|
12
|
-
})(TaskCacheStatus = exports.TaskCacheStatus || (exports.TaskCacheStatus = {}));
|
|
13
7
|
/**
|
|
14
8
|
* Automatically disable styling applied by chalk if CI=true
|
|
15
9
|
*/
|
|
@@ -138,11 +132,17 @@ class CLIOutput {
|
|
|
138
132
|
});
|
|
139
133
|
this.addNewline();
|
|
140
134
|
}
|
|
141
|
-
logCommand(message,
|
|
135
|
+
logCommand(message, taskStatus) {
|
|
142
136
|
this.addNewline();
|
|
143
|
-
let commandOutput =
|
|
144
|
-
if (
|
|
145
|
-
commandOutput += ` ${chalk.grey(
|
|
137
|
+
let commandOutput = `${chalk.dim('> nx run')} ${message}`;
|
|
138
|
+
if (taskStatus === 'local-cache') {
|
|
139
|
+
commandOutput += ` ${chalk.grey('[local cache]')}`;
|
|
140
|
+
}
|
|
141
|
+
else if (taskStatus === 'remote-cache') {
|
|
142
|
+
commandOutput += ` ${chalk.grey('[remote cache]')}`;
|
|
143
|
+
}
|
|
144
|
+
else if (taskStatus === 'local-cache-kept-existing') {
|
|
145
|
+
commandOutput += ` ${chalk.grey('[existing outputs match the cache, left as is]')}`;
|
|
146
146
|
}
|
|
147
147
|
this.writeToStdOut(commandOutput);
|
|
148
148
|
this.addNewline();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/output.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,2BAAyB;AACzB,mCAA+B;
|
|
1
|
+
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/output.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { CommunityPlugin, PluginCapabilities } from './models';
|
|
2
2
|
export declare function fetchCommunityPlugins(): Promise<CommunityPlugin[]>;
|
|
3
|
-
export declare function listCommunityPlugins(installedPlugins:
|
|
3
|
+
export declare function listCommunityPlugins(installedPlugins: Map<string, PluginCapabilities>, communityPlugins?: CommunityPlugin[]): void;
|
|
@@ -35,8 +35,7 @@ exports.fetchCommunityPlugins = fetchCommunityPlugins;
|
|
|
35
35
|
function listCommunityPlugins(installedPlugins, communityPlugins) {
|
|
36
36
|
if (!communityPlugins)
|
|
37
37
|
return;
|
|
38
|
-
const
|
|
39
|
-
const availableCommunityPlugins = communityPlugins.filter((p) => !installedPluginsMap.has(p.name));
|
|
38
|
+
const availableCommunityPlugins = communityPlugins.filter((p) => !installedPlugins.has(p.name));
|
|
40
39
|
output_1.output.log({
|
|
41
40
|
title: `Community plugins:`,
|
|
42
41
|
bodyLines: availableCommunityPlugins.map((p) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"community-plugins.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/plugins/community-plugins.ts"],"names":[],"mappings":";;;;AAAA,iCAA4B;AAC5B,+BAA+B;AAC/B,sCAAmC;AAGnC,MAAM,0BAA0B,GAC9B,kFAAkF,CAAC;AAErF,SAAsB,qBAAqB;;QACzC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,GAAG,GAAG,IAAA,WAAG,EAAC,0BAA0B,EAAE,CAAC,GAAG,EAAE,EAAE;gBAClD,IAAI,GAAG,CAAC,UAAU,GAAG,GAAG,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,EAAE;oBACjD,MAAM,CAAC,IAAI,KAAK,CAAC,mCAAmC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;iBACxE;gBAED,MAAM,IAAI,GAAG,EAAE,CAAC;gBAChB,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;oBACvB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACnB,CAAC,CAAC,CAAC;gBACH,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;oBACjB,IAAI;wBACF,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;qBAC5D;oBAAC,OAAO,CAAC,EAAE;wBACV,MAAM,CAAC,CAAC,CAAC,CAAC;qBACX;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YACxB,GAAG,CAAC,GAAG,EAAE,CAAC;QACZ,CAAC,CAAC,CAAC;IACL,CAAC;CAAA;AAvBD,sDAuBC;AAED,SAAgB,oBAAoB,CAClC,
|
|
1
|
+
{"version":3,"file":"community-plugins.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/plugins/community-plugins.ts"],"names":[],"mappings":";;;;AAAA,iCAA4B;AAC5B,+BAA+B;AAC/B,sCAAmC;AAGnC,MAAM,0BAA0B,GAC9B,kFAAkF,CAAC;AAErF,SAAsB,qBAAqB;;QACzC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,GAAG,GAAG,IAAA,WAAG,EAAC,0BAA0B,EAAE,CAAC,GAAG,EAAE,EAAE;gBAClD,IAAI,GAAG,CAAC,UAAU,GAAG,GAAG,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,EAAE;oBACjD,MAAM,CAAC,IAAI,KAAK,CAAC,mCAAmC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;iBACxE;gBAED,MAAM,IAAI,GAAG,EAAE,CAAC;gBAChB,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;oBACvB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACnB,CAAC,CAAC,CAAC;gBACH,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;oBACjB,IAAI;wBACF,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;qBAC5D;oBAAC,OAAO,CAAC,EAAE;wBACV,MAAM,CAAC,CAAC,CAAC,CAAC;qBACX;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YACxB,GAAG,CAAC,GAAG,EAAE,CAAC;QACZ,CAAC,CAAC,CAAC;IACL,CAAC;CAAA;AAvBD,sDAuBC;AAED,SAAgB,oBAAoB,CAClC,gBAAiD,EACjD,gBAAoC;IAEpC,IAAI,CAAC,gBAAgB;QAAE,OAAO;IAE9B,MAAM,yBAAyB,GAAG,gBAAgB,CAAC,MAAM,CACvD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CACrC,CAAC;IAEF,eAAM,CAAC,GAAG,CAAC;QACT,KAAK,EAAE,oBAAoB;QAC3B,SAAS,EAAE,yBAAyB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YAC7C,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC;QACpD,CAAC,CAAC;KACH,CAAC,CAAC;AACL,CAAC;AAhBD,oDAgBC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { CorePlugin, PluginCapabilities } from './models';
|
|
2
2
|
export declare function fetchCorePlugins(): CorePlugin[];
|
|
3
|
-
export declare function listCorePlugins(installedPlugins:
|
|
3
|
+
export declare function listCorePlugins(installedPlugins: Map<string, PluginCapabilities>, corePlugins: CorePlugin[]): void;
|
|
@@ -62,8 +62,7 @@ function fetchCorePlugins() {
|
|
|
62
62
|
}
|
|
63
63
|
exports.fetchCorePlugins = fetchCorePlugins;
|
|
64
64
|
function listCorePlugins(installedPlugins, corePlugins) {
|
|
65
|
-
const
|
|
66
|
-
const alsoAvailable = corePlugins.filter((p) => !installedPluginsMap.has(p.name));
|
|
65
|
+
const alsoAvailable = corePlugins.filter((p) => !installedPlugins.has(p.name));
|
|
67
66
|
if (alsoAvailable.length) {
|
|
68
67
|
output_1.output.log({
|
|
69
68
|
title: `Also available:`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core-plugins.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/plugins/core-plugins.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,sCAAmC;AAGnC,SAAgB,gBAAgB;IAC9B,MAAM,WAAW,GAAiB;QAChC;YACE,IAAI,EAAE,eAAe;YACrB,YAAY,EAAE,YAAY;SAC3B;QACD;YACE,IAAI,EAAE,eAAe;YACrB,YAAY,EAAE,sBAAsB;SACrC;QACD;YACE,IAAI,EAAE,eAAe;YACrB,YAAY,EAAE,sBAAsB;SACrC;QACD;YACE,IAAI,EAAE,YAAY;YAClB,YAAY,EAAE,sBAAsB;SACrC;QACD;YACE,IAAI,EAAE,cAAc;YACpB,YAAY,EAAE,WAAW;SAC1B;QACD;YACE,IAAI,EAAE,YAAY;YAClB,YAAY,EAAE,sBAAsB;SACrC;QACD;YACE,IAAI,EAAE,YAAY;YAClB,YAAY,EAAE,sBAAsB;SACrC;QACD;YACE,IAAI,EAAE,YAAY;YAClB,YAAY,EAAE,sBAAsB;SACrC;QACD;YACE,IAAI,EAAE,iBAAiB;YACvB,YAAY,EAAE,sBAAsB;SACrC;QACD;YACE,IAAI,EAAE,aAAa;YACnB,YAAY,EAAE,sBAAsB;SACrC;QACD;YACE,IAAI,EAAE,iBAAiB;YACvB,YAAY,EAAE,sBAAsB;SACrC;QACD;YACE,IAAI,EAAE,WAAW;YACjB,YAAY,EAAE,sBAAsB;SACrC;QACD;YACE,IAAI,EAAE,iBAAiB;YACvB,YAAY,EAAE,sBAAsB;SACrC;KACF,CAAC;IACF,OAAO,WAAW,CAAC;AACrB,CAAC;AAxDD,4CAwDC;AAED,SAAgB,eAAe,CAC7B,
|
|
1
|
+
{"version":3,"file":"core-plugins.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/plugins/core-plugins.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,sCAAmC;AAGnC,SAAgB,gBAAgB;IAC9B,MAAM,WAAW,GAAiB;QAChC;YACE,IAAI,EAAE,eAAe;YACrB,YAAY,EAAE,YAAY;SAC3B;QACD;YACE,IAAI,EAAE,eAAe;YACrB,YAAY,EAAE,sBAAsB;SACrC;QACD;YACE,IAAI,EAAE,eAAe;YACrB,YAAY,EAAE,sBAAsB;SACrC;QACD;YACE,IAAI,EAAE,YAAY;YAClB,YAAY,EAAE,sBAAsB;SACrC;QACD;YACE,IAAI,EAAE,cAAc;YACpB,YAAY,EAAE,WAAW;SAC1B;QACD;YACE,IAAI,EAAE,YAAY;YAClB,YAAY,EAAE,sBAAsB;SACrC;QACD;YACE,IAAI,EAAE,YAAY;YAClB,YAAY,EAAE,sBAAsB;SACrC;QACD;YACE,IAAI,EAAE,YAAY;YAClB,YAAY,EAAE,sBAAsB;SACrC;QACD;YACE,IAAI,EAAE,iBAAiB;YACvB,YAAY,EAAE,sBAAsB;SACrC;QACD;YACE,IAAI,EAAE,aAAa;YACnB,YAAY,EAAE,sBAAsB;SACrC;QACD;YACE,IAAI,EAAE,iBAAiB;YACvB,YAAY,EAAE,sBAAsB;SACrC;QACD;YACE,IAAI,EAAE,WAAW;YACjB,YAAY,EAAE,sBAAsB;SACrC;QACD;YACE,IAAI,EAAE,iBAAiB;YACvB,YAAY,EAAE,sBAAsB;SACrC;KACF,CAAC;IACF,OAAO,WAAW,CAAC;AACrB,CAAC;AAxDD,4CAwDC;AAED,SAAgB,eAAe,CAC7B,gBAAiD,EACjD,WAAyB;IAEzB,MAAM,aAAa,GAAG,WAAW,CAAC,MAAM,CACtC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CACrC,CAAC;IAEF,IAAI,aAAa,CAAC,MAAM,EAAE;QACxB,eAAM,CAAC,GAAG,CAAC;YACT,KAAK,EAAE,iBAAiB;YACxB,SAAS,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBACjC,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,YAAY,GAAG,CAAC;YACrD,CAAC,CAAC;SACH,CAAC,CAAC;KACJ;AACH,CAAC;AAhBD,0CAgBC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { CommunityPlugin, CorePlugin, PluginCapabilities } from './models';
|
|
2
|
-
export declare function getInstalledPluginsFromPackageJson(workspaceRoot: string, corePlugins: CorePlugin[], communityPlugins?: CommunityPlugin[]):
|
|
3
|
-
export declare function listInstalledPlugins(installedPlugins: PluginCapabilities
|
|
2
|
+
export declare function getInstalledPluginsFromPackageJson(workspaceRoot: string, corePlugins: CorePlugin[], communityPlugins?: CommunityPlugin[]): Map<string, PluginCapabilities>;
|
|
3
|
+
export declare function listInstalledPlugins(installedPlugins: Map<string, PluginCapabilities>): void;
|
|
@@ -14,7 +14,7 @@ function getInstalledPluginsFromPackageJson(workspaceRoot, corePlugins, communit
|
|
|
14
14
|
...Object.keys(packageJson.dependencies || {}),
|
|
15
15
|
...Object.keys(packageJson.devDependencies || {}),
|
|
16
16
|
]);
|
|
17
|
-
return Array.from(plugins)
|
|
17
|
+
return new Map(Array.from(plugins)
|
|
18
18
|
.filter((name) => {
|
|
19
19
|
try {
|
|
20
20
|
// Check for `package.json` existence instead of requiring the module itself
|
|
@@ -27,23 +27,28 @@ function getInstalledPluginsFromPackageJson(workspaceRoot, corePlugins, communit
|
|
|
27
27
|
}
|
|
28
28
|
})
|
|
29
29
|
.sort()
|
|
30
|
-
.map((name) =>
|
|
31
|
-
|
|
30
|
+
.map((name) => [
|
|
31
|
+
name,
|
|
32
|
+
(0, plugin_capabilities_1.getPluginCapabilities)(workspaceRoot, name),
|
|
33
|
+
])
|
|
34
|
+
.filter(([, x]) => x && !!(x.generators || x.executors)));
|
|
32
35
|
}
|
|
33
36
|
exports.getInstalledPluginsFromPackageJson = getInstalledPluginsFromPackageJson;
|
|
34
37
|
function listInstalledPlugins(installedPlugins) {
|
|
38
|
+
const bodyLines = [];
|
|
39
|
+
for (const [, p] of installedPlugins) {
|
|
40
|
+
const capabilities = [];
|
|
41
|
+
if ((0, shared_1.hasElements)(p.executors)) {
|
|
42
|
+
capabilities.push('executors');
|
|
43
|
+
}
|
|
44
|
+
if ((0, shared_1.hasElements)(p.generators)) {
|
|
45
|
+
capabilities.push('generators');
|
|
46
|
+
}
|
|
47
|
+
bodyLines.push(`${chalk.bold(p.name)} (${capabilities.join()})`);
|
|
48
|
+
}
|
|
35
49
|
output_1.output.log({
|
|
36
50
|
title: `Installed plugins:`,
|
|
37
|
-
bodyLines:
|
|
38
|
-
const capabilities = [];
|
|
39
|
-
if ((0, shared_1.hasElements)(p.executors)) {
|
|
40
|
-
capabilities.push('builders');
|
|
41
|
-
}
|
|
42
|
-
if ((0, shared_1.hasElements)(p.generators)) {
|
|
43
|
-
capabilities.push('generators');
|
|
44
|
-
}
|
|
45
|
-
return `${chalk.bold(p.name)} (${capabilities.join()})`;
|
|
46
|
-
}),
|
|
51
|
+
bodyLines: bodyLines,
|
|
47
52
|
});
|
|
48
53
|
}
|
|
49
54
|
exports.listInstalledPlugins = listInstalledPlugins;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installed-plugins.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/plugins/installed-plugins.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,yCAA4C;AAC5C,sCAAmC;AAEnC,+DAA8D;AAC9D,qCAAuC;AAEvC,SAAgB,kCAAkC,CAChD,aAAqB,EACrB,WAAyB,EACzB,mBAAsC,EAAE;IAExC,MAAM,WAAW,GAAG,IAAA,qBAAY,EAAC,GAAG,aAAa,eAAe,CAAC,CAAC;IAElE,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC;QACtB,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QACjC,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QACtC,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC;QAC9C,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,IAAI,EAAE,CAAC;KAClD,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"installed-plugins.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/plugins/installed-plugins.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,yCAA4C;AAC5C,sCAAmC;AAEnC,+DAA8D;AAC9D,qCAAuC;AAEvC,SAAgB,kCAAkC,CAChD,aAAqB,EACrB,WAAyB,EACzB,mBAAsC,EAAE;IAExC,MAAM,WAAW,GAAG,IAAA,qBAAY,EAAC,GAAG,aAAa,eAAe,CAAC,CAAC;IAElE,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC;QACtB,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QACjC,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QACtC,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC;QAC9C,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,IAAI,EAAE,CAAC;KAClD,CAAC,CAAC;IAEH,OAAO,IAAI,GAAG,CACZ,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC;SAChB,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;QACf,IAAI;YACF,4EAA4E;YAC5E,qEAAqE;YACrE,OAAO,CAAC,OAAO,CAAC,GAAG,IAAI,eAAe,EAAE,EAAE,KAAK,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YACpE,OAAO,IAAI,CAAC;SACb;QAAC,WAAM;YACN,OAAO,KAAK,CAAC;SACd;IACH,CAAC,CAAC;SACD,IAAI,EAAE;SACN,GAAG,CAA+B,CAAC,IAAI,EAAE,EAAE,CAAC;QAC3C,IAAI;QACJ,IAAA,2CAAqB,EAAC,aAAa,EAAE,IAAI,CAAC;KAC3C,CAAC;SACD,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,CAC3D,CAAC;AACJ,CAAC;AAjCD,gFAiCC;AAED,SAAgB,oBAAoB,CAClC,gBAAiD;IAEjD,MAAM,SAAS,GAAa,EAAE,CAAC;IAE/B,KAAK,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,gBAAgB,EAAE;QACpC,MAAM,YAAY,GAAG,EAAE,CAAC;QACxB,IAAI,IAAA,oBAAW,EAAC,CAAC,CAAC,SAAS,CAAC,EAAE;YAC5B,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SAChC;QACD,IAAI,IAAA,oBAAW,EAAC,CAAC,CAAC,UAAU,CAAC,EAAE;YAC7B,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;SACjC;QACD,SAAS,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,YAAY,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;KAClE;IAED,eAAM,CAAC,GAAG,CAAC;QACT,KAAK,EAAE,oBAAoB;QAC3B,SAAS,EAAE,SAAS;KACrB,CAAC,CAAC;AACL,CAAC;AApBD,oDAoBC"}
|
package/src/utils/versions.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export declare const nxVersion = "*";
|
|
2
2
|
export declare const angularCliVersion = "~13.1.0";
|
|
3
3
|
export declare const typescriptVersion = "~4.4.3";
|
|
4
|
-
export declare const prettierVersion = "^2.
|
|
4
|
+
export declare const prettierVersion = "^2.5.1";
|
|
5
5
|
export declare const tslintVersion = "~6.1.0";
|
|
6
6
|
export declare const typescriptESLintVersion = "~5.3.0";
|
|
7
7
|
export declare const eslintVersion = "8.2.0";
|
package/src/utils/versions.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.eslintConfigPrettierVersion = exports.eslintVersion = exports.typescriptESLintVersion = exports.tslintVersion = exports.prettierVersion = exports.typescriptVersion = exports.angularCliVersion = exports.nxVersion = void 0;
|
|
4
|
-
exports.nxVersion = '13.5.0-beta.
|
|
4
|
+
exports.nxVersion = '13.5.0-beta.5';
|
|
5
5
|
exports.angularCliVersion = '~13.1.0';
|
|
6
6
|
exports.typescriptVersion = '~4.4.3';
|
|
7
|
-
exports.prettierVersion = '^2.
|
|
7
|
+
exports.prettierVersion = '^2.5.1';
|
|
8
8
|
exports.tslintVersion = '~6.1.0';
|
|
9
9
|
exports.typescriptESLintVersion = '~5.3.0';
|
|
10
10
|
exports.eslintVersion = '8.2.0';
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"life-cycle.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/tasks-runner/life-cycles/life-cycle.ts"],"names":[],"mappings":";;;AA+CA,MAAa,kBAAkB;IAC7B,YAA6B,UAAuB;QAAvB,eAAU,GAAV,UAAU,CAAa;IAAG,CAAC;IAExD,YAAY;QACV,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,YAAY,EAAE;gBAClB,CAAC,CAAC,YAAY,EAAE,CAAC;aAClB;SACF;IACH,CAAC;IAED,UAAU;QACR,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,UAAU,EAAE;gBAChB,CAAC,CAAC,UAAU,EAAE,CAAC;aAChB;SACF;IACH,CAAC;IAED,YAAY,CAAC,IAAU;QACrB,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,YAAY,EAAE;gBAClB,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;aACtB;SACF;IACH,CAAC;IAED,SAAS,CAAC,IAAU;QAClB,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,SAAS,EAAE;gBACf,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;aACnB;SACF;IACH,CAAC;IAED,OAAO,CAAC,IAAU,EAAE,IAAY;QAC9B,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,OAAO,EAAE;gBACb,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;aACvB;SACF;IACH,CAAC;IAED,UAAU,CAAC,KAAa,EAAE,QAAsB;QAC9C,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,UAAU,EAAE;gBAChB,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;aAC/B;iBAAM,IAAI,CAAC,CAAC,SAAS,EAAE;gBACtB,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;aACtC;SACF;IACH,CAAC;IAED,QAAQ,CAAC,WAAyB,EAAE,QAAsB;QACxD,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,QAAQ,EAAE;gBACd,CAAC,CAAC,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;aACnC;iBAAM,IAAI,CAAC,CAAC,OAAO,EAAE;gBACpB,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;aACvD;SACF;IACH,CAAC;IAED,uBAAuB,CACrB,IAAU,EACV,WAA4B,EAC5B,MAAc;QAEd,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,CAAC,uBAAuB,EAAE;gBAC7B,CAAC,CAAC,uBAAuB,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;aACtD;SACF;IACH,CAAC;CACF;AA1ED,gDA0EC"}
|