@appland/appmap 3.107.0 → 3.109.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/CHANGELOG.md +15 -0
- package/built/cmds/openapi/DefinitionGenerator.js +15 -2
- package/built/cmds/openapi/DefinitionGenerator.js.map +1 -1
- package/built/cmds/openapi/openapi.js +15 -6
- package/built/cmds/openapi/openapi.js.map +1 -1
- package/built/html/appmap.js +88 -88
- package/built/html/appmap.js.map +4 -4
- package/built/html/sequenceDiagram.js +88 -88
- package/built/html/sequenceDiagram.js.map +4 -4
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,18 @@
|
|
|
1
|
+
# [@appland/appmap-v3.109.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.108.0...@appland/appmap-v3.109.0) (2023-11-07)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Features
|
|
5
|
+
|
|
6
|
+
* Update @appland/openapi to 1.7.0 ([1718173](https://github.com/getappmap/appmap-js/commit/17181733221e46a371266b6b3d9c18966b4db099))
|
|
7
|
+
|
|
8
|
+
# [@appland/appmap-v3.108.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.107.0...@appland/appmap-v3.108.0) (2023-11-06)
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Features
|
|
12
|
+
|
|
13
|
+
* Report OpenAPI warnings ([2fb737d](https://github.com/getappmap/appmap-js/commit/2fb737d4a447a2b166bde20751042b030d5e80a7))
|
|
14
|
+
* Report OpenAPI warnings ([1698bb0](https://github.com/getappmap/appmap-js/commit/1698bb01957a5bf9718a5f92cd58bd7d71ea8f90))
|
|
15
|
+
|
|
1
16
|
# [@appland/appmap-v3.107.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.106.0...@appland/appmap-v3.107.0) (2023-11-04)
|
|
2
17
|
|
|
3
18
|
|
|
@@ -14,6 +14,8 @@ class DefinitionGenerator {
|
|
|
14
14
|
async generate() {
|
|
15
15
|
const securitySchemes = new openapi_1.SecuritySchemes();
|
|
16
16
|
const paths = {};
|
|
17
|
+
const warnings = {};
|
|
18
|
+
const warningStrings = new Set();
|
|
17
19
|
for (const requestFileName of this.dataStore.requestFileNames) {
|
|
18
20
|
let requestData;
|
|
19
21
|
try {
|
|
@@ -38,11 +40,22 @@ class DefinitionGenerator {
|
|
|
38
40
|
if (pathItem)
|
|
39
41
|
paths[path] = pathItem;
|
|
40
42
|
}
|
|
41
|
-
|
|
42
|
-
|
|
43
|
+
const collectedWarnings = model.collectWarnings();
|
|
44
|
+
for (const key of Object.keys(collectedWarnings)) {
|
|
45
|
+
if (!warnings[key])
|
|
46
|
+
warnings[key] = [];
|
|
47
|
+
for (const warning of collectedWarnings[key]) {
|
|
48
|
+
const warningString = [key, warning].join(':');
|
|
49
|
+
if (!warningStrings.has(warningString)) {
|
|
50
|
+
warningStrings.add(warningString);
|
|
51
|
+
console.warn(`OpenAPI warning generating ${key}: ${warning}`);
|
|
52
|
+
warnings[key].push(warning);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
43
55
|
}
|
|
44
56
|
}
|
|
45
57
|
return {
|
|
58
|
+
warnings,
|
|
46
59
|
paths: Object.keys(paths)
|
|
47
60
|
.sort()
|
|
48
61
|
.reduce((memo, path) => ((memo[path] = paths[path]), memo), {}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DefinitionGenerator.js","sourceRoot":"","sources":["../../../src/cmds/openapi/DefinitionGenerator.ts"],"names":[],"mappings":";;;;;AAAA,8CAA0D;AAG1D,0CAAuC;AACvC,oDAA4B;AAC5B,iEAA+D;AAE/D,MAAqB,mBAAmB;IACtC,YAAmB,SAAoB;QAApB,cAAS,GAAT,SAAS,CAAW;IAAG,CAAC;IAE3C,KAAK,CAAC,QAAQ;
|
|
1
|
+
{"version":3,"file":"DefinitionGenerator.js","sourceRoot":"","sources":["../../../src/cmds/openapi/DefinitionGenerator.ts"],"names":[],"mappings":";;;;;AAAA,8CAA0D;AAG1D,0CAAuC;AACvC,oDAA4B;AAC5B,iEAA+D;AAE/D,MAAqB,mBAAmB;IACtC,YAAmB,SAAoB;QAApB,cAAS,GAAT,SAAS,CAAW;IAAG,CAAC;IAE3C,KAAK,CAAC,QAAQ;QAKZ,MAAM,eAAe,GAAG,IAAI,yBAAe,EAAE,CAAC;QAC9C,MAAM,KAAK,GAA6C,EAAE,CAAC;QAC3D,MAAM,QAAQ,GAA6B,EAAE,CAAC;QAC9C,MAAM,cAAc,GAAG,IAAI,GAAG,EAAU,CAAC;QAEzC,KAAK,MAAM,eAAe,IAAI,IAAI,CAAC,SAAS,CAAC,gBAAgB,EAAE;YAC7D,IAAI,WAAkB,CAAC;YACvB,IAAI;gBACF,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,IAAA,mBAAQ,EAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CAAC;aACpE;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,IAAI,CAAC,mCAAmC,eAAe,KAAK,CAAC,EAAE,CAAC,CAAC;gBACzE,SAAS;aACV;YACD,IAAA,gBAAM,EAAC,WAAW,CAAC,CAAC;YACpB,MAAM,KAAK,GAAG,IAAI,eAAK,EAAE,CAAC;YAC1B,KAAK,MAAM,OAAO,IAAI,WAAW,EAAE;gBACjC,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;gBAC7B,IAAI,OAAO,CAAC,cAAc,EAAE;oBAC1B,MAAM,mBAAmB,GAAG,IAAA,wBAAW,EAAC,OAAO,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;oBACjF,IAAI,mBAAmB;wBAAE,eAAe,CAAC,sBAAsB,CAAC,mBAAmB,CAAC,CAAC;iBACtF;aACF;YAED,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC;YAChC,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;gBACtD,IAAI,QAAQ;oBAAE,KAAK,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;aACtC;YAED,MAAM,iBAAiB,GAAG,KAAK,CAAC,eAAe,EAAE,CAAC;YAClD,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE;gBAChD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;oBAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;gBACvC,KAAK,MAAM,OAAO,IAAI,iBAAiB,CAAC,GAAG,CAAC,EAAE;oBAC5C,MAAM,aAAa,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBAC/C,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE;wBACtC,cAAc,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;wBAElC,OAAO,CAAC,IAAI,CAAC,8BAA8B,GAAG,KAAK,OAAO,EAAE,CAAC,CAAC;wBAC9D,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;qBAC7B;iBACF;aACF;SACF;QACD,OAAO;YACL,QAAQ;YACR,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;iBACtB,IAAI,EAAE;iBACN,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC;YACjE,eAAe,EAAE,eAAe,CAAC,OAAO,EAAE;SAC3C,CAAC;IACJ,CAAC;CACF;AA1DD,sCA0DC"}
|
|
@@ -79,11 +79,12 @@ class OpenAPICommand {
|
|
|
79
79
|
}
|
|
80
80
|
await dataStore.closeAll();
|
|
81
81
|
const definitionGenerator = new DefinitionGenerator_1.default(dataStore);
|
|
82
|
-
const { paths, securitySchemes } = await definitionGenerator.generate();
|
|
82
|
+
const { warnings, paths, securitySchemes } = await definitionGenerator.generate();
|
|
83
83
|
// Leave the files in place if an error occurs.
|
|
84
84
|
await dataStore.cleanup();
|
|
85
85
|
return [
|
|
86
86
|
{
|
|
87
|
+
warnings,
|
|
87
88
|
paths,
|
|
88
89
|
securitySchemes,
|
|
89
90
|
},
|
|
@@ -182,10 +183,18 @@ exports.default = {
|
|
|
182
183
|
applySchemaOverrides(template.paths, overrides);
|
|
183
184
|
if (template.paths)
|
|
184
185
|
sortProperties(template.paths);
|
|
186
|
+
let warnings = ['#'];
|
|
187
|
+
if (Object.keys(openapi.warnings).length) {
|
|
188
|
+
warnings.push('# OpenAPI generator reported warnings during processing:');
|
|
189
|
+
for (const [path, messages] of Object.entries(openapi.warnings)) {
|
|
190
|
+
for (const message of messages) {
|
|
191
|
+
warnings.push(`# ${path}: ${message}`);
|
|
192
|
+
}
|
|
193
|
+
}
|
|
194
|
+
warnings.push('#');
|
|
195
|
+
}
|
|
185
196
|
const fileContents = `# This document can be generated with the following command:
|
|
186
|
-
#
|
|
187
|
-
#
|
|
188
|
-
# NOTE: You will need Node.js installed on your machine to run the above command
|
|
197
|
+
# appmap openapi
|
|
189
198
|
#
|
|
190
199
|
# Some helpful options:
|
|
191
200
|
# --output-file output file name
|
|
@@ -193,10 +202,10 @@ exports.default = {
|
|
|
193
202
|
# --openapi-version version field of the OpenAPI document
|
|
194
203
|
#
|
|
195
204
|
# For more info, run:
|
|
196
|
-
#
|
|
205
|
+
# appmap openapi --help
|
|
197
206
|
#
|
|
198
207
|
# Visit our docs: https://appmap.io/docs/openapi.html
|
|
199
|
-
|
|
208
|
+
${warnings.join('\n')}
|
|
200
209
|
${js_yaml_1.default.dump(template)}
|
|
201
210
|
`;
|
|
202
211
|
if (argv.outputFile) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openapi.js","sourceRoot":"","sources":["../../../src/cmds/openapi/openapi.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA4B;AAE5B,
|
|
1
|
+
{"version":3,"file":"openapi.js","sourceRoot":"","sources":["../../../src/cmds/openapi/openapi.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA4B;AAE5B,2BAAgC;AAChC,2BAAqC;AACrC,0CAAuC;AACvC,mDAAqC;AAErC,8CAA2C;AAG3C,+DAA4D;AAC5D,6EAA0E;AAC1E,6EAA0E;AAC1E,6DAAoF;AACpF,uCAAwC;AACxC,4DAAoC;AACpC,gFAAwD;AAIxD,MAAM,cAAc;IAIlB,YAA6B,SAAiB;QAAjB,cAAS,GAAT,SAAS,CAAQ;QAHvC,WAAM,GAAa,EAAE,CAAC;QACtB,WAAM,GAAmB,KAAK,EAAE,IAAY,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IAE1B,CAAC;IAElD,KAAK,CAAC,OAAO;QAUX,wFAAwF;QACxF,IAAI,CAAC,IAAA,eAAU,EAAC,IAAI,CAAC,SAAS,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CAAC,oBAAoB,IAAI,CAAC,SAAS,iBAAiB,CAAC,CAAC;SACtE;QAED,MAAM,SAAS,GAAG,IAAI,mBAAS,EAAE,CAAC;QAClC,MAAM,SAAS,CAAC,UAAU,EAAE,CAAC;QAE7B,MAAM,aAAa,GAAG,KAAK,EAAE,IAAY,EAAE,EAAE;YAC3C,IAAI;gBACF,MAAM,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;aACnC;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,WAAmB,CAAC;gBACxB,IAAI;oBACF,WAAW,GAAI,CAAS,CAAC,QAAQ,EAAE,CAAC;iBACrC;gBAAC,OAAO,CAAC,EAAE;oBACV,WAAW,GAAG,CAAE,CAAS,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;iBAC7C;gBACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;aAC/B;QACH,CAAC,CAAC;QAEF,MAAM,WAAW,GAAG,MAAM,IAAA,iBAAS,EAAC,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;QACpE,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE;YAC9B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC7C,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE;gBACxB,IAAI,YAAY,CAAC,OAAO;oBAAE,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBAC7D,SAAS;aACV;YACD,MAAM,aAAa,CAAC,IAAI,CAAC,CAAC;SAC3B;QACD,MAAM,SAAS,CAAC,QAAQ,EAAE,CAAC;QAE3B,MAAM,mBAAmB,GAAG,IAAI,6BAAmB,CAAC,SAAS,CAAC,CAAC;QAC/D,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,eAAe,EAAE,GAAG,MAAM,mBAAmB,CAAC,QAAQ,EAAE,CAAC;QAElF,+CAA+C;QAC/C,MAAM,SAAS,CAAC,OAAO,EAAE,CAAC;QAE1B,OAAO;YACL;gBACE,QAAQ;gBACR,KAAK;gBACL,eAAe;aAChB;YACD,WAAW,CAAC,MAAM;SACnB,CAAC;IACJ,CAAC;CACF;AAED,KAAK,UAAU,YAAY,CAAC,QAAgB;IAC1C,IAAI,CAAC,QAAQ,EAAE;QACb,6CAA6C;QAC7C,QAAQ,GAAG,IAAA,WAAI,EAAC,SAAS,EAAE,0CAA0C,CAAC,CAAC;KACxE;IACD,OAAO,iBAAI,CAAC,IAAI,CAAC,CAAC,MAAM,aAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;AAC9D,CAAC;AAED,kBAAe;IACb,OAAO,EAAE,SAAS;IAClB,cAAc;IACd,OAAO,EAAE,CAAC,SAAS,CAAC;IACpB,QAAQ,EAAE,8CAA8C;IACxD,OAAO,CAAC,IAAU;QAChB,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;YACvB,QAAQ,EAAE,2BAA2B;YACrC,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,GAAG;SACX,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE;YACxB,QAAQ,EAAE,8CAA8C;SACzD,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACtB,QAAQ,EAAE,uEAAuE;YACjF,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,yCAAwB;SAClC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;YACzB,KAAK,EAAE,CAAC,GAAG,CAAC;YACZ,QAAQ,EAAE,kBAAkB;YAC5B,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,kBAAkB,EAAE;YAC9B,QAAQ,EACN,sFAAsF;SACzF,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE;YAC3B,QAAQ,EAAE,0CAA0C;SACrD,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE;YAC7B,QAAQ,EAAE,4CAA4C;SACvD,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;IACvB,CAAC;IACD,KAAK,CAAC,OAAO,CAAC,IAAqB;;QACjC,IAAA,iBAAO,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACtB,IAAA,+CAAsB,EAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACvC,MAAM,SAAS,GAAG,MAAM,IAAA,iCAAe,EAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACxD,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;QACpE,MAAM,oBAAoB,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC;QAE3E,SAAS,YAAY,CAAC,IAAY,EAAE,EAAc;YAChD,IAAI;gBACF,EAAE,EAAE,CAAC;aACN;YAAC,WAAM;gBACN,OAAO,CAAC,IAAI,CAAC,8CAA8C,IAAI,EAAE,CAAC,CAAC;aACpE;QACH,CAAC;QAED,MAAM,gBAAgB,GAAG,MAAM,IAAA,+CAAsB,EAAC,SAAS,CAAC,CAAC;QAEjE,MAAM,GAAG,GAAG,IAAI,cAAc,CAAC,SAAS,CAAC,CAAC;QAC1C,GAAG,CAAC,MAAM,GAAG,IAAA,+BAAc,EAAC,oBAAoB,CAAC,CAAC;QAClD,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;QAEtC,KAAK,MAAM,KAAK,IAAI,GAAG,CAAC,MAAM,EAAE;YAC9B,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACrB;QAED,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC1D,QAAQ,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAE/B,IAAI,YAAY,EAAE;YAChB,YAAY,CAAC,YAAY,EAAE,GAAG,EAAE;gBAC9B,QAAQ,CAAC,IAAI,CAAC,KAAK,GAAG,YAAY,CAAC;YACrC,CAAC,CAAC,CAAC;SACJ;QACD,IAAI,cAAc,EAAE;YAClB,YAAY,CAAC,cAAc,EAAE,GAAG,EAAE;gBAChC,QAAQ,CAAC,IAAI,CAAC,OAAO,GAAG,cAAc,CAAC;YACzC,CAAC,CAAC,CAAC;SACJ;QAED,iDAAiD;QACjD,QAAQ,CAAC,UAAU,GAAI,OAAe,CAAC,UAAU,CAAC;QAClD,QAAQ,CAAC,UAAU,KAAnB,QAAQ,CAAC,UAAU,GAAK,EAAE,EAAC;QAE3B,IAAI,YAA6C,CAAC;QAClD,IAAI,gBAAgB,EAAE;YACpB,YAAY,GAAG,CAAC,IAAA,cAAI,EAAC,MAAM,IAAA,mBAAQ,EAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAQ,CAAC;SAC/E;QAED,MAAM,SAAS,GAAG,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO,0CAAE,SAAS,CAAC;QACnD,MAAM,OAAO,GAAG,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO,0CAAE,OAAO,CAAC;QAC/C,IAAI,OAAO;YAAE,QAAQ,CAAC,UAAU,CAAC,OAAO,GAAG,OAAO,CAAC;QACnD,IAAI,SAAS;YAAE,oBAAoB,CAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAC/D,IAAI,QAAQ,CAAC,KAAK;YAAE,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAEnD,IAAI,QAAQ,GAAG,CAAC,GAAG,CAAC,CAAC;QACrB,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE;YACxC,QAAQ,CAAC,IAAI,CAAC,0DAA0D,CAAC,CAAC;YAC1E,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAC/D,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;oBAC9B,QAAQ,CAAC,IAAI,CAAC,OAAO,IAAI,KAAK,OAAO,EAAE,CAAC,CAAC;iBAC1C;aACF;YACD,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACpB;QAED,MAAM,YAAY,GAAG;;;;;;;;;;;;EAYvB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;EACnB,iBAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;CACpB,CAAC;QACE,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,MAAM,aAAG,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;SACpD;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;SAC3B;IACH,CAAC;CACF,CAAC;AAEF,SAAS,cAAc,CAAC,MAA2B;IACjD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAClC,IAAI,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QACxB,IAAI,GAAG,KAAK,YAAY,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YACrD,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;iBAC7B,IAAI,EAAE;iBACN,MAAM,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;gBACpB,MAAM,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;gBACrB,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,WAAW,KAAK,KAAK;oBAAE,cAAc,CAAC,CAAC,CAAC,CAAC;gBACtF,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACd,OAAO,IAAI,CAAC;YACd,CAAC,EAAE,EAAE,CAAC,CAAC;SACV;aAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE;YACtD,cAAc,CAAC,KAAK,CAAC,CAAC;SACvB;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,oBAAoB,CAAC,KAA0B,EAAE,SAA8B;IACtF,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACrC,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,KAAK,KAAK,SAAS;YAAE,OAAO;QAEhC,IAAI,KAAK,CAAC,GAAG,CAAC,IAAI,SAAS;YAAE,OAAO;QAEpC,IAAI,GAAG,KAAK,QAAQ,EAAE;YACpB,KAAK,CAAC,MAAM,qBAAQ,SAAS,CAAC,MAAM,CAAE,CAAC;SACxC;aAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YACpC,oBAAoB,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC;SACzC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,SAAS,CAAI,EAA0B;IACpD,IAAI;QACF,OAAO,MAAM,EAAE,CAAC;KACjB;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAClB,OAAO;KACR;AACH,CAAC"}
|