create-nx-workspace 16.0.3 → 16.1.0-rc.0
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/package.json +2 -2
- package/src/create-empty-workspace.js +5 -4
- package/src/create-empty-workspace.js.map +1 -1
- package/src/create-workspace.js +2 -2
- package/src/create-workspace.js.map +1 -1
- package/src/utils/ci/setup-ci.d.ts +1 -1
- package/src/utils/ci/setup-ci.js +2 -4
- package/src/utils/ci/setup-ci.js.map +1 -1
- package/src/utils/nx/nx-cloud.d.ts +1 -1
- package/src/utils/nx/nx-cloud.js +2 -4
- package/src/utils/nx/nx-cloud.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "create-nx-workspace",
|
|
3
|
-
"version": "16.0.
|
|
3
|
+
"version": "16.1.0-rc.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "Smart, Fast and Extensible Build System",
|
|
6
6
|
"repository": {
|
|
@@ -43,5 +43,5 @@
|
|
|
43
43
|
},
|
|
44
44
|
"main": "./index.js",
|
|
45
45
|
"types": "./index.d.ts",
|
|
46
|
-
"gitHead": "
|
|
46
|
+
"gitHead": "8cc64baf9537e775fcc5f2e606687ea3d01308ab"
|
|
47
47
|
}
|
|
@@ -25,9 +25,10 @@ function createEmptyWorkspace(tmpDir, name, packageManager, options) {
|
|
|
25
25
|
if (!options.packageManager) {
|
|
26
26
|
options.packageManager = packageManager;
|
|
27
27
|
}
|
|
28
|
+
const directory = (0, string_utils_1.getFileName)(name);
|
|
28
29
|
const args = (0, unparse_1.unparse)(Object.assign({}, options)).join(' ');
|
|
29
30
|
const pmc = (0, package_manager_1.getPackageManagerCommand)(packageManager);
|
|
30
|
-
const command = `new ${
|
|
31
|
+
const command = `new ${directory} ${args}`;
|
|
31
32
|
const workingDir = process.cwd().replace(/\\/g, '/');
|
|
32
33
|
let nxWorkspaceRoot = `"${workingDir}"`;
|
|
33
34
|
// If path contains spaces there is a problem in Windows for npm@6.
|
|
@@ -40,11 +41,11 @@ function createEmptyWorkspace(tmpDir, name, packageManager, options) {
|
|
|
40
41
|
nxWorkspaceRoot = `\\"${nxWorkspaceRoot.slice(1, -1)}\\"`;
|
|
41
42
|
}
|
|
42
43
|
}
|
|
43
|
-
let workspaceSetupSpinner = ora(`Creating your workspace in ${
|
|
44
|
+
let workspaceSetupSpinner = ora(`Creating your workspace in ${directory}`).start();
|
|
44
45
|
try {
|
|
45
46
|
const fullCommand = `${pmc.exec} nx ${command} --nxWorkspaceRoot=${nxWorkspaceRoot}`;
|
|
46
47
|
yield (0, child_process_utils_1.execAndWait)(fullCommand, tmpDir);
|
|
47
|
-
workspaceSetupSpinner.succeed(`Successfully created the workspace: ${
|
|
48
|
+
workspaceSetupSpinner.succeed(`Successfully created the workspace: ${directory}.`);
|
|
48
49
|
}
|
|
49
50
|
catch (e) {
|
|
50
51
|
workspaceSetupSpinner.fail();
|
|
@@ -62,7 +63,7 @@ function createEmptyWorkspace(tmpDir, name, packageManager, options) {
|
|
|
62
63
|
finally {
|
|
63
64
|
workspaceSetupSpinner.stop();
|
|
64
65
|
}
|
|
65
|
-
return (0, path_1.join)(workingDir,
|
|
66
|
+
return (0, path_1.join)(workingDir, directory);
|
|
66
67
|
});
|
|
67
68
|
}
|
|
68
69
|
exports.createEmptyWorkspace = createEmptyWorkspace;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-empty-workspace.js","sourceRoot":"","sources":["../../../../packages/create-nx-workspace/src/create-empty-workspace.ts"],"names":[],"mappings":";;;;AAAA,2BAA2B;AAC3B,+BAA4B;AAE5B,qEAA0D;AAC1D,qDAA0D;AAC1D,2CAAwC;AACxC,6DAIiC;AACjC,uDAAmD;AACnD,6CAA0C;AAE1C;;;;;;;GAOG;AACH,SAAsB,oBAAoB,CACxC,MAAc,EACd,IAAY,EACZ,cAA8B,EAC9B,OAAU;;QAEV,wCAAwC;QACxC,sDAAsD;QACtD,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;YAC3B,OAAO,CAAC,cAAc,GAAG,cAAc,CAAC;SACzC;QAED,MAAM,IAAI,GAAG,IAAA,iBAAO,oBACf,OAAO,EACV,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEb,MAAM,GAAG,GAAG,IAAA,0CAAwB,EAAC,cAAc,CAAC,CAAC;QAErD,MAAM,OAAO,GAAG,OAAO,
|
|
1
|
+
{"version":3,"file":"create-empty-workspace.js","sourceRoot":"","sources":["../../../../packages/create-nx-workspace/src/create-empty-workspace.ts"],"names":[],"mappings":";;;;AAAA,2BAA2B;AAC3B,+BAA4B;AAE5B,qEAA0D;AAC1D,qDAA0D;AAC1D,2CAAwC;AACxC,6DAIiC;AACjC,uDAAmD;AACnD,6CAA0C;AAE1C;;;;;;;GAOG;AACH,SAAsB,oBAAoB,CACxC,MAAc,EACd,IAAY,EACZ,cAA8B,EAC9B,OAAU;;QAEV,wCAAwC;QACxC,sDAAsD;QACtD,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;YAC3B,OAAO,CAAC,cAAc,GAAG,cAAc,CAAC;SACzC;QAED,MAAM,SAAS,GAAG,IAAA,0BAAW,EAAC,IAAI,CAAC,CAAC;QAEpC,MAAM,IAAI,GAAG,IAAA,iBAAO,oBACf,OAAO,EACV,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEb,MAAM,GAAG,GAAG,IAAA,0CAAwB,EAAC,cAAc,CAAC,CAAC;QAErD,MAAM,OAAO,GAAG,OAAO,SAAS,IAAI,IAAI,EAAE,CAAC;QAE3C,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACrD,IAAI,eAAe,GAAG,IAAI,UAAU,GAAG,CAAC;QAExC,mEAAmE;QACnE,sDAAsD;QACtD,IACE,OAAO,CAAC,QAAQ,KAAK,OAAO;YAC5B,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC;YAC1B,cAAc,KAAK,KAAK,EACxB;YACA,MAAM,SAAS,GAAG,CAAC,IAAA,0CAAwB,EAAC,cAAc,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1E,IAAI,SAAS,GAAG,CAAC,EAAE;gBACjB,eAAe,GAAG,MAAM,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;aAC3D;SACF;QACD,IAAI,qBAAqB,GAAG,GAAG,CAC7B,8BAA8B,SAAS,EAAE,CAC1C,CAAC,KAAK,EAAE,CAAC;QAEV,IAAI;YACF,MAAM,WAAW,GAAG,GAAG,GAAG,CAAC,IAAI,OAAO,OAAO,sBAAsB,eAAe,EAAE,CAAC;YACrF,MAAM,IAAA,iCAAW,EAAC,WAAW,EAAE,MAAM,CAAC,CAAC;YAEvC,qBAAqB,CAAC,OAAO,CAC3B,uCAAuC,SAAS,GAAG,CACpD,CAAC;SACH;QAAC,OAAO,CAAC,EAAE;YACV,qBAAqB,CAAC,IAAI,EAAE,CAAC;YAC7B,IAAI,CAAC,YAAY,KAAK,EAAE;gBACtB,eAAM,CAAC,KAAK,CAAC;oBACX,KAAK,EAAE,+BAA+B;oBACtC,SAAS,EAAE,IAAA,iCAAmB,EAAC,CAAC,CAAC;iBAClC,CAAC,CAAC;aACJ;iBAAM;gBACL,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;aAClB;YACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;gBAAS;YACR,qBAAqB,CAAC,IAAI,EAAE,CAAC;SAC9B;QACD,OAAO,IAAA,WAAI,EAAC,UAAU,EAAE,SAAS,CAAC,CAAC;IACrC,CAAC;CAAA;AA/DD,oDA+DC"}
|
package/src/create-workspace.js
CHANGED
|
@@ -29,10 +29,10 @@ function createWorkspace(preset, options) {
|
|
|
29
29
|
}
|
|
30
30
|
let nxCloudInstallRes;
|
|
31
31
|
if (nxCloud) {
|
|
32
|
-
nxCloudInstallRes = yield (0, nx_cloud_1.setupNxCloud)(
|
|
32
|
+
nxCloudInstallRes = yield (0, nx_cloud_1.setupNxCloud)(directory, packageManager);
|
|
33
33
|
}
|
|
34
34
|
if (ci) {
|
|
35
|
-
yield (0, setup_ci_1.setupCI)(
|
|
35
|
+
yield (0, setup_ci_1.setupCI)(directory, ci, packageManager, nxCloud && (nxCloudInstallRes === null || nxCloudInstallRes === void 0 ? void 0 : nxCloudInstallRes.code) === 0);
|
|
36
36
|
}
|
|
37
37
|
if (!skipGit && commit) {
|
|
38
38
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-workspace.js","sourceRoot":"","sources":["../../../../packages/create-nx-workspace/src/create-workspace.ts"],"names":[],"mappings":";;;;AACA,2CAAwC;AACxC,kDAAmD;AACnD,qDAAiD;AACjD,qEAAgE;AAChE,mDAA+C;AAC/C,kDAA8C;AAC9C,yCAAoD;AACpD,kFAA4E;AAC5E,qDAA0D;AAE1D,SAAsB,eAAe,CACnC,MAAc,EACd,OAAU;;QAEV,MAAM,EACJ,cAAc,EACd,IAAI,EACJ,OAAO,EACP,EAAE,GAAG,EAAE,EACP,OAAO,GAAG,KAAK,EACf,WAAW,GAAG,MAAM,EACpB,MAAM,EACN,OAAO,GACR,GAAG,OAAO,CAAC;QAEZ,IAAI,OAAO,EAAE;YACX,eAAM,CAAC,UAAU,CAAC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,IAAI,CAAC,CAAC;SACpC;QAED,MAAM,MAAM,GAAG,MAAM,IAAA,8BAAa,EAAC,cAAc,CAAC,CAAC;QAEnD,yEAAyE;QACzE,MAAM,SAAS,GAAG,MAAM,IAAA,6CAAoB,EAC1C,MAAM,EACN,IAAI,EACJ,cAAc,kCACT,OAAO,KAAE,MAAM,IACrB,CAAC;QAEF,oFAAoF;QACpF,4EAA4E;QAC5E,oHAAoH;QACpH,MAAM,gBAAgB,GAAG,MAAM,IAAA,4CAAmB,EAAC,MAAM,CAAC,CAAC;QAC3D,IAAI,gBAAgB,EAAE;YACpB,MAAM,IAAA,4BAAY,EAAC,gBAAgB,EAAE,OAAO,EAAE,cAAc,EAAE,SAAS,CAAC,CAAC;SAC1E;QAED,IAAI,iBAAiB,CAAC;QACtB,IAAI,OAAO,EAAE;YACX,iBAAiB,GAAG,MAAM,IAAA,uBAAY,EAAC,
|
|
1
|
+
{"version":3,"file":"create-workspace.js","sourceRoot":"","sources":["../../../../packages/create-nx-workspace/src/create-workspace.ts"],"names":[],"mappings":";;;;AACA,2CAAwC;AACxC,kDAAmD;AACnD,qDAAiD;AACjD,qEAAgE;AAChE,mDAA+C;AAC/C,kDAA8C;AAC9C,yCAAoD;AACpD,kFAA4E;AAC5E,qDAA0D;AAE1D,SAAsB,eAAe,CACnC,MAAc,EACd,OAAU;;QAEV,MAAM,EACJ,cAAc,EACd,IAAI,EACJ,OAAO,EACP,EAAE,GAAG,EAAE,EACP,OAAO,GAAG,KAAK,EACf,WAAW,GAAG,MAAM,EACpB,MAAM,EACN,OAAO,GACR,GAAG,OAAO,CAAC;QAEZ,IAAI,OAAO,EAAE;YACX,eAAM,CAAC,UAAU,CAAC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,IAAI,CAAC,CAAC;SACpC;QAED,MAAM,MAAM,GAAG,MAAM,IAAA,8BAAa,EAAC,cAAc,CAAC,CAAC;QAEnD,yEAAyE;QACzE,MAAM,SAAS,GAAG,MAAM,IAAA,6CAAoB,EAC1C,MAAM,EACN,IAAI,EACJ,cAAc,kCACT,OAAO,KAAE,MAAM,IACrB,CAAC;QAEF,oFAAoF;QACpF,4EAA4E;QAC5E,oHAAoH;QACpH,MAAM,gBAAgB,GAAG,MAAM,IAAA,4CAAmB,EAAC,MAAM,CAAC,CAAC;QAC3D,IAAI,gBAAgB,EAAE;YACpB,MAAM,IAAA,4BAAY,EAAC,gBAAgB,EAAE,OAAO,EAAE,cAAc,EAAE,SAAS,CAAC,CAAC;SAC1E;QAED,IAAI,iBAAiB,CAAC;QACtB,IAAI,OAAO,EAAE;YACX,iBAAiB,GAAG,MAAM,IAAA,uBAAY,EAAC,SAAS,EAAE,cAAc,CAAC,CAAC;SACnE;QACD,IAAI,EAAE,EAAE;YACN,MAAM,IAAA,kBAAO,EACX,SAAS,EACT,EAAE,EACF,cAAc,EACd,OAAO,IAAI,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,IAAI,MAAK,CAAC,CACzC,CAAC;SACH;QACD,IAAI,CAAC,OAAO,IAAI,MAAM,EAAE;YACtB,IAAI;gBACF,MAAM,IAAA,uBAAiB,EAAC,SAAS,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,CAAC;aAC7D;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,CAAC,YAAY,KAAK,EAAE;oBACtB,eAAM,CAAC,KAAK,CAAC;wBACX,KAAK,EAAE,qCAAqC;wBAC5C,SAAS,EAAE,IAAA,iCAAmB,EAAC,CAAC,CAAC;qBAClC,CAAC,CAAC;iBACJ;qBAAM;oBACL,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;iBAClB;aACF;SACF;QAED,OAAO;YACL,WAAW,EAAE,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM;YACtC,SAAS;SACV,CAAC;IACJ,CAAC;CAAA;AApED,0CAoEC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { PackageManager } from '../package-manager';
|
|
2
|
-
export declare function setupCI(
|
|
2
|
+
export declare function setupCI(directory: string, ci: string, packageManager: PackageManager, nxCloudSuccessfullyInstalled: boolean): Promise<{
|
|
3
3
|
code: number;
|
|
4
4
|
stdout: string;
|
|
5
5
|
}>;
|
package/src/utils/ci/setup-ci.js
CHANGED
|
@@ -3,13 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.setupCI = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const ora = require("ora");
|
|
6
|
-
const path_1 = require("path");
|
|
7
6
|
const child_process_utils_1 = require("../child-process-utils");
|
|
8
7
|
const error_utils_1 = require("../error-utils");
|
|
9
8
|
const output_1 = require("../output");
|
|
10
9
|
const package_manager_1 = require("../package-manager");
|
|
11
|
-
|
|
12
|
-
function setupCI(name, ci, packageManager, nxCloudSuccessfullyInstalled) {
|
|
10
|
+
function setupCI(directory, ci, packageManager, nxCloudSuccessfullyInstalled) {
|
|
13
11
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
14
12
|
if (!nxCloudSuccessfullyInstalled) {
|
|
15
13
|
output_1.output.error({
|
|
@@ -23,7 +21,7 @@ function setupCI(name, ci, packageManager, nxCloudSuccessfullyInstalled) {
|
|
|
23
21
|
const ciSpinner = ora(`Generating CI workflow`).start();
|
|
24
22
|
try {
|
|
25
23
|
const pmc = (0, package_manager_1.getPackageManagerCommand)(packageManager);
|
|
26
|
-
const res = yield (0, child_process_utils_1.execAndWait)(`${pmc.exec} nx g @nx/workspace:ci-workflow --ci=${ci}`,
|
|
24
|
+
const res = yield (0, child_process_utils_1.execAndWait)(`${pmc.exec} nx g @nx/workspace:ci-workflow --ci=${ci}`, directory);
|
|
27
25
|
ciSpinner.succeed('CI workflow has been generated successfully');
|
|
28
26
|
return res;
|
|
29
27
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-ci.js","sourceRoot":"","sources":["../../../../../../packages/create-nx-workspace/src/utils/ci/setup-ci.ts"],"names":[],"mappings":";;;;AAAA,2BAA2B;
|
|
1
|
+
{"version":3,"file":"setup-ci.js","sourceRoot":"","sources":["../../../../../../packages/create-nx-workspace/src/utils/ci/setup-ci.ts"],"names":[],"mappings":";;;;AAAA,2BAA2B;AAG3B,gEAAqD;AACrD,gDAAqD;AACrD,sCAAmC;AACnC,wDAA8E;AAE9E,SAAsB,OAAO,CAC3B,SAAiB,EACjB,EAAU,EACV,cAA8B,EAC9B,4BAAqC;;QAErC,IAAI,CAAC,4BAA4B,EAAE;YACjC,eAAM,CAAC,KAAK,CAAC;gBACX,KAAK,EAAE,gCAAgC;gBACvC,SAAS,EAAE;oBACT,4BAA4B;oBAC5B,+DAA+D;iBAChE;aACF,CAAC,CAAC;SACJ;QACD,MAAM,SAAS,GAAG,GAAG,CAAC,wBAAwB,CAAC,CAAC,KAAK,EAAE,CAAC;QACxD,IAAI;YACF,MAAM,GAAG,GAAG,IAAA,0CAAwB,EAAC,cAAc,CAAC,CAAC;YACrD,MAAM,GAAG,GAAG,MAAM,IAAA,iCAAW,EAC3B,GAAG,GAAG,CAAC,IAAI,wCAAwC,EAAE,EAAE,EACvD,SAAS,CACV,CAAC;YACF,SAAS,CAAC,OAAO,CAAC,6CAA6C,CAAC,CAAC;YACjE,OAAO,GAAG,CAAC;SACZ;QAAC,OAAO,CAAC,EAAE;YACV,SAAS,CAAC,IAAI,EAAE,CAAC;YACjB,IAAI,CAAC,YAAY,KAAK,EAAE;gBACtB,eAAM,CAAC,KAAK,CAAC;oBACX,KAAK,EAAE,gCAAgC;oBACvC,SAAS,EAAE,IAAA,iCAAmB,EAAC,CAAC,CAAC;iBAClC,CAAC,CAAC;aACJ;iBAAM;gBACL,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;aAClB;YAED,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;gBAAS;YACR,SAAS,CAAC,IAAI,EAAE,CAAC;SAClB;IACH,CAAC;CAAA;AAvCD,0BAuCC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { PackageManager } from '../package-manager';
|
|
2
|
-
export declare function setupNxCloud(
|
|
2
|
+
export declare function setupNxCloud(directory: string, packageManager: PackageManager): Promise<{
|
|
3
3
|
code: number;
|
|
4
4
|
stdout: string;
|
|
5
5
|
}>;
|
package/src/utils/nx/nx-cloud.js
CHANGED
|
@@ -3,18 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.printNxCloudSuccessMessage = exports.setupNxCloud = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const ora = require("ora");
|
|
6
|
-
const path_1 = require("path");
|
|
7
6
|
const child_process_utils_1 = require("../child-process-utils");
|
|
8
7
|
const output_1 = require("../output");
|
|
9
8
|
const package_manager_1 = require("../package-manager");
|
|
10
|
-
const string_utils_1 = require("../string-utils");
|
|
11
9
|
const error_utils_1 = require("../error-utils");
|
|
12
|
-
function setupNxCloud(
|
|
10
|
+
function setupNxCloud(directory, packageManager) {
|
|
13
11
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
14
12
|
const nxCloudSpinner = ora(`Setting up NxCloud`).start();
|
|
15
13
|
try {
|
|
16
14
|
const pmc = (0, package_manager_1.getPackageManagerCommand)(packageManager);
|
|
17
|
-
const res = yield (0, child_process_utils_1.execAndWait)(`${pmc.exec} nx g nx-cloud:init --no-analytics --installationSource=create-nx-workspace`,
|
|
15
|
+
const res = yield (0, child_process_utils_1.execAndWait)(`${pmc.exec} nx g nx-cloud:init --no-analytics --installationSource=create-nx-workspace`, directory);
|
|
18
16
|
nxCloudSpinner.succeed('NxCloud has been set up successfully');
|
|
19
17
|
return res;
|
|
20
18
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nx-cloud.js","sourceRoot":"","sources":["../../../../../../packages/create-nx-workspace/src/utils/nx/nx-cloud.ts"],"names":[],"mappings":";;;;AAAA,2BAA2B;
|
|
1
|
+
{"version":3,"file":"nx-cloud.js","sourceRoot":"","sources":["../../../../../../packages/create-nx-workspace/src/utils/nx/nx-cloud.ts"],"names":[],"mappings":";;;;AAAA,2BAA2B;AAE3B,gEAAqD;AACrD,sCAAmC;AACnC,wDAA8E;AAC9E,gDAAqD;AAErD,SAAsB,YAAY,CAChC,SAAiB,EACjB,cAA8B;;QAE9B,MAAM,cAAc,GAAG,GAAG,CAAC,oBAAoB,CAAC,CAAC,KAAK,EAAE,CAAC;QACzD,IAAI;YACF,MAAM,GAAG,GAAG,IAAA,0CAAwB,EAAC,cAAc,CAAC,CAAC;YACrD,MAAM,GAAG,GAAG,MAAM,IAAA,iCAAW,EAC3B,GAAG,GAAG,CAAC,IAAI,6EAA6E,EACxF,SAAS,CACV,CAAC;YACF,cAAc,CAAC,OAAO,CAAC,sCAAsC,CAAC,CAAC;YAC/D,OAAO,GAAG,CAAC;SACZ;QAAC,OAAO,CAAC,EAAE;YACV,cAAc,CAAC,IAAI,EAAE,CAAC;YAEtB,IAAI,CAAC,YAAY,KAAK,EAAE;gBACtB,eAAM,CAAC,KAAK,CAAC;oBACX,KAAK,EAAE,yBAAyB;oBAChC,SAAS,EAAE,IAAA,iCAAmB,EAAC,CAAC,CAAC;iBAClC,CAAC,CAAC;aACJ;iBAAM;gBACL,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;aAClB;YAED,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;gBAAS;YACR,cAAc,CAAC,IAAI,EAAE,CAAC;SACvB;IACH,CAAC;CAAA;AA7BD,oCA6BC;AAED,SAAgB,0BAA0B,CAAC,UAAkB;IAC3D,MAAM,SAAS,GAAG,UAAU;SACzB,KAAK,CAAC,mDAAmD,CAAC,CAAC,CAAC,CAAC;SAC7D,IAAI,EAAE,CAAC;IACV,eAAM,CAAC,IAAI,CAAC;QACV,KAAK,EAAE,mDAAmD;QAC1D,SAAS,EAAE,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;KACtD,CAAC,CAAC;AACL,CAAC;AARD,gEAQC"}
|