nx 14.0.3 → 14.1.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/executors.json +5 -0
- package/migrations.json +8 -1
- package/package.json +4 -4
- package/src/adapter/ngcli-adapter.d.ts +1 -1
- package/src/adapter/ngcli-adapter.js +10 -8
- package/src/adapter/ngcli-adapter.js.map +1 -1
- package/src/command-line/generate.js +1 -1
- package/src/command-line/generate.js.map +1 -1
- package/src/command-line/migrate.js +15 -20
- package/src/command-line/migrate.js.map +1 -1
- package/src/command-line/nx-commands.d.ts +1 -0
- package/src/command-line/nx-commands.js +7 -12
- package/src/command-line/nx-commands.js.map +1 -1
- package/src/command-line/workspace-generators.js +2 -0
- package/src/command-line/workspace-generators.js.map +1 -1
- package/src/config/misc-interfaces.d.ts +12 -3
- package/src/config/nx-json.d.ts +1 -8
- package/src/config/project-graph.d.ts +1 -1
- package/src/config/workspace-json-project-json.d.ts +1 -1
- package/src/config/workspaces.js +11 -3
- package/src/config/workspaces.js.map +1 -1
- package/src/core/dep-graph/main.esm.js +1 -1
- package/src/daemon/client/client.js +3 -0
- package/src/daemon/client/client.js.map +1 -1
- package/src/executors/noop/noop.impl.d.ts +3 -0
- package/src/executors/noop/noop.impl.js +10 -0
- package/src/executors/noop/noop.impl.js.map +1 -0
- package/src/executors/noop/schema.json +9 -0
- package/src/executors/run-commands/run-commands.impl.d.ts +39 -0
- package/src/executors/run-commands/run-commands.impl.js +226 -0
- package/src/executors/run-commands/run-commands.impl.js.map +1 -0
- package/src/executors/run-commands/schema.json +132 -0
- package/src/generators/internal-utils/format-changed-files-with-prettier-if-available.d.ts +6 -0
- package/src/generators/internal-utils/format-changed-files-with-prettier-if-available.js +46 -0
- package/src/generators/internal-utils/format-changed-files-with-prettier-if-available.js.map +1 -0
- package/src/generators/testing-utils/create-tree-with-empty-workspace.d.ts +5 -0
- package/src/generators/testing-utils/create-tree-with-empty-workspace.js +35 -0
- package/src/generators/testing-utils/create-tree-with-empty-workspace.js.map +1 -0
- package/src/generators/testing-utils/create-tree.d.ts +5 -0
- package/src/generators/testing-utils/create-tree.js +12 -0
- package/src/generators/testing-utils/create-tree.js.map +1 -0
- package/src/{config → generators}/tree.d.ts +0 -0
- package/src/{config → generators}/tree.js +0 -0
- package/src/generators/tree.js.map +1 -0
- package/src/generators/utils/json.d.ts +28 -0
- package/src/generators/utils/json.js +49 -0
- package/src/generators/utils/json.js.map +1 -0
- package/src/generators/utils/project-configuration.d.ts +77 -0
- package/src/generators/utils/project-configuration.js +383 -0
- package/src/generators/utils/project-configuration.js.map +1 -0
- package/src/migrations/update-14-0-6/remove-roots.d.ts +2 -0
- package/src/migrations/update-14-0-6/remove-roots.js +16 -0
- package/src/migrations/update-14-0-6/remove-roots.js.map +1 -0
- package/src/project-graph/build-project-graph.js +20 -17
- package/src/project-graph/build-project-graph.js.map +1 -1
- package/src/project-graph/operators.d.ts +0 -8
- package/src/project-graph/operators.js +1 -12
- package/src/project-graph/operators.js.map +1 -1
- package/src/tasks-runner/run-command.d.ts +1 -1
- package/src/tasks-runner/run-command.js +5 -24
- package/src/tasks-runner/run-command.js.map +1 -1
- package/src/tasks-runner/task-graph-creator.d.ts +1 -1
- package/src/tasks-runner/utils.d.ts +2 -2
- package/src/tasks-runner/utils.js +12 -2
- package/src/tasks-runner/utils.js.map +1 -1
- package/src/utils/nx-plugin.js +12 -3
- package/src/utils/nx-plugin.js.map +1 -1
- package/src/utils/package-json.d.ts +1 -1
- package/src/utils/package-manager.d.ts +4 -1
- package/src/utils/package-manager.js +14 -10
- package/src/utils/package-manager.js.map +1 -1
- package/src/utils/versions.js +1 -1
- package/src/config/tree.js.map +0 -1
|
@@ -13,6 +13,7 @@ const output_1 = require("../../utils/output");
|
|
|
13
13
|
const cache_1 = require("../cache");
|
|
14
14
|
const socket_utils_1 = require("../socket-utils");
|
|
15
15
|
const tmp_dir_1 = require("../tmp-dir");
|
|
16
|
+
const DAEMON_ENV_SETTINGS = Object.assign(Object.assign({}, process.env), { NX_PROJECT_GLOB_CACHE: 'false' });
|
|
16
17
|
function startInBackground() {
|
|
17
18
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
18
19
|
yield (0, cache_1.safelyCleanUpExistingProcess)();
|
|
@@ -26,6 +27,7 @@ function startInBackground() {
|
|
|
26
27
|
detached: true,
|
|
27
28
|
windowsHide: true,
|
|
28
29
|
shell: false,
|
|
30
|
+
env: DAEMON_ENV_SETTINGS,
|
|
29
31
|
});
|
|
30
32
|
backgroundProcess.unref();
|
|
31
33
|
// Persist metadata about the background process so that it can be cleaned up later if needed
|
|
@@ -80,6 +82,7 @@ function startInCurrentProcess() {
|
|
|
80
82
|
(0, child_process_1.spawnSync)(process.execPath, [(0, path_1.join)(__dirname, '../server/start.js')], {
|
|
81
83
|
cwd: app_root_1.workspaceRoot,
|
|
82
84
|
stdio: 'inherit',
|
|
85
|
+
env: DAEMON_ENV_SETTINGS,
|
|
83
86
|
});
|
|
84
87
|
}
|
|
85
88
|
exports.startInCurrentProcess = startInCurrentProcess;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/client/client.ts"],"names":[],"mappings":";;;;AAAA,mDAAqD;AACrD,iDAA+D;AAC/D,2BAA4C;AAC5C,uCAAyD;AACzD,6BAA8B;AAC9B,+BAA4B;AAC5B,2CAAyC;AACzC,+CAA4C;AAC5C,oCAGkB;AAClB,kDAAwE;AACxE,wCAGoB;AAGpB,SAAsB,iBAAiB;;QACrC,MAAM,IAAA,oCAA4B,GAAE,CAAC;QACrC,IAAA,wBAAa,EAAC,0CAAgC,CAAC,CAAC;QAChD,IAAA,yBAAc,EAAC,gCAAsB,CAAC,CAAC;QAEvC,MAAM,GAAG,GAAG,IAAA,aAAQ,EAAC,gCAAsB,EAAE,GAAG,CAAC,CAAC;QAClD,MAAM,GAAG,GAAG,IAAA,aAAQ,EAAC,gCAAsB,EAAE,GAAG,CAAC,CAAC;QAClD,MAAM,iBAAiB,GAAG,IAAA,qBAAK,EAC7B,OAAO,CAAC,QAAQ,EAChB,CAAC,IAAA,WAAI,EAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC,EACvC;YACE,GAAG,EAAE,wBAAa;YAClB,KAAK,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,GAAG,CAAC;YAC3B,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,IAAI;YACjB,KAAK,EAAE,KAAK;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/client/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
function default_1() {
|
|
5
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
6
|
+
return { success: true };
|
|
7
|
+
});
|
|
8
|
+
}
|
|
9
|
+
exports.default = default_1;
|
|
10
|
+
//# sourceMappingURL=noop.impl.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"noop.impl.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/executors/noop/noop.impl.ts"],"names":[],"mappings":";;;AAAA;;QACE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;CAAA;AAFD,4BAEC"}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import { ExecutorContext } from '../../config/misc-interfaces';
|
|
2
|
+
export declare const LARGE_BUFFER: number;
|
|
3
|
+
export declare type Json = {
|
|
4
|
+
[k: string]: any;
|
|
5
|
+
};
|
|
6
|
+
export interface RunCommandsOptions extends Json {
|
|
7
|
+
command?: string;
|
|
8
|
+
commands?: ({
|
|
9
|
+
command: string;
|
|
10
|
+
forwardAllArgs?: boolean;
|
|
11
|
+
/**
|
|
12
|
+
* description was added to allow users to document their commands inline,
|
|
13
|
+
* it is not intended to be used as part of the execution of the command.
|
|
14
|
+
*/
|
|
15
|
+
description?: string;
|
|
16
|
+
prefix?: string;
|
|
17
|
+
color?: string;
|
|
18
|
+
bgColor?: string;
|
|
19
|
+
} | string)[];
|
|
20
|
+
color?: boolean;
|
|
21
|
+
parallel?: boolean;
|
|
22
|
+
readyWhen?: string;
|
|
23
|
+
cwd?: string;
|
|
24
|
+
args?: string;
|
|
25
|
+
envFile?: string;
|
|
26
|
+
outputPath?: string;
|
|
27
|
+
}
|
|
28
|
+
export interface NormalizedRunCommandsOptions extends RunCommandsOptions {
|
|
29
|
+
commands: {
|
|
30
|
+
command: string;
|
|
31
|
+
forwardAllArgs?: boolean;
|
|
32
|
+
}[];
|
|
33
|
+
parsedArgs: {
|
|
34
|
+
[k: string]: any;
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
export default function (options: RunCommandsOptions, context: ExecutorContext): Promise<{
|
|
38
|
+
success: boolean;
|
|
39
|
+
}>;
|
|
@@ -0,0 +1,226 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.LARGE_BUFFER = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const child_process_1 = require("child_process");
|
|
6
|
+
const path = require("path");
|
|
7
|
+
const yargsParser = require("yargs-parser");
|
|
8
|
+
const npm_run_path_1 = require("npm-run-path");
|
|
9
|
+
const chalk = require("chalk");
|
|
10
|
+
exports.LARGE_BUFFER = 1024 * 1000000;
|
|
11
|
+
function loadEnvVars(path) {
|
|
12
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
13
|
+
if (path) {
|
|
14
|
+
const result = (yield Promise.resolve().then(() => require('dotenv'))).config({ path });
|
|
15
|
+
if (result.error) {
|
|
16
|
+
throw result.error;
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
else {
|
|
20
|
+
try {
|
|
21
|
+
(yield Promise.resolve().then(() => require('dotenv'))).config();
|
|
22
|
+
}
|
|
23
|
+
catch (_a) { }
|
|
24
|
+
}
|
|
25
|
+
});
|
|
26
|
+
}
|
|
27
|
+
const propKeys = [
|
|
28
|
+
'command',
|
|
29
|
+
'commands',
|
|
30
|
+
'color',
|
|
31
|
+
'parallel',
|
|
32
|
+
'readyWhen',
|
|
33
|
+
'cwd',
|
|
34
|
+
'args',
|
|
35
|
+
'envFile',
|
|
36
|
+
'outputPath',
|
|
37
|
+
];
|
|
38
|
+
function default_1(options, context) {
|
|
39
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
40
|
+
yield loadEnvVars(options.envFile);
|
|
41
|
+
const normalized = normalizeOptions(options);
|
|
42
|
+
if (options.readyWhen && !options.parallel) {
|
|
43
|
+
throw new Error('ERROR: Bad executor config for run-commands - "readyWhen" can only be used when "parallel=true".');
|
|
44
|
+
}
|
|
45
|
+
if (options.commands.find((c) => c.prefix || c.color || c.bgColor) &&
|
|
46
|
+
!options.parallel) {
|
|
47
|
+
throw new Error('ERROR: Bad executor config for run-commands - "prefix", "color" and "bgColor" can only be set when "parallel=true".');
|
|
48
|
+
}
|
|
49
|
+
try {
|
|
50
|
+
const success = options.parallel
|
|
51
|
+
? yield runInParallel(normalized, context)
|
|
52
|
+
: yield runSerially(normalized, context);
|
|
53
|
+
return { success };
|
|
54
|
+
}
|
|
55
|
+
catch (e) {
|
|
56
|
+
if (process.env.NX_VERBOSE_LOGGING === 'true') {
|
|
57
|
+
console.error(e);
|
|
58
|
+
}
|
|
59
|
+
throw new Error(`ERROR: Something went wrong in run-commands - ${e.message}`);
|
|
60
|
+
}
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
exports.default = default_1;
|
|
64
|
+
function runInParallel(options, context) {
|
|
65
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
66
|
+
const procs = options.commands.map((c) => createProcess(c, options.readyWhen, options.color, calculateCwd(options.cwd, context)).then((result) => ({
|
|
67
|
+
result,
|
|
68
|
+
command: c.command,
|
|
69
|
+
})));
|
|
70
|
+
if (options.readyWhen) {
|
|
71
|
+
const r = yield Promise.race(procs);
|
|
72
|
+
if (!r.result) {
|
|
73
|
+
process.stderr.write(`Warning: run-commands command "${r.command}" exited with non-zero status code`);
|
|
74
|
+
return false;
|
|
75
|
+
}
|
|
76
|
+
else {
|
|
77
|
+
return true;
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
else {
|
|
81
|
+
const r = yield Promise.all(procs);
|
|
82
|
+
const failed = r.filter((v) => !v.result);
|
|
83
|
+
if (failed.length > 0) {
|
|
84
|
+
failed.forEach((f) => {
|
|
85
|
+
process.stderr.write(`Warning: run-commands command "${f.command}" exited with non-zero status code`);
|
|
86
|
+
});
|
|
87
|
+
return false;
|
|
88
|
+
}
|
|
89
|
+
else {
|
|
90
|
+
return true;
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
});
|
|
94
|
+
}
|
|
95
|
+
function normalizeOptions(options) {
|
|
96
|
+
options.parsedArgs = parseArgs(options);
|
|
97
|
+
if (options.command) {
|
|
98
|
+
options.commands = [{ command: options.command }];
|
|
99
|
+
options.parallel = !!options.readyWhen;
|
|
100
|
+
}
|
|
101
|
+
else {
|
|
102
|
+
options.commands = options.commands.map((c) => typeof c === 'string' ? { command: c } : c);
|
|
103
|
+
}
|
|
104
|
+
options.commands.forEach((c) => {
|
|
105
|
+
var _a;
|
|
106
|
+
c.command = transformCommand(c.command, options.parsedArgs, (_a = c.forwardAllArgs) !== null && _a !== void 0 ? _a : true);
|
|
107
|
+
});
|
|
108
|
+
return options;
|
|
109
|
+
}
|
|
110
|
+
function runSerially(options, context) {
|
|
111
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
112
|
+
for (const c of options.commands) {
|
|
113
|
+
createSyncProcess(c.command, options.color, calculateCwd(options.cwd, context));
|
|
114
|
+
}
|
|
115
|
+
return true;
|
|
116
|
+
});
|
|
117
|
+
}
|
|
118
|
+
function createProcess(commandConfig, readyWhen, color, cwd) {
|
|
119
|
+
return new Promise((res) => {
|
|
120
|
+
const childProcess = (0, child_process_1.exec)(commandConfig.command, {
|
|
121
|
+
maxBuffer: exports.LARGE_BUFFER,
|
|
122
|
+
env: processEnv(color),
|
|
123
|
+
cwd,
|
|
124
|
+
});
|
|
125
|
+
/**
|
|
126
|
+
* Ensure the child process is killed when the parent exits
|
|
127
|
+
*/
|
|
128
|
+
const processExitListener = () => childProcess.kill();
|
|
129
|
+
process.on('exit', processExitListener);
|
|
130
|
+
process.on('SIGTERM', processExitListener);
|
|
131
|
+
childProcess.stdout.on('data', (data) => {
|
|
132
|
+
process.stdout.write(addColorAndPrefix(data, commandConfig));
|
|
133
|
+
if (readyWhen && data.toString().indexOf(readyWhen) > -1) {
|
|
134
|
+
res(true);
|
|
135
|
+
}
|
|
136
|
+
});
|
|
137
|
+
childProcess.stderr.on('data', (err) => {
|
|
138
|
+
process.stderr.write(addColorAndPrefix(err, commandConfig));
|
|
139
|
+
if (readyWhen && err.toString().indexOf(readyWhen) > -1) {
|
|
140
|
+
res(true);
|
|
141
|
+
}
|
|
142
|
+
});
|
|
143
|
+
childProcess.on('exit', (code) => {
|
|
144
|
+
if (!readyWhen) {
|
|
145
|
+
res(code === 0);
|
|
146
|
+
}
|
|
147
|
+
});
|
|
148
|
+
});
|
|
149
|
+
}
|
|
150
|
+
function addColorAndPrefix(out, config) {
|
|
151
|
+
if (config.prefix) {
|
|
152
|
+
out = out
|
|
153
|
+
.split('\n')
|
|
154
|
+
.map((l) => l.trim().length > 0 ? `${chalk.bold(config.prefix)} ${l}` : l)
|
|
155
|
+
.join('\n');
|
|
156
|
+
}
|
|
157
|
+
if (config.color && chalk[config.color]) {
|
|
158
|
+
out = chalk[config.color](out);
|
|
159
|
+
}
|
|
160
|
+
if (config.bgColor && chalk[config.bgColor]) {
|
|
161
|
+
out = chalk[config.bgColor](out);
|
|
162
|
+
}
|
|
163
|
+
return out;
|
|
164
|
+
}
|
|
165
|
+
function createSyncProcess(command, color, cwd) {
|
|
166
|
+
(0, child_process_1.execSync)(command, {
|
|
167
|
+
env: processEnv(color),
|
|
168
|
+
stdio: ['inherit', 'inherit', 'inherit'],
|
|
169
|
+
maxBuffer: exports.LARGE_BUFFER,
|
|
170
|
+
cwd,
|
|
171
|
+
});
|
|
172
|
+
}
|
|
173
|
+
function calculateCwd(cwd, context) {
|
|
174
|
+
if (!cwd)
|
|
175
|
+
return context.root;
|
|
176
|
+
if (path.isAbsolute(cwd))
|
|
177
|
+
return cwd;
|
|
178
|
+
return path.join(context.root, cwd);
|
|
179
|
+
}
|
|
180
|
+
function processEnv(color) {
|
|
181
|
+
const env = Object.assign(Object.assign({}, process.env), (0, npm_run_path_1.env)());
|
|
182
|
+
if (color) {
|
|
183
|
+
env.FORCE_COLOR = `${color}`;
|
|
184
|
+
}
|
|
185
|
+
return env;
|
|
186
|
+
}
|
|
187
|
+
function transformCommand(command, args, forwardAllArgs) {
|
|
188
|
+
if (command.indexOf('{args.') > -1) {
|
|
189
|
+
const regex = /{args\.([^}]+)}/g;
|
|
190
|
+
return command.replace(regex, (_, group) => args[camelCase(group)]);
|
|
191
|
+
}
|
|
192
|
+
else if (Object.keys(args).length > 0 && forwardAllArgs) {
|
|
193
|
+
const stringifiedArgs = Object.keys(args)
|
|
194
|
+
.map((a) => typeof args[a] === 'string' && args[a].includes(' ')
|
|
195
|
+
? `--${a}="${args[a].replace(/"/g, '"')}"`
|
|
196
|
+
: `--${a}=${args[a]}`)
|
|
197
|
+
.join(' ');
|
|
198
|
+
return `${command} ${stringifiedArgs}`;
|
|
199
|
+
}
|
|
200
|
+
else {
|
|
201
|
+
return command;
|
|
202
|
+
}
|
|
203
|
+
}
|
|
204
|
+
function parseArgs(options) {
|
|
205
|
+
const args = options.args;
|
|
206
|
+
if (!args) {
|
|
207
|
+
const unknownOptionsTreatedAsArgs = Object.keys(options)
|
|
208
|
+
.filter((p) => propKeys.indexOf(p) === -1)
|
|
209
|
+
.reduce((m, c) => ((m[c] = options[c]), m), {});
|
|
210
|
+
return unknownOptionsTreatedAsArgs;
|
|
211
|
+
}
|
|
212
|
+
return yargsParser(args.replace(/(^"|"$)/g, ''), {
|
|
213
|
+
configuration: { 'camel-case-expansion': true },
|
|
214
|
+
});
|
|
215
|
+
}
|
|
216
|
+
function camelCase(input) {
|
|
217
|
+
if (input.indexOf('-') > 1) {
|
|
218
|
+
return input
|
|
219
|
+
.toLowerCase()
|
|
220
|
+
.replace(/-(.)/g, (match, group1) => group1.toUpperCase());
|
|
221
|
+
}
|
|
222
|
+
else {
|
|
223
|
+
return input;
|
|
224
|
+
}
|
|
225
|
+
}
|
|
226
|
+
//# sourceMappingURL=run-commands.impl.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-commands.impl.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/executors/run-commands/run-commands.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,132 @@
|
|
|
1
|
+
{
|
|
2
|
+
"title": "Run Commands",
|
|
3
|
+
"description": "Run any custom commands with Nx.",
|
|
4
|
+
"type": "object",
|
|
5
|
+
"cli": "nx",
|
|
6
|
+
"outputCapture": "pipe",
|
|
7
|
+
"presets": [
|
|
8
|
+
{
|
|
9
|
+
"name": "Arguments forwarding",
|
|
10
|
+
"keys": ["commands"]
|
|
11
|
+
},
|
|
12
|
+
{
|
|
13
|
+
"name": "Custom done conditions",
|
|
14
|
+
"keys": ["commands", "readyWhen"]
|
|
15
|
+
},
|
|
16
|
+
{
|
|
17
|
+
"name": "Setting the cwd",
|
|
18
|
+
"keys": ["commands", "cwd"]
|
|
19
|
+
}
|
|
20
|
+
],
|
|
21
|
+
"properties": {
|
|
22
|
+
"commands": {
|
|
23
|
+
"type": "array",
|
|
24
|
+
"description": "Commands to run in child process.",
|
|
25
|
+
"items": {
|
|
26
|
+
"oneOf": [
|
|
27
|
+
{
|
|
28
|
+
"type": "object",
|
|
29
|
+
"properties": {
|
|
30
|
+
"command": {
|
|
31
|
+
"type": "string",
|
|
32
|
+
"description": "Command to run in child process."
|
|
33
|
+
},
|
|
34
|
+
"forwardAllArgs": {
|
|
35
|
+
"type": "boolean",
|
|
36
|
+
"description": "Whether arguments should be forwarded when interpolation is not present."
|
|
37
|
+
},
|
|
38
|
+
"prefix": {
|
|
39
|
+
"type": "string",
|
|
40
|
+
"description": "Prefix in front of every line out of the output"
|
|
41
|
+
},
|
|
42
|
+
"color": {
|
|
43
|
+
"type": "string",
|
|
44
|
+
"description": "Color of the output",
|
|
45
|
+
"enum": [
|
|
46
|
+
"black",
|
|
47
|
+
"red",
|
|
48
|
+
"green",
|
|
49
|
+
"yellow",
|
|
50
|
+
"blue",
|
|
51
|
+
"magenta",
|
|
52
|
+
"cyan",
|
|
53
|
+
"white"
|
|
54
|
+
]
|
|
55
|
+
},
|
|
56
|
+
"bgColor": {
|
|
57
|
+
"type": "string",
|
|
58
|
+
"description": "Background color of the output",
|
|
59
|
+
"enum": [
|
|
60
|
+
"bgBlack",
|
|
61
|
+
"bgRed",
|
|
62
|
+
"bgGreen",
|
|
63
|
+
"bgYellow",
|
|
64
|
+
"bgBlue",
|
|
65
|
+
"bgMagenta",
|
|
66
|
+
"bgCyan",
|
|
67
|
+
"bgWhite"
|
|
68
|
+
]
|
|
69
|
+
},
|
|
70
|
+
"description": {
|
|
71
|
+
"type": "string",
|
|
72
|
+
"description": "An optional description useful for inline documentation purposes. It is not used as part of the execution of the command."
|
|
73
|
+
}
|
|
74
|
+
},
|
|
75
|
+
"additionalProperties": false,
|
|
76
|
+
"required": ["command"]
|
|
77
|
+
},
|
|
78
|
+
{
|
|
79
|
+
"type": "string"
|
|
80
|
+
}
|
|
81
|
+
]
|
|
82
|
+
}
|
|
83
|
+
},
|
|
84
|
+
"command": {
|
|
85
|
+
"type": "string",
|
|
86
|
+
"description": "Command to run in child process."
|
|
87
|
+
},
|
|
88
|
+
"parallel": {
|
|
89
|
+
"type": "boolean",
|
|
90
|
+
"description": "Run commands in parallel.",
|
|
91
|
+
"default": true
|
|
92
|
+
},
|
|
93
|
+
"readyWhen": {
|
|
94
|
+
"type": "string",
|
|
95
|
+
"description": "String to appear in `stdout` or `stderr` that indicates that the task is done. When running multiple commands, this option can only be used when `parallel` is set to `true`. If not specified, the task is done when all the child processes complete."
|
|
96
|
+
},
|
|
97
|
+
"args": {
|
|
98
|
+
"type": "string",
|
|
99
|
+
"description": "Extra arguments. You can pass them as follows: nx run project:target --args='--wait=100'. You can then use {args.wait} syntax to interpolate them in the workspace config file. See example [above](#chaining-commands-interpolating-args-and-setting-the-cwd)"
|
|
100
|
+
},
|
|
101
|
+
"envFile": {
|
|
102
|
+
"type": "string",
|
|
103
|
+
"description": "You may specify a custom .env file path."
|
|
104
|
+
},
|
|
105
|
+
"color": {
|
|
106
|
+
"type": "boolean",
|
|
107
|
+
"description": "Use colors when showing output of command.",
|
|
108
|
+
"default": false
|
|
109
|
+
},
|
|
110
|
+
"outputPath": {
|
|
111
|
+
"description": "Allows you to specify where the build artifacts are stored. This allows Nx Cloud to pick them up correctly, in the case that the build artifacts are placed somewhere other than the top level dist folder.",
|
|
112
|
+
"oneOf": [
|
|
113
|
+
{
|
|
114
|
+
"type": "string"
|
|
115
|
+
},
|
|
116
|
+
{
|
|
117
|
+
"type": "array",
|
|
118
|
+
"items": {
|
|
119
|
+
"type": "string"
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
]
|
|
123
|
+
},
|
|
124
|
+
"cwd": {
|
|
125
|
+
"type": "string",
|
|
126
|
+
"description": "Current working directory of the commands. If it's not specified the commands will run in the workspace root, if a relative path is specified the commands will run in that path relative to the workspace root and if it's an absolute path the commands will run in that path."
|
|
127
|
+
}
|
|
128
|
+
},
|
|
129
|
+
"additionalProperties": true,
|
|
130
|
+
"required": [],
|
|
131
|
+
"examplesFile": "../../../docs/run-commands-examples.md"
|
|
132
|
+
}
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.formatChangedFilesWithPrettierIfAvailable = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const path = require("path");
|
|
6
|
+
/**
|
|
7
|
+
* Formats all the created or updated files using Prettier
|
|
8
|
+
* @param tree - the file system tree
|
|
9
|
+
*/
|
|
10
|
+
function formatChangedFilesWithPrettierIfAvailable(tree) {
|
|
11
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
12
|
+
let prettier;
|
|
13
|
+
try {
|
|
14
|
+
prettier = yield Promise.resolve().then(() => require('prettier'));
|
|
15
|
+
}
|
|
16
|
+
catch (_a) { }
|
|
17
|
+
if (!prettier)
|
|
18
|
+
return;
|
|
19
|
+
const files = new Set(tree.listChanges().filter((file) => file.type !== 'DELETE'));
|
|
20
|
+
yield Promise.all(Array.from(files).map((file) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
21
|
+
const systemPath = path.join(tree.root, file.path);
|
|
22
|
+
let options = {
|
|
23
|
+
filepath: systemPath,
|
|
24
|
+
};
|
|
25
|
+
const resolvedOptions = yield prettier.resolveConfig(systemPath, {
|
|
26
|
+
editorconfig: true,
|
|
27
|
+
});
|
|
28
|
+
if (!resolvedOptions) {
|
|
29
|
+
return;
|
|
30
|
+
}
|
|
31
|
+
options = Object.assign(Object.assign({}, options), resolvedOptions);
|
|
32
|
+
const support = yield prettier.getFileInfo(systemPath, options);
|
|
33
|
+
if (support.ignored || !support.inferredParser) {
|
|
34
|
+
return;
|
|
35
|
+
}
|
|
36
|
+
try {
|
|
37
|
+
tree.write(file.path, prettier.format(file.content.toString('utf-8'), options));
|
|
38
|
+
}
|
|
39
|
+
catch (e) {
|
|
40
|
+
console.warn(`Could not format ${file.path}. Error: "${e.message}"`);
|
|
41
|
+
}
|
|
42
|
+
})));
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
exports.formatChangedFilesWithPrettierIfAvailable = formatChangedFilesWithPrettierIfAvailable;
|
|
46
|
+
//# sourceMappingURL=format-changed-files-with-prettier-if-available.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"format-changed-files-with-prettier-if-available.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/generators/internal-utils/format-changed-files-with-prettier-if-available.ts"],"names":[],"mappings":";;;;AACA,6BAA6B;AAG7B;;;GAGG;AACH,SAAsB,yCAAyC,CAC7D,IAAU;;QAEV,IAAI,QAAyB,CAAC;QAC9B,IAAI;YACF,QAAQ,GAAG,2CAAa,UAAU,EAAC,CAAC;SACrC;QAAC,WAAM,GAAE;QAEV,IAAI,CAAC,QAAQ;YAAE,OAAO;QAEtB,MAAM,KAAK,GAAG,IAAI,GAAG,CACnB,IAAI,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAC5D,CAAC;QACF,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAO,IAAI,EAAE,EAAE;YACnC,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACnD,IAAI,OAAO,GAAQ;gBACjB,QAAQ,EAAE,UAAU;aACrB,CAAC;YAEF,MAAM,eAAe,GAAG,MAAM,QAAQ,CAAC,aAAa,CAAC,UAAU,EAAE;gBAC/D,YAAY,EAAE,IAAI;aACnB,CAAC,CAAC;YACH,IAAI,CAAC,eAAe,EAAE;gBACpB,OAAO;aACR;YACD,OAAO,mCACF,OAAO,GACP,eAAe,CACnB,CAAC;YAEF,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,WAAW,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;YAChE,IAAI,OAAO,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;gBAC9C,OAAO;aACR;YAED,IAAI;gBACF,IAAI,CAAC,KAAK,CACR,IAAI,CAAC,IAAI,EACT,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CACzD,CAAC;aACH;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,IAAI,CAAC,oBAAoB,IAAI,CAAC,IAAI,aAAa,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC;aACtE;QACH,CAAC,CAAA,CAAC,CACH,CAAC;IACJ,CAAC;CAAA;AA9CD,8FA8CC"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.createTreeWithEmptyWorkspace = void 0;
|
|
4
|
+
const tree_1 = require("nx/src/generators/tree");
|
|
5
|
+
/**
|
|
6
|
+
* Creates a host for testing.
|
|
7
|
+
*/
|
|
8
|
+
function createTreeWithEmptyWorkspace(version = 1) {
|
|
9
|
+
const tree = new tree_1.FsTree('/virtual', false);
|
|
10
|
+
tree.write('/workspace.json', JSON.stringify({ version, projects: {} }));
|
|
11
|
+
tree.write('./.prettierrc', JSON.stringify({ singleQuote: true }));
|
|
12
|
+
tree.write('/package.json', JSON.stringify({
|
|
13
|
+
name: 'test-name',
|
|
14
|
+
dependencies: {},
|
|
15
|
+
devDependencies: {},
|
|
16
|
+
}));
|
|
17
|
+
tree.write('/nx.json', JSON.stringify({
|
|
18
|
+
npmScope: 'proj',
|
|
19
|
+
affected: {
|
|
20
|
+
defaultBase: 'main',
|
|
21
|
+
},
|
|
22
|
+
tasksRunnerOptions: {
|
|
23
|
+
default: {
|
|
24
|
+
runner: 'nx/tasks-runners/default',
|
|
25
|
+
options: {
|
|
26
|
+
cacheableOperations: ['build', 'lint', 'test', 'e2e'],
|
|
27
|
+
},
|
|
28
|
+
},
|
|
29
|
+
},
|
|
30
|
+
}));
|
|
31
|
+
tree.write('/tsconfig.base.json', JSON.stringify({ compilerOptions: { paths: {} } }));
|
|
32
|
+
return tree;
|
|
33
|
+
}
|
|
34
|
+
exports.createTreeWithEmptyWorkspace = createTreeWithEmptyWorkspace;
|
|
35
|
+
//# sourceMappingURL=create-tree-with-empty-workspace.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"create-tree-with-empty-workspace.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/generators/testing-utils/create-tree-with-empty-workspace.ts"],"names":[],"mappings":";;;AAAA,iDAAgD;AAGhD;;GAEG;AACH,SAAgB,4BAA4B,CAAC,OAAO,GAAG,CAAC;IACtD,MAAM,IAAI,GAAG,IAAI,aAAM,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IAE3C,IAAI,CAAC,KAAK,CAAC,iBAAiB,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IACzE,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IACnE,IAAI,CAAC,KAAK,CACR,eAAe,EACf,IAAI,CAAC,SAAS,CAAC;QACb,IAAI,EAAE,WAAW;QACjB,YAAY,EAAE,EAAE;QAChB,eAAe,EAAE,EAAE;KACpB,CAAC,CACH,CAAC;IACF,IAAI,CAAC,KAAK,CACR,UAAU,EACV,IAAI,CAAC,SAAS,CAAC;QACb,QAAQ,EAAE,MAAM;QAChB,QAAQ,EAAE;YACR,WAAW,EAAE,MAAM;SACpB;QACD,kBAAkB,EAAE;YAClB,OAAO,EAAE;gBACP,MAAM,EAAE,0BAA0B;gBAClC,OAAO,EAAE;oBACP,mBAAmB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC;iBACtD;aACF;SACF;KACF,CAAC,CACH,CAAC;IACF,IAAI,CAAC,KAAK,CACR,qBAAqB,EACrB,IAAI,CAAC,SAAS,CAAC,EAAE,eAAe,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC,CACnD,CAAC;IAEF,OAAO,IAAI,CAAC;AACd,CAAC;AApCD,oEAoCC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.createTree = void 0;
|
|
4
|
+
const tree_1 = require("nx/src/generators/tree");
|
|
5
|
+
/**
|
|
6
|
+
* Creates a host for testing.
|
|
7
|
+
*/
|
|
8
|
+
function createTree() {
|
|
9
|
+
return new tree_1.FsTree('/virtual', false);
|
|
10
|
+
}
|
|
11
|
+
exports.createTree = createTree;
|
|
12
|
+
//# sourceMappingURL=create-tree.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"create-tree.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/generators/testing-utils/create-tree.ts"],"names":[],"mappings":";;;AAAA,iDAAgD;AAGhD;;GAEG;AACH,SAAgB,UAAU;IACxB,OAAO,IAAI,aAAM,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;AACvC,CAAC;AAFD,gCAEC"}
|
|
File without changes
|
|
File without changes
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tree.js","sourceRoot":"","sources":["../../../../../packages/nx/src/generators/tree.ts"],"names":[],"mappings":";;;AAAA,uCAQkB;AAClB,4CAAyC;AACzC,+BAAoD;AACpD,+BAA+B;AA4G/B,MAAa,MAAM;IASjB,YAAqB,IAAY,EAAmB,SAAkB;QAAjD,SAAI,GAAJ,IAAI,CAAQ;QAAmB,cAAS,GAAT,SAAS,CAAS;QAR9D,oBAAe,GAMnB,EAAE,CAAC;IAEkE,CAAC;IAI1E,IAAI,CAAC,QAAgB,EAAE,QAAyB;QAC9C,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QACpC,IAAI;YACF,IAAI,OAAe,CAAC;YACpB,IAAI,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE;gBAC3C,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC;aAC3D;iBAAM;gBACL,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;aACrC;YAED,OAAO,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;SACxD;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,IAAI,CAAC,SAAS,EAAE;gBAClB,eAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;aACjB;YACD,OAAO,IAAI,CAAC;SACb;IACH,CAAC;IAED,KAAK,CACH,QAAgB,EAChB,OAAwB,EACxB,OAA0B;QAE1B,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QACpC,IACE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;YAChC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,EACtD;YACA,sFAAsF;YACtF,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC/C,OAAO;SACR;QACD,IAAI;YACF,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,GAAG;gBACxC,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;gBAC7B,SAAS,EAAE,KAAK;gBAChB,OAAO;aACR,CAAC;SACH;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,IAAI,CAAC,SAAS,EAAE;gBAClB,eAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;aACjB;SACF;IACH,CAAC;IAED,SAAS,CACP,QAAgB,EAChB,OAAwB,EACxB,OAA0B;QAE1B,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QACpC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IACzC,CAAC;IAED,MAAM,CAAC,QAAgB;QACrB,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QACpC,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;YAClD,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CACzC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CACtE,CAAC;SACH;QACD,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,GAAG;YACxC,OAAO,EAAE,IAAI;YACb,SAAS,EAAE,IAAI;SAChB,CAAC;QAEF,0BAA0B;QAC1B,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAA,cAAO,EAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;YACxD,IAAI,CAAC,MAAM,CAAC,IAAA,cAAO,EAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;SACzC;IACH,CAAC;IAED,MAAM,CAAC,QAAgB;QACrB,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QACpC,IAAI;YACF,IAAI,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE;gBAC3C,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;aAC3D;iBAAM,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;gBACzD,OAAO,IAAI,CAAC;aACb;iBAAM;gBACL,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;aAChC;SACF;QAAC,WAAM;YACN,OAAO,KAAK,CAAC;SACd;IACH,CAAC;IAED,MAAM,CAAC,IAAY,EAAE,EAAU;QAC7B,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC5B,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QACxB,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QACzC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;IACnC,CAAC;IAED,MAAM,CAAC,QAAgB;QACrB,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QACpC,IAAI;YACF,IAAI,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE;gBAC3C,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;aAC3D;iBAAM;gBACL,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;aAChC;SACF;QAAC,WAAM;YACN,OAAO,KAAK,CAAC;SACd;IACH,CAAC;IAED,QAAQ,CAAC,OAAe;QACtB,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAClC,IAAI,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAElC,GAAG,GAAG,CAAC,GAAG,GAAG,EAAE,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAC9D,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;YACrB,MAAM,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,IAAA,WAAI,EAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAC1D,OAAO,CAAC,CAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,SAAS,CAAA,CAAC;QACvB,CAAC,CAAC,CAAC;QACH,SAAS;QACT,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IAClC,CAAC;IAED,WAAW;QACT,MAAM,GAAG,GAAG,EAAkB,CAAC;QAC/B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAC9C,IAAI,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE;gBACrC,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE;oBACpB,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;iBACtD;aACF;iBAAM;gBACL,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE;oBACpB,GAAG,CAAC,IAAI,CAAC;wBACP,IAAI,EAAE,CAAC;wBACP,IAAI,EAAE,QAAQ;wBACd,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,OAAO;wBACxC,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,OAAO;qBACzC,CAAC,CAAC;iBACJ;qBAAM;oBACL,GAAG,CAAC,IAAI,CAAC;wBACP,IAAI,EAAE,CAAC;wBACP,IAAI,EAAE,QAAQ;wBACd,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,OAAO;wBACxC,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,OAAO;qBACzC,CAAC,CAAC;iBACJ;aACF;QACH,CAAC,CAAC,CAAC;QACH,OAAO,GAAG,CAAC;IACb,CAAC;IAED,iBAAiB,CAAC,QAAgB,EAAE,IAAqB;QACvD,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QACpC,MAAM,iBAAiB,GAAG,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;QAC5C,IAAI,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,EAAE;YAC3C,IAAI,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,CAAC,SAAS,EAAE;gBACrD,MAAM,IAAI,KAAK,CACb,6CAA6C,QAAQ,GAAG,CACzD,CAAC;aACH;YAED,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,CAAC,OAAO,GAAG,EAAE,IAAI,EAAE,CAAC;SAC5D;aAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;YACnC,MAAM,IAAI,KAAK,CACb,kDAAkD,QAAQ,GAAG,CAC9D,CAAC;SACH;aAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;YACnC,gEAAgE;YAChE,8DAA8D;YAC9D,uBAAuB;YACvB,MAAM,IAAI,KAAK,CAAC,yCAAyC,QAAQ,GAAG,CAAC,CAAC;SACvE;aAAM;YACL,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,GAAG;gBACxC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;gBAClC,SAAS,EAAE,KAAK;gBAChB,OAAO,EAAE,EAAE,IAAI,EAAE;aAClB,CAAC;SACH;IACH,CAAC;IAEO,SAAS,CAAC,IAAY;QAC5B,OAAO,IAAA,eAAQ,EAAC,IAAI,CAAC,IAAI,EAAE,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,UAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACzE,CAAC;IAEO,SAAS,CAAC,OAAe;QAC/B,IAAI;YACF,OAAO,IAAA,sBAAW,EAAC,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;SAC9C;QAAC,WAAM;YACN,OAAO,EAAE,CAAC;SACX;IACH,CAAC;IAEO,QAAQ,CAAC,QAAgB;QAC/B,MAAM,IAAI,GAAG,IAAA,mBAAQ,EAAC,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;QACjD,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;IACvB,CAAC;IAEO,UAAU,CAAC,QAAgB;QACjC,OAAO,IAAA,uBAAY,EAAC,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;IACjD,CAAC;IAEO,QAAQ,CAAC,QAAgB;QAC/B,IAAI;YACF,MAAM,IAAI,GAAG,IAAA,mBAAQ,EAAC,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;YACjD,OAAO,IAAI,CAAC,MAAM,EAAE,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;SAC5C;QAAC,WAAM;YACN,OAAO,KAAK,CAAC;SACd;IACH,CAAC;IAEO,WAAW,CAAC,IAAY;QAC9B,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM,CAC7C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,SAAS,CACtE,CAAC;IACJ,CAAC;IAEO,mBAAmB,CAAC,IAAY;QACtC,MAAM,GAAG,GAAG,EAAE,CAAC;QACf,IAAI,IAAI,KAAK,EAAE,EAAE;YACf,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,GAAG,CAC1C,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAC7B,CAAC;SACH;QACD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAC9C,IAAI,CAAC,CAAC,UAAU,CAAC,GAAG,IAAI,GAAG,CAAC,EAAE;gBAC5B,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC;gBACtC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;aAChC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IAEO,EAAE,CAAC,EAAU;QACnB,OAAO,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACnD,CAAC;CACF;AAxPD,wBAwPC;AAED,SAAgB,YAAY,CAAC,IAAY,EAAE,WAAyB;IAClE,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;;QACxB,MAAM,KAAK,GAAG,IAAA,WAAI,EAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE;YACvB,IAAA,wBAAa,EAAC,IAAA,cAAO,EAAC,KAAK,CAAC,CAAC,CAAC;YAC9B,IAAA,wBAAa,EAAC,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;YAChC,IAAI,MAAA,CAAC,CAAC,OAAO,0CAAE,IAAI;gBAAE,IAAA,oBAAS,EAAC,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SACvD;aAAM,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC9B,IAAA,wBAAa,EAAC,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;YAChC,IAAI,MAAA,CAAC,CAAC,OAAO,0CAAE,IAAI;gBAAE,IAAA,oBAAS,EAAC,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SACvD;aAAM,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC9B,IAAA,qBAAU,EAAC,KAAK,CAAC,CAAC;SACnB;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAdD,oCAcC;AAED,SAAgB,YAAY,CAAC,WAAyB;IACpD,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACxB,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE;YACvB,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;SACnD;aAAM,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC9B,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;SACnD;aAAM,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC9B,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;SACpD;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAVD,oCAUC"}
|