@nx/devkit 16.0.1 → 16.0.2
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/nx.d.ts +1 -1
- package/nx.js +11 -2
- package/nx.js.map +1 -1
- package/package.json +3 -3
- package/src/utils/package-json.js +5 -2
- package/src/utils/package-json.js.map +1 -1
package/nx.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare function requireNx(): typeof import('nx/src/devkit-exports')
|
|
1
|
+
export declare function requireNx(): typeof import('nx/src/devkit-exports') & Partial<typeof import('nx/src/devkit-internals')>;
|
package/nx.js
CHANGED
|
@@ -1,11 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.requireNx = void 0;
|
|
4
|
+
// After Nx v18, this can be removed and replaced with either:
|
|
5
|
+
// - import {} from 'nx/src/devkit-exports'
|
|
6
|
+
// - import {} from 'nx/src/devkit-internals'
|
|
4
7
|
function requireNx() {
|
|
5
8
|
try {
|
|
6
|
-
|
|
9
|
+
let result = Object.assign({}, require('nx/src/devkit-exports'));
|
|
10
|
+
try {
|
|
11
|
+
result = Object.assign(Object.assign({}, result), require('nx/src/devkit-internals'));
|
|
12
|
+
}
|
|
13
|
+
catch (_a) { }
|
|
14
|
+
return result;
|
|
7
15
|
}
|
|
8
|
-
catch (
|
|
16
|
+
catch (_b) {
|
|
17
|
+
// Remove in Nx V17, devkit should not support Nx < 16 at that point.
|
|
9
18
|
return require('./nx-reexports-pre16');
|
|
10
19
|
}
|
|
11
20
|
}
|
package/nx.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nx.js","sourceRoot":"","sources":["../../../packages/devkit/nx.ts"],"names":[],"mappings":";;;AAAA,SAAgB,SAAS;
|
|
1
|
+
{"version":3,"file":"nx.js","sourceRoot":"","sources":["../../../packages/devkit/nx.ts"],"names":[],"mappings":";;;AAAA,8DAA8D;AAC9D,2CAA2C;AAC3C,6CAA6C;AAC7C,SAAgB,SAAS;IAEvB,IAAI;QACF,IAAI,MAAM,qBAAQ,OAAO,CAAC,uBAAuB,CAAC,CAAE,CAAC;QACrD,IAAI;YACF,MAAM,mCACD,MAAM,GAEN,OAAO,CAAC,yBAAyB,CAAC,CACtC,CAAC;SACH;QAAC,WAAM,GAAE;QACV,OAAO,MAAM,CAAC;KACf;IAAC,WAAM;QACN,qEAAqE;QACrE,OAAO,OAAO,CAAC,sBAAsB,CAAC,CAAC;KACxC;AACH,CAAC;AAhBD,8BAgBC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/devkit",
|
|
3
|
-
"version": "16.0.
|
|
3
|
+
"version": "16.0.2",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The Nx Devkit is used to customize Nx for different technologies and use cases. It contains many utility functions for reading and writing files, updating configuration, working with Abstract Syntax Trees(ASTs), and more.",
|
|
6
6
|
"repository": {
|
|
@@ -28,7 +28,7 @@
|
|
|
28
28
|
},
|
|
29
29
|
"homepage": "https://nx.dev",
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@nrwl/devkit": "16.0.
|
|
31
|
+
"@nrwl/devkit": "16.0.2",
|
|
32
32
|
"ejs": "^3.1.7",
|
|
33
33
|
"ignore": "^5.0.4",
|
|
34
34
|
"semver": "7.3.4",
|
|
@@ -45,5 +45,5 @@
|
|
|
45
45
|
"migrations": "./migrations.json"
|
|
46
46
|
},
|
|
47
47
|
"types": "./index.d.ts",
|
|
48
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "e48d7d1835c13b23df9515bea186722d47a15ba5"
|
|
49
49
|
}
|
|
@@ -8,7 +8,7 @@ const install_packages_task_1 = require("../tasks/install-packages-task");
|
|
|
8
8
|
const nx_1 = require("../../nx");
|
|
9
9
|
const tmp_1 = require("tmp");
|
|
10
10
|
const path_1 = require("path");
|
|
11
|
-
const { readJson, updateJson, getPackageManagerCommand, workspaceRoot, detectPackageManager, } = (0, nx_1.requireNx)();
|
|
11
|
+
const { readJson, updateJson, getPackageManagerCommand, workspaceRoot, detectPackageManager, createTempNpmDirectory, } = (0, nx_1.requireNx)();
|
|
12
12
|
const UNIDENTIFIED_VERSION = 'UNIDENTIFIED_VERSION';
|
|
13
13
|
const NON_SEMVER_TAGS = {
|
|
14
14
|
'*': 2,
|
|
@@ -231,6 +231,7 @@ function requiresRemovingOfPackages(packageJsonFile, deps, devDeps) {
|
|
|
231
231
|
}
|
|
232
232
|
const packageMapCache = new Map();
|
|
233
233
|
function ensurePackage(pkgOrTree, requiredVersionOrPackage, maybeRequiredVersion, _) {
|
|
234
|
+
var _a;
|
|
234
235
|
let pkg;
|
|
235
236
|
let requiredVersion;
|
|
236
237
|
if (typeof pkgOrTree === 'string') {
|
|
@@ -256,7 +257,9 @@ function ensurePackage(pkgOrTree, requiredVersionOrPackage, maybeRequiredVersion
|
|
|
256
257
|
if (process.env.NX_DRY_RUN && process.env.NX_DRY_RUN !== 'false') {
|
|
257
258
|
throw new Error('NOTE: This generator does not support --dry-run. If you are running this in Nx Console, it should execute fine once you hit the "Run" button.\n');
|
|
258
259
|
}
|
|
259
|
-
const tempDir = (0
|
|
260
|
+
const { dir: tempDir } = (_a = createTempNpmDirectory === null || createTempNpmDirectory === void 0 ? void 0 : createTempNpmDirectory()) !== null && _a !== void 0 ? _a : {
|
|
261
|
+
dir: (0, tmp_1.dirSync)().name,
|
|
262
|
+
};
|
|
260
263
|
console.log(`Fetching ${pkg}...`);
|
|
261
264
|
const packageManager = detectPackageManager();
|
|
262
265
|
let addCommand = getPackageManagerCommand(packageManager).addDev;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-json.js","sourceRoot":"","sources":["../../../../../packages/devkit/src/utils/package-json.ts"],"names":[],"mappings":";;;AAAA,iDAAyC;AACzC,mCAAgC;AAKhC,mCAA2C;AAE3C,0EAAqE;AACrE,iCAAqC;AACrC,6BAA8B;AAC9B,+BAA4B;AAE5B,MAAM,EACJ,QAAQ,EACR,UAAU,EACV,wBAAwB,EACxB,aAAa,EACb,oBAAoB,
|
|
1
|
+
{"version":3,"file":"package-json.js","sourceRoot":"","sources":["../../../../../packages/devkit/src/utils/package-json.ts"],"names":[],"mappings":";;;AAAA,iDAAyC;AACzC,mCAAgC;AAKhC,mCAA2C;AAE3C,0EAAqE;AACrE,iCAAqC;AACrC,6BAA8B;AAC9B,+BAA4B;AAE5B,MAAM,EACJ,QAAQ,EACR,UAAU,EACV,wBAAwB,EACxB,aAAa,EACb,oBAAoB,EACpB,sBAAsB,GACvB,GAAG,IAAA,cAAS,GAAE,CAAC;AAEhB,MAAM,oBAAoB,GAAG,sBAAsB,CAAC;AACpD,MAAM,eAAe,GAAG;IACtB,GAAG,EAAE,CAAC;IACN,CAAC,oBAAoB,CAAC,EAAE,CAAC;IACzB,IAAI,EAAE,CAAC;IACP,MAAM,EAAE,CAAC;IACT,QAAQ,EAAE,CAAC,CAAC;IACZ,MAAM,EAAE,CAAC,CAAC;CACX,CAAC;AAEF,SAAS,0BAA0B,CACjC,YAAoC,EACpC,uBAA+C;IAE/C,IAAI,CAAC,uBAAuB,EAAE;QAC5B,OAAO,YAAY,CAAC;KACrB;IAED,OAAO,MAAM,CAAC,IAAI,CAAC,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,EAAE,CAAC;SACnC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC;SAC1C,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,iCAAM,GAAG,KAAE,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,IAAG,EAAE,EAAE,CAAC,CAAC;AAChE,CAAC;AAED,SAAS,WAAW,CAAC,OAAe;;IAClC,OAAO,MAAA,IAAA,cAAK,EAAC,OAAO,CAAC,mCAAI,IAAA,eAAM,EAAC,OAAO,CAAC,CAAC;AAC3C,CAAC;AAED,SAAS,wBAAwB,CAC/B,eAAuB,EACvB,eAAuB;;IAEvB,kGAAkG;IAClG,MAAM,wBAAwB,GAC5B,eAAe,IAAI,eAAe;QAChC,CAAC,CAAC,eAAe;QACjB,CAAC,CAAC,MAAA,MAAA,WAAW,CAAC,eAAe,CAAC,0CAAE,QAAQ,EAAE,mCAAI,oBAAoB,CAAC;IACvE,MAAM,wBAAwB,GAC5B,eAAe,IAAI,eAAe;QAChC,CAAC,CAAC,eAAe;QACjB,CAAC,CAAC,MAAA,MAAA,WAAW,CAAC,eAAe,CAAC,0CAAE,QAAQ,EAAE,mCAAI,oBAAoB,CAAC;IAEvE,IACE,wBAAwB,IAAI,eAAe;QAC3C,wBAAwB,IAAI,eAAe,EAC3C;QACA,OAAO,CACL,eAAe,CAAC,wBAAwB,CAAC;YACzC,eAAe,CAAC,wBAAwB,CAAC,CAC1C,CAAC;KACH;IAED,IACE,wBAAwB,IAAI,eAAe;QAC3C,wBAAwB,IAAI,eAAe,EAC3C;QACA,OAAO,IAAI,CAAC;KACb;IAED,OAAO,IAAA,WAAE,EAAC,WAAW,CAAC,eAAe,CAAC,EAAE,WAAW,CAAC,eAAe,CAAC,CAAC,CAAC;AACxE,CAAC;AAED,SAAS,oCAAoC,CAC3C,YAAoC,EACpC,uBAA+C;IAE/C,OAAO,MAAM,CAAC,IAAI,CAAC,uBAAuB,IAAI,EAAE,CAAC;SAC9C,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;QACZ,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE;YACpB,OAAO,KAAK,CAAC;SACd;QAED,MAAM,eAAe,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;QACxC,MAAM,eAAe,GAAG,uBAAuB,CAAC,CAAC,CAAC,CAAC;QACnD,OAAO,wBAAwB,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;IACpE,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,iCAAM,GAAG,KAAE,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,IAAG,EAAE,EAAE,CAAC,CAAC;AAChE,CAAC;AAED,SAAS,iCAAiC,CACxC,YAAoC,EACpC,uBAA+C,EAAE;IAEjD,OAAO,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC;SAC7B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;QACZ,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE;YAC5B,OAAO,IAAI,CAAC;SACb;QAED,MAAM,eAAe,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;QACxC,MAAM,eAAe,GAAG,oBAAoB,CAAC,CAAC,CAAC,CAAC;QAEhD,OAAO,wBAAwB,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;IACpE,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,iCAAM,GAAG,KAAE,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,IAAG,EAAE,EAAE,CAAC,CAAC;AAChE,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,SAAgB,4BAA4B,CAC1C,IAAU,EACV,YAAoC,EACpC,eAAuC,EACvC,kBAA0B,cAAc;IAExC,MAAM,kBAAkB,GAAG,QAAQ,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IAE3D,mEAAmE;IACnE,IAAI,oBAAoB,GAAG,0BAA0B,CACnD,YAAY,EACZ,kBAAkB,CAAC,eAAe,CACnC,CAAC;IACF,mEAAmE;IACnE,IAAI,uBAAuB,GAAG,0BAA0B,CACtD,eAAe,EACf,kBAAkB,CAAC,YAAY,CAChC,CAAC;IAEF,2CAA2C;IAC3C,uDAAuD;IACvD,4DAA4D;IAC5D,iHAAiH;IACjH,oBAAoB,mCACf,iCAAiC,CAClC,oBAAoB,EACpB,kBAAkB,CAAC,YAAY,CAChC,GACE,oCAAoC,CACrC,eAAe,EACf,kBAAkB,CAAC,YAAY,CAChC,CACF,CAAC;IACF,uBAAuB,mCAClB,iCAAiC,CAClC,uBAAuB,EACvB,kBAAkB,CAAC,eAAe,CACnC,GACE,oCAAoC,CACrC,YAAY,EACZ,kBAAkB,CAAC,eAAe,CACnC,CACF,CAAC;IAEF,oBAAoB,GAAG,mBAAmB,CACxC,oBAAoB,EACpB,kBAAkB,CAAC,YAAY,CAChC,CAAC;IACF,uBAAuB,GAAG,mBAAmB,CAC3C,uBAAuB,EACvB,kBAAkB,CAAC,eAAe,CACnC,CAAC;IAEF,IACE,wBAAwB,CACtB,kBAAkB,EAClB,oBAAoB,EACpB,uBAAuB,CACxB,EACD;QACA,UAAU,CAAC,IAAI,EAAE,eAAe,EAAE,CAAC,IAAI,EAAE,EAAE;YACzC,IAAI,CAAC,YAAY,mCACZ,CAAC,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC,GACzB,oBAAoB,CACxB,CAAC;YAEF,IAAI,CAAC,eAAe,mCACf,CAAC,IAAI,CAAC,eAAe,IAAI,EAAE,CAAC,GAC5B,uBAAuB,CAC3B,CAAC;YAEF,IAAI,CAAC,YAAY,GAAG,gBAAgB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACxD,IAAI,CAAC,eAAe,GAAG,gBAAgB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YAE9D,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,OAAO,GAAS,EAAE;YAChB,IAAA,2CAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;KACH;IACD,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;AAClB,CAAC;AAlFD,oEAkFC;AAED;;IAEI;AACJ,SAAS,mBAAmB,CAC1B,YAAoC,EACpC,YAAoC;IAEpC,OAAO,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;QACjD,IACE,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAG,CAAC,CAAC;YACjB,CAAC,wBAAwB,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,EAC3D;YACA,OAAO,GAAG,CAAC;SACZ;QACD,uCAAY,GAAG,KAAE,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,IAAG;IAC1C,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,SAAgB,iCAAiC,CAC/C,IAAU,EACV,YAAsB,EACtB,eAAyB,EACzB,kBAA0B,cAAc;IAExC,MAAM,kBAAkB,GAAG,QAAQ,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IAE3D,IACE,0BAA0B,CACxB,kBAAkB,EAClB,YAAY,EACZ,eAAe,CAChB,EACD;QACA,UAAU,CAAC,IAAI,EAAE,eAAe,EAAE,CAAC,IAAI,EAAE,EAAE;YACzC,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE;gBAC9B,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;aAC/B;YACD,KAAK,MAAM,MAAM,IAAI,eAAe,EAAE;gBACpC,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;aACrC;YACD,IAAI,CAAC,YAAY,GAAG,gBAAgB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACxD,IAAI,CAAC,eAAe,GAAG,gBAAgB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YAE9D,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;KACJ;IACD,OAAO,GAAS,EAAE;QAChB,IAAA,2CAAmB,EAAC,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC;AA/BD,8EA+BC;AAED,SAAS,gBAAgB,CAAI,GAAM;IACjC,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QACzD,OAAO,GAAG,CAAC;KACZ;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;SACpB,IAAI,EAAE;SACN,MAAM,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;QACtB,uCACK,MAAM,KACT,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,IACf;IACJ,CAAC,EAAE,EAAE,CAAM,CAAC;AAChB,CAAC;AAED;;;GAGG;AACH,SAAS,wBAAwB,CAAC,eAAe,EAAE,IAAI,EAAE,OAAO;IAC9D,IAAI,eAAe,GAAG,KAAK,CAAC;IAC5B,IAAI,kBAAkB,GAAG,KAAK,CAAC;IAE/B,eAAe,CAAC,YAAY,GAAG,eAAe,CAAC,YAAY,IAAI,EAAE,CAAC;IAClE,eAAe,CAAC,eAAe,GAAG,eAAe,CAAC,eAAe,IAAI,EAAE,CAAC;IAExE,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;QAChC,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;YACjD,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;YACpC,IAAI,eAAe,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;gBACvC,MAAM,eAAe,GAAG,eAAe,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;gBAC5D,OAAO,wBAAwB,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;aACnE;YAED,IAAI,eAAe,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE;gBAC1C,MAAM,eAAe,GAAG,eAAe,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;gBAC/D,OAAO,wBAAwB,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;aACnE;YAED,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;KACJ;IAED,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;QACnC,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;YACvD,MAAM,eAAe,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;YACvC,IAAI,eAAe,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE;gBAC1C,MAAM,eAAe,GAAG,eAAe,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;gBAC/D,OAAO,wBAAwB,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;aACnE;YACD,IAAI,eAAe,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;gBACvC,MAAM,eAAe,GAAG,eAAe,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;gBAE5D,OAAO,wBAAwB,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;aACnE;YAED,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;KACJ;IAED,OAAO,eAAe,IAAI,kBAAkB,CAAC;AAC/C,CAAC;AAED;;;GAGG;AACH,SAAS,0BAA0B,CACjC,eAAe,EACf,IAAc,EACd,OAAiB;IAEjB,IAAI,eAAe,GAAG,KAAK,CAAC;IAC5B,IAAI,kBAAkB,GAAG,KAAK,CAAC;IAE/B,eAAe,CAAC,YAAY,GAAG,eAAe,CAAC,YAAY,IAAI,EAAE,CAAC;IAClE,eAAe,CAAC,eAAe,GAAG,eAAe,CAAC,eAAe,IAAI,EAAE,CAAC;IAExE,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;QACnB,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,eAAe,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;KAC7E;IAED,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;QACtB,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAC/B,CAAC,KAAK,EAAE,EAAE,CAAC,eAAe,CAAC,eAAe,CAAC,KAAK,CAAC,CAClD,CAAC;KACH;IAED,OAAO,eAAe,IAAI,kBAAkB,CAAC;AAC/C,CAAC;AAED,MAAM,eAAe,GAAG,IAAI,GAAG,EAAe,CAAC;AA+C/C,SAAgB,aAAa,CAC3B,SAAwB,EACxB,wBAAgC,EAChC,oBAA6B,EAC7B,CAAS;;IAET,IAAI,GAAW,CAAC;IAChB,IAAI,eAAuB,CAAC;IAC5B,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;QACjC,GAAG,GAAG,SAAS,CAAC;QAChB,eAAe,GAAG,wBAAwB,CAAC;KAC5C;SAAM;QACL,gBAAgB;QAChB,GAAG,GAAG,wBAAwB,CAAC;QAC/B,eAAe,GAAG,oBAAoB,CAAC;KACxC;IAED,IAAI,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QAC5B,OAAO,eAAe,CAAC,GAAG,CAAC,GAAG,CAAM,CAAC;KACtC;IAED,IAAI;QACF,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC;KACrB;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,CAAC,CAAC,IAAI,KAAK,kBAAkB,EAAE;YACjC,MAAM,CAAC,CAAC;SACT;KACF;IAED,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,KAAK,OAAO,EAAE;QAChE,MAAM,IAAI,KAAK,CACb,iJAAiJ,CAClJ,CAAC;KACH;IAED,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,MAAA,sBAAsB,aAAtB,sBAAsB,uBAAtB,sBAAsB,EAAI,mCAAI;QACrD,GAAG,EAAE,IAAA,aAAO,GAAE,CAAC,IAAI;KACpB,CAAC;IAEF,OAAO,CAAC,GAAG,CAAC,YAAY,GAAG,KAAK,CAAC,CAAC;IAClC,MAAM,cAAc,GAAG,oBAAoB,EAAE,CAAC;IAC9C,IAAI,UAAU,GAAG,wBAAwB,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC;IACjE,IAAI,cAAc,KAAK,MAAM,EAAE;QAC7B,UAAU,GAAG,aAAa,CAAC,CAAC,4DAA4D;KACzF;IAED,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,KAAK,MAAM,CAAC;IAC5D,IAAA,wBAAQ,EAAC,GAAG,UAAU,IAAI,GAAG,IAAI,eAAe,EAAE,EAAE;QAClD,GAAG,EAAE,OAAO;QACZ,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ;KACxC,CAAC,CAAC;IAEH,aAAa,CAAC,IAAA,WAAI,EAAC,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC;IACnD,aAAa,CAAC,IAAA,WAAI,EAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC;IAE7C,6CAA6C;IAC5C,eAAc,CAAC,UAAU,EAAE,CAAC;IAE7B,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE;QAC1C,KAAK,EAAE,CAAC,OAAO,CAAC;KACjB,CAAC,CAAC,CAAC;IAEJ,eAAe,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAEjC,OAAO,MAAM,CAAC;AAChB,CAAC;AAjED,sCAiEC;AAED,SAAS,aAAa,CAAC,GAAW;IAChC,0CAA0C;IAC1C,0CAA0C;IAC1C,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IAEnE,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS;QACjC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC;QACxC,CAAC,CAAC,EAAE,CAAC;IAEP,uCAAuC;IACvC,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QACvB,OAAO;KACR;IAED,mBAAmB;IACnB,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAEhB,2BAA2B;IAC3B,OAAO,CAAC,GAAG,CAAC,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;AAChD,CAAC;AAED,SAAS,iBAAiB,CAAC,GAAW;IACpC,OAAO,OAAO,CAAC,IAAA,WAAI,EAAC,GAAG,EAAE,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC;AACpD,CAAC;AAED;;GAEG;AACU,QAAA,UAAU,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC"}
|