@mpis/run 0.0.3 → 0.0.5
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/commands.schema.json +2 -2
- package/lib/autoindex.d.ts +6 -6
- package/lib/autoindex.d.ts.map +1 -1
- package/lib/autoindex.js +4 -4
- package/lib/autoindex.js.map +1 -1
- package/lib/bin.js +47 -20
- package/lib/bin.js.map +1 -1
- package/lib/common/config-file.d.ts.map +1 -1
- package/lib/common/config-file.js +36 -5
- package/lib/common/config-file.js.map +1 -1
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/package.json +11 -17
- package/src/autoindex.ts +10 -10
- package/src/bin.ts +51 -34
- package/src/common/config-file.ts +38 -14
- package/src/common/paths.ts +0 -1
package/commands.schema.json
CHANGED
|
@@ -30,8 +30,8 @@
|
|
|
30
30
|
"minLength": 1
|
|
31
31
|
},
|
|
32
32
|
"watch": {
|
|
33
|
-
"type": ["string", "array"],
|
|
34
|
-
"description": "additional arguments to pass to the command when watching",
|
|
33
|
+
"type": ["string", "array", "boolean"],
|
|
34
|
+
"description": "additional arguments to pass to the command when watching, set to false to disable watching",
|
|
35
35
|
"default": ["-w"],
|
|
36
36
|
"items": { "type": "string", "minLength": 1 }
|
|
37
37
|
},
|
package/lib/autoindex.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
export { printUsage } from
|
|
2
|
-
export { projectRoot } from
|
|
3
|
-
export { selfRoot } from
|
|
4
|
-
export type { ICommand } from
|
|
5
|
-
export type { IConfigFile } from
|
|
6
|
-
export { loadConfigFile } from
|
|
1
|
+
export { printUsage } from './common/args.js';
|
|
2
|
+
export { projectRoot } from './common/paths.js';
|
|
3
|
+
export { selfRoot } from './common/paths.js';
|
|
4
|
+
export type { ICommand } from './common/config-file.js';
|
|
5
|
+
export type { IConfigFile } from './common/config-file.js';
|
|
6
|
+
export { loadConfigFile } from './common/config-file.js';
|
|
7
7
|
//# sourceMappingURL=autoindex.d.ts.map
|
package/lib/autoindex.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"autoindex.d.ts","sourceRoot":"","sources":["../src/autoindex.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"autoindex.d.ts","sourceRoot":"","sources":["../src/autoindex.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAG9C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAG7C,YAAY,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,YAAY,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC"}
|
package/lib/autoindex.js
CHANGED
|
@@ -3,12 +3,12 @@
|
|
|
3
3
|
/* eslint-disable */
|
|
4
4
|
/* common/args.ts */
|
|
5
5
|
// Identifiers
|
|
6
|
-
export { printUsage } from
|
|
6
|
+
export { printUsage } from './common/args.js';
|
|
7
7
|
/* common/paths.ts */
|
|
8
8
|
// Identifiers
|
|
9
|
-
export { projectRoot } from
|
|
10
|
-
export { selfRoot } from
|
|
11
|
-
export { loadConfigFile } from
|
|
9
|
+
export { projectRoot } from './common/paths.js';
|
|
10
|
+
export { selfRoot } from './common/paths.js';
|
|
11
|
+
export { loadConfigFile } from './common/config-file.js';
|
|
12
12
|
/* bin.ts */
|
|
13
13
|
// Identifiers
|
|
14
14
|
//# sourceMappingURL=autoindex.js.map
|
package/lib/autoindex.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"autoindex.js","sourceRoot":"","sources":["../src/autoindex.ts"],"names":[],"mappings":"AAAA,wBAAwB;AACxB,aAAa;AACb,oBAAoB;AAEpB,oBAAoB;
|
|
1
|
+
{"version":3,"file":"autoindex.js","sourceRoot":"","sources":["../src/autoindex.ts"],"names":[],"mappings":"AAAA,wBAAwB;AACxB,aAAa;AACb,oBAAoB;AAEpB,oBAAoB;AACpB,cAAc;AACd,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,qBAAqB;AACrB,cAAc;AACd,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAK7C,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,YAAY;AACZ,cAAc"}
|
package/lib/bin.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { humanDate, prettyFormatError, registerGlobalLifecycle, toDisposable } from '@idlebox/common';
|
|
2
2
|
import { logger } from '@idlebox/logger';
|
|
3
|
-
import { registerNodejsExitHandler } from '@idlebox/node';
|
|
3
|
+
import { registerNodejsExitHandler, shutdown } from '@idlebox/node';
|
|
4
4
|
import { channelClient } from '@mpis/client';
|
|
5
5
|
import { CompileError, ModeKind, ProcessIPCClient, WorkersManager } from '@mpis/server';
|
|
6
6
|
import { rmSync } from 'node:fs';
|
|
@@ -35,24 +35,32 @@ switch (context.command) {
|
|
|
35
35
|
{
|
|
36
36
|
if (context.withCleanup)
|
|
37
37
|
executeClean();
|
|
38
|
-
await executeBuild()
|
|
38
|
+
await executeBuild().catch((e) => {
|
|
39
|
+
logger.error `failed ${context.command} project: ${e.message}`;
|
|
40
|
+
shutdown(1);
|
|
41
|
+
});
|
|
39
42
|
}
|
|
40
43
|
break;
|
|
41
44
|
case 'watch':
|
|
42
45
|
initializeStdin();
|
|
43
|
-
await executeBuild()
|
|
46
|
+
await executeBuild().catch((e) => {
|
|
47
|
+
logger.error `failed ${context.command} project: ${e.message}`;
|
|
48
|
+
shutdown(1);
|
|
49
|
+
});
|
|
44
50
|
break;
|
|
45
51
|
}
|
|
46
52
|
// channelClient.displayName = `MpisRun`;
|
|
47
53
|
async function executeBuild() {
|
|
48
54
|
workersManager = new WorkersManager(context.watchMode ? ModeKind.Watch : ModeKind.Build);
|
|
49
55
|
initializeWorkers();
|
|
50
|
-
workersManager.
|
|
56
|
+
const graph = workersManager.finalize();
|
|
57
|
+
workersManager.onTerminate((trans) => {
|
|
58
|
+
const w = trans.worker;
|
|
51
59
|
if (!ProcessIPCClient.is(w)) {
|
|
52
60
|
logger.fatal `worker "${w._id}" is not a ProcessIPCClient, this is a bug.`;
|
|
53
61
|
return;
|
|
54
62
|
}
|
|
55
|
-
const times = `(+${humanDate.delta(w.time.
|
|
63
|
+
const times = `(+${humanDate.delta(w.time.executeStart, w.time.executeEnd)})`;
|
|
56
64
|
if (context.watchMode) {
|
|
57
65
|
printFailedRunError(w, `unexpected exit in watch mode ${times}`);
|
|
58
66
|
}
|
|
@@ -63,7 +71,10 @@ async function executeBuild() {
|
|
|
63
71
|
logger.success `"${w._id}" successfully finished ${times}.`;
|
|
64
72
|
}
|
|
65
73
|
});
|
|
66
|
-
workersManager.
|
|
74
|
+
if (workersManager.nodeNames.length === 0) {
|
|
75
|
+
logger.fatal `No workers to execute, check your config file.`;
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
67
78
|
channelClient.start();
|
|
68
79
|
if (context.breakMode) {
|
|
69
80
|
logger.warn `Break mode enabled, waiting for input command...`;
|
|
@@ -71,7 +82,8 @@ async function executeBuild() {
|
|
|
71
82
|
return;
|
|
72
83
|
}
|
|
73
84
|
logger.verbose `Workers initialized, starting execution...`;
|
|
74
|
-
await
|
|
85
|
+
await graph.startup();
|
|
86
|
+
logger.verbose `Startup returned.`;
|
|
75
87
|
reprintWatchModeError();
|
|
76
88
|
}
|
|
77
89
|
function executeClean() {
|
|
@@ -130,23 +142,31 @@ function printFailedRunError(worker, message) {
|
|
|
130
142
|
else {
|
|
131
143
|
console.error('\n\x1B[48;5;1m%s\r \x1B[0;38;5;9;1m %s \x1B[0m', ' '.repeat(process.stderr.columns || 80), `no output from ${worker._id}`);
|
|
132
144
|
}
|
|
133
|
-
|
|
145
|
+
const graph = workersManager.finalize();
|
|
146
|
+
console.error('%s\n%s', graph.debugFormatGraph(), graph.debugFormatSummary());
|
|
134
147
|
logger.fatal `"${worker._id}" ${message}`;
|
|
135
148
|
}
|
|
149
|
+
let printTo;
|
|
136
150
|
function reprintWatchModeError(noClear) {
|
|
137
|
-
if (
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
151
|
+
if (printTo)
|
|
152
|
+
clearTimeout(printTo);
|
|
153
|
+
printTo = setTimeout(() => {
|
|
154
|
+
printTo = undefined;
|
|
155
|
+
if (context.watchMode) {
|
|
156
|
+
if (!noClear && !defaultNoClear)
|
|
157
|
+
process.stderr.write('\x1Bc');
|
|
158
|
+
}
|
|
159
|
+
const graph = workersManager.finalize();
|
|
160
|
+
console.error('%s\n%s', graph.debugFormatList(), graph.debugFormatSummary());
|
|
161
|
+
printAllErrors();
|
|
162
|
+
}, 50);
|
|
143
163
|
}
|
|
144
164
|
function addDebugCommand() {
|
|
145
165
|
registerCommand({
|
|
146
166
|
name: ['continue', 'c'],
|
|
147
167
|
description: '开始执行',
|
|
148
168
|
callback: () => {
|
|
149
|
-
workersManager.startup();
|
|
169
|
+
workersManager.finalize().startup();
|
|
150
170
|
},
|
|
151
171
|
});
|
|
152
172
|
registerCommand({
|
|
@@ -154,7 +174,7 @@ function addDebugCommand() {
|
|
|
154
174
|
description: '切换调试模式（仅在启动前有效）',
|
|
155
175
|
callback: (text) => {
|
|
156
176
|
const [_, index, on_off] = text.split(/\s+/);
|
|
157
|
-
const list = workersManager.
|
|
177
|
+
const list = workersManager._allWorkers;
|
|
158
178
|
const worker = list[Number(index)];
|
|
159
179
|
if (!worker) {
|
|
160
180
|
logger.error `worker index out of range: ${index}`;
|
|
@@ -188,8 +208,15 @@ function sendStatus() {
|
|
|
188
208
|
channelClient.success(`All workers completed successfully.`);
|
|
189
209
|
}
|
|
190
210
|
else {
|
|
191
|
-
|
|
192
|
-
|
|
211
|
+
let errorCnt = 0;
|
|
212
|
+
const arr = [];
|
|
213
|
+
for (const [client, err] of errors.entries()) {
|
|
214
|
+
if (err) {
|
|
215
|
+
errorCnt++;
|
|
216
|
+
arr.push(client._id);
|
|
217
|
+
}
|
|
218
|
+
}
|
|
219
|
+
channelClient.failed(`mpis-run: ${arr.join(', ')} (${errorCnt} / ${workersManager.size()})`, formatAllErrors());
|
|
193
220
|
}
|
|
194
221
|
}
|
|
195
222
|
function formatAllErrors() {
|
|
@@ -225,10 +252,10 @@ function printAllErrors() {
|
|
|
225
252
|
const numFailed = [...errors.values().filter((e) => !!e)].length;
|
|
226
253
|
if (numFailed !== 0) {
|
|
227
254
|
console.error(formatAllErrors());
|
|
228
|
-
logger.error(`💥 ${numFailed} of ${workersManager.size} worker failed (${execTip})`);
|
|
255
|
+
logger.error(`💥 ${numFailed} of ${workersManager.size()} worker failed (${execTip})`);
|
|
229
256
|
}
|
|
230
257
|
else {
|
|
231
|
-
logger.success(`✅ no error in ${workersManager.size} workers (${execTip})`);
|
|
258
|
+
logger.success(`✅ no error in ${workersManager.size()} workers (${execTip})`);
|
|
232
259
|
}
|
|
233
260
|
}
|
|
234
261
|
//# sourceMappingURL=bin.js.map
|
package/lib/bin.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bin.js","sourceRoot":"","sources":["../src/bin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACtG,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"bin.js","sourceRoot":"","sources":["../src/bin.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-file.d.ts","sourceRoot":"","sources":["../../src/common/config-file.ts"],"names":[],"mappings":"AA2BA,MAAM,WAAW,QAAQ;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,CAAC;IACpC,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5B;AACD,MAAM,WAAW,WAAW;IAC3B,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IAC/B,KAAK,EAAE,WAAW,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACrC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,eAAe,EAAE,SAAS,MAAM,EAAE,CAAC;CACnC;
|
|
1
|
+
{"version":3,"file":"config-file.d.ts","sourceRoot":"","sources":["../../src/common/config-file.ts"],"names":[],"mappings":"AA2BA,MAAM,WAAW,QAAQ;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,CAAC;IACpC,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5B;AACD,MAAM,WAAW,WAAW;IAC3B,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IAC/B,KAAK,EAAE,WAAW,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACrC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,eAAe,EAAE,SAAS,MAAM,EAAE,CAAC;CACnC;AAqBD,wBAAgB,cAAc,CAAC,SAAS,EAAE,OAAO,GAAG,WAAW,CAoG9D"}
|
|
@@ -9,6 +9,9 @@ function watchModeCmd(command, watch, watchMode) {
|
|
|
9
9
|
if (!watchMode) {
|
|
10
10
|
return command;
|
|
11
11
|
}
|
|
12
|
+
if (typeof watch === 'boolean') {
|
|
13
|
+
throw new Error(`Invalid watch value: ${watch}. Expected string or array.`);
|
|
14
|
+
}
|
|
12
15
|
if (typeof command === 'string') {
|
|
13
16
|
if (!watch)
|
|
14
17
|
watch = '-w';
|
|
@@ -26,8 +29,19 @@ export function loadConfigFile(watchMode) {
|
|
|
26
29
|
const configFile = config.getJsonConfigInfo('commands');
|
|
27
30
|
logger.debug `using config file long<${configFile.effective}>`;
|
|
28
31
|
const input = config.loadBothJson('commands', schemaFile, {
|
|
29
|
-
|
|
30
|
-
|
|
32
|
+
array(left, right, keyPath) {
|
|
33
|
+
switch (keyPath[0]) {
|
|
34
|
+
case 'build':
|
|
35
|
+
case 'clean': {
|
|
36
|
+
if (!Array.isArray(right)) {
|
|
37
|
+
return left;
|
|
38
|
+
}
|
|
39
|
+
const s = new Set([...left, ...right]);
|
|
40
|
+
return [...s.values()];
|
|
41
|
+
}
|
|
42
|
+
default:
|
|
43
|
+
return right;
|
|
44
|
+
}
|
|
31
45
|
},
|
|
32
46
|
});
|
|
33
47
|
const buildMap = new Map();
|
|
@@ -41,10 +55,27 @@ export function loadConfigFile(watchMode) {
|
|
|
41
55
|
}
|
|
42
56
|
for (let item of input.build) {
|
|
43
57
|
if (typeof item === 'string') {
|
|
44
|
-
|
|
45
|
-
if (!
|
|
46
|
-
logger.fatal `command "${item}" not found in commands
|
|
58
|
+
const found = input.commands[item];
|
|
59
|
+
if (!found) {
|
|
60
|
+
logger.fatal `command ${input.build.indexOf(item)} "${item}" not found in "commands" list<${Object.keys(input.commands)}>`;
|
|
61
|
+
}
|
|
62
|
+
item = found;
|
|
63
|
+
}
|
|
64
|
+
if (item.watch === false && watchMode) {
|
|
65
|
+
let debug_title = item.title;
|
|
66
|
+
if (!debug_title) {
|
|
67
|
+
if (Array.isArray(item.command)) {
|
|
68
|
+
debug_title = item.command[0];
|
|
69
|
+
}
|
|
70
|
+
else if (typeof item.command === 'string') {
|
|
71
|
+
debug_title = item.command;
|
|
72
|
+
}
|
|
73
|
+
else if (typeof item.command === 'object' && 'package' in item.command) {
|
|
74
|
+
debug_title = item.command.package;
|
|
75
|
+
}
|
|
47
76
|
}
|
|
77
|
+
logger.log `command "${debug_title}" watch mode is disabled.`;
|
|
78
|
+
continue;
|
|
48
79
|
}
|
|
49
80
|
const cmd = item.command;
|
|
50
81
|
if (Array.isArray(cmd)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-file.js","sourceRoot":"","sources":["../../src/common/config-file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAkCnD,SAAS,YAAY,
|
|
1
|
+
{"version":3,"file":"config-file.js","sourceRoot":"","sources":["../../src/common/config-file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAkCnD,SAAS,YAAY,CAAC,OAAmC,EAAE,KAA4C,EAAE,SAAmB;IAC3H,IAAI,CAAC,SAAS,EAAE,CAAC;QAChB,OAAO,OAAO,CAAC;IAChB,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,SAAS,EAAE,CAAC;QAChC,MAAM,IAAI,KAAK,CAAC,wBAAwB,KAAK,6BAA6B,CAAC,CAAC;IAC7E,CAAC;IAED,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QACjC,IAAI,CAAC,KAAK;YAAE,KAAK,GAAG,IAAI,CAAC;QAEzB,OAAO,GAAG,OAAO,IAAI,KAAK,EAAE,CAAC;IAC9B,CAAC;SAAM,CAAC;QACP,IAAI,CAAC,KAAK;YAAE,KAAK,GAAG,CAAC,IAAI,CAAC,CAAC;QAE3B,OAAO,CAAC,GAAG,OAAO,EAAE,GAAG,KAAK,CAAC,CAAC;IAC/B,CAAC;AACF,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,SAAkB;IAChD,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,WAAW,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;IACjE,MAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,EAAE,sBAAsB,CAAC,CAAC;IAE7D,MAAM,UAAU,GAAG,MAAM,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;IACxD,MAAM,CAAC,KAAK,CAAA,0BAA0B,UAAU,CAAC,SAAS,GAAG,CAAC;IAE9D,MAAM,KAAK,GAAqB,MAAM,CAAC,YAAY,CAAC,UAAU,EAAE,UAAU,EAAE;QAC3E,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO;YACzB,QAAQ,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;gBACpB,KAAK,OAAO,CAAC;gBACb,KAAK,OAAO,CAAC,CAAC,CAAC;oBACd,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;wBAC3B,OAAO,IAAI,CAAC;oBACb,CAAC;oBACD,MAAM,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC;oBACvC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;gBACxB,CAAC;gBACD;oBACC,OAAO,KAAK,CAAC;YACf,CAAC;QACF,CAAC;KACD,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAoB,CAAC;IAC7C,MAAM,WAAW,GAAa,EAAE,CAAC;IACjC,SAAS,GAAG,CAAC,GAAa;QACzB,IAAI,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CAAC,sBAAsB,GAAG,CAAC,KAAK,8BAA8B,CAAC,CAAC;QAChF,CAAC;QACD,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC7B,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC;IAED,KAAK,IAAI,IAAI,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;QAC9B,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC9B,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACnC,IAAI,CAAC,KAAK,EAAE,CAAC;gBACZ,MAAM,CAAC,KAAK,CAAA,WAAW,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,kCAAkC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC;YAC3H,CAAC;YACD,IAAI,GAAG,KAAK,CAAC;QACd,CAAC;QAED,IAAI,IAAI,CAAC,KAAK,KAAK,KAAK,IAAI,SAAS,EAAE,CAAC;YACvC,IAAI,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC;YAC7B,IAAI,CAAC,WAAW,EAAE,CAAC;gBAClB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;oBACjC,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;gBAC/B,CAAC;qBAAM,IAAI,OAAO,IAAI,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;oBAC7C,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC;gBAC5B,CAAC;qBAAM,IAAI,OAAO,IAAI,CAAC,OAAO,KAAK,QAAQ,IAAI,SAAS,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;oBAC1E,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;gBACpC,CAAC;YACF,CAAC;YACD,MAAM,CAAC,GAAG,CAAA,YAAY,WAAW,2BAA2B,CAAC;YAC7D,SAAS;QACV,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC;QACzB,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YACxB,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,EAAE,CAAC;YACzB,oBAAoB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YACnC,GAAG,CAAC;gBACH,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,UAAU,CAAC,GAAG,CAAC;gBACpC,OAAO,EAAE,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC;gBAClD,GAAG,EAAE,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC;gBAC1C,GAAG,EAAE,IAAI,CAAC,GAAG,IAAI,EAAE;aACnB,CAAC,CAAC;QACJ,CAAC;aAAM,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,SAAS,IAAI,GAAG,EAAE,CAAC;YACxD,MAAM,GAAG,GAAG,mBAAmB,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;YACzD,GAAG,CAAC,GAAG,CAAC,CAAC;QACV,CAAC;aAAM,CAAC;YACP,MAAM,SAAS,CAAC,yBAAyB,OAAO,GAAG,uCAAuC,CAAC,CAAC;QAC7F,CAAC;IACF,CAAC;IAED,MAAM,eAAe,GAAa,EAAE,CAAC;IACrC,IAAI,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;QAC/B,MAAM,MAAM,GAAG,eAAe,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,wBAAwB,EAAE,EAAE,CAAC,CAAC;QAC5G,IAAI,CAAC,MAAM,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,wDAAwD,MAAM,CAAC,SAAS,CAAC,wBAAwB,EAAE,IAAI,CAAC,CAAC;QAC1H,CAAC;QACD,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC/C,CAAC;IAED,MAAM,KAAK,GAAG,EAAE,CAAC;IACjB,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;QAChC,MAAM,GAAG,GAAG,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QACvC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CAAC,uBAAuB,IAAI,sBAAsB,WAAW,GAAG,CAAC,CAAC;QAClF,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACjB,CAAC;IAED,OAAO;QACN,WAAW;QACX,KAAK,EAAE,QAAQ;QACf,KAAK;QACL,eAAe,EAAE,eAAe,CAAC,UAAU,EAAE;KAC7C,CAAC;AACH,CAAC;AAED,SAAS,UAAU,CAAC,OAAmC;IACtD,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QACjC,OAAO,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9B,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5B,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC;IACnB,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,oBAAoB,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC;AAC9F,CAAC;AAED,SAAS,mBAAmB,CAAC,MAAqB,EAAE,IAAmB,EAAE,SAAkB;IAC1F,MAAM,GAAG,GAAG,IAAI,CAAC,OAAyB,CAAC;IAE3C,MAAM,WAAW,GAAG,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC;IACjF,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;IACvB,IAAI,CAAC,KAAK,EAAE,CAAC;QACZ,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QACrC,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;YACxC,KAAK,IAAI,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;QAC3B,CAAC;IACF,CAAC;IAED,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC;IAC3D,MAAM,KAAK,GAAG,OAAO,GAAG,CAAC,GAAG,KAAK,QAAQ,CAAC;IAC1C,MAAM,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC;IAC3B,IAAI,KAAK,IAAI,KAAK,EAAE,CAAC;QACpB,MAAM,IAAI,KAAK,CAAC,IAAI,WAAW,uEAAuE,CAAC,CAAC;IACzG,CAAC;SAAM,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,IAAI,WAAW,wEAAwE,CAAC,CAAC;IAC1G,CAAC;IAED,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,MAAgB,CAAC,CAAC;IAC/D,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IAEnD,OAAO;QACN,KAAK,EAAE,KAAM;QACb,OAAO,EAAE,YAAY,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,CAAC,GAAG,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC;QACnG,GAAG,EAAE,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC;QAC1C,GAAG,EAAE,IAAI,CAAC,GAAG,IAAI,EAAE;KACnB,CAAC;AACH,CAAC;AAED;;;;;;GAMG;AACH,SAAS,oBAAoB,CAAC,MAAqB,EAAE,OAAiB;IACrE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO;IAExC,MAAM,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IAEzC,IAAI,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;QAClB,OAAO,CAAC,mBAAmB;IAC5B,CAAC;IAED,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC;AACrD,CAAC"}
|