@rxap/plugin-library 16.1.0-dev.1 → 16.1.0-dev.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/CHANGELOG.md +6 -0
- package/README.md +1 -1
- package/package.json +8 -8
- package/src/generators/bundle-json-schema/generator.js +24 -9
- package/src/generators/bundle-json-schema/generator.js.map +1 -1
- package/src/generators/index-json-schema/generator.js +2 -2
- package/src/generators/index-json-schema/generator.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,12 @@
|
|
|
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
|
+
# [16.1.0-dev.2](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@16.1.0-dev.1...@rxap/plugin-library@16.1.0-dev.2) (2024-03-04)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
- generate valid schema ([aff3e0e](https://gitlab.com/rxap/packages/commit/aff3e0e0e340f1f2fbb6d08483a6199a1cabeb32))
|
|
11
|
+
|
|
6
12
|
# [16.1.0-dev.1](https://gitlab.com/rxap/packages/compare/@rxap/plugin-library@16.1.0-dev.0...@rxap/plugin-library@16.1.0-dev.1) (2024-02-28)
|
|
7
13
|
|
|
8
14
|
### Features
|
package/README.md
CHANGED
|
@@ -19,7 +19,7 @@ yarn add @rxap/plugin-library
|
|
|
19
19
|
```
|
|
20
20
|
**Install peer dependencies:**
|
|
21
21
|
```bash
|
|
22
|
-
yarn add @nx/devkit@^16.5.0 @rxap/generator-ts-morph@^1.0.1 @rxap/generator-utilities@^1.1.0 @rxap/node-utilities@^1.1.0 @rxap/plugin-angular@^16.1.1-dev.1 @rxap/plugin-nestjs@^16.1.1-dev.0 @rxap/plugin-utilities@^16.1.0 @rxap/ts-morph@^1.1.0-dev.
|
|
22
|
+
yarn add @nx/devkit@^16.5.0 @rxap/generator-ts-morph@^1.0.1 @rxap/generator-utilities@^1.1.0 @rxap/node-utilities@^1.1.0 @rxap/plugin-angular@^16.1.1-dev.1 @rxap/plugin-nestjs@^16.1.1-dev.0 @rxap/plugin-utilities@^16.1.1-dev.0 @rxap/ts-morph@^1.1.0-dev.5 @rxap/utilities@^16.1.0-dev.3 @rxap/workspace-utilities@^16.0.1 handlebars@^4.7.7 nx@^16.5.0 semver@^7.5.3 ts-morph@^18.0.0 tslib@2.6.2
|
|
23
23
|
```
|
|
24
24
|
**Execute the init generator:**
|
|
25
25
|
```bash
|
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "16.1.0-dev.
|
|
2
|
+
"version": "16.1.0-dev.2",
|
|
3
3
|
"name": "@rxap/plugin-library",
|
|
4
4
|
"license": "GPL-3.0-or-later",
|
|
5
5
|
"dependencies": {
|
|
@@ -16,9 +16,9 @@
|
|
|
16
16
|
"@rxap/node-utilities": "^1.1.0",
|
|
17
17
|
"@rxap/plugin-angular": "^16.1.1-dev.1",
|
|
18
18
|
"@rxap/plugin-nestjs": "^16.1.1-dev.0",
|
|
19
|
-
"@rxap/plugin-utilities": "^16.1.0",
|
|
20
|
-
"@rxap/ts-morph": "^1.1.0-dev.
|
|
21
|
-
"@rxap/utilities": "^16.1.0-dev.
|
|
19
|
+
"@rxap/plugin-utilities": "^16.1.1-dev.0",
|
|
20
|
+
"@rxap/ts-morph": "^1.1.0-dev.5",
|
|
21
|
+
"@rxap/utilities": "^16.1.0-dev.3",
|
|
22
22
|
"@rxap/workspace-utilities": "^16.0.1",
|
|
23
23
|
"handlebars": "^4.7.7",
|
|
24
24
|
"nx": "^16.5.0",
|
|
@@ -70,7 +70,7 @@
|
|
|
70
70
|
},
|
|
71
71
|
{
|
|
72
72
|
"package": "@rxap/plugin-utilities",
|
|
73
|
-
"version": "16.1.0"
|
|
73
|
+
"version": "16.1.1-dev.0"
|
|
74
74
|
},
|
|
75
75
|
{
|
|
76
76
|
"package": "@rxap/schematics-utilities",
|
|
@@ -78,11 +78,11 @@
|
|
|
78
78
|
},
|
|
79
79
|
{
|
|
80
80
|
"package": "@rxap/ts-morph",
|
|
81
|
-
"version": "1.1.0-dev.
|
|
81
|
+
"version": "1.1.0-dev.5"
|
|
82
82
|
},
|
|
83
83
|
{
|
|
84
84
|
"package": "@rxap/utilities",
|
|
85
|
-
"version": "16.1.0-dev.
|
|
85
|
+
"version": "16.1.0-dev.3"
|
|
86
86
|
},
|
|
87
87
|
{
|
|
88
88
|
"package": "@rxap/workspace-utilities",
|
|
@@ -101,7 +101,7 @@
|
|
|
101
101
|
},
|
|
102
102
|
"schematics": "./generators.json",
|
|
103
103
|
"type": "commonjs",
|
|
104
|
-
"gitHead": "
|
|
104
|
+
"gitHead": "1cbac86e12b74f4ffffb4b4b9b65f2bdfdb47384",
|
|
105
105
|
"main": "./src/index.js",
|
|
106
106
|
"types": "./src/index.d.ts"
|
|
107
107
|
}
|
|
@@ -7,12 +7,22 @@ const utilities_1 = require("@rxap/utilities");
|
|
|
7
7
|
const workspace_utilities_1 = require("@rxap/workspace-utilities");
|
|
8
8
|
const path_1 = require("path");
|
|
9
9
|
const generator_1 = require("../index-json-schema/generator");
|
|
10
|
-
|
|
10
|
+
/**
|
|
11
|
+
* Remove the definitions and $id and $schema properties from the schema and normalize the $ref properties to only have
|
|
12
|
+
* the prefix '#/definitions/' before the definition name
|
|
13
|
+
* @param tree
|
|
14
|
+
* @param projectSourceRoot
|
|
15
|
+
* @param $ref
|
|
16
|
+
*/
|
|
17
|
+
function loadCleanDefinition(tree, projectSourceRoot, { $ref }) {
|
|
11
18
|
const filePath = (0, path_1.join)(projectSourceRoot, $ref);
|
|
12
19
|
if (!tree.exists(filePath)) {
|
|
13
20
|
throw new Error(`The file '${filePath}' does not exist!`);
|
|
14
21
|
}
|
|
15
22
|
const schema = JSON.parse(tree.read(filePath).toString());
|
|
23
|
+
return cleanupDefinition(schema);
|
|
24
|
+
}
|
|
25
|
+
function cleanupDefinition(schema) {
|
|
16
26
|
if (schema['definitions']) {
|
|
17
27
|
delete schema['definitions'];
|
|
18
28
|
}
|
|
@@ -29,23 +39,21 @@ function resolveDefinition(tree, projectSourceRoot, { $ref }) {
|
|
|
29
39
|
}
|
|
30
40
|
}
|
|
31
41
|
}
|
|
32
|
-
// removeProperty(schema, 'definitions');
|
|
33
|
-
// removeProperty(schema, '$id');
|
|
34
|
-
// removeProperty(schema, '$schema');
|
|
35
42
|
return schema;
|
|
36
43
|
}
|
|
37
|
-
function
|
|
44
|
+
function getCleanDefinitionMap(tree, projectSourceRoot, definitions) {
|
|
38
45
|
const resolvedDefinitions = {};
|
|
39
46
|
for (const [key, definition] of Object.entries(definitions)) {
|
|
40
|
-
resolvedDefinitions[key] =
|
|
47
|
+
resolvedDefinitions[key] = loadCleanDefinition(tree, projectSourceRoot, definition);
|
|
41
48
|
}
|
|
42
49
|
return resolvedDefinitions;
|
|
43
50
|
}
|
|
44
51
|
function bundleJsonSchemaGenerator(tree, options) {
|
|
52
|
+
var _a;
|
|
45
53
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
46
54
|
const projectSourceRoot = (0, workspace_utilities_1.GetProjectSourceRoot)(tree, options.project);
|
|
47
55
|
const workspaceRoot = tree.root;
|
|
48
|
-
const definitions =
|
|
56
|
+
const definitions = getCleanDefinitionMap(tree, projectSourceRoot, (0, generator_1.GenerateDefinitionsMap)(tree, options));
|
|
49
57
|
for (const file of (0, workspace_utilities_1.SearchFile)(tree, projectSourceRoot)) {
|
|
50
58
|
if (file.path.endsWith('template.schema.json')) {
|
|
51
59
|
const relativePathFromProjectSourceRoot = (0, path_1.dirname)((0, path_1.relative)(projectSourceRoot, file.path));
|
|
@@ -76,6 +84,11 @@ function bundleJsonSchemaGenerator(tree, options) {
|
|
|
76
84
|
// removeProperty(bundledSchema, '$schema');
|
|
77
85
|
bundledSchema['definitions'] = Object.assign(Object.assign({}, bundledSchema['definitions']), definitions);
|
|
78
86
|
fixNestaedDefinitions(bundledSchema);
|
|
87
|
+
for (const [, definition] of Object.entries(bundledSchema['definitions'])) {
|
|
88
|
+
cleanupDefinition(definition);
|
|
89
|
+
}
|
|
90
|
+
(_a = bundledSchema['definitions']) !== null && _a !== void 0 ? _a : (bundledSchema['definitions'] = {});
|
|
91
|
+
bundledSchema['definitions'] = Object.entries(bundledSchema['definitions']).sort(([a], [b]) => a.localeCompare(b)).reduce((acc, [key, value]) => (Object.assign(Object.assign({}, acc), { [key]: value })), {});
|
|
79
92
|
tree.write(file.path.replace('template.schema.json', 'schema.json'), JSON.stringify(bundledSchema, null, 2));
|
|
80
93
|
}
|
|
81
94
|
}
|
|
@@ -122,7 +135,9 @@ function fixNestaedDefinitions(schema) {
|
|
|
122
135
|
(0, utilities_1.CoerceArrayItems)(usedDefinitions, getUsedDefinitions(item));
|
|
123
136
|
}
|
|
124
137
|
let removeList = Object.keys(schema.definitions).filter((key) => !usedDefinitions.includes(key));
|
|
125
|
-
|
|
138
|
+
let removeListLength = 0;
|
|
139
|
+
do {
|
|
140
|
+
removeListLength = removeList.length;
|
|
126
141
|
// check for each definition that will not be removed if it is using another definition that should be removed
|
|
127
142
|
// if yes remove this from the list of definitions to remove
|
|
128
143
|
for (const [key, item] of Object.entries((_a = schema.definitions) !== null && _a !== void 0 ? _a : {})) {
|
|
@@ -132,7 +147,7 @@ function fixNestaedDefinitions(schema) {
|
|
|
132
147
|
(0, utilities_1.CoerceArrayItems)(usedDefinitions, getUsedDefinitions(item));
|
|
133
148
|
}
|
|
134
149
|
removeList = removeList.filter((key) => !usedDefinitions.includes(key));
|
|
135
|
-
}
|
|
150
|
+
} while (removeListLength !== removeList.length);
|
|
136
151
|
for (const key of removeList) {
|
|
137
152
|
delete schema.definitions[key];
|
|
138
153
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/bundle-json-schema/generator.ts"],"names":[],"mappings":";;;;AAAA,yGAA6D;AAE7D,+
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/bundle-json-schema/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,11 +34,11 @@ function generateSchematicInputSchema(tree, options) {
|
|
|
34
34
|
properties: {
|
|
35
35
|
package: {
|
|
36
36
|
type: "string",
|
|
37
|
-
|
|
37
|
+
const: packageJsonName,
|
|
38
38
|
},
|
|
39
39
|
name: {
|
|
40
40
|
type: "string",
|
|
41
|
-
|
|
41
|
+
const: name,
|
|
42
42
|
},
|
|
43
43
|
options: {
|
|
44
44
|
$ref: `#/definitions/${(0, utilities_1.camelize)(content.$id)}`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/index-json-schema/generator.ts"],"names":[],"mappings":";;;;AACA,6DAAuD;AACvD,+CAGyB;AACzB,mEAImC;AACnC,+BAIc;AAGd,SAAS,eAAe,CAAC,IAAU,EAAE,OAAuC;IAC1E,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,IAAA,gCAAa,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACxE,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,EAAE,CAAC,CAAC;IAC1D,IAAA,4BAAgB,EAAC,gBAAgB,EAAE,MAAM,CAAC,OAAO,CAAC,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9F,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED,SAAS,4BAA4B,CAAC,IAAU,EAAE,OAAuC;IACvF,MAAM,UAAU,GAAU,EAAE,CAAC;IAC7B,MAAM,WAAW,GAAG,IAAA,oCAAc,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1D,MAAM,eAAe,GAAG,IAAA,oCAAc,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC,IAAI,CAAC;IAC/D,MAAM,gBAAgB,GAAG,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACxD,KAAK,MAAM,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,IAAI,gBAAgB,EAAE;QACjD,MAAM,UAAU,GAAG,IAAA,cAAO,EAAC,MAAM,CAAC,CAAC;QACnC,MAAM,kBAAkB,GAAG,IAAI,GAAG,IAAA,WAAI,EAAC,UAAU,EAAE,sBAAsB,CAAC,CAAC;QAC3E,IAAI,aAAqB,CAAC;QAC1B,IAAI,IAAI,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC,EAAE;YACtD,aAAa,GAAG,kBAAkB,CAAC;SACpC;aAAM;YACL,aAAa,GAAG,MAAM,CAAC;SACxB;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAA,WAAI,EAAC,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QACnF,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;QAC5D,UAAU,CAAC,IAAI,CAAC;YACd,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACV,OAAO,EAAE;oBACP,IAAI,EAAE,QAAQ;oBACd,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/index-json-schema/generator.ts"],"names":[],"mappings":";;;;AACA,6DAAuD;AACvD,+CAGyB;AACzB,mEAImC;AACnC,+BAIc;AAGd,SAAS,eAAe,CAAC,IAAU,EAAE,OAAuC;IAC1E,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,IAAA,gCAAa,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACxE,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,EAAE,CAAC,CAAC;IAC1D,IAAA,4BAAgB,EAAC,gBAAgB,EAAE,MAAM,CAAC,OAAO,CAAC,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9F,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED,SAAS,4BAA4B,CAAC,IAAU,EAAE,OAAuC;IACvF,MAAM,UAAU,GAAU,EAAE,CAAC;IAC7B,MAAM,WAAW,GAAG,IAAA,oCAAc,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1D,MAAM,eAAe,GAAG,IAAA,oCAAc,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC,IAAI,CAAC;IAC/D,MAAM,gBAAgB,GAAG,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACxD,KAAK,MAAM,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,IAAI,gBAAgB,EAAE;QACjD,MAAM,UAAU,GAAG,IAAA,cAAO,EAAC,MAAM,CAAC,CAAC;QACnC,MAAM,kBAAkB,GAAG,IAAI,GAAG,IAAA,WAAI,EAAC,UAAU,EAAE,sBAAsB,CAAC,CAAC;QAC3E,IAAI,aAAqB,CAAC;QAC1B,IAAI,IAAI,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC,EAAE;YACtD,aAAa,GAAG,kBAAkB,CAAC;SACpC;aAAM;YACL,aAAa,GAAG,MAAM,CAAC;SACxB;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAA,WAAI,EAAC,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QACnF,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;QAC5D,UAAU,CAAC,IAAI,CAAC;YACd,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACV,OAAO,EAAE;oBACP,IAAI,EAAE,QAAQ;oBACd,KAAK,EAAE,eAAe;iBACvB;gBACD,IAAI,EAAE;oBACJ,IAAI,EAAE,QAAQ;oBACd,KAAK,EAAE,IAAI;iBACZ;gBACD,OAAO,EAAE;oBACP,IAAI,EAAE,iBAAiB,IAAA,oBAAQ,EAAC,OAAO,CAAC,GAAG,CAAC,EAAE;iBAC/C;aACF;SACF,CAAC,CAAC;KACJ;IACD,OAAO;QACL,OAAO,EAAE,+BAA+B;QACxC,GAAG,EAAE,iBAAiB;QACtB,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,UAAU;QACjB,WAAW,EAAE,+BAA+B,CAAC,IAAI,EAAE,OAAO,CAAC;KAC5D,CAAC;AACJ,CAAC;AAED,SAAgB,+BAA+B,CAAC,IAAU,EAAE,OAAuC,EAAE,QAAQ,GAAG,OAAO;IACrH,MAAM,WAAW,GAAG,IAAA,oCAAc,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1D,MAAM,gBAAgB,GAAG,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACxD,MAAM,WAAW,GAAqC,EAAE,CAAC;IACzD,KAAK,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,IAAI,gBAAgB,EAAE;QAC7C,MAAM,UAAU,GAAG,IAAA,cAAO,EAAC,MAAM,CAAC,CAAC;QACnC,MAAM,kBAAkB,GAAG,IAAA,WAAI,EAAC,UAAU,EAAE,sBAAsB,CAAC,CAAC;QACpE,IAAI,aAAqB,CAAC;QAC1B,IAAI,IAAI,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC,EAAE;YACtD,aAAa,GAAG,kBAAkB,CAAC;SACpC;aAAM;YACL,aAAa,GAAG,MAAM,CAAC;SACxB;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAA,WAAI,EAAC,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QACnF,WAAW,CAAC,IAAA,oBAAQ,EAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG;YACnC,IAAI,EAAE,IAAA,eAAQ,EAAC,QAAQ,EAAE,aAAa,CAAC;SACxC,CAAC;KACH;IACD,OAAO,WAAW,CAAC;AACrB,CAAC;AAnBD,0EAmBC;AAED,SAAgB,sBAAsB,CAAC,IAAU,EAAE,OAAuC,EAAE,QAAQ,GAAG,OAAO;IAC5G,MAAM,iBAAiB,GAAG,IAAA,0CAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACtE,MAAM,gBAAgB,GAAG,IAAA,WAAI,EAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC;IAC/D,MAAM,WAAW,GAAqC,+BAA+B,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC/G,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE;QACvD,IAAI,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;YACrC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAA,WAAI,EAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;YACnF,WAAW,CAAC,IAAA,oBAAQ,EAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG;gBAClC,IAAI,EAAE,IAAA,eAAQ,EAAC,QAAQ,EAAE,oBAAoB,SAAS,EAAE,CAAC;aAC1D,CAAC;SACH;KACF;IACD,OAAO,WAAW,CAAC;AACrB,CAAC;AAbD,wDAaC;AAED,SAAS,sBAAsB,CAAC,IAAU,EAAE,OAAuC;IACjF,MAAM,WAAW,GAAG,sBAAsB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC1D,WAAW,CAAC,gBAAgB,CAAC,GAAG;QAC9B,IAAI,EAAE,+BAA+B;KACtC,CAAC;IACF,OAAO;QACL,OAAO,EAAE,+BAA+B;QACxC,GAAG,EAAE,mBAAmB;QACxB,KAAK,EAAE;YACL;gBACE,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE;oBACL,IAAI,EAAE,8BAA8B;iBACrC;aACF;YACD;gBACE,IAAI,EAAE,8BAA8B;aACrC;SACF;QACD,WAAW;KACZ,CAAC;AACJ,CAAC;AAED,SAAsB,wBAAwB,CAC5C,IAAU,EACV,OAAuC;;QAEvC,MAAM,iBAAiB,GAAG,IAAA,0CAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACtE,IAAI,CAAC,KAAK,CAAC,IAAA,WAAI,EAAC,iBAAiB,EAAE,6BAA6B,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,4BAA4B,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACzI,IAAI,CAAC,KAAK,CAAC,IAAA,WAAI,EAAC,iBAAiB,EAAE,sBAAsB,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,sBAAsB,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAC9H,CAAC;CAAA;AAPD,4DAOC;AAED,kBAAe,wBAAwB,CAAC"}
|