@nrwl/cypress 15.8.0-beta.2 → 15.8.0-beta.3
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 +6 -6
- package/src/generators/cypress-project/cypress-project.js +1 -5
- package/src/generators/cypress-project/cypress-project.js.map +1 -1
- package/src/generators/init/init.d.ts +2 -2
- package/src/generators/init/init.js +12 -2
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/init/schema.d.ts +2 -0
- package/src/generators/migrate-to-cypress-11/conversion.util.js +5 -3
- package/src/generators/migrate-to-cypress-11/conversion.util.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/cypress",
|
|
3
|
-
"version": "15.8.0-beta.
|
|
3
|
+
"version": "15.8.0-beta.3",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The Nx Plugin for Cypress contains executors and generators allowing your workspace to use the powerful Cypress integration testing capabilities.",
|
|
6
6
|
"repository": {
|
|
@@ -34,10 +34,10 @@
|
|
|
34
34
|
"migrations": "./migrations.json"
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
|
-
"@nrwl/devkit": "15.8.0-beta.
|
|
38
|
-
"@nrwl/js": "15.8.0-beta.
|
|
39
|
-
"@nrwl/linter": "15.8.0-beta.
|
|
40
|
-
"@nrwl/workspace": "15.8.0-beta.
|
|
37
|
+
"@nrwl/devkit": "15.8.0-beta.3",
|
|
38
|
+
"@nrwl/js": "15.8.0-beta.3",
|
|
39
|
+
"@nrwl/linter": "15.8.0-beta.3",
|
|
40
|
+
"@nrwl/workspace": "15.8.0-beta.3",
|
|
41
41
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
42
42
|
"dotenv": "~10.0.0",
|
|
43
43
|
"semver": "7.3.4"
|
|
@@ -54,5 +54,5 @@
|
|
|
54
54
|
"access": "public"
|
|
55
55
|
},
|
|
56
56
|
"types": "./index.d.ts",
|
|
57
|
-
"gitHead": "
|
|
57
|
+
"gitHead": "cbf33c478661e0c4f4795f9986a2357b641cc497"
|
|
58
58
|
}
|
|
@@ -189,16 +189,12 @@ exports.addLinter = addLinter;
|
|
|
189
189
|
function cypressProjectGenerator(host, schema) {
|
|
190
190
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
191
191
|
const options = normalizeOptions(host, schema);
|
|
192
|
-
yield (0, js_1.initGenerator)(host, {
|
|
193
|
-
js: schema.js,
|
|
194
|
-
skipFormat: true,
|
|
195
|
-
});
|
|
196
192
|
const tasks = [];
|
|
197
193
|
const cypressVersion = (0, cypress_version_1.installedCypressVersion)();
|
|
198
194
|
// if there is an installed cypress version, then we don't call
|
|
199
195
|
// init since we want to keep the existing version that is installed
|
|
200
196
|
if (!cypressVersion) {
|
|
201
|
-
tasks.push((0, init_1.cypressInitGenerator)(host, options));
|
|
197
|
+
tasks.push(yield (0, init_1.cypressInitGenerator)(host, options));
|
|
202
198
|
}
|
|
203
199
|
if (schema.bundler === 'vite') {
|
|
204
200
|
tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, {}, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cypress-project.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/cypress-project/cypress-project.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"cypress-project.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/cypress-project/cypress-project.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Tree } from '@nrwl/devkit';
|
|
1
|
+
import { GeneratorCallback, Tree } from '@nrwl/devkit';
|
|
2
2
|
import { Schema } from './schema';
|
|
3
|
-
export declare function cypressInitGenerator(tree: Tree, options: Schema):
|
|
3
|
+
export declare function cypressInitGenerator(tree: Tree, options: Schema): Promise<GeneratorCallback>;
|
|
4
4
|
export default cypressInitGenerator;
|
|
5
5
|
export declare const cypressInitSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;
|
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.cypressInitSchematic = exports.cypressInitGenerator = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
4
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
6
|
const versions_1 = require("../../utils/versions");
|
|
7
|
+
const js_1 = require("@nrwl/js");
|
|
8
|
+
const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
|
|
6
9
|
function setupE2ETargetDefaults(tree) {
|
|
7
10
|
var _a, _b, _c, _d;
|
|
8
11
|
var _e, _f;
|
|
@@ -29,8 +32,15 @@ function updateDependencies(tree) {
|
|
|
29
32
|
});
|
|
30
33
|
}
|
|
31
34
|
function cypressInitGenerator(tree, options) {
|
|
32
|
-
|
|
33
|
-
|
|
35
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
36
|
+
setupE2ETargetDefaults(tree);
|
|
37
|
+
const tasks = [];
|
|
38
|
+
tasks.push(yield (0, js_1.initGenerator)(tree, Object.assign(Object.assign({}, options), { skipFormat: true })));
|
|
39
|
+
if (!options.skipPackageJson) {
|
|
40
|
+
tasks.push(updateDependencies(tree));
|
|
41
|
+
}
|
|
42
|
+
return (0, run_tasks_in_serial_1.runTasksInSerial)(...tasks);
|
|
43
|
+
});
|
|
34
44
|
}
|
|
35
45
|
exports.cypressInitGenerator = cypressInitGenerator;
|
|
36
46
|
exports.default = cypressInitGenerator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/init/init.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,yCAQsB;AACtB,mDAI8B;AAE9B,iCAAyC;AACzC,2FAAqF;AAErF,SAAS,sBAAsB,CAAC,IAAU;;;IACxC,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAEhC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;QACvB,OAAO;KACR;IAED,yFAAyF;IACzF,MAAA,MAAM,CAAC,cAAc,oCAArB,MAAM,CAAC,cAAc,GAAK,EAAE,EAAC;IAE7B,MAAM,iBAAiB,GAAG,CAAC,CAAC,CAAA,MAAA,MAAM,CAAC,WAAW,0CAAE,UAAU,CAAA,CAAC;IAC3D,YAAA,MAAM,CAAC,cAAc,EAAC,GAAG,uCAAH,GAAG,GAAK,EAAE,EAAC;IACjC,YAAA,MAAM,CAAC,cAAc,CAAC,GAAG,EAAC,MAAM,uCAAN,MAAM,GAAK;QACnC,SAAS;QACT,iBAAiB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU;KAC/C,EAAC;IAEF,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAU;IACpC,IAAA,0CAAiC,EAAC,IAAI,EAAE,CAAC,eAAe,CAAC,EAAE,EAAE,CAAC,CAAC;IAE/D,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,EACF;QACE,CAAC,eAAe,CAAC,EAAE,oBAAS;QAC5B,OAAO,EAAE,yBAAc;QACvB,aAAa,EAAE,2BAAgB;KAChC,CACF,CAAC;AACJ,CAAC;AAED,SAAsB,oBAAoB,CAAC,IAAU,EAAE,OAAe;;QACpE,sBAAsB,CAAC,IAAI,CAAC,CAAC;QAE7B,MAAM,KAAK,GAAwB,EAAE,CAAC;QAEtC,KAAK,CAAC,IAAI,CACR,MAAM,IAAA,kBAAa,EAAC,IAAI,kCACnB,OAAO,KACV,UAAU,EAAE,IAAI,IAChB,CACH,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YAC5B,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC;SACtC;QAED,OAAO,IAAA,sCAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AAjBD,oDAiBC;AAED,kBAAe,oBAAoB,CAAC;AACvB,QAAA,oBAAoB,GAAG,IAAA,2BAAkB,EAAC,oBAAoB,CAAC,CAAC"}
|
|
@@ -4,6 +4,7 @@ exports.updatePluginFile = exports.addConfigToTsConfig = exports.writeNewConfig
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const path_1 = require("path");
|
|
7
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
7
8
|
let tsModule;
|
|
8
9
|
let tsquery;
|
|
9
10
|
const validFilesEndingsToUpdate = [
|
|
@@ -156,12 +157,13 @@ function updateProjectPaths(tree, projectConfig, { cypressConfigTs, cypressConfi
|
|
|
156
157
|
}
|
|
157
158
|
exports.updateProjectPaths = updateProjectPaths;
|
|
158
159
|
function updateImports(tree, filePath, oldImportPath, newImportPath) {
|
|
160
|
+
if (!tsModule) {
|
|
161
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
162
|
+
}
|
|
159
163
|
if (!tsquery) {
|
|
164
|
+
(0, ensure_typescript_1.ensureTypescript)();
|
|
160
165
|
tsquery = require('@phenomnomnominal/tsquery').tsquery;
|
|
161
166
|
}
|
|
162
|
-
if (!tsModule) {
|
|
163
|
-
tsModule = require('typescript');
|
|
164
|
-
}
|
|
165
167
|
const { isCallExpression, isExportDeclaration, isImportDeclaration } = tsModule;
|
|
166
168
|
const endOfImportSelector = `StringLiteral[value=/${oldImportPath}$/]`;
|
|
167
169
|
const fileContent = tree.read(filePath, 'utf-8');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversion.util.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/migrate-to-cypress-11/conversion.util.ts"],"names":[],"mappings":";;;;AAAA,yCASsB;AACtB,+BAA4D;
|
|
1
|
+
{"version":3,"file":"conversion.util.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/migrate-to-cypress-11/conversion.util.ts"],"names":[],"mappings":";;;;AAAA,yCASsB;AACtB,+BAA4D;AAE5D,uFAAmF;AAEnF,IAAI,QAAqC,CAAC;AAC1C,IAAI,OAA2D,CAAC;AAEhE,MAAM,yBAAyB,GAAG;IAChC,KAAK;IACL,MAAM;IACN,KAAK;IACL,MAAM;IACN,MAAM;IACN,MAAM;CACP,CAAC;AAEF,SAAgB,kBAAkB,CAChC,IAAU,EACV,aAAmC,EACnC,MAAc,EACd,MAAc;;IAKd,MAAM,qBAAqB,GACzB,CAAA,MAAA,MAAA,MAAA,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,0CAAE,cAAc,0CAAG,MAAM,CAAC,0CAAE,aAAa;SACtE,MAAA,MAAA,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,0CAAE,OAAO,0CAAE,aAAa,CAAA,CAAC;IAExD,gHAAgH;IAChH,IAAI,CAAC,qBAAqB,IAAI,IAAA,cAAO,EAAC,qBAAqB,CAAC,KAAK,OAAO,EAAE;QACxE,OAAO;YACL,qBAAqB,EAAE,IAAI;YAC3B,mBAAmB,EAAE,IAAI;SAC1B,CAAC;KACH;IAED,MAAM,mBAAmB,GAAG,IAAA,0BAAiB,EAC3C,IAAA,cAAO,EAAC,qBAAqB,CAAC;IAC9B,iEAAiE;IACjE,CAAA,qBAAqB,aAArB,qBAAqB,uBAArB,qBAAqB,CAAE,QAAQ,CAAC,cAAc,CAAC;QAC7C,CAAC,CAAC,mBAAmB,CAAC,SAAS;QAC/B,CAAC,CAAC,GAAG,IAAA,eAAQ,EACT,qBAAqB,EACrB,IAAA,cAAO,EAAC,qBAAqB,CAAC,CAC/B,YAAY,CAClB,CAAC;IAEF,OAAO;QACL,qBAAqB;QACrB,mBAAmB;KACpB,CAAC;AACJ,CAAC;AApCD,gDAoCC;AAED;;;GAGG;AACH,SAAgB,sBAAsB,CACpC,IAAU,EACV,aAAmC,EACnC,qBAA6B;IAK7B,MAAM,iBAAiB,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;IAEhE,MAAM,EACJ,qBAAqB,GAAG,IAAI,EAAE,8BAA8B;IAC5D,iBAAiB,GAAG,SAAS,EAAE,sDAAsD;IACrF,WAAW,GAAG,oBAAoB,KAEhC,iBAAiB,EADhB,YAAY,kBACb,iBAAiB,EALf,6DAKL,CAAoB,CAAC;IAEtB,MAAM,oBAAoB,GAAG,IAAI,CAAC,MAAM,CACtC,IAAA,0BAAiB,EAAC,aAAa,CAAC,UAAU,EAAE,aAAa,CAAC,CAC3D;QACC,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,iBAAiB,CAAC;IACtB,MAAM,eAAe,GAAG;QACtB,GAAG,kCACE,YAAY,KACf,WAAW,EAAE,GAAG,oBAAoB,0BAA0B;YAC9D,yHAAyH;YACzH,qCAAqC;YACrC,kEAAkE;YAClE,WAAW,EACT,CAAC,WAAW;gBACV,IAAI,CAAC,MAAM,CACT,IAAA,0BAAiB,EAAC,aAAa,CAAC,UAAU,EAAE,SAAS,EAAE,UAAU,CAAC,CACnE,CAAC;gBACJ,IAAI,CAAC,MAAM,CACT,IAAA,0BAAiB,EAAC,aAAa,CAAC,UAAU,EAAE,SAAS,EAAE,QAAQ,CAAC,CACjE;gBACC,CAAC,CAAC,oBAAoB;gBACtB,CAAC,CAAC,WAAW;YACjB,0GAA0G;YAC1G,mGAAmG;YACnG,iBAAiB,EAAE,oBAAoB,GACxC;KACF,CAAC;IAEF,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,CAAC;AAChD,CAAC;AA9CD,wDA8CC;AAED,SAAgB,uBAAuB,CACrC,kBAA0B,EAC1B,kBAA0B,EAC1B,iBAAyB;IAEzB,wDAAwD;IACxD,6GAA6G;IAC7G,4CAA4C;IAC5C,8GAA8G;IAC9G,gHAAgH;IAChH,qDAAqD;IAErD,6CAA6C;IAC7C,MAAM,UAAU,GAAG,IAAA,cAAO,EAAC,kBAAkB,CAAC,CAAC;IAC/C,MAAM,iBAAiB,GAAG,IAAA,eAAQ,EAChC,iBAAiB,EACjB,kBAAkB,CACnB,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IAE1B,iDAAiD;IACjD,MAAM,UAAU,GAAG,IAAA,cAAO,EAAC,kBAAkB,CAAC,CAAC;IAC/C,MAAM,iBAAiB,GAAG,IAAA,eAAQ,EAChC,iBAAiB,EACjB,kBAAkB,CACnB,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IAE1B,2BAA2B;IAC3B,MAAM,qBAAqB,GAAG,IAAA,eAAQ,EAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;IAEtE,OAAO;QACL,iBAAiB;QACjB,wDAAwD;QACxD,iBAAiB,EACf,qBAAqB,KAAK,OAAO;YAC/B,CAAC,CAAC,IAAA,cAAO,EAAC,iBAAiB,CAAC;YAC5B,CAAC,CAAC,iBAAiB;KACxB,CAAC;AACJ,CAAC;AArCD,0DAqCC;AAED,SAAgB,kBAAkB,CAChC,IAAU,EACV,aAAmC,EACnC,EACE,eAAe,EACf,iBAAiB,GAIlB;IAED,MAAM,EAAE,iBAAiB,EAAE,WAAW,EAAE,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;IAElE,MAAM,oBAAoB,GAAG,IAAA,0BAAiB,EAC5C,aAAa,CAAC,IAAI,EAClB,iBAAiB,CAAC,iBAAiB,CACpC,CAAC;IACF,MAAM,oBAAoB,GAAG,IAAA,0BAAiB,EAC5C,aAAa,CAAC,IAAI,EAClB,iBAAiB,CAClB,CAAC;IAEF,IAAI,cAAsB,CAAC;IAC3B,IAAI,cAAsB,CAAC;IAC3B,IAAI,iBAAyB,CAAC;IAC9B,IAAI,iBAAyB,CAAC;IAC9B,IAAI,8BAA8B,GAAG,KAAK,CAAC;IAC3C,yDAAyD;IACzD,IAAI,iBAAiB,CAAC,WAAW,EAAE;QACjC,4CAA4C;QAC5C,uDAAuD;QACvD,8BAA8B,GAAG,IAAI,CAAC;QACtC,cAAc,GAAG,IAAA,0BAAiB,EAChC,aAAa,CAAC,IAAI,EAClB,iBAAiB,CAAC,WAAW,CAC9B,CAAC;QAEF,cAAc,GAAG,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QACpE,iDAAiD;QACjD,qDAAqD;QACrD,IAAI,cAAc,KAAK,cAAc,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;YACpE,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;SAC7C;KACF;SAAM;QACL,8BAA8B,GAAG,KAAK,CAAC;QACvC,cAAc,GAAG,WAAW,CAAC;QAC7B,iGAAiG;QACjG,MAAM,kBAAkB,GAAG,IAAA,0BAAiB,EAC1C,aAAa,CAAC,UAAU,EACxB,SAAS,EACT,UAAU,CACX,CAAC;QAEF,IAAI,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE;YACnC,MAAM,qBAAqB,GAAG,IAAA,0BAAiB,EAC7C,aAAa,CAAC,UAAU,EACxB,SAAS,EACT,QAAQ,CACT,CAAC;YACF,IACE,kBAAkB,KAAK,qBAAqB;gBAC5C,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAC/B;gBACA,IAAI,CAAC,MAAM,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,CAAC;aACxD;SACF;KACF;IAED,IAAI,8BAA8B,EAAE;QAClC,MAAM,cAAc,GAAG,uBAAuB,CAC5C,cAAc,EACd,cAAc,EACd,aAAa,CAAC,UAAU,CACzB,CAAC;QACF,iBAAiB,GAAG,cAAc,CAAC,iBAAiB,CAAC;QACrD,iBAAiB,GAAG,cAAc,CAAC,iBAAiB,CAAC;KACtD;IAED,uEAAuE;IACvE,qCAAqC;IACrC,IAAA,6BAAoB,EAAC,IAAI,EAAE,aAAa,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE;QAC5D,MAAM,cAAc,GAAG,IAAA,sBAAa,EAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,oBAAoB,CAAC,EAAE;YAClD,OAAO;SACR;QACD,MAAM,QAAQ,GAAG,IAAA,eAAQ,EAAC,cAAc,CAAC,CAAC;QAC1C,IAAI,OAAO,GAAG,cAAc,CAAC,OAAO,CAClC,oBAAoB,EACpB,oBAAoB,CACrB,CAAC;QAEF,IAAI,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;YAC/B,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;SAC7C;QACD,IAAI,OAAO,KAAK,cAAc,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;YAC7D,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;SACtC;QACD,qFAAqF;QACrF,IACE,8BAA8B;YAC9B,yBAAyB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EACvD;YACA,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,CAAC,CAAC;SACpE;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;QACpD,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;KACnC;AACH,CAAC;AA7GD,gDA6GC;AAED,SAAgB,aAAa,CAC3B,IAAU,EACV,QAAgB,EAChB,aAAqB,EACrB,aAAqB;IAErB,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IACD,IAAI,CAAC,OAAO,EAAE;QACZ,IAAA,oCAAgB,GAAE,CAAC;QACnB,OAAO,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC,OAAO,CAAC;KACxD;IACD,MAAM,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,GAClE,QAAQ,CAAC;IACX,MAAM,mBAAmB,GAAG,wBAAwB,aAAa,KAAK,CAAC;IACvE,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACjD,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAChC,WAAW,EACX,mBAAmB,EACnB,CAAC,IAAmB,EAAE,EAAE;QACtB,oEAAoE;QACpE,IACE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM;YACZ,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC;gBAC5B,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC;gBAChC,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EACnC;YACA,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,aAAa,CAAC,GAAG,CAAC;SAC/D;QACD,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC,CACF,CAAC;IACF,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;AACnC,CAAC;AAlCD,sCAkCC;AAED,SAAgB,cAAc,CAC5B,IAAU,EACV,mBAA2B,EAC3B,cAGC;IAED,oCAAoC;IACpC,MAAM,KAIF,cAAc,CAAC,eAAe,CAAC,GAAG,EAJhC,EACJ,WAAW,GAAG,KAAK,EACnB,iBAAiB,GAAG,EAAE,OAEc,EADjC,YAAY,sBAHX,oCAIL,CAAqC,CAAC;IACvC,MAAM,YAAY,GAAG,WAAW;QAC9B,CAAC,CAAC,gCAAgC,WAAW,IAAI;QACjD,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAE9D,IAAI,CAAC,KAAK,CACR,mBAAmB,EACnB,IAAA,qBAAY,EAAA;;;EAGd,YAAY;;4BAEc,eAAe;;;;;MAKrC,WAAW,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE;;;CAGzC,CACE,CAAC;AACJ,CAAC;AArCD,wCAqCC;AAED,SAAgB,mBAAmB,CACjC,IAAU,EACV,YAAoB,EACpB,iBAAyB;IAEzB,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;QAC7B,IAAA,mBAAU,EACR,IAAI,EACJ,YAAY,EACZ,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,IAAI,CACvB,IAAI,GAAG,CAAC;gBACN,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;gBACvB,IAAA,eAAQ,EAAC,IAAA,cAAO,EAAC,YAAY,CAAC,EAAE,iBAAiB,CAAC;aACnD,CAAC,CACH,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC,EACD,EAAE,cAAc,EAAE,IAAI,EAAE,CACzB,CAAC;KACH;AACH,CAAC;AArBD,kDAqBC;AAED,SAAgB,gBAAgB,CAC9B,IAAU,EACV,aAAmC,EACnC,cAGC;;IAED,uDAAuD;IACvD,+BAA+B;IAC/B,sDAAsD;IACtD,MAAM,WAAW,GAAG,MAAA,MAAA,cAAc,CAAC,eAAe,0CAAE,GAAG,0CAAE,WAAW,CAAC;IACrE,IAAI,CAAC,WAAW,EAAE;QAChB,OAAO,cAAc,CAAC;KACvB;IACD,MAAM,GAAG,GAAG,IAAA,cAAO,EAAC,WAAW,CAAC,CAAC;IACjC,MAAM,qBAAqB,mCACtB,cAAc,KACjB,eAAe,EAAE;YACf,GAAG,kCACE,cAAc,CAAC,eAAe,CAAC,GAAG,KACrC,WAAW,EAAE,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,GAC1C;SACF,GACF,CAAC;IAEF,MAAM,cAAc,GAAG,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAE1E,IAAI,GAAG,KAAK,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;QAChD,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QAE7D,IAAI,CAAC,KAAK,CACR,cAAc,EACd,iBAAiB;aACd,OAAO,CAAC,kBAAkB,EAAE,gBAAgB,CAAC;aAC7C,OAAO,CAAC,0BAA0B,EAAE,kBAAkB,CAAC,CAC3D,CAAC;KACH;IAED,OAAO,qBAAqB,CAAC;AAC/B,CAAC;AAxCD,4CAwCC"}
|