@salesforce/source-deploy-retrieve 5.8.2 → 5.8.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/CHANGELOG.md +6 -0
- package/LICENSE.txt +1 -1
- package/lib/src/i18n/i18n.d.ts +1 -0
- package/lib/src/i18n/i18n.js +1 -0
- package/lib/src/i18n/i18n.js.map +1 -1
- package/lib/src/resolve/sourceComponent.d.ts +1 -0
- package/lib/src/resolve/sourceComponent.js +22 -4
- package/lib/src/resolve/sourceComponent.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,12 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
|
4
4
|
|
|
5
|
+
### [5.8.3](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.8.2...v5.8.3) (2022-01-03)
|
|
6
|
+
|
|
7
|
+
### Bug Fixes
|
|
8
|
+
|
|
9
|
+
- wrap error from fast-xml-parser when invalid xml parsed ([#518](https://github.com/forcedotcom/source-deploy-retrieve/issues/518)) ([407af67](https://github.com/forcedotcom/source-deploy-retrieve/commit/407af6754994b9b8b0484ee7a8dcb380ada2c554))
|
|
10
|
+
|
|
5
11
|
### [5.8.2](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.8.1...v5.8.2) (2021-12-16)
|
|
6
12
|
|
|
7
13
|
### [5.8.1](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.8.0...v5.8.1) (2021-12-15)
|
package/LICENSE.txt
CHANGED
package/lib/src/i18n/i18n.d.ts
CHANGED
package/lib/src/i18n/i18n.js
CHANGED
|
@@ -65,5 +65,6 @@ exports.messages = {
|
|
|
65
65
|
error_no_job_id: 'The %s operation is missing a job ID. Initialize an operation with an ID, or start a new job.',
|
|
66
66
|
tapi_deploy_component_limit_error: 'This deploy method only supports deploying one metadata component at a time',
|
|
67
67
|
warn_unresolved_source_for_components: 'The following components will not be deployed due to unresolved source: %s',
|
|
68
|
+
invalid_xml_parsing: 'error parsing %s due to:\n message: %s\n line: %s\n code: %s',
|
|
68
69
|
};
|
|
69
70
|
//# sourceMappingURL=i18n.js.map
|
package/lib/src/i18n/i18n.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i18n.js","sourceRoot":"","sources":["../../../src/i18n/i18n.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,yBAAyB;AACzB;;;;;;;;;GASG;AACU,QAAA,QAAQ,GAAG;IACtB,eAAe,EAAE,iCAAiC;IAClD,kBAAkB,EAAE,gCAAgC;IACpD,sCAAsC,EAAE,yCAAyC;IACjF,6BAA6B,EAAE,mBAAmB;IAClD,mCAAmC,EAAE,kCAAkC;IACvE,+BAA+B,EAAE,0DAA0D;IAC3F,2BAA2B,EAAE,8CAA8C;IAC3E,0BAA0B,EAAE,qCAAqC;IACjE,mBAAmB,EAAE,mDAAmD;IACxE,sBAAsB,EAAE,kCAAkC;IAC1D,sCAAsC,EAAE,yBAAyB;IACjE,4BAA4B,EAAE,gCAAgC;IAC9D,6BAA6B,EAAE,sDAAsD;IACrF,0BAA0B,EAAE,qCAAqC;IACjE,2BAA2B,EAAE,2DAA2D;IACxF,2BAA2B,EAAE,yCAAyC;IACtE,oBAAoB,EAAE,iCAAiC;IACvD,uCAAuC,EAAE,gEAAgE;IACzG,yBAAyB,EAAE,sEAAsE;IACjG,2BAA2B,EAAE,yBAAyB;IACtD,qBAAqB,EAAE,6CAA6C;IACpE,yBAAyB,EAAE,iDAAiD;IAC5E,0BAA0B,EAAE,wCAAwC;IACpE,sCAAsC,EAAE,2CAA2C;IACnF,6BAA6B,EAAE,2DAA2D;IAC1F,mCAAmC,EAAE,mDAAmD;IACxF,4BAA4B,EAAE,8DAA8D;IAC5F,sBAAsB,EACpB,8UAA8U;IAChV,oBAAoB,EAAE,8BAA8B;IACpD,mCAAmC,EAAE,gFAAgF;IACrH,0BAA0B,EAAE,oEAAoE;IAChG,4BAA4B,EAAE,gCAAgC;IAC9D,4BAA4B,EAAE,gCAAgC;IAC9D,2BAA2B,EAAE,6BAA6B;IAC1D,iBAAiB,EAAE,sEAAsE;IACzF,wBAAwB,EAAE,6CAA6C;IACvE,6BAA6B,EAAE,6CAA6C;IAC5E,yBAAyB,EAAE,qDAAqD;IAChF,yBAAyB,EAAE,qDAAqD;IAChF,+BAA+B,EAAE,2CAA2C;IAC5E,qBAAqB,EAAE,mDAAmD;IAC1E,2CAA2C,EACzC,8GAA8G;IAChH,2CAA2C,EACzC,uFAAuF;IACzF,eAAe,EAAE,+FAA+F;IAChH,iCAAiC,EAAE,6EAA6E;IAChH,qCAAqC,EAAE,4EAA4E;
|
|
1
|
+
{"version":3,"file":"i18n.js","sourceRoot":"","sources":["../../../src/i18n/i18n.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,yBAAyB;AACzB;;;;;;;;;GASG;AACU,QAAA,QAAQ,GAAG;IACtB,eAAe,EAAE,iCAAiC;IAClD,kBAAkB,EAAE,gCAAgC;IACpD,sCAAsC,EAAE,yCAAyC;IACjF,6BAA6B,EAAE,mBAAmB;IAClD,mCAAmC,EAAE,kCAAkC;IACvE,+BAA+B,EAAE,0DAA0D;IAC3F,2BAA2B,EAAE,8CAA8C;IAC3E,0BAA0B,EAAE,qCAAqC;IACjE,mBAAmB,EAAE,mDAAmD;IACxE,sBAAsB,EAAE,kCAAkC;IAC1D,sCAAsC,EAAE,yBAAyB;IACjE,4BAA4B,EAAE,gCAAgC;IAC9D,6BAA6B,EAAE,sDAAsD;IACrF,0BAA0B,EAAE,qCAAqC;IACjE,2BAA2B,EAAE,2DAA2D;IACxF,2BAA2B,EAAE,yCAAyC;IACtE,oBAAoB,EAAE,iCAAiC;IACvD,uCAAuC,EAAE,gEAAgE;IACzG,yBAAyB,EAAE,sEAAsE;IACjG,2BAA2B,EAAE,yBAAyB;IACtD,qBAAqB,EAAE,6CAA6C;IACpE,yBAAyB,EAAE,iDAAiD;IAC5E,0BAA0B,EAAE,wCAAwC;IACpE,sCAAsC,EAAE,2CAA2C;IACnF,6BAA6B,EAAE,2DAA2D;IAC1F,mCAAmC,EAAE,mDAAmD;IACxF,4BAA4B,EAAE,8DAA8D;IAC5F,sBAAsB,EACpB,8UAA8U;IAChV,oBAAoB,EAAE,8BAA8B;IACpD,mCAAmC,EAAE,gFAAgF;IACrH,0BAA0B,EAAE,oEAAoE;IAChG,4BAA4B,EAAE,gCAAgC;IAC9D,4BAA4B,EAAE,gCAAgC;IAC9D,2BAA2B,EAAE,6BAA6B;IAC1D,iBAAiB,EAAE,sEAAsE;IACzF,wBAAwB,EAAE,6CAA6C;IACvE,6BAA6B,EAAE,6CAA6C;IAC5E,yBAAyB,EAAE,qDAAqD;IAChF,yBAAyB,EAAE,qDAAqD;IAChF,+BAA+B,EAAE,2CAA2C;IAC5E,qBAAqB,EAAE,mDAAmD;IAC1E,2CAA2C,EACzC,8GAA8G;IAChH,2CAA2C,EACzC,uFAAuF;IACzF,eAAe,EAAE,+FAA+F;IAChH,iCAAiC,EAAE,6EAA6E;IAChH,qCAAqC,EAAE,4EAA4E;IACnH,mBAAmB,EAAE,iEAAiE;CACvF,CAAC"}
|
|
@@ -74,6 +74,7 @@ export declare class SourceComponent implements MetadataComponent {
|
|
|
74
74
|
setMarkedForDelete(destructiveChangeType?: DestructiveChangesType | boolean): void;
|
|
75
75
|
private calculateRelativePath;
|
|
76
76
|
private parse;
|
|
77
|
+
private parseAndValidateXML;
|
|
77
78
|
private getDecomposedChildren;
|
|
78
79
|
private getNonDecomposedChildren;
|
|
79
80
|
private walk;
|
|
@@ -84,16 +84,16 @@ class SourceComponent {
|
|
|
84
84
|
async parseXml(xmlFilePath) {
|
|
85
85
|
const xml = xmlFilePath !== null && xmlFilePath !== void 0 ? xmlFilePath : this.xml;
|
|
86
86
|
if (xml) {
|
|
87
|
-
const contents = await this.tree.readFile(xml);
|
|
88
|
-
return this.
|
|
87
|
+
const contents = (await this.tree.readFile(xml)).toString();
|
|
88
|
+
return this.parseAndValidateXML(contents, xml);
|
|
89
89
|
}
|
|
90
90
|
return {};
|
|
91
91
|
}
|
|
92
92
|
parseXmlSync(xmlFilePath) {
|
|
93
93
|
const xml = xmlFilePath !== null && xmlFilePath !== void 0 ? xmlFilePath : this.xml;
|
|
94
94
|
if (xml) {
|
|
95
|
-
const contents = this.tree.readFileSync(xml);
|
|
96
|
-
return this.
|
|
95
|
+
const contents = this.tree.readFileSync(xml).toString();
|
|
96
|
+
return this.parseAndValidateXML(contents, xml);
|
|
97
97
|
}
|
|
98
98
|
return {};
|
|
99
99
|
}
|
|
@@ -191,6 +191,24 @@ class SourceComponent {
|
|
|
191
191
|
return parsed;
|
|
192
192
|
}
|
|
193
193
|
}
|
|
194
|
+
parseAndValidateXML(contents, path) {
|
|
195
|
+
try {
|
|
196
|
+
return this.parse(contents);
|
|
197
|
+
}
|
|
198
|
+
catch (e) {
|
|
199
|
+
// only attempt validating once there's an error to avoid the performance hit of validating every file
|
|
200
|
+
const validation = (0, fast_xml_parser_1.validate)(contents);
|
|
201
|
+
if (validation !== true) {
|
|
202
|
+
throw new errors_1.LibraryError('invalid_xml_parsing', [
|
|
203
|
+
path,
|
|
204
|
+
validation.err.msg,
|
|
205
|
+
validation.err.line.toString(),
|
|
206
|
+
validation.err.code,
|
|
207
|
+
]);
|
|
208
|
+
}
|
|
209
|
+
throw e;
|
|
210
|
+
}
|
|
211
|
+
}
|
|
194
212
|
getDecomposedChildren(dirPath) {
|
|
195
213
|
const children = [];
|
|
196
214
|
for (const fsPath of this.walk(dirPath)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sourceComponent.js","sourceRoot":"","sources":["../../../src/resolve/sourceComponent.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAAsC;AACtC,
|
|
1
|
+
{"version":3,"file":"sourceComponent.js","sourceRoot":"","sources":["../../../src/resolve/sourceComponent.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAAsC;AACtC,qDAAkD;AAClD,mDAA+D;AAC/D,oCAAmF;AACnF,sCAAsD;AAGtD,sCAA6D;AAC7D,gDAAwD;AACxD,kEAA4E;AAE5E,qDAA4F;AAC5F,+CAA4C;AAW5C;;GAEG;AACH,MAAa,eAAe;IAY1B,YACE,KAA0B,EAC1B,OAAsB,IAAI,oCAAmB,EAAE,EAC/C,WAAW,GAAG,IAAI,yBAAW,EAAE;QANzB,oBAAe,GAAG,KAAK,CAAC;QAQ9B,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QACvB,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QACvB,IAAI,CAAC,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;QAC7B,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC;QACnC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC1B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC;IAED;;;;;;OAMG;IACI,MAAM,CAAC,sBAAsB,CAClC,KAA0B,EAC1B,EAAuB,EACvB,WAAyB;QAEzB,MAAM,IAAI,GAAG,EAAE;YACb,CAAC,CAAC,IAAI,qCAAoB,CAAC,EAAE,CAAC;YAC9B,CAAC,CAAC,qCAAoB,CAAC,aAAa,CAAC,IAAA,kDAA8B,EAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAEnH,OAAO,IAAI,eAAe,CAAC,KAAK,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;IACvD,CAAC;IAEM,WAAW;QAChB,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;gBAC5C,IAAI,MAAM,KAAK,IAAI,CAAC,GAAG,EAAE;oBACvB,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;iBACtB;aACF;SACF;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IACD;;;;;;;;OAQG;IACI,WAAW;;QAChB,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,wBAAwB,EAAE,CAAC;YAE3G,MAAM,eAAe,GAAG,CAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,QAAQ,EAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,QAAQ,0CAAE,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3F,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE;gBAC5B,8DAA8D;gBAC9D,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,MAAA,KAAK,CAAC,IAAI,0CAAE,EAAE,CAAC,EAAE;oBAC7C,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,IAAI,KAAK,CAAC,OAAO,CAAC;oBAC5C,MAAM,IAAI,2BAAkB,CAAC,6BAA6B,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;iBACzF;aACF;YACD,OAAO,QAAQ,CAAC;SACjB;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAEM,KAAK,CAAC,QAAQ,CAAc,WAAoB;QACrD,MAAM,GAAG,GAAG,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,IAAI,CAAC,GAAG,CAAC;QACpC,IAAI,GAAG,EAAE;YACP,MAAM,QAAQ,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;YAC5D,OAAO,IAAI,CAAC,mBAAmB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;SAChD;QACD,OAAO,EAAO,CAAC;IACjB,CAAC;IAEM,YAAY,CAAc,WAAoB;QACnD,MAAM,GAAG,GAAG,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,IAAI,CAAC,GAAG,CAAC;QACpC,IAAI,GAAG,EAAE;YACP,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC;YACxD,OAAO,IAAI,CAAC,mBAAmB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;SAChD;QACD,OAAO,EAAO,CAAC;IACjB,CAAC;IAED;;;;OAIG;IACI,cAAc;QACnB,IAAI,IAAI,CAAC,WAAW,EAAE;YACpB,OAAO,IAAI,CAAC,WAAW,CAAC;SACzB;aAAM;YACL,OAAO,yBAAW,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAChD;IACH,CAAC;IAED;;;;;;;;OAQG;IACI,kBAAkB,CAAc,SAAY;QACjD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YAChB,OAAO,SAAS,CAAC;SAClB;QACD,MAAM,QAAQ,GAAG,IAAA,wBAAgB,EAC/B,IAAA,cAAG,EAAC,SAAS,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAC3F,CAAC;QACT,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,oBAAS,EAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC;IACrF,CAAC;IAEM,sBAAsB,CAAC,MAAc,EAAE,MAAsB;QAClE,OAAO,MAAM,KAAK,QAAQ;YACxB,CAAC,CAAC,IAAA,WAAI,EAAC,kCAAyB,EAAE,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;YACrE,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC;IAED;;OAEG;IACI,iBAAiB;QACtB,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAEM,yBAAyB;QAC9B,OAAO,IAAI,CAAC,sBAAsB,CAAC;IACrC,CAAC;IAEM,kBAAkB,CAAC,qBAAwD;QAChF,IAAI,qBAAqB,KAAK,KAAK,EAAE;YACnC,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC;YAC7B,qDAAqD;YACrD,OAAO,IAAI,CAAC,sBAAsB,CAAC;SACpC;aAAM;YACL,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;YAC5B,iDAAiD;YACjD,qBAAqB,KAAK,oCAAsB,CAAC,GAAG;gBAClD,CAAC,CAAC,CAAC,IAAI,CAAC,sBAAsB,GAAG,oCAAsB,CAAC,GAAG,CAAC;gBAC5D,CAAC,CAAC,CAAC,IAAI,CAAC,sBAAsB,GAAG,oCAAsB,CAAC,IAAI,CAAC,CAAC;SACjE;IACH,CAAC;IAEO,qBAAqB,CAAC,MAAc;;QAC1C,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAErF,8EAA8E;QAC9E,oFAAoF;QACpF,oFAAoF;QACpF,iFAAiF;QACjF,+DAA+D;QAC/D,IAAI,CAAC,MAAM,IAAI,QAAQ,IAAI,iBAAiB,EAAE;YAC5C,OAAO,IAAA,iBAAS,EAAC,MAAM,EAAE,aAAa,CAAC,CAAC;SACzC;QAED,IAAI,UAAU,EAAE;YACd,wGAAwG;YACxG,IAAI,CAAA,MAAA,IAAI,CAAC,UAAU,0CAAE,UAAU,KAAI,CAAA,MAAA,IAAI,CAAC,UAAU,0CAAE,UAAU,MAAK,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE;gBAC/E,OAAO,IAAA,iBAAS,EAAC,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;aACzD;YACD,OAAO,IAAA,WAAI,EAAC,aAAa,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,IAAA,eAAQ,EAAC,MAAM,CAAC,CAAC,CAAC;SAC3E;QACD,OAAO,IAAA,WAAI,EAAC,aAAa,EAAE,IAAA,eAAQ,EAAC,MAAM,CAAC,CAAC,CAAC;IAC/C,CAAC;IAEO,KAAK,CAAc,QAAgB;QACzC,6DAA6D;QAC7D,MAAM,MAAM,GAAG,IAAA,uBAAK,EAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE;YACxC,gBAAgB,EAAE,KAAK;YACvB,cAAc,EAAE,KAAK;SACtB,CAAM,CAAC;QACR,MAAM,CAAC,YAAY,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC3C,IAAI,YAAY,KAAK,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YACnC,OAAO,MAAM,CAAC;SACf;aAAM,IAAI,IAAI,CAAC,MAAM,EAAE;YACtB,OAAO,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;SACxC;aAAM;YACL,OAAO,MAAM,CAAC;SACf;IACH,CAAC;IAEO,mBAAmB,CAAc,QAAgB,EAAE,IAAY;QACrE,IAAI;YACF,OAAO,IAAI,CAAC,KAAK,CAAI,QAAQ,CAAC,CAAC;SAChC;QAAC,OAAO,CAAC,EAAE;YACV,sGAAsG;YACtG,MAAM,UAAU,GAAG,IAAA,0BAAQ,EAAC,QAAQ,CAAC,CAAC;YACtC,IAAI,UAAU,KAAK,IAAI,EAAE;gBACvB,MAAM,IAAI,qBAAY,CAAC,qBAAqB,EAAE;oBAC5C,IAAI;oBACJ,UAAU,CAAC,GAAG,CAAC,GAAG;oBAClB,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE;oBAC9B,UAAU,CAAC,GAAG,CAAC,IAAI;iBACpB,CAAC,CAAC;aACJ;YACD,MAAM,CAAC,CAAC;SACT;IACH,CAAC;IAEO,qBAAqB,CAAC,OAAe;QAC3C,MAAM,QAAQ,GAAsB,EAAE,CAAC;QACvC,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YACvC,MAAM,QAAQ,GAAG,IAAA,wBAAgB,EAAC,MAAM,CAAC,CAAC;YAC1C,MAAM,aAAa,GAAG,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,MAAK,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;YAC5D,IAAI,QAAQ,IAAI,CAAC,aAAa,EAAE;gBAC9B,qDAAqD;gBACrD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;gBACjE,MAAM,cAAc,GAAG,IAAI,eAAe,CACxC;oBACE,IAAI,EAAE,IAAA,gBAAQ,EAAC,MAAM,CAAC;oBACtB,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC;oBAC3C,GAAG,EAAE,MAAM;oBACX,MAAM,EAAE,IAAI;iBACb,EACD,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,WAAW,CACjB,CAAC;gBACF,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;aAC/B;SACF;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,wEAAwE;IACxE,+CAA+C;IAC/C,gEAAgE;IACxD,wBAAwB;QAC9B,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QACnC,MAAM,QAAQ,GAAsB,EAAE,CAAC;QACvC,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YAC/D,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YACxD,MAAM,eAAe,GAAG,SAAS,CAAC,eAAe,CAAC;YAClD,IAAI,eAAe,EAAE;gBACnB,MAAM,iBAAiB,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,SAAS,CAAC,cAAc,EAAE,CAAC;gBAC1E,MAAM,QAAQ,GAAG,IAAA,wBAAgB,EAAC,IAAA,cAAG,EAAC,MAAM,EAAE,iBAAiB,EAAE,EAAE,CAAC,CAAC,CAAC;gBACtE,MAAM,eAAe,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;oBAC/C,OAAO,IAAI,eAAe,CACxB;wBACE,IAAI,EAAE,IAAA,oBAAS,EAAC,OAAO,EAAE,eAAe,CAAC;wBACzC,IAAI,EAAE,SAAS;wBACf,GAAG,EAAE,IAAI,CAAC,GAAG;wBACb,MAAM,EAAE,IAAI;qBACb,EACD,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,WAAW,CACjB,CAAC;gBACJ,CAAC,CAAC,CAAC;gBACH,QAAQ,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,CAAC;aACnC;SACF;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEO,CAAC,IAAI,CAAC,MAAc;QAC1B,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE;YAC3C,MAAM,MAAM,CAAC;SACd;aAAM;YACL,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE;gBAC5D,MAAM,SAAS,GAAG,IAAA,WAAI,EAAC,MAAM,EAAE,KAAK,CAAC,CAAC;gBACtC,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;oBACtC,SAAS;iBACV;qBAAM,IAAI,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE;oBACpD,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;iBAC7B;qBAAM;oBACL,MAAM,SAAS,CAAC;iBACjB;aACF;SACF;IACH,CAAC;IAED,IAAW,QAAQ;QACjB,IAAI,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE;YAClC,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;SACvB;QACD,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;YAC7C,OAAO,IAAI,CAAC,IAAI,CAAC;SAClB;aAAM;YACL,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;SACvE;IACH,CAAC;IAED,IAAW,IAAI;QACb,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED;;;;;;;;;;;;OAYG;IACH,IAAW,aAAa;QACtB,OAAO,IAAI,CAAC,IAAI,CAAC,aAAa,KAAK,KAAK,CAAC;IAC3C,CAAC;CACF;AAlUD,0CAkUC"}
|