nx 15.8.5 → 15.8.7
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/.eslintrc.json +24 -0
- package/bin/nx.js +7 -5
- package/bin/nx.js.map +1 -1
- package/migrations.json +1 -1
- package/package.json +13 -13
- package/src/adapter/ngcli-adapter.d.ts +2 -2
- package/src/adapter/ngcli-adapter.js +19 -21
- package/src/adapter/ngcli-adapter.js.map +1 -1
- package/src/command-line/init.js +47 -23
- package/src/command-line/init.js.map +1 -1
- package/src/command-line/migrate.d.ts +1 -1
- package/src/command-line/migrate.js +105 -79
- package/src/command-line/migrate.js.map +1 -1
- package/src/command-line/nx-commands.js +1 -0
- package/src/command-line/nx-commands.js.map +1 -1
- package/src/command-line/reset.d.ts +1 -1
- package/src/command-line/reset.js +14 -11
- package/src/command-line/reset.js.map +1 -1
- package/src/command-line/run-many.js +1 -1
- package/src/command-line/run-many.js.map +1 -1
- package/src/command-line/run-one.js +6 -0
- package/src/command-line/run-one.js.map +1 -1
- package/src/daemon/cache.d.ts +4 -1
- package/src/daemon/cache.js +14 -10
- package/src/daemon/cache.js.map +1 -1
- package/src/daemon/client/client.d.ts +1 -1
- package/src/daemon/client/client.js +13 -11
- package/src/daemon/client/client.js.map +1 -1
- package/src/daemon/client/generate-help-output.js +1 -1
- package/src/daemon/client/generate-help-output.js.map +1 -1
- package/src/daemon/server/server.d.ts +0 -1
- package/src/daemon/server/server.js +55 -42
- package/src/daemon/server/server.js.map +1 -1
- package/src/daemon/server/shutdown-utils.d.ts +2 -1
- package/src/daemon/server/shutdown-utils.js +16 -5
- package/src/daemon/server/shutdown-utils.js.map +1 -1
- package/src/daemon/server/watcher.d.ts +1 -0
- package/src/daemon/server/watcher.js +16 -1
- package/src/daemon/server/watcher.js.map +1 -1
- package/src/generators/utils/project-configuration.js +1 -0
- package/src/generators/utils/project-configuration.js.map +1 -1
- package/src/hasher/hasher.js +11 -5
- package/src/hasher/hasher.js.map +1 -1
- package/src/hasher/hashing-impl.js +4 -1
- package/src/hasher/hashing-impl.js.map +1 -1
- package/src/lock-file/lock-file.js +67 -25
- package/src/lock-file/lock-file.js.map +1 -1
- package/src/lock-file/npm-parser.js +58 -19
- package/src/lock-file/npm-parser.js.map +1 -1
- package/src/lock-file/pnpm-parser.js +1 -1
- package/src/lock-file/pnpm-parser.js.map +1 -1
- package/src/lock-file/utils/pnpm-normalizer.js +2 -2
- package/src/lock-file/utils/pnpm-normalizer.js.map +1 -1
- package/src/lock-file/yarn-parser.js +2 -2
- package/src/lock-file/yarn-parser.js.map +1 -1
- package/src/migrations/update-15-8-2/update-nxw.js +1 -1
- package/src/migrations/update-15-8-2/update-nxw.js.map +1 -1
- package/src/nx-init/add-nx-to-npm-repo.js +1 -1
- package/src/nx-init/add-nx-to-npm-repo.js.map +1 -1
- package/src/nx-init/{encapsulated → dot-nx}/add-nx-scripts.d.ts +2 -1
- package/src/nx-init/{encapsulated → dot-nx}/add-nx-scripts.js +20 -6
- package/src/nx-init/dot-nx/add-nx-scripts.js.map +1 -0
- package/src/nx-init/{encapsulated → dot-nx}/nxw.js +6 -8
- package/src/nx-init/dot-nx/nxw.js.map +1 -0
- package/src/project-graph/affected/locators/project-glob-changes.js +1 -1
- package/src/project-graph/affected/locators/project-glob-changes.js.map +1 -1
- package/src/project-graph/affected/locators/workspace-json-changes.js.map +1 -1
- package/src/project-graph/build-dependencies/build-explicit-typescript-and-package-json-dependencies.d.ts +1 -1
- package/src/project-graph/build-nodes/workspace-projects.js +5 -1
- package/src/project-graph/build-nodes/workspace-projects.js.map +1 -1
- package/src/project-graph/project-graph-builder.js +6 -2
- package/src/project-graph/project-graph-builder.js.map +1 -1
- package/src/project-graph/project-graph.js +2 -2
- package/src/project-graph/project-graph.js.map +1 -1
- package/src/tasks-runner/forked-process-task-runner.js +22 -0
- package/src/tasks-runner/forked-process-task-runner.js.map +1 -1
- package/src/utils/command-line-utils.js +21 -10
- package/src/utils/command-line-utils.js.map +1 -1
- package/src/utils/find-matching-projects.js +1 -1
- package/src/utils/find-matching-projects.js.map +1 -1
- package/src/utils/ignore.js +1 -1
- package/src/utils/ignore.js.map +1 -1
- package/src/utils/plugins/plugin-capabilities.js +7 -2
- package/src/utils/plugins/plugin-capabilities.js.map +1 -1
- package/src/utils/workspace-configuration-check.js +1 -1
- package/src/utils/workspace-configuration-check.js.map +1 -1
- package/src/daemon/server/stop.d.ts +0 -1
- package/src/daemon/server/stop.js +0 -19
- package/src/daemon/server/stop.js.map +0 -1
- package/src/nx-init/encapsulated/add-nx-scripts.js.map +0 -1
- package/src/nx-init/encapsulated/nxw.js.map +0 -1
- /package/src/nx-init/{encapsulated → dot-nx}/nxw.d.ts +0 -0
package/.eslintrc.json
CHANGED
|
@@ -26,6 +26,30 @@
|
|
|
26
26
|
}
|
|
27
27
|
]
|
|
28
28
|
}
|
|
29
|
+
},
|
|
30
|
+
{
|
|
31
|
+
"files": ["nxw.ts"],
|
|
32
|
+
"rules": {
|
|
33
|
+
"@typescript-eslint/no-restricted-imports": [
|
|
34
|
+
"error",
|
|
35
|
+
{
|
|
36
|
+
"patterns": [
|
|
37
|
+
{
|
|
38
|
+
"group": ["*", "!fs"],
|
|
39
|
+
"message": "The Nx wrapper is ran before packages are installed. It should only import node builtins.",
|
|
40
|
+
"allowTypeImports": true
|
|
41
|
+
}
|
|
42
|
+
]
|
|
43
|
+
}
|
|
44
|
+
],
|
|
45
|
+
"no-restricted-modules": [
|
|
46
|
+
"error",
|
|
47
|
+
{
|
|
48
|
+
"patterns": ["*", "!fs", "!path", "!child_process", "!node:*"]
|
|
49
|
+
}
|
|
50
|
+
],
|
|
51
|
+
"no-restricted-imports": "off"
|
|
52
|
+
}
|
|
29
53
|
}
|
|
30
54
|
]
|
|
31
55
|
}
|
package/bin/nx.js
CHANGED
|
@@ -56,15 +56,17 @@ else {
|
|
|
56
56
|
}
|
|
57
57
|
// this file is already in the local workspace
|
|
58
58
|
if (localNx === resolveNx(null)) {
|
|
59
|
-
if (localNx.includes('.nx') && !process.env.NX_WRAPPER_SET) {
|
|
60
|
-
const nxWrapperPath = localNx.replace(/\.nx.*/, '.nx/') + 'nxw.js';
|
|
61
|
-
require(nxWrapperPath);
|
|
62
|
-
}
|
|
63
59
|
(0, init_local_1.initLocal)(workspace);
|
|
64
60
|
}
|
|
65
61
|
else {
|
|
66
62
|
// Nx is being run from globally installed CLI - hand off to the local
|
|
67
|
-
|
|
63
|
+
if (localNx.includes('.nx')) {
|
|
64
|
+
const nxWrapperPath = localNx.replace(/\.nx.*/, '.nx/') + 'nxw.js';
|
|
65
|
+
require(nxWrapperPath);
|
|
66
|
+
}
|
|
67
|
+
else {
|
|
68
|
+
require(localNx);
|
|
69
|
+
}
|
|
68
70
|
}
|
|
69
71
|
}
|
|
70
72
|
function resolveNx(workspace) {
|
package/bin/nx.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nx.js","sourceRoot":"","sources":["../../../../packages/nx/bin/nx.ts"],"names":[],"mappings":";;;AACA,0EAG0C;AAC1C,+BAA+B;AAC/B,6CAAyC;AACzC,gDAA6C;AAC7C,gFAA4E;AAE5E,MAAM,SAAS,GAAG,IAAA,uCAAiB,EAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;AACnD,oEAAoE;AACpE,IACE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,KAAK;IACzB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,UAAU;IAC9B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,MAAM;IAC1B,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,OAAO,IAAI,CAAC,SAAS,CAAC,EAC3C;IACA,OAAO,CAAC,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC;IAChC,OAAO,CAAC,iCAAiC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC;CAChE;KAAM;IACL,IAAI,SAAS,IAAI,SAAS,CAAC,IAAI,KAAK,IAAI,EAAE;QACxC,OAAO,CAAC,kBAAkB,CAAC,CAAC;KAC7B;IACD,yGAAyG;IACzG,8DAA8D;IAC9D,IAAI,CAAE,MAAc,CAAC,UAAU;QAC5B,MAAc,CAAC,UAAU,GAAG,MAAM,CAAC,qBAAqB,CAAC,CAAC;IAE7D,IAAI,CAAC,SAAS,EAAE;QACd,eAAM,CAAC,GAAG,CAAC;YACT,KAAK,EAAE,sDAAsD;YAC7D,SAAS,EAAE;gBACT,4BAA4B;gBAC5B,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,iDAAiD,CAAC;gBACnE,EAAE;gBACF,wEAAwE;gBACxE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,+BAA+B,CAAC;gBACjD,EAAE;gBACF,sCAAsC;gBACtC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;aAC5B;SACF,CAAC,CAAC;QAEH,eAAM,CAAC,IAAI,CAAC;YACV,KAAK,EAAE,mDAAmD;SAC3D,CAAC,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;IAED,wDAAwD;IACxD,IAAI,OAAe,CAAC;IACpB,IAAI;QACF,OAAO,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC;KAChC;IAAC,WAAM;QACN,eAAM,CAAC,KAAK,CAAC;YACX,KAAK,EAAE,8CAA8C;YACrD,SAAS,EAAE,CAAC,gBAAgB,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,GAAG,CAAC;SACrE,CAAC,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;IAED,8CAA8C;IAC9C,IAAI,OAAO,KAAK,SAAS,CAAC,IAAI,CAAC,EAAE;QAC/B,
|
|
1
|
+
{"version":3,"file":"nx.js","sourceRoot":"","sources":["../../../../packages/nx/bin/nx.ts"],"names":[],"mappings":"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"}
|
package/migrations.json
CHANGED
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
"15.8.2-update-nx-wrapper": {
|
|
52
52
|
"cli": "nx",
|
|
53
53
|
"version": "15.8.2-beta.0",
|
|
54
|
-
"description": "Updates the nx wrapper
|
|
54
|
+
"description": "Updates the nx wrapper.",
|
|
55
55
|
"implementation": "./src/migrations/update-15-8-2/update-nxw"
|
|
56
56
|
}
|
|
57
57
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nx",
|
|
3
|
-
"version": "15.8.
|
|
3
|
+
"version": "15.8.7",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
|
|
6
6
|
"repository": {
|
|
@@ -32,8 +32,8 @@
|
|
|
32
32
|
},
|
|
33
33
|
"homepage": "https://nx.dev",
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"@nrwl/cli": "15.8.
|
|
36
|
-
"@nrwl/tao": "15.8.
|
|
35
|
+
"@nrwl/cli": "15.8.7",
|
|
36
|
+
"@nrwl/tao": "15.8.7",
|
|
37
37
|
"@parcel/watcher": "2.0.4",
|
|
38
38
|
"@yarnpkg/lockfile": "^1.1.0",
|
|
39
39
|
"@yarnpkg/parsers": "^3.0.0-rc.18",
|
|
@@ -81,15 +81,15 @@
|
|
|
81
81
|
}
|
|
82
82
|
},
|
|
83
83
|
"optionalDependencies": {
|
|
84
|
-
"@nrwl/nx-darwin-arm64": "15.8.
|
|
85
|
-
"@nrwl/nx-darwin-x64": "15.8.
|
|
86
|
-
"@nrwl/nx-linux-arm-gnueabihf": "15.8.
|
|
87
|
-
"@nrwl/nx-linux-arm64-gnu": "15.8.
|
|
88
|
-
"@nrwl/nx-linux-arm64-musl": "15.8.
|
|
89
|
-
"@nrwl/nx-linux-x64-gnu": "15.8.
|
|
90
|
-
"@nrwl/nx-linux-x64-musl": "15.8.
|
|
91
|
-
"@nrwl/nx-win32-arm64-msvc": "15.8.
|
|
92
|
-
"@nrwl/nx-win32-x64-msvc": "15.8.
|
|
84
|
+
"@nrwl/nx-darwin-arm64": "15.8.7",
|
|
85
|
+
"@nrwl/nx-darwin-x64": "15.8.7",
|
|
86
|
+
"@nrwl/nx-linux-arm-gnueabihf": "15.8.7",
|
|
87
|
+
"@nrwl/nx-linux-arm64-gnu": "15.8.7",
|
|
88
|
+
"@nrwl/nx-linux-arm64-musl": "15.8.7",
|
|
89
|
+
"@nrwl/nx-linux-x64-gnu": "15.8.7",
|
|
90
|
+
"@nrwl/nx-linux-x64-musl": "15.8.7",
|
|
91
|
+
"@nrwl/nx-win32-arm64-msvc": "15.8.7",
|
|
92
|
+
"@nrwl/nx-win32-x64-msvc": "15.8.7"
|
|
93
93
|
},
|
|
94
94
|
"nx-migrations": {
|
|
95
95
|
"migrations": "./migrations.json",
|
|
@@ -148,5 +148,5 @@
|
|
|
148
148
|
},
|
|
149
149
|
"main": "./bin/nx.js",
|
|
150
150
|
"types": "./bin/nx.d.ts",
|
|
151
|
-
"gitHead": "
|
|
151
|
+
"gitHead": "f300d356c11fb8eaffe44b1839c4dac4b7df1ff1"
|
|
152
152
|
}
|
|
@@ -17,13 +17,13 @@ export declare class NxScopedHost extends virtualFs.ScopedHost<any> {
|
|
|
17
17
|
private root;
|
|
18
18
|
constructor(root: string);
|
|
19
19
|
read(path: Path): Observable<FileBuffer>;
|
|
20
|
-
private
|
|
20
|
+
private readMergedWorkspaceConfiguration;
|
|
21
21
|
write(path: Path, content: FileBuffer): Observable<void>;
|
|
22
22
|
isFile(path: Path): Observable<boolean>;
|
|
23
23
|
exists(path: Path): Observable<boolean>;
|
|
24
24
|
mergeProjectConfiguration(existing: AngularProjectConfiguration, updated: AngularProjectConfiguration, projectName: string): AngularProjectConfiguration;
|
|
25
25
|
readExistingAngularJson(): Observable<any>;
|
|
26
|
-
|
|
26
|
+
private readJson;
|
|
27
27
|
}
|
|
28
28
|
export declare function arrayBufferToString(buffer: any): string;
|
|
29
29
|
export declare class NxScopeHostUsedForWrappedSchematics extends NxScopedHost {
|
|
@@ -132,30 +132,31 @@ class NxScopedHost extends core_1.virtualFs.ScopedHost {
|
|
|
132
132
|
}
|
|
133
133
|
read(path) {
|
|
134
134
|
if (path === 'angular.json' || path === '/angular.json') {
|
|
135
|
-
return this.
|
|
135
|
+
return this.readMergedWorkspaceConfiguration().pipe((0, operators_1.map)((r) => Buffer.from(JSON.stringify((0, angular_json_1.toOldFormat)(r)))));
|
|
136
136
|
}
|
|
137
137
|
else {
|
|
138
138
|
return super.read(path);
|
|
139
139
|
}
|
|
140
140
|
}
|
|
141
|
-
|
|
142
|
-
return (0, rxjs_1.zip)((0, rxjs_1.from)((0, project_graph_1.createProjectGraphAsync)()), this.readExistingAngularJson()).pipe((0, operators_1.concatMap)((
|
|
143
|
-
|
|
144
|
-
const
|
|
141
|
+
readMergedWorkspaceConfiguration() {
|
|
142
|
+
return (0, rxjs_1.zip)((0, rxjs_1.from)((0, project_graph_1.createProjectGraphAsync)()), this.readExistingAngularJson(), this.readJson('nx.json')).pipe((0, operators_1.concatMap)(([graph, angularJson, nxJson]) => {
|
|
143
|
+
var _a, _b;
|
|
144
|
+
const workspaceConfig = (angularJson || { projects: {} });
|
|
145
|
+
(_a = workspaceConfig.cli) !== null && _a !== void 0 ? _a : (workspaceConfig.cli = nxJson.cli);
|
|
146
|
+
(_b = workspaceConfig.schematics) !== null && _b !== void 0 ? _b : (workspaceConfig.schematics = nxJson.generators);
|
|
145
147
|
const projectJsonReads = [];
|
|
146
148
|
for (let projectName of Object.keys(graph.nodes)) {
|
|
147
|
-
if (!
|
|
148
|
-
projectJsonReads.push((0, rxjs_1.zip)((0, rxjs_1.of)(projectName), this.
|
|
149
|
+
if (!workspaceConfig.projects[projectName]) {
|
|
150
|
+
projectJsonReads.push((0, rxjs_1.zip)((0, rxjs_1.of)(projectName), this.readJson((0, path_1.join)(graph.nodes[projectName].data.root, 'project.json'))));
|
|
149
151
|
}
|
|
150
152
|
}
|
|
151
153
|
return (0, rxjs_1.zip)(...projectJsonReads).pipe((0, operators_1.map)((reads) => {
|
|
152
154
|
reads
|
|
153
155
|
.filter(([, p]) => p !== null)
|
|
154
156
|
.forEach(([projectName, project]) => {
|
|
155
|
-
|
|
156
|
-
ret.projects[projectName] = Object.assign(Object.assign({}, project), { root: graph.nodes[projectName].data.root });
|
|
157
|
+
workspaceConfig.projects[projectName] = Object.assign(Object.assign({}, project), { root: graph.nodes[projectName].data.root });
|
|
157
158
|
});
|
|
158
|
-
return
|
|
159
|
+
return workspaceConfig;
|
|
159
160
|
}));
|
|
160
161
|
}), (0, operators_1.catchError)((err) => {
|
|
161
162
|
console.log('Unable to read angular.json');
|
|
@@ -167,7 +168,7 @@ class NxScopedHost extends core_1.virtualFs.ScopedHost {
|
|
|
167
168
|
if (path === 'angular.json' || path === '/angular.json') {
|
|
168
169
|
const configV2 = (0, angular_json_1.toNewFormat)((0, json_2.parseJson)(content.toString()));
|
|
169
170
|
const root = this.root;
|
|
170
|
-
return (0, rxjs_1.zip)(this.
|
|
171
|
+
return (0, rxjs_1.zip)(this.readMergedWorkspaceConfiguration(), this.readExistingAngularJson()).pipe((0, operators_1.concatMap)((arg) => {
|
|
171
172
|
const existingConfig = arg[0];
|
|
172
173
|
const existingAngularJson = arg[1];
|
|
173
174
|
const projectsInAngularJson = existingAngularJson
|
|
@@ -251,21 +252,15 @@ class NxScopedHost extends core_1.virtualFs.ScopedHost {
|
|
|
251
252
|
return modified ? res : null;
|
|
252
253
|
}
|
|
253
254
|
readExistingAngularJson() {
|
|
254
|
-
return
|
|
255
|
-
.exists('angular.json')
|
|
256
|
-
.pipe((0, operators_1.concatMap)((r) => r
|
|
257
|
-
? super
|
|
258
|
-
.read('angular.json')
|
|
259
|
-
.pipe((0, operators_1.map)((r) => (0, json_2.parseJson)(arrayBufferToString(r))))
|
|
260
|
-
: (0, rxjs_1.of)(null)));
|
|
255
|
+
return this.readJson('angular.json');
|
|
261
256
|
}
|
|
262
|
-
|
|
257
|
+
readJson(path) {
|
|
263
258
|
return super
|
|
264
259
|
.exists(path)
|
|
265
260
|
.pipe((0, operators_1.concatMap)((r) => r
|
|
266
261
|
? super
|
|
267
262
|
.read(path)
|
|
268
|
-
.pipe((0, operators_1.map)((r) => (0,
|
|
263
|
+
.pipe((0, operators_1.map)((r) => (0, json_2.parseJson)(arrayBufferToString(r))))
|
|
269
264
|
: (0, rxjs_1.of)(null)));
|
|
270
265
|
}
|
|
271
266
|
}
|
|
@@ -641,7 +636,10 @@ function saveProjectsConfigurationsInWrappedSchematic(host, content) {
|
|
|
641
636
|
}
|
|
642
637
|
else {
|
|
643
638
|
if (existingProjects.has(projectName)) {
|
|
644
|
-
(
|
|
639
|
+
if (JSON.stringify(existingProjects.get(projectName)) !==
|
|
640
|
+
JSON.stringify(projects[projectName])) {
|
|
641
|
+
(0, project_configuration_1.updateProjectConfiguration)(host, projectName, projects[projectName]);
|
|
642
|
+
}
|
|
645
643
|
}
|
|
646
644
|
else {
|
|
647
645
|
(0, project_configuration_1.addProjectConfiguration)(host, projectName, projects[projectName]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ngcli-adapter.js","sourceRoot":"","sources":["../../../../../packages/nx/src/adapter/ngcli-adapter.ts"],"names":[],"mappings":";;;;AAEA,+CAU8B;AAC9B,oDAAgF;AAEhF,+BAA+B;AAE/B,+BAAuD;AACvD,+BAAyD;AACzD,8CAAiE;AAGjE,6CAAkD;AAClD,mDAAoD;AACpD,qFAImD;AACnD,kEAAyE;AACzE,kDAAkD;AAClD,4EAAoE;AACpE,wCAA0C;AAC1C,4CAAsD;AACtD,wDAA8D;AAC9D,8DAAgE;AAChE,iDAA0D;AAE1D,SAAsB,cAAc,CAClC,IAAY,EACZ,IAKC,EACD,OAAgB;;QAEhB,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;QAC3D,MAAM,EACJ,iCAAiC,GAClC,GAAG,OAAO,CAAC,gCAAgC,CAAC,CAAC;QAE9C,MAAM,MAAM,GAAG,IAAA,iBAAS,EAAC,OAAO,CAAC,CAAC;QAClC,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC;QACtC,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,iBAAU,CAAC,aAAa,CAClD,cAAc,EACd,iBAAU,CAAC,mBAAmB,CAAC,MAAM,CAAC,CACvC,CAAC;QAEF,MAAM,QAAQ,GAAG,IAAI,aAAM,CAAC,kBAAkB,EAAE,CAAC;QACjD,QAAQ,CAAC,gBAAgB,CAAC,aAAM,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;QAClE,QAAQ,CAAC,uBAAuB,CAAC,UAAU,EAAE,GAAG,EAAE;YAChD,yFAAyF;YACzF,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC,CAAC;QACH,MAAM,aAAa,GAAG,IAAI,iCAAiC,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAC7E,MAAM,SAAS,GAAc,IAAI,SAAS,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;QACpE,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,cAAc,CACxC;YACE,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,aAAa,EAAE,IAAI,CAAC,aAAa;SAClC,EACD,IAAI,CAAC,UAAU,EACf,EAAE,MAAM,EAAE,CACX,CAAC;QAEF,IAAI,eAAuB,CAAC;QAC5B,OAAO,GAAG,CAAC,MAAM,CAAC,IAAI,CACpB,IAAA,eAAG,EACD,CAAC,MAAM,EAAE,EAAE,CACT,CAAC,eAAe,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,EAChE,CAAC,KAAK,EAAE,EAAE,GAAE,CAAC,EAAE,iDAAiD;QAChE,GAAG,EAAE;YACH,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACtD,CAAC,CACF,CACF,CAAC;IACJ,CAAC;CAAA;AAnDD,wCAmDC;AAED,SAAS,cAAc,CACrB,MAA6B,EAC7B,IAAY,EACZ,IAAS;IAET,MAAM,YAAY,GAAG,OAAO,CAAC,kCAAkC,CAAC,CAAC,YAAY,CAAC;IAC9E,MAAM,QAAQ,GAAG,IAAI,YAAY,CAAC,MAAM,EAAE;QACxC,KAAK,EAAE,KAAK;QACZ,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,cAAc,EAAE,IAAA,sCAAoB,GAAE;QACtC,IAAI,EAAE,IAAA,gBAAS,EAAC,IAAI,CAAC;QACrB,QAAQ,EAAE,IAAI,aAAM,CAAC,kBAAkB,CACrC,OAAO,CAAC,4BAA4B,CAAC,CAAC,OAAO,CAAC,eAAe,CAC9D;QACD,YAAY,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC;KACpC,CAAC,CAAC;IACH,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,CAAC,aAAM,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;IAC3E,QAAQ,CAAC,UAAU,CAAC,wBAAwB,CAC1C,OAAO,CAAC,kCAAkC,CAAC,CAAC,yBAAyB,CACnE,QAAQ,CAAC,QAAQ,CAClB,CACF,CAAC;IACF,IAAI,IAAI,CAAC,WAAW,EAAE;QACpB,QAAQ,CAAC,QAAQ,CAAC,iBAAiB,CAAC,oBAAoB,EAAE,CAAC,CAAC;KAC7D;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,aAAa,CAAC,QAAa,EAAE,IAAY;IAChD,MAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAC1D,IAAI,CAAC,UAAU;QAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,IAAI,GAAG,CAAC,CAAC;IACrE,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAe,cAAc,CAC3B,IAAkB,EAClB,MAGC,EACD,MAAsB;;QAEtB,OAAO,CAAC,KAAuD,EAAE,EAAE;YACjE,IAAI,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;gBACxC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;gBACrB,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;YAEf,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE;gBAC1B,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC;gBACpB,MAAM,CAAC,IAAI,CACT,UAAU,SAAS,IACjB,KAAK,CAAC,WAAW,IAAI,cAAc;oBACjC,CAAC,CAAC,gBAAgB;oBAClB,CAAC,CAAC,iBACN,GAAG,CACJ,CAAC;aACH;iBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAClC,MAAM,CAAC,YAAY,CAAC,IAAI,CACtB,WAAI,CAAC,OAAO,CAAA,GAAG,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,SAAS,EAAE,CACpD,CAAC;aACH;iBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAClC,MAAM,CAAC,YAAY,CAAC,IAAI,CACtB,WAAI,CAAC,OAAO,CAAA,GAAG,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,SAAS,EAAE,CACpD,CAAC;aACH;iBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAClC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,SAAS,EAAE,CAAC,CAAC;aACpE;iBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAClC,MAAM,CAAC,YAAY,CAAC,IAAI,CACtB,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,SAAS,OAAO,KAAK,CAAC,EAAE,EAAE,CACtD,CAAC;aACH;QACH,CAAC,CAAC;IACJ,CAAC;CAAA;AAED,SAAe,YAAY,CACzB,IAAkB,EAClB,IAAY,EACZ,QAAiE,EACjE,MAAsB,EACtB,IAAqB,EACrB,SAGC,EACD,kBAAkB,GAAG,IAAI,EACzB,WAAgB,IAAI;;QAEpB,MAAM,MAAM,GAAG,EAAE,YAAY,EAAE,EAAc,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;QAC9D,QAAQ,CAAC,QAAQ,CAAC,SAAS,CACzB,QAAQ,IAAI,CAAC,MAAM,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CACzD,CAAC;QAEF,IAAI;YACF,MAAM,QAAQ;iBACX,OAAO,CAAC;gBACP,UAAU,EAAE,IAAI,CAAC,cAAc;gBAC/B,SAAS,EAAE,IAAI,CAAC,aAAa;gBAC7B,OAAO,EAAE,IAAI,CAAC,gBAAgB;gBAC9B,KAAK,EAAE,KAAK;gBACZ,MAAM;aACP,CAAC;iBACD,SAAS,EAAE,CAAC;SAChB;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACf,MAAM,CAAC,CAAC;SACT;QACD,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;YACjB,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;SACxD;QACD,IAAI,IAAI,CAAC,MAAM,IAAI,kBAAkB,EAAE;YACrC,MAAM,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAC;SACtE;QACD,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE,YAAY,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC;IAC1D,CAAC;CAAA;AAID,MAAa,YAAa,SAAQ,gBAAS,CAAC,UAAe;IACzD,YAAoB,IAAY;QAC9B,KAAK,CAAC,IAAI,qBAAc,EAAE,EAAE,IAAA,gBAAS,EAAC,IAAI,CAAC,CAAC,CAAC;QAD3B,SAAI,GAAJ,IAAI,CAAQ;IAEhC,CAAC;IAED,IAAI,CAAC,IAAU;QACb,IAAI,IAAI,KAAK,cAAc,IAAI,IAAI,KAAK,eAAe,EAAE;YACvD,OAAO,IAAI,CAAC,8BAA8B,EAAE,CAAC,IAAI,CAC/C,IAAA,eAAG,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAA,0BAAW,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACxD,CAAC;SACH;aAAM;YACL,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;IAEO,8BAA8B;QACpC,OAAO,IAAA,UAAG,EACR,IAAA,WAAI,EAAC,IAAA,uCAAuB,GAAE,CAAC,EAC/B,IAAI,CAAC,uBAAuB,EAAE,CAC/B,CAAC,IAAI,CACJ,IAAA,qBAAS,EAAC,CAAC,GAAG,EAAE,EAAE;YAChB,MAAM,KAAK,GAAG,GAAG,CAAC,CAAC,CAAQ,CAAC;YAC5B,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAQ,CAAC;YAChD,MAAM,gBAAgB,GAEhB,EAAE,CAAC;YACT,KAAK,IAAI,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;gBAChD,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;oBAC9B,gBAAgB,CAAC,IAAI,CACnB,IAAA,UAAG,EACD,IAAA,SAAE,EAAC,WAAW,CAAC,EACf,IAAI,CAAC,uBAAuB,CAC1B,IAAA,WAAI,EAAC,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CACzD,CACF,CACF,CAAC;iBACH;aACF;YACD,OAAO,IAAA,UAAG,EAAC,GAAG,gBAAgB,CAAC,CAAC,IAAI,CAClC,IAAA,eAAG,EAAC,CAAC,KAAK,EAAE,EAAE;gBACZ,KAAK;qBACF,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC;qBAC7B,OAAO,CAAC,CAAC,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,EAAE;oBAClC,OAAO,OAAO,CAAC,OAAO,CAAC;oBACvB,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,mCACpB,OAAO,KACV,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,GACzC,CAAC;gBACJ,CAAC,CAAC,CAAC;gBAEL,OAAO,GAAG,CAAC;YACb,CAAC,CAAC,CACH,CAAC;QACJ,CAAC,CAAC,EACF,IAAA,sBAAU,EAAC,CAAC,GAAG,EAAE,EAAE;YACjB,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;YAC3C,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACjB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,IAAU,EAAE,OAAmB;QACnC,IAAI,IAAI,KAAK,cAAc,IAAI,IAAI,KAAK,eAAe,EAAE;YACvD,MAAM,QAAQ,GAAG,IAAA,0BAAW,EAAC,IAAA,gBAAS,EAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;YAC5D,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;YAEvB,OAAO,IAAA,UAAG,EACR,IAAI,CAAC,8BAA8B,EAAE,EACrC,IAAI,CAAC,uBAAuB,EAAE,CAC/B,CAAC,IAAI,CACJ,IAAA,qBAAS,EAAC,CAAC,GAAG,EAAE,EAAE;gBAChB,MAAM,cAAc,GAAG,GAAG,CAAC,CAAC,CAAQ,CAAC;gBACrC,MAAM,mBAAmB,GAAG,GAAG,CAAC,CAAC,CAAQ,CAAC;gBAE1C,MAAM,qBAAqB,GAAG,mBAAmB;oBAC/C,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC;oBAC3C,CAAC,CAAC,EAAE,CAAC;gBACP,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;gBACnC,MAAM,cAAc,GAAG,EAAE,CAAC;gBAC1B,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;oBAC5C,IAAI,qBAAqB,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;wBAC/C,iCAAiC;qBAClC;yBAAM;wBACL,IAAA,kDAA0B,EACxB;4BACE,IAAI;4BACJ,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI;4BAClB,KAAK,EAAE,CAAC,IAAY,EAAE,OAAO,EAAE,EAAE;gCAC/B,IAAI,cAAc,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;oCACxC,MAAM,cAAc,GAAG,IAAI,CAAC,yBAAyB,CACnD,cAAc,CAAC,QAAQ,CAAC,WAAW,CAAC,EACpC,QAAQ,CAAC,WAAW,CAAC,EACrB,WAAW,CACZ,CAAC;oCACF,IAAI,cAAc,EAAE;wCAClB,OAAO,cAAc,CAAC,IAAI,CAAC;wCAC3B,cAAc,CAAC,IAAI,CACjB,KAAK,CAAC,KAAK,CACT,IAAW,EACX,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CACrD,CACF,CAAC;qCACH;iCACF;qCAAM;oCACL,cAAc,CAAC,IAAI,CACjB,KAAK,CAAC,KAAK,CAAC,IAAW,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAC/C,CAAC;iCACH;4BACH,CAAC;yBACK,EACR,WAAW,EACX,QAAQ,CAAC,WAAW,CAAC,CACtB,CAAC;qBACH;gBACH,CAAC,CAAC,CAAC;gBACH,OAAO,IAAA,aAAM,EAAC,GAAG,cAAc,CAAC,CAAC;YACnC,CAAC,CAAC,CACI,CAAC;SACV;aAAM;YACL,OAAO,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACnC;IACH,CAAC;IAED,MAAM,CAAC,IAAU;QACf,IAAI,IAAI,KAAK,cAAc,IAAI,IAAI,KAAK,eAAe,EAAE;YACvD,OAAO,IAAA,SAAE,EAAC,IAAI,CAAC,CAAC;SACjB;aAAM;YACL,OAAO,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;SAC3B;IACH,CAAC;IAED,MAAM,CAAC,IAAU;QACf,IAAI,IAAI,KAAK,cAAc,IAAI,IAAI,KAAK,eAAe,EAAE;YACvD,OAAO,IAAA,SAAE,EAAC,IAAI,CAAC,CAAC;SACjB;aAAM;YACL,OAAO,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;SAC3B;IACH,CAAC;IAED,yBAAyB,CACvB,QAAqC,EACrC,OAAoC,EACpC,WAAmB;;QAEnB,MAAM,GAAG,qBAAqC,QAAQ,CAAE,CAAC;QACzD,IAAI,QAAQ,GAAG,KAAK,CAAC;QAErB,SAAS,yBAAyB,CAEhC,QAAW;YACX,IAAI,OAAO,GAAG,CAAC,QAAQ,CAAC,KAAK,QAAQ,EAAE;gBACrC,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,OAAO,CAAC,QAAQ,CAAC,EAAE;oBACvC,GAAG,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;oBAClC,QAAQ,GAAG,IAAI,CAAC;iBACjB;aACF;iBAAM,IACL,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,EACnE;gBACA,GAAG,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;gBAClC,QAAQ,GAAG,IAAI,CAAC;aACjB;QACH,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC,EAAE;YAC5D,MAAA,GAAG,CAAC,IAAI,oCAAR,GAAG,CAAC,IAAI,GAAK,OAAO,CAAC,IAAI,IAAI,WAAW,EAAC;YACzC,QAAQ,GAAG,IAAI,CAAC;SACjB;QACD,yBAAyB,CAAC,aAAa,CAAC,CAAC;QACzC,yBAAyB,CAAC,YAAY,CAAC,CAAC;QACxC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QACpC,yBAAyB,CAAC,SAAS,CAAC,CAAC;QACrC,yBAAyB,CAAC,YAAY,CAAC,CAAC;QACxC,yBAAyB,CAAC,sBAAsB,CAAC,CAAC;QAClD,yBAAyB,CAAC,MAAM,CAAC,CAAC;QAElC,OAAO,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;IAC/B,CAAC;IAED,uBAAuB;QACrB,OAAO,KAAK;aACT,MAAM,CAAC,cAAqB,CAAC;aAC7B,IAAI,CACH,IAAA,qBAAS,EAAC,CAAC,CAAC,EAAE,EAAE,CACd,CAAC;YACC,CAAC,CAAC,KAAK;iBACF,IAAI,CAAC,cAAqB,CAAC;iBAC3B,IAAI,CAAC,IAAA,eAAG,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,gBAAS,EAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACxD,CAAC,CAAC,IAAA,SAAE,EAAC,IAAI,CAAC,CACb,CACF,CAAC;IACN,CAAC;IAED,uBAAuB,CAAC,IAAY;QAClC,OAAO,KAAK;aACT,MAAM,CAAC,IAAW,CAAC;aACnB,IAAI,CACH,IAAA,qBAAS,EAAC,CAAC,CAAC,EAAE,EAAE,CACd,CAAC;YACC,CAAC,CAAC,KAAK;iBACF,IAAI,CAAC,IAAW,CAAC;iBACjB,IAAI,CACH,IAAA,eAAG,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,0BAAW,EAAC,IAAA,gBAAS,EAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAC3D;YACL,CAAC,CAAC,IAAA,SAAE,EAAC,IAAI,CAAC,CACb,CACF,CAAC;IACN,CAAC;CACF;AAhND,oCAgNC;AAED,SAAgB,mBAAmB,CAAC,MAAW;IAC7C,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC;IACrC,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,MAAM,SAAS,GAAG,CAAC,GAAG,IAAI,CAAC;IAC3B,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,GAAG,SAAS,EAAE,CAAC,EAAE,EAAE;QAC7C,MAAM,IAAI,MAAM,CAAC,YAAY,CAAC,KAAK,CACjC,IAAI,EACJ,KAAK,CAAC,QAAQ,CAAC,CAAC,GAAG,SAAS,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CACnD,CAAC;KACH;IACD,MAAM,IAAI,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;IACzE,OAAO,MAAM,CAAC;AAChB,CAAC;AAbD,kDAaC;AAED,MAAa,mCAAoC,SAAQ,YAAY;IACnE,YAAY,IAAY,EAAmB,IAAU;QACnD,KAAK,CAAC,IAAI,CAAC,CAAC;QAD6B,SAAI,GAAJ,IAAI,CAAM;IAErD,CAAC;IAED,IAAI,CAAC,IAAU;QACb,IAAI,IAAI,IAAI,cAAc,IAAI,IAAI,IAAI,eAAe,EAAE;YACrD,MAAM,iBAAiB,GAAG,IAAA,0BAAW,EAAC;gBACpC,QAAQ,EAAE,MAAM,CAAC,WAAW,CAAC,IAAA,mCAAW,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACrD,CAAC,CAAC;YACH,OAAO,KAAK,CAAC,uBAAuB,EAAE,CAAC,IAAI,CACzC,IAAA,eAAG,EAAC,CAAC,WAAW,EAAE,EAAE;gBAClB,IAAI,WAAW,EAAE;oBACf,OAAO,MAAM,CAAC,IAAI,CAChB,IAAI,CAAC,SAAS,CAAC;wBACb,OAAO,EAAE,CAAC;wBACV,QAAQ,kCACH,iBAAiB,CAAC,QAAQ,GAC1B,WAAW,CAAC,QAAQ,CACxB;qBACF,CAAC,CACH,CAAC;iBACH;qBAAM;oBACL,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC,CAAC;iBACvD;YACH,CAAC,CAAC,CACH,CAAC;SACH;aAAM;YACL,MAAM,KAAK,GAAG,sBAAsB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACtD,IAAI,KAAK,EAAE;gBACT,OAAO,IAAA,SAAE,EAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;aACvC;iBAAM;gBACL,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACzB;SACF;IACH,CAAC;IAED,MAAM,CAAC,IAAU;QACf,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YAC1B,OAAO,IAAA,SAAE,EAAC,IAAI,CAAC,CAAC;SACjB;aAAM,IAAI,IAAI,KAAK,cAAc,IAAI,IAAI,KAAK,eAAe,EAAE;YAC9D,OAAO,IAAA,SAAE,EAAC,IAAI,CAAC,CAAC;SACjB;aAAM;YACL,OAAO,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;SAC3B;IACH,CAAC;IAED,WAAW,CAAC,IAAU;QACpB,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YACrD,OAAO,IAAA,SAAE,EAAC,IAAI,CAAC,CAAC;SACjB;aAAM,IAAI,IAAI,KAAK,cAAc,IAAI,IAAI,KAAK,eAAe,EAAE;YAC9D,OAAO,IAAA,SAAE,EAAC,KAAK,CAAC,CAAC;SAClB;aAAM;YACL,OAAO,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;SAChC;IACH,CAAC;IAED,MAAM,CAAC,IAAU;QACf,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YAC1B,OAAO,IAAA,SAAE,EAAC,IAAI,CAAC,CAAC;SACjB;aAAM,IAAI,IAAI,KAAK,cAAc,IAAI,IAAI,KAAK,eAAe,EAAE;YAC9D,OAAO,IAAA,SAAE,EAAC,IAAI,CAAC,CAAC;SACjB;aAAM;YACL,OAAO,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;SAC3B;IACH,CAAC;IAED,IAAI,CAAC,IAAU;QACb,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,eAAQ,EAAC,KAAK,CAAC,CAAC,CAAC;QAC3E,OAAO,IAAA,SAAE,EAAC,SAAS,CAAC,CAAC;IACvB,CAAC;CACF;AAvED,kFAuEC;AAED,SAAS,sBAAsB,CAAC,IAAU,EAAE,IAAU;IACpD,MAAM,UAAU,GAAG,IAAA,gBAAS,EAC1B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAC3D,CAAC;IACF,OAAO,IAAI;SACR,WAAW,EAAE;SACb,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,IAAI,IAAA,gBAAS,EAAC,CAAC,CAAC,IAAI,CAAC,KAAK,UAAU,CAAC,CAAC;AAC1E,CAAC;AAED,SAAsB,QAAQ,CAC5B,IAAY,EACZ,IAAqB,EACrB,OAAgB;;QAEhB,MAAM,MAAM,GAAG,IAAA,iBAAS,EAAC,OAAO,CAAC,CAAC;QAClC,MAAM,MAAM,GAAG,IAAI,mCAAmC,CACpD,IAAI,EACJ,IAAI,aAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAC1B,CAAC;QACF,MAAM,QAAQ,GAAG,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QACpD,MAAM,UAAU,GAAG,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAChE,MAAM,SAAS,GAAG,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QACvE,OAAO,CACL,MAAM,YAAY,CAChB,MAAM,EACN,IAAI,EACJ,QAAQ,EACR,MAAa,kCACR,IAAI,KAAE,aAAa,EAAE,SAAS,CAAC,WAAW,CAAC,IAAI,KACpD,SAAS,CACV,CACF,CAAC,MAAM,CAAC;IACX,CAAC;CAAA;AAvBD,4BAuBC;AAED,SAAS,oBAAoB;IAU3B,OAAO,CAAC,WAAuB,EAAE,EAAE;QACjC,MAAM,SAAS,GAAa,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;YACzD,MAAM,QAAQ,GAAW;gBACvB,IAAI,EAAE,UAAU,CAAC,EAAE;gBACnB,OAAO,EAAE,UAAU,CAAC,OAAO;aACrB,CAAC;YAET,IAAI,UAAU,CAAC,OAAO,EAAE;gBACtB,QAAQ,CAAC,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;aACvC;YAED,MAAM,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC;YACvC,IAAI,SAAS,EAAE;gBACb,QAAQ,CAAC,QAAQ,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;aACjD;YAED,QAAQ,UAAU,CAAC,IAAI,EAAE;gBACvB,KAAK,QAAQ,CAAC;gBACd,KAAK,OAAO;oBACV,uCAAY,QAAQ,KAAE,IAAI,EAAE,OAAO,IAAG;gBACxC,KAAK,SAAS,CAAC;gBACf,KAAK,cAAc,CAAC;gBACpB,KAAK,SAAS;oBACZ,uCAAY,QAAQ,KAAE,IAAI,EAAE,SAAS,IAAG;gBAC1C,KAAK,QAAQ,CAAC;gBACd,KAAK,SAAS;oBACZ,uCAAY,QAAQ,KAAE,IAAI,EAAE,SAAS,IAAG;gBAC1C,KAAK,MAAM;oBACT,uCACK,QAAQ,KACX,IAAI,EAAE,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,EACzD,OAAO,EACL,UAAU,CAAC,KAAK;4BAChB,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gCAC5B,IAAI,OAAO,IAAI,IAAI,QAAQ,EAAE;oCAC3B,OAAO,IAAI,CAAC;iCACb;qCAAM;oCACL,OAAO;wCACL,OAAO,EAAE,IAAI,CAAC,KAAK;wCACnB,IAAI,EAAE,IAAI,CAAC,KAAK;qCACjB,CAAC;iCACH;4BACH,CAAC,CAAC,IACJ;gBACJ;oBACE,uCAAY,QAAQ,KAAE,IAAI,EAAE,UAAU,CAAC,IAAI,IAAG;aACjD;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAC/C,CAAC,CAAC;AACJ,CAAC;AAED,SAAsB,YAAY,CAChC,IAAY,EACZ,WAAmB,EACnB,aAAqB,EACrB,SAAkB;;QAElB,MAAM,MAAM,GAAG,IAAA,iBAAS,EAAC,SAAS,CAAC,CAAC;QACpC,MAAM,MAAM,GAAG,IAAI,mCAAmC,CACpD,IAAI,EACJ,IAAI,aAAM,CAAC,IAAI,EAAE,SAAS,CAAC,CAC5B,CAAC;QACF,MAAM,QAAQ,GAAG,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QAClD,MAAM,UAAU,GAAG,2BAA2B,CAAC,WAAW,CAAC,CAAC;QAE5D,MAAM,MAAM,GAAG,EAAE,YAAY,EAAE,EAAc,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;QAC9D,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;QAE1E,MAAM,QAAQ;aACX,OAAO,CAAC;YACP,UAAU;YACV,SAAS,EAAE,aAAa;YACxB,OAAO,EAAE,EAAE;YACX,KAAK,EAAE,KAAK;YACZ,MAAM,EAAE,MAAa;SACtB,CAAC;aACD,SAAS,EAAE,CAAC;QAEf,OAAO;YACL,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,WAAW,EAAE,MAAM,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC;SAC5C,CAAC;IACJ,CAAC;CAAA;AA/BD,oCA+BC;AAED,SAAS,2BAA2B,CAAC,IAAY;;IAC/C,IAAI,cAAc,GAAuB,SAAS,CAAC;IAEnD,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QAChD,IAAI,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC;KACtB;IAED,IAAI,IAAA,cAAO,EAAC,IAAI,CAAC,EAAE;QACjB,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;KACxC;SAAM;QACL,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,WAAW,EAAE,GAAG,IAAA,oCAAqB,EAClE,IAAI,EACJ,IAAA,0CAAiB,EAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CACjC,CAAC;QAEF,IAAI,iBAAiB,GACnB,MAAA,WAAW,CAAC,eAAe,CAAC,mCAAI,WAAW,CAAC,WAAW,CAAC,CAAC;QAC3D,IAAI,CAAC,iBAAiB,EAAE;YACtB,MAAM,IAAI,KAAK,CAAC,0CAA0C,IAAI,GAAG,CAAC,CAAC;SACpE;QACD,IAAI,OAAO,iBAAiB,IAAI,QAAQ,EAAE;YACxC,iBAAiB,GAAG,iBAAiB,CAAC,UAAU,CAAC;SAClD;QACD,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,EAAE;YAClD,KAAK,EAAE,CAAC,IAAA,cAAO,EAAC,eAAe,CAAC,CAAC;SAClC,CAAC,CAAC;KACJ;IAED,IAAI;QACF,IAAI,cAAc,EAAE;YAClB,IAAA,wBAAY,EAAC,cAAc,CAAC,CAAC;YAC7B,OAAO,cAAc,CAAC;SACvB;KACF;IAAC,WAAM;QACN,MAAM,IAAI,KAAK,CAAC,uCAAuC,IAAI,GAAG,CAAC,CAAC;KACjE;IACD,MAAM,IAAI,KAAK,CAAC,mCAAmC,IAAI,GAAG,CAAC,CAAC;AAC9D,CAAC;AAED,IAAI,6BAA6B,GAAG,IAAI,CAAC;AACzC,IAAI,gBAAgB,GAAG,IAAI,CAAC;AAE5B;;;;;;;;;;;;;;;;;GAiBG;AACH,SAAgB,sCAAsC,CAAC,WAEtD;IACC,6BAA6B,GAAG,WAAW,CAAC;AAC9C,CAAC;AAJD,wFAIC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,SAAgB,wBAAwB,CAAC,UAKxC;IACC,gBAAgB,GAAG,UAAU,CAAC;AAChC,CAAC;AAPD,4DAOC;AAED,SAAgB,0BAA0B,CACxC,cAAsB,EACtB,aAAqB;IAErB,kDAAkD;IAClD,uDAAuD;IACvD,oDAAoD;IACpD,0DAA0D;IAC1D,4DAA4D;IAC5D,6CAA6C;IAC7C,EAAE;IACF,iEAAiE;IACjE,yDAAyD;IACzD,OAAO,CAAC,UAAU,CAAC,CAAC;IAEpB,OAAO,CAAO,IAAU,EAAE,gBAAsC,EAAE,EAAE;QAClE,IACE,gBAAgB;YAChB,gBAAgB,CAAC,GAAG,cAAc,IAAI,aAAa,EAAE,CAAC,EACtD;YACA,OAAO,MAAM,gBAAgB,CAAC,GAAG,cAAc,IAAI,aAAa,EAAE,CAAC,CACjE,IAAI,EACJ,gBAAgB,CACjB,CAAC;SACH;QAED,MAAM,WAAW,GAAG;YAClB,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,GAAE,CAAC;YACd,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,GAAE,CAAC;YACf,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,GAAE,CAAC;YACf,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;YACf,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,GAAE,CAAC;YAChB,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,GAAE,CAAC;SACV,CAAC;QACT,WAAW,CAAC,WAAW,GAAG,GAAG,EAAE,CAAC,WAAW,CAAC;QAE5C,MAAM,QAAQ,GAAG,CACf,KAAuD,EACvD,EAAE;YACF,IAAI,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;gBACxC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;gBACrB,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;YAEf,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE;aAC3B;iBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAClC,IAAI,SAAS,KAAK,cAAc,EAAE;oBAChC,4CAA4C,CAC1C,IAAI,EACJ,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,CACzB,CAAC;iBACH;qBAAM;oBACL,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;iBACtC;aACF;iBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAClC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;aACtC;iBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAClC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;aACxB;iBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAClC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;aAClC;QACH,CAAC,CAAC;QAEF,MAAM,MAAM,GAAG,IAAI,mCAAmC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAExE,MAAM,OAAO,GAAG;YACd,gBAAgB;YAChB,MAAM,EAAE,IAAI;YACZ,WAAW,EAAE,KAAK;YAClB,IAAI,EAAE,KAAK;YACX,KAAK,EAAE,KAAK;YACZ,cAAc;YACd,aAAa;YACb,KAAK,EAAE,KAAK;YACZ,QAAQ,EAAE,KAAK;SAChB,CAAC;QACF,MAAM,QAAQ,GAAG,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE5D,mBAAmB;QACnB,IAAI,6BAA6B,EAAE;YACjC,MAAM,CAAC,GAAI,QAAQ,CAAC,UAAkB,CAAC,OAAO,CAAC;YAC9C,QAAQ,CAAC,UAAkB,CAAC,OAAO,GAAG,CAAC,UAAU,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE;gBAC1D,IAAI,6BAA6B,CAAC,UAAU,CAAC,EAAE;oBAC7C,OAAO,6BAA6B,CAAC,UAAU,CAAC,CAAC;iBAClD;qBAAM;oBACL,OAAO,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;iBACzD;YACH,CAAC,CAAC;SACH;QAED,MAAM,UAAU,GAAG,aAAa,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;QAC3D,MAAM,SAAS,GAAG,UAAU,CAAC,eAAe,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QAClE,MAAM,GAAG,GAAG,MAAM,YAAY,CAC5B,MAAM,EACN,IAAI,CAAC,IAAI,EACT,QAAQ,EACR,WAAW,EACX,OAAO,EACP,SAAS,EACT,KAAK,EACL,QAAQ,CACT,CAAC;QAEF,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;SAC9C;IACH,CAAC,CAAA,CAAC;AACJ,CAAC;AA1GD,gEA0GC;AAED,IAAI,MAAsB,CAAC;AAEpB,MAAM,SAAS,GAAG,CAAC,SAAS,GAAG,KAAK,EAAkB,EAAE;IAC7D,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,GAAG,IAAA,0BAAmB,EAAC,SAAS,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE;YACtE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACxC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE;gBACX,IAAI,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;oBACvB,OAAO,KAAK,iBAAQ,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;iBAC/D;gBAED,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAClC,CAAC;YACD,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE;gBACV,IAAI,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;oBACvB,OAAO,KAAK,kBAAS,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;iBACrD;gBAED,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACxB,CAAC;SACF,CAAC,CAAC;KACJ;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AArBW,QAAA,SAAS,aAqBpB;AAEF,SAAS,4CAA4C,CACnD,IAAU,EACV,OAAe;IAEf,MAAM,QAAQ,GAAG,IAAA,0BAAW,EAAC,IAAA,gBAAS,EAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC;IAC1D,MAAM,gBAAgB,GAAG,IAAA,mCAAW,EAAC,IAAI,CAAC,CAAC;IAE3C,MAAM,mBAAmB,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC;QACrD,CAAC,CAAC,IAAA,eAAQ,EAAC,IAAI,EAAE,cAAc,CAAC;QAChC,CAAC,CAAC,IAAI,CAAC;IACT,MAAM,qBAAqB,GAAG,mBAAmB;QAC/C,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC;QAC3C,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,cAAc,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;IAExC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;QAC5C,IAAI,qBAAqB,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YAC/C,cAAc,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC;SAC9D;aAAM;YACL,IAAI,gBAAgB,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;gBACrC,IAAA,kDAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;aACtE;iBAAM;gBACL,IAAA,+CAAuB,EAAC,IAAI,EAAE,WAAW,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;aACnE;SACF;IACH,CAAC,CAAC,CAAC;IACH,IAAI,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;QACnD,IAAI,CAAC,KAAK,CACR,cAAc,EACd,IAAI,CAAC,SAAS,CAAC,IAAA,0BAAW,EAAC,cAAc,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CACrD,CAAC;KACH;AACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"ngcli-adapter.js","sourceRoot":"","sources":["../../../../../packages/nx/src/adapter/ngcli-adapter.ts"],"names":[],"mappings":"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"}
|
package/src/command-line/init.js
CHANGED
|
@@ -3,43 +3,34 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.initHandler = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const child_process_1 = require("child_process");
|
|
6
|
+
const enquirer_1 = require("enquirer");
|
|
6
7
|
const fs_1 = require("fs");
|
|
7
8
|
const add_nx_to_nest_1 = require("../nx-init/add-nx-to-nest");
|
|
8
9
|
const add_nx_to_npm_repo_1 = require("../nx-init/add-nx-to-npm-repo");
|
|
9
10
|
const fileutils_1 = require("../utils/fileutils");
|
|
10
11
|
const parser = require("yargs-parser");
|
|
11
|
-
const add_nx_scripts_1 = require("../nx-init/
|
|
12
|
+
const add_nx_scripts_1 = require("../nx-init/dot-nx/add-nx-scripts");
|
|
12
13
|
const semver_1 = require("semver");
|
|
14
|
+
const child_process_2 = require("../utils/child-process");
|
|
13
15
|
function initHandler() {
|
|
14
16
|
var _a;
|
|
15
17
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
16
18
|
const args = process.argv.slice(2).join(' ');
|
|
17
19
|
const flags = parser(args, {
|
|
18
|
-
boolean: ['
|
|
20
|
+
boolean: ['useDotNxInstallation'],
|
|
21
|
+
alias: {
|
|
22
|
+
useDotNxInstallation: ['encapsulated'],
|
|
23
|
+
},
|
|
19
24
|
default: {
|
|
20
|
-
|
|
25
|
+
useDotNxInstallation: false,
|
|
21
26
|
},
|
|
22
27
|
});
|
|
23
|
-
const version = (
|
|
24
|
-
? 'next'
|
|
25
|
-
: 'latest';
|
|
28
|
+
const version = (_a = process.env.NX_VERSION) !== null && _a !== void 0 ? _a : ((0, semver_1.prerelease)(require('../../package.json').version) ? 'next' : 'latest');
|
|
26
29
|
if (process.env.NX_VERSION) {
|
|
27
30
|
console.log(`Using version ${process.env.NX_VERSION}`);
|
|
28
31
|
}
|
|
29
|
-
if (flags.
|
|
30
|
-
|
|
31
|
-
console.log('Setting Nx up installation in `.nx`. You can run nx commands like: `./nx --help`');
|
|
32
|
-
}
|
|
33
|
-
else {
|
|
34
|
-
console.log('Setting Nx up installation in `.nx`. You can run nx commands like: `./nx.bat --help`');
|
|
35
|
-
}
|
|
36
|
-
(0, add_nx_scripts_1.generateEncapsulatedNxSetup)(version);
|
|
37
|
-
if (process.platform === 'win32') {
|
|
38
|
-
(0, child_process_1.execSync)('./nx.bat', { stdio: 'inherit' });
|
|
39
|
-
}
|
|
40
|
-
else {
|
|
41
|
-
(0, child_process_1.execSync)('./nx', { stdio: 'inherit' });
|
|
42
|
-
}
|
|
32
|
+
if (flags.useDotNxInstallation === true) {
|
|
33
|
+
setupDotNxInstallation(version);
|
|
43
34
|
}
|
|
44
35
|
else if ((0, fs_1.existsSync)('package.json')) {
|
|
45
36
|
const packageJson = (0, fileutils_1.readJsonFile)('package.json');
|
|
@@ -69,9 +60,31 @@ function initHandler() {
|
|
|
69
60
|
}
|
|
70
61
|
}
|
|
71
62
|
else {
|
|
72
|
-
(0,
|
|
73
|
-
|
|
74
|
-
|
|
63
|
+
const useDotNxFolder = yield (0, enquirer_1.prompt)([
|
|
64
|
+
{
|
|
65
|
+
name: 'useDotNxFolder',
|
|
66
|
+
type: 'autocomplete',
|
|
67
|
+
message: 'Where should your workspace be created?',
|
|
68
|
+
choices: [
|
|
69
|
+
{
|
|
70
|
+
name: 'In a new folder under this directory',
|
|
71
|
+
value: 'false',
|
|
72
|
+
},
|
|
73
|
+
{
|
|
74
|
+
name: 'In this directory',
|
|
75
|
+
value: 'true',
|
|
76
|
+
},
|
|
77
|
+
],
|
|
78
|
+
},
|
|
79
|
+
]).then((r) => r.useDotNxFolder === 'true');
|
|
80
|
+
if (useDotNxFolder) {
|
|
81
|
+
setupDotNxInstallation(version);
|
|
82
|
+
}
|
|
83
|
+
else {
|
|
84
|
+
(0, child_process_1.execSync)(`npx --yes create-nx-workspace@${version} ${args}`, {
|
|
85
|
+
stdio: [0, 1, 2],
|
|
86
|
+
});
|
|
87
|
+
}
|
|
75
88
|
}
|
|
76
89
|
});
|
|
77
90
|
}
|
|
@@ -104,4 +117,15 @@ function isMonorepo(packageJson) {
|
|
|
104
117
|
return true;
|
|
105
118
|
return false;
|
|
106
119
|
}
|
|
120
|
+
function setupDotNxInstallation(version) {
|
|
121
|
+
if (process.platform !== 'win32') {
|
|
122
|
+
console.log('Setting Nx up installation in `.nx`. You can run nx commands like: `./nx --help`');
|
|
123
|
+
}
|
|
124
|
+
else {
|
|
125
|
+
console.log('Setting Nx up installation in `.nx`. You can run nx commands like: `./nx.bat --help`');
|
|
126
|
+
}
|
|
127
|
+
(0, add_nx_scripts_1.generateDotNxSetup)(version);
|
|
128
|
+
// invokes the wrapper, thus invoking the initial installation process
|
|
129
|
+
(0, child_process_2.runNxSync)('');
|
|
130
|
+
}
|
|
107
131
|
//# sourceMappingURL=init.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/init.ts"],"names":[],"mappings":";;;;AAAA,iDAAyC;AACzC,2BAAgC;AAChC,8DAAwD;AACxD,sEAA+D;AAC/D,kDAAmE;AAEnE,uCAAuC;AACvC,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -91,7 +91,7 @@ type RunMigrations = {
|
|
|
91
91
|
};
|
|
92
92
|
export declare function parseMigrationsOptions(options: {
|
|
93
93
|
[k: string]: any;
|
|
94
|
-
}): GenerateMigrations | RunMigrations
|
|
94
|
+
}): Promise<GenerateMigrations | RunMigrations>;
|
|
95
95
|
export declare function executeMigrations(root: string, migrations: {
|
|
96
96
|
package: string;
|
|
97
97
|
name: string;
|