@storm-software/workspace-tools 1.5.17 → 1.5.19
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/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,17 @@
|
|
|
1
|
+
## [1.5.18](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.5.17...workspace-tools-v1.5.18) (2023-11-10)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* **workspace-tools:** Replace joins with calls to joinPathFragments in node-library generator ([5599b5b](https://github.com/storm-software/storm-ops/commit/5599b5bf0f3ddac163b20efe05f0c3e62a215ac9))
|
|
7
|
+
|
|
8
|
+
## [1.5.17](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.5.16...workspace-tools-v1.5.17) (2023-11-10)
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Bug Fixes
|
|
12
|
+
|
|
13
|
+
* **workspace-tools:** Resolved issue with node-library generator package.json creation ([d18d160](https://github.com/storm-software/storm-ops/commit/d18d160f1dd7958df7c0d9c0b1921600dbb3741d))
|
|
14
|
+
|
|
1
15
|
## [1.5.16](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.5.15...workspace-tools-v1.5.16) (2023-11-09)
|
|
2
16
|
|
|
3
17
|
|
package/package.json
CHANGED
|
@@ -6,12 +6,11 @@ const devkit_1 = require("@nx/devkit");
|
|
|
6
6
|
const js_1 = require("@nx/js");
|
|
7
7
|
const init_1 = require("@nx/js/src/generators/init/init");
|
|
8
8
|
const generator_1 = require("@nx/js/src/generators/setup-verdaccio/generator");
|
|
9
|
-
const path_1 = require("path");
|
|
10
9
|
const versions_1 = require("../../utils/versions");
|
|
11
10
|
const normalize_options_1 = require("./normalize-options");
|
|
12
11
|
function nodeLibraryGenerator(tree, schema) {
|
|
13
12
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
14
|
-
const filesDir = (0,
|
|
13
|
+
const filesDir = (0, devkit_1.joinPathFragments)(__dirname, "./files");
|
|
15
14
|
const options = yield (0, normalize_options_1.normalizeOptions)(tree, schema);
|
|
16
15
|
const tasks = [];
|
|
17
16
|
tasks.push(yield (0, init_1.default)(tree, Object.assign(Object.assign({}, options), { tsConfigName: options.rootProject ? "tsconfig.json" : "tsconfig.base.json" })));
|
|
@@ -23,8 +22,16 @@ function nodeLibraryGenerator(tree, schema) {
|
|
|
23
22
|
if (options.publishable) {
|
|
24
23
|
tasks.push(yield (0, generator_1.default)(tree, Object.assign(Object.assign({}, options), { skipFormat: true })));
|
|
25
24
|
}
|
|
25
|
+
const lintCallback = yield addLint(tree, options);
|
|
26
|
+
tasks.push(lintCallback);
|
|
26
27
|
const { className, name, propertyName } = (0, devkit_1.names)(options.projectNames.projectFileName);
|
|
27
28
|
createProjectTsConfigJson(tree, options);
|
|
29
|
+
(0, js_1.addTsConfigPath)(tree, options.importPath, [
|
|
30
|
+
(0, devkit_1.joinPathFragments)(options.projectRoot, "./src", "index." + (options.js ? "js" : "ts"))
|
|
31
|
+
]);
|
|
32
|
+
(0, js_1.addTsConfigPath)(tree, (0, devkit_1.joinPathFragments)(options.importPath, "/*"), [
|
|
33
|
+
(0, devkit_1.joinPathFragments)(options.projectRoot, "./src", "/*")
|
|
34
|
+
]);
|
|
28
35
|
(0, devkit_1.addProjectConfiguration)(tree, options.name, {
|
|
29
36
|
root: options.directory,
|
|
30
37
|
projectType: "library",
|
|
@@ -35,9 +42,9 @@ function nodeLibraryGenerator(tree, schema) {
|
|
|
35
42
|
outputs: ["{options.outputPath}"],
|
|
36
43
|
options: {
|
|
37
44
|
outputPath: getOutputPath(options),
|
|
38
|
-
main: (0,
|
|
39
|
-
tsConfig: (0,
|
|
40
|
-
project: (0,
|
|
45
|
+
main: (0, devkit_1.joinPathFragments)(options.projectRoot, "src/index.ts"),
|
|
46
|
+
tsConfig: (0, devkit_1.joinPathFragments)(options.projectRoot, "tsconfig.json"),
|
|
47
|
+
project: (0, devkit_1.joinPathFragments)(options.projectRoot, "package.json"),
|
|
41
48
|
defaultConfiguration: "production",
|
|
42
49
|
configurations: {
|
|
43
50
|
production: {
|
|
@@ -119,10 +126,85 @@ function nodeLibraryGenerator(tree, schema) {
|
|
|
119
126
|
}
|
|
120
127
|
});
|
|
121
128
|
}
|
|
129
|
+
if (tree.exists("package.json")) {
|
|
130
|
+
(0, devkit_1.updateJson)(tree, "package.json", json => (Object.assign(Object.assign({}, json), { pnpm: Object.assign(Object.assign({}, json.pnpm), { override: Object.assign(Object.assign({}, json.pnpm.override), { [options.importPath]: "workspace:*" }) }) })));
|
|
131
|
+
}
|
|
122
132
|
yield (0, devkit_1.formatFiles)(tree);
|
|
123
133
|
});
|
|
124
134
|
}
|
|
125
135
|
exports.nodeLibraryGenerator = nodeLibraryGenerator;
|
|
136
|
+
function addLint(tree, options) {
|
|
137
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
138
|
+
const { lintProjectGenerator } = (0, devkit_1.ensurePackage)("@nx/eslint", versions_1.nxVersion);
|
|
139
|
+
const { mapLintPattern } =
|
|
140
|
+
// nx-ignore-next-line
|
|
141
|
+
require("@nx/eslint/src/generators/lint-project/lint-project");
|
|
142
|
+
const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, options.name);
|
|
143
|
+
const task = lintProjectGenerator(tree, {
|
|
144
|
+
project: options.name,
|
|
145
|
+
linter: options.linter,
|
|
146
|
+
skipFormat: true,
|
|
147
|
+
tsConfigPaths: [
|
|
148
|
+
(0, devkit_1.joinPathFragments)(options.projectRoot, "tsconfig.lib.json")
|
|
149
|
+
],
|
|
150
|
+
unitTestRunner: options.unitTestRunner,
|
|
151
|
+
eslintFilePatterns: [
|
|
152
|
+
mapLintPattern(options.projectRoot, options.js ? "js" : "ts", options.rootProject)
|
|
153
|
+
],
|
|
154
|
+
setParserOptionsProject: options.setParserOptionsProject,
|
|
155
|
+
rootProject: options.rootProject
|
|
156
|
+
});
|
|
157
|
+
const { addOverrideToLintConfig, lintConfigHasOverride, isEslintConfigSupported, updateOverrideInLintConfig
|
|
158
|
+
// nx-ignore-next-line
|
|
159
|
+
} = require("@nx/eslint/src/generators/utils/eslint-file");
|
|
160
|
+
// if config is not supported, we don't need to do anything
|
|
161
|
+
if (!isEslintConfigSupported(tree)) {
|
|
162
|
+
return task;
|
|
163
|
+
}
|
|
164
|
+
// Also update the root ESLint config. The lintProjectGenerator will not generate it for root projects.
|
|
165
|
+
// But we need to set the package.json checks.
|
|
166
|
+
if (options.rootProject) {
|
|
167
|
+
addOverrideToLintConfig(tree, "", {
|
|
168
|
+
files: ["*.json"],
|
|
169
|
+
parser: "jsonc-eslint-parser",
|
|
170
|
+
rules: {
|
|
171
|
+
"@nx/dependency-checks": "error"
|
|
172
|
+
}
|
|
173
|
+
});
|
|
174
|
+
}
|
|
175
|
+
// If project lints package.json with @nx/dependency-checks, then add ignore files for
|
|
176
|
+
// build configuration files such as vite.config.ts. These config files need to be
|
|
177
|
+
// ignored, otherwise we will errors on missing dependencies that are for dev only.
|
|
178
|
+
if (lintConfigHasOverride(tree, projectConfiguration.root, o => {
|
|
179
|
+
var _a;
|
|
180
|
+
return Array.isArray(o.files)
|
|
181
|
+
? o.files.some(f => f.match(/\.json$/))
|
|
182
|
+
: !!((_a = o.files) === null || _a === void 0 ? void 0 : _a.match(/\.json$/));
|
|
183
|
+
}, true)) {
|
|
184
|
+
updateOverrideInLintConfig(tree, projectConfiguration.root, o => { var _a; return (_a = o.rules) === null || _a === void 0 ? void 0 : _a["@nx/dependency-checks"]; }, o => {
|
|
185
|
+
const value = o.rules["@nx/dependency-checks"];
|
|
186
|
+
let ruleSeverity;
|
|
187
|
+
let ruleOptions;
|
|
188
|
+
if (Array.isArray(value)) {
|
|
189
|
+
ruleSeverity = value[0];
|
|
190
|
+
ruleOptions = value[1];
|
|
191
|
+
}
|
|
192
|
+
else {
|
|
193
|
+
ruleSeverity = value;
|
|
194
|
+
ruleOptions = {};
|
|
195
|
+
}
|
|
196
|
+
if (options.bundler === "esbuild") {
|
|
197
|
+
ruleOptions.ignoredFiles = [
|
|
198
|
+
"{projectRoot}/esbuild.config.{js,ts,mjs,mts}"
|
|
199
|
+
];
|
|
200
|
+
o.rules["@nx/dependency-checks"] = [ruleSeverity, ruleOptions];
|
|
201
|
+
}
|
|
202
|
+
return o;
|
|
203
|
+
});
|
|
204
|
+
}
|
|
205
|
+
return task;
|
|
206
|
+
});
|
|
207
|
+
}
|
|
126
208
|
function getOutputPath(options) {
|
|
127
209
|
const parts = ["dist"];
|
|
128
210
|
if (options.projectRoot === ".") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/workspace-tools/src/generators/node-library/generator.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/workspace-tools/src/generators/node-library/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAcoB;AACpB,+BAIgB;AAChB,0DAA8D;AAK9D,+EAA6E;AAE7E,mDAAmE;AACnE,2DAAuD;AAGvD,SAAsB,oBAAoB,CACxC,IAAU,EACV,MAAkC;;QAElC,MAAM,QAAQ,GAAG,IAAA,0BAAiB,EAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QACzD,MAAM,OAAO,GAAG,MAAM,IAAA,oCAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAErD,MAAM,KAAK,GAAwB,EAAE,CAAC;QACtC,KAAK,CAAC,IAAI,CACR,MAAM,IAAA,cAAe,EAAC,IAAI,kCACrB,OAAO,KACV,YAAY,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,oBAAoB,IAC1E,CACH,CAAC;QAEF,KAAK,CAAC,IAAI,CACR,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;YACE,iCAAiC,EAAE,QAAQ;YAC3C,+BAA+B,EAAE,QAAQ;YACzC,aAAa,EAAE,2BAAgB;SAChC,CACF,CACF,CAAC;QAEF,IAAI,OAAO,CAAC,WAAW,EAAE;YACvB,KAAK,CAAC,IAAI,CAAC,MAAM,IAAA,mBAAc,EAAC,IAAI,kCAAO,OAAO,KAAE,UAAU,EAAE,IAAI,IAAG,CAAC,CAAC;SAC1E;QAED,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAClD,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAEzB,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,IAAA,cAAK,EAC7C,OAAO,CAAC,YAAY,CAAC,eAAe,CACrC,CAAC;QAEF,yBAAyB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzC,IAAA,oBAAe,EAAC,IAAI,EAAE,OAAO,CAAC,UAAU,EAAE;YACxC,IAAA,0BAAiB,EACf,OAAO,CAAC,WAAW,EACnB,OAAO,EACP,QAAQ,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CACtC;SACF,CAAC,CAAC;QACH,IAAA,oBAAe,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE;YACjE,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,OAAO,EAAE,IAAI,CAAC;SACtD,CAAC,CAAC;QAEH,IAAA,gCAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE;YAC1C,IAAI,EAAE,OAAO,CAAC,SAAS;YACvB,WAAW,EAAE,SAAS;YACtB,UAAU,EAAE,GAAG,OAAO,CAAC,SAAS,MAAM;YACtC,OAAO,EAAE;gBACP,KAAK,EAAE;oBACL,QAAQ,EAAE,sCAAsC;oBAChD,OAAO,EAAE,CAAC,sBAAsB,CAAC;oBACjC,OAAO,EAAE;wBACP,UAAU,EAAE,aAAa,CAAC,OAAO,CAAC;wBAClC,IAAI,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC;wBAC5D,QAAQ,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,eAAe,CAAC;wBACjE,OAAO,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC;wBAC/D,oBAAoB,EAAE,YAAY;wBAClC,cAAc,EAAE;4BACd,UAAU,EAAE;gCACV,KAAK,EAAE,KAAK;6BACb;4BACD,WAAW,EAAE;gCACX,KAAK,EAAE,IAAI;6BACZ;yBACF;qBACF;iBACF;gBACD,IAAI,EAAE,EAAE;gBACR,IAAI,EAAE,EAAE;aACT;SACF,CAAC,CAAC;QAEH,IAAA,sBAAa,EAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,WAAW,kCAC5C,OAAO,KACV,GAAG,EAAE,GAAG,EACR,SAAS;YACT,IAAI;YACJ,YAAY,EACZ,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,EAChB,UAAU,EAAE,IAAI,EAChB,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,EAAE,EACR,cAAc,EAAE,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,CAAC,EACnD,SAAS,EAAE,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,KAAK,MAAM,EACxD,iBAAiB,EAAE,OAAO,CAAC,cAAc,KAAK,MAAM,IACpD,CAAC;QAEH,MAAM,eAAe,GAAG,IAAA,0BAAiB,EACvC,OAAO,CAAC,WAAW,EACnB,cAAc,CACf,CAAC;QACF,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;YAChC,IAAA,mBAAU,EAAc,IAAI,EAAE,eAAe,EAAE,CAAC,IAAiB,EAAE,EAAE;gBACnE,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC;gBAC/B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;gBACvB,wFAAwF;gBACxF,IAAI,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,WAAW,CAAC,EAAE;oBAChE,OAAO,IAAI,CAAC,OAAO,CAAC;iBACrB;gBAED,OAAO,gCACF,IAAI,KACP,KAAK,EAAE;wBACL,IAAA,0BAAiB,EACf,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,CAAC,EACnC,MAAM,EACN,OAAO,CAAC,WAAW,EACnB,KAAK,CACN;qBACF,EACD,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,mBAAmB,EAC1B,IAAI,EAAE,kBAAkB,EACxB,MAAM,EAAE,iBAAiB,EACzB,OAAO,EAAE;wBACP,GAAG,EAAE;4BACH,MAAM,EAAE;gCACN,KAAK,EAAE,qBAAqB;gCAC5B,OAAO,EAAE,mBAAmB;6BAC7B;4BACD,OAAO,EAAE;gCACP,KAAK,EAAE,sBAAsB;gCAC7B,OAAO,EAAE,oBAAoB;6BAC9B;yBACF;wBACD,gBAAgB,EAAE,gBAAgB;qBACnC,EACD,WAAW,EAAE,KAAK,EAClB,YAAY,oBACP,IAAI,CAAC,YAAY,GAEtB,aAAa,EAAE;wBACb,MAAM,EAAE,QAAQ;qBACjB,GACwB,CAAC;YAC9B,CAAC,CAAC,CAAC;SACJ;aAAM;YACL,IAAA,kBAAS,EAAc,IAAI,EAAE,eAAe,EAAE;gBAC5C,IAAI,EAAE,OAAO,CAAC,UAAU;gBACxB,OAAO,EAAE,OAAO,CAAC,WAAW,IAAI,CAAC,OAAO,CAAC,WAAW;gBACpD,KAAK,EAAE;oBACL,IAAA,0BAAiB,EACf,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,CAAC,EACnC,MAAM,EACN,OAAO,CAAC,WAAW,EACnB,KAAK,CACN;iBACF;gBACD,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,mBAAmB;gBAC1B,IAAI,EAAE,kBAAkB;gBACxB,MAAM,EAAE,iBAAiB;gBACzB,OAAO,EAAE;oBACP,GAAG,EAAE;wBACH,MAAM,EAAE;4BACN,KAAK,EAAE,qBAAqB;4BAC5B,OAAO,EAAE,mBAAmB;yBAC7B;wBACD,OAAO,EAAE;4BACP,KAAK,EAAE,sBAAsB;4BAC7B,OAAO,EAAE,oBAAoB;yBAC9B;qBACF;oBACD,gBAAgB,EAAE,gBAAgB;iBACnC;gBACD,WAAW,EAAE,KAAK;gBAClB,eAAe,EAAE;oBACf,iCAAiC,EAAE,QAAQ;oBAC3C,+BAA+B,EAAE,QAAQ;oBACzC,aAAa,EAAE,2BAAgB;iBAChC;gBACD,aAAa,EAAE;oBACb,MAAM,EAAE,QAAQ;iBACjB;aACwB,CAAC,CAAC;SAC9B;QAED,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;YAC/B,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,IAAI,CAAC,EAAE,CAAC,iCACpC,IAAI,KACP,IAAI,kCACC,IAAI,CAAC,IAAI,KACZ,QAAQ,kCACH,IAAI,CAAC,IAAI,CAAC,QAAQ,KACrB,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,aAAa,UAGvC,CAAC,CAAC;SACL;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAtMD,oDAsMC;AAED,SAAe,OAAO,CACpB,IAAU,EACV,OAAuB;;QAEvB,MAAM,EAAE,oBAAoB,EAAE,GAAG,IAAA,sBAAa,EAAC,YAAY,EAAE,oBAAS,CAAC,CAAC;QACxE,MAAM,EAAE,cAAc,EAAE;QACtB,sBAAsB;QACtB,OAAO,CAAC,qDAAqD,CAAC,CAAC;QACjE,MAAM,oBAAoB,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAC1E,MAAM,IAAI,GAAG,oBAAoB,CAAC,IAAI,EAAE;YACtC,OAAO,EAAE,OAAO,CAAC,IAAI;YACrB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,UAAU,EAAE,IAAI;YAChB,aAAa,EAAE;gBACb,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,mBAAmB,CAAC;aAC5D;YACD,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,kBAAkB,EAAE;gBAClB,cAAc,CACZ,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EACxB,OAAO,CAAC,WAAW,CACpB;aACF;YACD,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;YACxD,WAAW,EAAE,OAAO,CAAC,WAAW;SACjC,CAAC,CAAC;QACH,MAAM,EACJ,uBAAuB,EACvB,qBAAqB,EACrB,uBAAuB,EACvB,0BAA0B;QAC1B,sBAAsB;UACvB,GAAG,OAAO,CAAC,6CAA6C,CAAC,CAAC;QAE3D,2DAA2D;QAC3D,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,EAAE;YAClC,OAAO,IAAI,CAAC;SACb;QAED,uGAAuG;QACvG,8CAA8C;QAC9C,IAAI,OAAO,CAAC,WAAW,EAAE;YACvB,uBAAuB,CAAC,IAAI,EAAE,EAAE,EAAE;gBAChC,KAAK,EAAE,CAAC,QAAQ,CAAC;gBACjB,MAAM,EAAE,qBAAqB;gBAC7B,KAAK,EAAE;oBACL,uBAAuB,EAAE,OAAO;iBACjC;aACF,CAAC,CAAC;SACJ;QAED,sFAAsF;QACtF,kFAAkF;QAClF,mFAAmF;QACnF,IACE,qBAAqB,CACnB,IAAI,EACJ,oBAAoB,CAAC,IAAI,EACzB,CAAC,CAAC,EAAE;;YACF,OAAA,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC;gBACpB,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;gBACvC,CAAC,CAAC,CAAC,CAAC,CAAA,MAAA,CAAC,CAAC,KAAK,0CAAE,KAAK,CAAC,SAAS,CAAC,CAAA,CAAA;SAAA,EACjC,IAAI,CACL,EACD;YACA,0BAA0B,CACxB,IAAI,EACJ,oBAAoB,CAAC,IAAI,EACzB,CAAC,CAAC,EAAE,WAAC,OAAA,MAAA,CAAC,CAAC,KAAK,0CAAG,uBAAuB,CAAC,CAAA,EAAA,EACvC,CAAC,CAAC,EAAE;gBACF,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;gBAC/C,IAAI,YAAoB,CAAC;gBACzB,IAAI,WAAgB,CAAC;gBACrB,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;oBACxB,YAAY,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;oBACxB,WAAW,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;iBACxB;qBAAM;oBACL,YAAY,GAAG,KAAK,CAAC;oBACrB,WAAW,GAAG,EAAE,CAAC;iBAClB;gBAED,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS,EAAE;oBACjC,WAAW,CAAC,YAAY,GAAG;wBACzB,8CAA8C;qBAC/C,CAAC;oBACF,CAAC,CAAC,KAAK,CAAC,uBAAuB,CAAC,GAAG,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;iBAChE;gBACD,OAAO,CAAC,CAAC;YACX,CAAC,CACF,CAAC;SACH;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CAAA;AAED,SAAS,aAAa,CAAC,OAAyB;IAC9C,MAAM,KAAK,GAAG,CAAC,MAAM,CAAC,CAAC;IACvB,IAAI,OAAO,CAAC,WAAW,KAAK,GAAG,EAAE;QAC/B,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;KAC1B;SAAM;QACL,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;KACjC;IACD,OAAO,IAAA,0BAAiB,EAAC,GAAG,KAAK,CAAC,CAAC;AACrC,CAAC;AAED,SAAS,yBAAyB,CAAC,IAAU,EAAE,OAAyB;IACtE,MAAM,QAAQ,GAAG;QACf,OAAO,EAAE,OAAO,CAAC,WAAW;YAC1B,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,IAAA,kCAA6B,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC;QAC5D,eAAe,kCACV,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,wBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC,KACnD,MAAM,EAAE,IAAA,0BAAiB,EACvB,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,CAAC,EACnC,cAAc,CACf,EACD,MAAM,EAAE,IAAI,GACb;QACD,KAAK,EAAE,EAAE;QACT,OAAO,EAAE,CAAC,aAAa,EAAE,aAAa,EAAE,UAAU,CAAC;QACnD,OAAO,EAAE,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,kBAAkB,CAAC;KACpE,CAAC;IAEF,IAAA,kBAAS,EACP,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,eAAe,CAAC,EACvD,QAAQ,CACT,CAAC;AACJ,CAAC;AAED,kBAAe,oBAAoB,CAAC"}
|