@nrwl/workspace 15.3.3 → 15.4.0-beta.1
Sign up to get free protection for your applications and to get access to all the features.
- package/CHANGELOG.md +1 -1
- package/package.json +30 -29
- package/src/generators/move/lib/update-imports.js +10 -1
- package/src/generators/move/lib/update-imports.js.map +1 -1
- package/src/generators/new/generate-preset.js +3 -0
- package/src/generators/new/generate-preset.js.map +1 -1
- package/src/generators/preset/preset.js +1 -1
- package/src/generators/preset/preset.js.map +1 -1
- package/src/migrations/update-13-0-0/config-locations/config-locations.d.ts +1 -1
- package/src/migrations/update-13-0-0/config-locations/config-locations.js +43 -6
- package/src/migrations/update-13-0-0/config-locations/config-locations.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
-
|
|
6
|
+
# [15.4.0-beta.1](https://github.com/nrwl/nx/compare/15.3.3...15.4.0-beta.1) (2022-12-16)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package @nrwl/workspace
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/workspace",
|
|
3
|
-
"version": "15.
|
|
3
|
+
"version": "15.4.0-beta.1",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The Workspace plugin contains executors and generators that are useful for any Nx workspace. It should be present in every Nx workspace and other plugins build on it.",
|
|
6
6
|
"repository": {
|
|
@@ -33,31 +33,31 @@
|
|
|
33
33
|
"requirements": {},
|
|
34
34
|
"migrations": "./migrations.json",
|
|
35
35
|
"packageGroup": {
|
|
36
|
-
"@nrwl/angular": "15.
|
|
37
|
-
"@nrwl/cli": "15.
|
|
38
|
-
"@nrwl/cypress": "15.
|
|
39
|
-
"@nrwl/detox": "15.
|
|
40
|
-
"@nrwl/devkit": "15.
|
|
41
|
-
"@nrwl/esbuild": "15.
|
|
42
|
-
"@nrwl/eslint-plugin-nx": "15.
|
|
43
|
-
"@nrwl/expo": "15.
|
|
44
|
-
"@nrwl/express": "15.
|
|
45
|
-
"@nrwl/jest": "15.
|
|
46
|
-
"@nrwl/js": "15.
|
|
47
|
-
"@nrwl/linter": "15.
|
|
48
|
-
"@nrwl/nest": "15.
|
|
49
|
-
"@nrwl/next": "15.
|
|
50
|
-
"@nrwl/node": "15.
|
|
36
|
+
"@nrwl/angular": "15.4.0-beta.1",
|
|
37
|
+
"@nrwl/cli": "15.4.0-beta.1",
|
|
38
|
+
"@nrwl/cypress": "15.4.0-beta.1",
|
|
39
|
+
"@nrwl/detox": "15.4.0-beta.1",
|
|
40
|
+
"@nrwl/devkit": "15.4.0-beta.1",
|
|
41
|
+
"@nrwl/esbuild": "15.4.0-beta.1",
|
|
42
|
+
"@nrwl/eslint-plugin-nx": "15.4.0-beta.1",
|
|
43
|
+
"@nrwl/expo": "15.4.0-beta.1",
|
|
44
|
+
"@nrwl/express": "15.4.0-beta.1",
|
|
45
|
+
"@nrwl/jest": "15.4.0-beta.1",
|
|
46
|
+
"@nrwl/js": "15.4.0-beta.1",
|
|
47
|
+
"@nrwl/linter": "15.4.0-beta.1",
|
|
48
|
+
"@nrwl/nest": "15.4.0-beta.1",
|
|
49
|
+
"@nrwl/next": "15.4.0-beta.1",
|
|
50
|
+
"@nrwl/node": "15.4.0-beta.1",
|
|
51
51
|
"@nrwl/nx-cloud": "latest",
|
|
52
|
-
"@nrwl/nx-plugin": "15.
|
|
53
|
-
"@nrwl/react": "15.
|
|
54
|
-
"@nrwl/react-native": "15.
|
|
55
|
-
"@nrwl/rollup": "15.
|
|
56
|
-
"@nrwl/storybook": "15.
|
|
57
|
-
"@nrwl/tao": "15.
|
|
58
|
-
"@nrwl/web": "15.
|
|
59
|
-
"@nrwl/webpack": "15.
|
|
60
|
-
"nx": "15.
|
|
52
|
+
"@nrwl/nx-plugin": "15.4.0-beta.1",
|
|
53
|
+
"@nrwl/react": "15.4.0-beta.1",
|
|
54
|
+
"@nrwl/react-native": "15.4.0-beta.1",
|
|
55
|
+
"@nrwl/rollup": "15.4.0-beta.1",
|
|
56
|
+
"@nrwl/storybook": "15.4.0-beta.1",
|
|
57
|
+
"@nrwl/tao": "15.4.0-beta.1",
|
|
58
|
+
"@nrwl/web": "15.4.0-beta.1",
|
|
59
|
+
"@nrwl/webpack": "15.4.0-beta.1",
|
|
60
|
+
"nx": "15.4.0-beta.1"
|
|
61
61
|
}
|
|
62
62
|
},
|
|
63
63
|
"peerDependencies": {
|
|
@@ -69,8 +69,8 @@
|
|
|
69
69
|
}
|
|
70
70
|
},
|
|
71
71
|
"dependencies": {
|
|
72
|
-
"@nrwl/devkit": "15.
|
|
73
|
-
"@nrwl/linter": "15.
|
|
72
|
+
"@nrwl/devkit": "15.4.0-beta.1",
|
|
73
|
+
"@nrwl/linter": "15.4.0-beta.1",
|
|
74
74
|
"@parcel/watcher": "2.0.4",
|
|
75
75
|
"chalk": "4.1.0",
|
|
76
76
|
"chokidar": "^3.5.1",
|
|
@@ -83,9 +83,10 @@
|
|
|
83
83
|
"fs-extra": "^10.1.0",
|
|
84
84
|
"glob": "7.1.4",
|
|
85
85
|
"ignore": "^5.0.4",
|
|
86
|
+
"jsonc-parser": "3.2.0",
|
|
86
87
|
"minimatch": "3.0.5",
|
|
87
88
|
"npm-run-path": "^4.0.1",
|
|
88
|
-
"nx": "15.
|
|
89
|
+
"nx": "15.4.0-beta.1",
|
|
89
90
|
"open": "^8.4.0",
|
|
90
91
|
"rxjs": "^6.5.4",
|
|
91
92
|
"semver": "7.3.4",
|
|
@@ -98,5 +99,5 @@
|
|
|
98
99
|
"access": "public"
|
|
99
100
|
},
|
|
100
101
|
"types": "./index.d.ts",
|
|
101
|
-
"gitHead": "
|
|
102
|
+
"gitHead": "b94c7e58706ce3b2e70876b648c0b19bf649e01c"
|
|
102
103
|
}
|
|
@@ -8,6 +8,7 @@ const typescript_1 = require("../../../utilities/typescript");
|
|
|
8
8
|
const typescript_2 = require("nx/src/utils/typescript");
|
|
9
9
|
const utils_1 = require("./utils");
|
|
10
10
|
const path_2 = require("path");
|
|
11
|
+
const jsonc_parser_1 = require("jsonc-parser");
|
|
11
12
|
/**
|
|
12
13
|
* Updates all the imports in the workspace and modifies the tsconfig appropriately.
|
|
13
14
|
*
|
|
@@ -26,7 +27,15 @@ function updateImports(tree, schema, project) {
|
|
|
26
27
|
let tsConfig;
|
|
27
28
|
let fromPath;
|
|
28
29
|
if (tree.exists(tsConfigPath)) {
|
|
29
|
-
|
|
30
|
+
const tsConfigRawContents = tree.read(tsConfigPath).toString('utf-8');
|
|
31
|
+
tsConfig = (() => {
|
|
32
|
+
try {
|
|
33
|
+
return JSON.parse(tsConfigRawContents);
|
|
34
|
+
}
|
|
35
|
+
catch (_a) {
|
|
36
|
+
return (0, jsonc_parser_1.parse)(tsConfigRawContents);
|
|
37
|
+
}
|
|
38
|
+
})();
|
|
30
39
|
fromPath = Object.keys(tsConfig.compilerOptions.paths).find((path) => tsConfig.compilerOptions.paths[path].some((x) => x.startsWith(project.sourceRoot)));
|
|
31
40
|
}
|
|
32
41
|
const projectRef = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-imports.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-imports.ts"],"names":[],"mappings":";;;AAAA,yCAWsB;AACtB,4CAAkD;AAClD,iCAAiC;AACjC,8DAA0E;AAC1E,wDAAoD;AAEpD,mCAA2C;AAC3C,+BAAgC;
|
|
1
|
+
{"version":3,"file":"update-imports.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-imports.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,6 +22,9 @@ exports.addPresetDependencies = addPresetDependencies;
|
|
|
22
22
|
function generatePreset(host, opts) {
|
|
23
23
|
const parsedArgs = yargsParser(process.argv, {
|
|
24
24
|
boolean: ['interactive'],
|
|
25
|
+
default: {
|
|
26
|
+
interactive: true,
|
|
27
|
+
},
|
|
25
28
|
});
|
|
26
29
|
const spawnOptions = {
|
|
27
30
|
stdio: [process.stdin, process.stdout, process.stderr],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/generate-preset.ts"],"names":[],"mappings":";;;AAAA,yCAIsB;AACtB,8CAA0C;AAC1C,mDAAiD;AACjD,8EAAwE;AAExE,+BAA4B;AAC5B,4CAA4C;AAC5C,iDAAsC;AAEtC,SAAgB,qBAAqB,CAAC,IAAU,EAAE,OAAyB;IACzE,IACE,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,IAAI;QAC9B,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,IAAI;QAC9B,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,KAAK;QAC/B,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,GAAG,EAC7B;QACA,OAAO;KACR;IACD,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE,GAAG,qBAAqB,CACjD,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,aAAa,CACtB,CAAC;IACF,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,YAAY,EACZ,GAAG,EACH,IAAA,WAAI,EAAC,OAAO,CAAC,SAAS,EAAE,cAAc,CAAC,CACxC,CAAC;AACJ,CAAC;AAnBD,sDAmBC;AAED,SAAgB,cAAc,CAAC,IAAU,EAAE,IAAsB;IAC/D,MAAM,UAAU,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE;QAC3C,OAAO,EAAE,CAAC,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"generate-preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/generate-preset.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/preset/preset.ts"],"names":[],"mappings":";;;;AAAA,yCAQsB;AAEtB,gEAA4D;AAC5D,8CAA0C;AAE1C,SAAsB,eAAe,CAAC,IAAU,EAAE,OAAe;;QAC/D,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACpC,MAAM,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAClC,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACxB,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC;CAAA;AAPD,0CAOC;AACD,kBAAe,eAAe,CAAC;AAE/B,SAAe,YAAY,CAAC,IAAU,EAAE,OAAe;;QACrD,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,KAAK,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,IAAI,EAAE;YACrE,OAAO;SACR;aAAM,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,eAAe,EAAE;YACpD,MAAM,EACJ,oBAAoB,EAAE,2BAA2B,GAClD,GAAG,OAAO,CAAC,OAAO,GAAG,qBAAqB,CAAC,CAAC;YAE7C,MAAM,2BAA2B,CAAC,IAAI,EAAE;gBACtC,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;aAC3C,CAAC,CAAC;SACJ;aAAM,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,iBAAiB,EAAE;YACtD,MAAM,EACJ,oBAAoB,EAAE,2BAA2B,GAClD,GAAG,OAAO,CAAC,OAAO,GAAG,qBAAqB,CAAC,CAAC;YAE7C,MAAM,2BAA2B,CAAC,IAAI,EAAE;gBACtC,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;gBAC1C,WAAW,EAAE,IAAI;aAClB,CAAC,CAAC;SACJ;aAAM,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,aAAa,EAAE;YAClD,MAAM,EACJ,oBAAoB,EAAE,yBAAyB,GAChD,GAAG,OAAO,CAAC,OAAO,GAAG,QAAQ,CAAC,CAAC;YAEhC,MAAM,yBAAyB,CAAC,IAAI,EAAE;gBACpC,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;aAC3C,CAAC,CAAC;SACJ;aAAM,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,eAAe,EAAE;YACpD,MAAM,EACJ,oBAAoB,EAAE,yBAAyB,GAChD,GAAG,OAAO,CAAC,OAAO,GAAG,QAAQ,CAAC,CAAC;YAEhC,MAAM,yBAAyB,CAAC,IAAI,EAAE;gBACpC,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;gBAC1C,WAAW,EAAE,IAAI;gBACjB,OAAO,EAAE,MAAM;gBACf,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/preset/preset.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { Tree } from '@nrwl/devkit';
|
|
2
|
-
export default function update(
|
|
2
|
+
export default function update(tree: Tree): Promise<void>;
|
|
@@ -2,23 +2,60 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
function update(
|
|
5
|
+
function update(tree) {
|
|
6
6
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
7
|
-
const nxJson = (0, devkit_1.readJson)(
|
|
7
|
+
const nxJson = (0, devkit_1.readJson)(tree, 'nx.json');
|
|
8
8
|
// updateProjectConfiguration automatically saves the project opts into workspace/project.json
|
|
9
9
|
if (nxJson.projects) {
|
|
10
10
|
Object.entries(nxJson.projects).forEach(([p, nxJsonConfig]) => {
|
|
11
11
|
var _a, _b;
|
|
12
|
-
const configuration = (0, devkit_1.readProjectConfiguration)(
|
|
12
|
+
const configuration = (0, devkit_1.readProjectConfiguration)(tree, p);
|
|
13
13
|
(_a = configuration.tags) !== null && _a !== void 0 ? _a : (configuration.tags = nxJsonConfig.tags);
|
|
14
14
|
(_b = configuration.implicitDependencies) !== null && _b !== void 0 ? _b : (configuration.implicitDependencies = nxJsonConfig.implicitDependencies);
|
|
15
|
-
(0, devkit_1.updateProjectConfiguration)(
|
|
15
|
+
(0, devkit_1.updateProjectConfiguration)(tree, p, configuration);
|
|
16
16
|
});
|
|
17
17
|
delete nxJson.projects;
|
|
18
18
|
}
|
|
19
|
-
(0, devkit_1.writeJson)(
|
|
20
|
-
|
|
19
|
+
(0, devkit_1.writeJson)(tree, 'nx.json', nxJson);
|
|
20
|
+
movePropertiesAreInNewLocations(tree); // move config options to new spots.
|
|
21
|
+
yield (0, devkit_1.formatFiles)(tree);
|
|
21
22
|
});
|
|
22
23
|
}
|
|
23
24
|
exports.default = update;
|
|
25
|
+
/**
|
|
26
|
+
* `updateWorkspaceConfiguration` already handles
|
|
27
|
+
* placing properties in their new locations, so
|
|
28
|
+
* reading + updating it ensures that props are placed
|
|
29
|
+
* correctly.
|
|
30
|
+
*/
|
|
31
|
+
function movePropertiesAreInNewLocations(tree) {
|
|
32
|
+
// If nx.json doesn't exist then there is no where to move these properties to
|
|
33
|
+
if (!tree.exists('nx.json')) {
|
|
34
|
+
return;
|
|
35
|
+
}
|
|
36
|
+
const workspacePath = (0, devkit_1.getWorkspacePath)(tree);
|
|
37
|
+
if (!workspacePath) {
|
|
38
|
+
return;
|
|
39
|
+
}
|
|
40
|
+
const wc = (0, devkit_1.readWorkspaceConfiguration)(tree);
|
|
41
|
+
(0, devkit_1.updateJson)(tree, workspacePath, (json) => {
|
|
42
|
+
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
43
|
+
var _j, _k;
|
|
44
|
+
(_a = wc.generators) !== null && _a !== void 0 ? _a : (wc.generators = (_b = json.generators) !== null && _b !== void 0 ? _b : json.schematics);
|
|
45
|
+
if (wc.cli) {
|
|
46
|
+
(_c = (_j = wc.cli).defaultCollection) !== null && _c !== void 0 ? _c : (_j.defaultCollection = (_d = json.cli) === null || _d === void 0 ? void 0 : _d.defaultCollection);
|
|
47
|
+
(_e = (_k = wc.cli).packageManager) !== null && _e !== void 0 ? _e : (_k.packageManager = (_f = json.cli) === null || _f === void 0 ? void 0 : _f.packageManager);
|
|
48
|
+
}
|
|
49
|
+
else if (json.cli) {
|
|
50
|
+
(_g = wc.cli) !== null && _g !== void 0 ? _g : (wc.cli = json.cli);
|
|
51
|
+
}
|
|
52
|
+
(_h = wc.defaultProject) !== null && _h !== void 0 ? _h : (wc.defaultProject = json.defaultProject);
|
|
53
|
+
delete json.cli;
|
|
54
|
+
delete json.defaultProject;
|
|
55
|
+
delete json.schematics;
|
|
56
|
+
delete json.generators;
|
|
57
|
+
return json;
|
|
58
|
+
});
|
|
59
|
+
(0, devkit_1.updateWorkspaceConfiguration)(tree, wc);
|
|
60
|
+
}
|
|
24
61
|
//# sourceMappingURL=config-locations.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-locations.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/migrations/update-13-0-0/config-locations/config-locations.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"config-locations.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/migrations/update-13-0-0/config-locations/config-locations.ts"],"names":[],"mappings":";;;AAAA,yCAcsB;AAEtB,SAA8B,MAAM,CAAC,IAAU;;QAC7C,MAAM,MAAM,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,SAAS,CAKtC,CAAC;QACF,8FAA8F;QAC9F,IAAI,MAAM,CAAC,QAAQ,EAAE;YACnB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,EAAE,EAAE;;gBAC5D,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,CAAC,CAAC,CAAC;gBACxD,MAAA,aAAa,CAAC,IAAI,oCAAlB,aAAa,CAAC,IAAI,GAAK,YAAY,CAAC,IAAI,EAAC;gBACzC,MAAA,aAAa,CAAC,oBAAoB,oCAAlC,aAAa,CAAC,oBAAoB,GAAK,YAAY,CAAC,oBAAoB,EAAC;gBACzE,IAAA,mCAA0B,EAAC,IAAI,EAAE,CAAC,EAAE,aAAa,CAAC,CAAC;YACrD,CAAC,CAAC,CAAC;YACH,OAAO,MAAM,CAAC,QAAQ,CAAC;SACxB;QAED,IAAA,kBAAS,EAAC,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAEnC,+BAA+B,CAAC,IAAI,CAAC,CAAC,CAAC,oCAAoC;QAE3E,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAvBD,yBAuBC;AAED;;;;;GAKG;AACH,SAAS,+BAA+B,CAAC,IAAU;IACjD,8EAA8E;IAC9E,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;QAC3B,OAAO;KACR;IAED,MAAM,aAAa,GAAG,IAAA,yBAAgB,EAAC,IAAI,CAAC,CAAC;IAC7C,IAAI,CAAC,aAAa,EAAE;QAClB,OAAO;KACR;IACD,MAAM,EAAE,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;IAC5C,IAAA,mBAAU,EAAyB,IAAI,EAAE,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE;;;QAC/D,MAAA,EAAE,CAAC,UAAU,oCAAb,EAAE,CAAC,UAAU,GAAK,MAAA,IAAI,CAAC,UAAU,mCAAK,IAAY,CAAC,UAAU,EAAC;QAC9D,IAAI,EAAE,CAAC,GAAG,EAAE;YACV,YAAA,EAAE,CAAC,GAAG,EAAC,iBAAiB,uCAAjB,iBAAiB,GAAK,MAAA,IAAI,CAAC,GAAG,0CAAE,iBAAiB,EAAC;YACzD,YAAA,EAAE,CAAC,GAAG,EAAC,cAAc,uCAAd,cAAc,GAAK,MAAA,IAAI,CAAC,GAAG,0CAAE,cAAc,EAAC;SACpD;aAAM,IAAI,IAAI,CAAC,GAAG,EAAE;YACnB,MAAA,EAAE,CAAC,GAAG,oCAAN,EAAE,CAAC,GAAG,GAAK,IAAI,CAAC,GAAG,EAAC;SACrB;QACD,MAAA,EAAE,CAAC,cAAc,oCAAjB,EAAE,CAAC,cAAc,GAAK,IAAI,CAAC,cAAc,EAAC;QAC1C,OAAO,IAAI,CAAC,GAAG,CAAC;QAChB,OAAO,IAAI,CAAC,cAAc,CAAC;QAC3B,OAAQ,IAAY,CAAC,UAAU,CAAC;QAChC,OAAO,IAAI,CAAC,UAAU,CAAC;QACvB,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IACH,IAAA,qCAA4B,EAAC,IAAI,EAAE,EAAE,CAAC,CAAC;AACzC,CAAC"}
|