slnodejs 6.1.1113 → 6.1.1114
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 +1 -1
- package/tsOutputs/build-scanner/js_diff/guess-method-location.js +15 -9
- package/tsOutputs/build-scanner/js_diff/guess-method-location.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/guess-method-name.js +2 -1
- package/tsOutputs/build-scanner/js_diff/guess-method-name.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/method-signature.js.map +1 -1
- package/tsOutputs/build-scanner/mappings/file-enricher.js +24 -14
- package/tsOutputs/build-scanner/mappings/file-enricher.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/hits-converter.js +9 -0
- package/tsOutputs/common/footprints-process-v6/hits-converter.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/index.js +13 -5
- package/tsOutputs/common/footprints-process-v6/index.js.map +1 -1
- package/tsOutputs/test-listener/nyc-report-executor-fpv6.js +13 -3
- package/tsOutputs/test-listener/nyc-report-executor-fpv6.js.map +1 -1
package/package.json
CHANGED
|
@@ -40,23 +40,28 @@ const sl_env_vars_1 = require("../../common/constants/sl-env-vars");
|
|
|
40
40
|
* This is actually true for all classes transpiled with Babel, not only React class components.
|
|
41
41
|
*/
|
|
42
42
|
function isBabelCreateClassMethod(node, nodeToParent, recognizeBabelCreateClass) {
|
|
43
|
-
if (node.type != 'FunctionExpression')
|
|
43
|
+
if (node.type != 'FunctionExpression') {
|
|
44
44
|
return false;
|
|
45
|
+
}
|
|
45
46
|
let key = (0, create_node_key_1.createNodeKey)(node);
|
|
46
47
|
const valueNode = nodeToParent[key];
|
|
47
|
-
if (valueNode == null)
|
|
48
|
+
if (valueNode == null) {
|
|
48
49
|
return false;
|
|
50
|
+
}
|
|
49
51
|
if (valueNode.key == null ||
|
|
50
|
-
(valueNode.key != null && valueNode.key.name != 'value'))
|
|
51
|
-
return false; //That's
|
|
52
|
+
(valueNode.key != null && valueNode.key.name != 'value')) {
|
|
53
|
+
return false; //That's not the 'value' node. Return.
|
|
54
|
+
}
|
|
52
55
|
key = (0, create_node_key_1.createNodeKey)(valueNode);
|
|
53
56
|
const parent = nodeToParent[key];
|
|
54
|
-
if (parent == null)
|
|
57
|
+
if (parent == null) {
|
|
55
58
|
return false;
|
|
59
|
+
}
|
|
56
60
|
key = (0, create_node_key_1.createNodeKey)(parent);
|
|
57
61
|
const arrayNode = nodeToParent[key];
|
|
58
|
-
if (arrayNode == null || arrayNode.type != 'ArrayExpression')
|
|
62
|
+
if (arrayNode == null || arrayNode.type != 'ArrayExpression') {
|
|
59
63
|
return false;
|
|
64
|
+
}
|
|
60
65
|
key = (0, create_node_key_1.createNodeKey)(arrayNode);
|
|
61
66
|
const createClassNode = nodeToParent[key];
|
|
62
67
|
if (createClassNode == null || createClassNode.callee == null) {
|
|
@@ -181,10 +186,11 @@ function getPossibleMethodLocations(node, nodeToParent, allowAccessibilityAdjust
|
|
|
181
186
|
* For methods transpiled by Babel we received wrong positions from sourcemaps, pointing to the end of previous method.
|
|
182
187
|
* Instead, we take the beginning of the body of the method to match it during enrichment.
|
|
183
188
|
* @see https://sealights.atlassian.net/browse/SLDEV-21768
|
|
189
|
+
*
|
|
190
|
+
* We removed `node.type === 'ClassMethod'` from condition, as we observed this behavior also for other cases (e.g. ArrowFunctionExpression).
|
|
191
|
+
* @see https://sealights.atlassian.net/browse/SLDEV-24082
|
|
184
192
|
*/
|
|
185
|
-
if (recognizeBabelCreateClass &&
|
|
186
|
-
node.type === 'ClassMethod' &&
|
|
187
|
-
((_b = node.body) === null || _b === void 0 ? void 0 : _b.loc)) {
|
|
193
|
+
if (recognizeBabelCreateClass && ((_b = node.body) === null || _b === void 0 ? void 0 : _b.loc)) {
|
|
188
194
|
const location = node.body.loc;
|
|
189
195
|
const possibleLocation = PossibleLocation.fromAstLocation(location, PositionSourceType.METHOD_BODY_LOCATION);
|
|
190
196
|
possibleLocations.push(possibleLocation);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"guess-method-location.js","sourceRoot":"","sources":["../../../build-scanner/js_diff/guess-method-location.ts"],"names":[],"mappings":";;;AAWA,uDAAkD;AAClD,qDAAoD;AACpD,oEAA+D;
|
|
1
|
+
{"version":3,"file":"guess-method-location.js","sourceRoot":"","sources":["../../../build-scanner/js_diff/guess-method-location.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
function guessMethodName(node, anc) {
|
|
2
|
-
var actualName = (node.id && node.id.name) ||
|
|
2
|
+
var actualName = (node.id && node.id.name) ||
|
|
3
|
+
(node.key && (node.key.name || (node.key.id && node.key.id.name)));
|
|
3
4
|
if (actualName && (node.kind == 'set' || node.kind == 'get')) {
|
|
4
5
|
actualName = node.kind + ' ' + actualName;
|
|
5
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"guess-method-name.js","sourceRoot":"","sources":["../../../build-scanner/js_diff/guess-method-name.js"],"names":[],"mappings":"AAAA,SAAS,eAAe,CAAC,IAAI,EAAE,GAAG;IAChC,IAAI,UAAU,
|
|
1
|
+
{"version":3,"file":"guess-method-name.js","sourceRoot":"","sources":["../../../build-scanner/js_diff/guess-method-name.js"],"names":[],"mappings":"AAAA,SAAS,eAAe,CAAC,IAAI,EAAE,GAAG;IAChC,IAAI,UAAU,GACZ,CAAC,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC;QACzB,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACrE,IAAI,UAAU,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,KAAK,IAAI,IAAI,CAAC,IAAI,IAAI,KAAK,CAAC,EAAE;QAC5D,UAAU,GAAG,IAAI,CAAC,IAAI,GAAG,GAAG,GAAG,UAAU,CAAC;KAC3C;IACD,IAAI,WAAW,GAAG,CAAC,UAAU,CAAC;IAC9B,IAAI,UAAU,GAAG,IAAI,CAAC;IACtB,IAAI,SAAS,GAAG,aAAa,CAAC;IAC9B,IAAI,QAAQ,GAAG,gBAAgB,CAAC;IAChC,IAAI,WAAW,EAAE;QACf,IAAI,GAAG,EAAE;YACP,QAAQ,GAAG,CAAC,IAAI,EAAE;gBAChB,KAAK,oBAAoB;oBACvB,IAAI,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,EAAE,CAAC,IAAI,IAAI,YAAY,EAAE;wBACzC,SAAS,GAAG,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC;qBACzB;oBACD,MAAM;gBACR,KAAK,gBAAgB,CAAC;gBACtB,KAAK,cAAc;oBACjB,IAAI,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,IAAI,YAAY,EAAE;wBAC3C,SAAS,GAAG,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC;wBACzB,UAAU,GAAG,cAAc,CAAC;qBAC7B;oBACD,MAAM;gBACR,KAAK,sBAAsB;oBACzB,IACE,GAAG,CAAC,IAAI;wBACR,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,kBAAkB;wBACnC,GAAG,CAAC,IAAI,CAAC,QAAQ;wBACjB,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,YAAY,EACtC;wBACA,SAAS,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;qBACpC;yBAAM,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,YAAY,EAAE;wBACpD,SAAS,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;qBAC3B;oBACD,MAAM;gBACR,KAAK,gBAAgB;oBACnB,2EAA2E;oBAC3E,MAAM;gBACR,KAAK,kBAAkB,CAAC;gBACxB,KAAK,eAAe;oBAClB,IAAI,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,IAAI,YAAY,EAAE;wBAC3C,SAAS,GAAG,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC;wBACzB,UAAU,GAAG,QAAQ,CAAC;qBACvB;oBACD,MAAM;gBACR;oBACE,MAAM;aACT;SACF;KACF;IACD,OAAO;QACL,UAAU,EAAE,UAAU;QACtB,IAAI,EAAE,UAAU,IAAI,SAAS;QAC7B,IAAI,EAAE,UAAU;QAChB,WAAW,EAAE,WAAW;KACzB,CAAC;AACJ,CAAC;AACD,MAAM,CAAC,OAAO,CAAC,eAAe,GAAG,eAAe,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"method-signature.js","sourceRoot":"","sources":["../../../build-scanner/js_diff/method-signature.ts"],"names":[],"mappings":";;;AAAA,mEAIiC;AACjC,2DAAsD;AACtD,iDAAiD;AACjD,2BAA2B;AAC3B,gDAAwC;AACxC,yCAAyC;AACzC,qDAAkE;AAClE,kCAAkC;AAClC,6DAA6D;AAY7D,MAAM,UAAU;IAYd,YACS,gBAAyB,EACzB,gBAAyB;QADzB,qBAAgB,GAAhB,gBAAgB,CAAS;QACzB,qBAAgB,GAAhB,gBAAgB,CAAS;QAblC,gBAAW,GAAuB,EAAE,CAAC;QACrC,YAAO,GAAa,IAAI,CAAC;QACzB,cAAS,GAAW,IAAI,CAAC;QAEzB,gBAAW,GAAc,IAAI,CAAC;QAC9B,gBAAW,GAAW,IAAI,CAAC;QAC3B,SAAI,GAAW,IAAI,CAAC;QACpB,YAAO,GAAW,IAAI,CAAC;QACvB,uBAAkB,GAAmB,IAAI,CAAC;QAC1C,kBAAa,GAAW,IAAI,CAAC;IAK1B,CAAC;CACL;AAED,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,SAAS,EAAE,UAAU,EAAE;IACtD,UAAU,EAAE,IAAI;IAChB,GAAG,EAAE,SAAS,QAAQ;QACpB,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE;YAC3B,OAAO,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;SACrC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"method-signature.js","sourceRoot":"","sources":["../../../build-scanner/js_diff/method-signature.ts"],"names":[],"mappings":"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"}
|
|
@@ -165,35 +165,41 @@ class FileEnricher {
|
|
|
165
165
|
}
|
|
166
166
|
// Get actual method positions from source file
|
|
167
167
|
const actualMethodPositions = this.getActualMethodPositionsFromSourceFile(sourceFile);
|
|
168
|
-
const
|
|
168
|
+
const methodsToUnenrich = flatMap(duplicateGroups, ([methodName, group]) => {
|
|
169
169
|
this.logger.debug(`Removing duplicated entries for ${methodName} method`);
|
|
170
|
-
const
|
|
171
|
-
if (!
|
|
170
|
+
const actualMethodPosition = actualMethodPositions.get(methodName);
|
|
171
|
+
if (!actualMethodPosition) {
|
|
172
172
|
// this should never happen - if the method was enriched, we should find an actual method in the source file
|
|
173
173
|
this.logger.warn(`Did not match ${methodName} in ${sourceFile.absolutePath} after enrichment; reverting enrichment process and marking the method as auto generated`);
|
|
174
|
-
return group
|
|
174
|
+
return group;
|
|
175
175
|
}
|
|
176
176
|
// `actualMethodPositions` may have multiple positions - there may be multiple methods
|
|
177
177
|
// of the same name in the source file (e.g. in different classes).
|
|
178
178
|
// For each of them we match the enriched method with the closest starting position.
|
|
179
179
|
// Unmatched methods we unenrich and mark as autogenerated
|
|
180
|
-
const methodsToKeep =
|
|
180
|
+
const methodsToKeep = actualMethodPosition.map(({ line: actualLineNumber, column: actualColumn }) => group
|
|
181
181
|
.slice()
|
|
182
|
-
.sort(({ position: [aLineNumber] }, { position: [bLineNumber] }) =>
|
|
183
|
-
|
|
182
|
+
.sort(({ position: [aLineNumber, aColumn] }, { position: [bLineNumber, bColumn] }) => {
|
|
183
|
+
// sort first by lines, then by columns
|
|
184
|
+
if (aLineNumber !== bLineNumber) {
|
|
185
|
+
return (Math.abs(aLineNumber - actualLineNumber) -
|
|
186
|
+
Math.abs(bLineNumber - actualLineNumber));
|
|
187
|
+
}
|
|
188
|
+
return (Math.abs(aColumn - actualColumn) -
|
|
189
|
+
Math.abs(bColumn - actualColumn));
|
|
190
|
+
})[0]);
|
|
184
191
|
this.logger.debug(`${group.length - methodsToKeep.length} duplicated entries will be removed for method ${methodName}`);
|
|
185
|
-
return group
|
|
186
|
-
.filter((method) => !methodsToKeep.includes(method))
|
|
187
|
-
.map(({ uniqueId }) => uniqueId);
|
|
192
|
+
return group.filter((method) => !methodsToKeep.includes(method));
|
|
188
193
|
});
|
|
189
194
|
const result = enrichedMethods.map((method) => {
|
|
190
|
-
if (!
|
|
195
|
+
if (!methodsToUnenrich.find(({ uniqueId, endPosition }) => method.uniqueId === uniqueId && method.endPosition === endPosition)) {
|
|
191
196
|
return method;
|
|
192
197
|
}
|
|
193
|
-
const unenrichedMethod = originalMethods.find((originalMethod) => method.uniqueId === originalMethod.uniqueId
|
|
198
|
+
const unenrichedMethod = originalMethods.find((originalMethod) => method.uniqueId === originalMethod.uniqueId &&
|
|
199
|
+
method.endPosition === originalMethod.endPosition);
|
|
194
200
|
return this.markCodeItemAsAutogenerated(unenrichedMethod, sourceFile.absolutePath, CodeElementsType.METHOD);
|
|
195
201
|
});
|
|
196
|
-
this.logger.info(`Removed ${
|
|
202
|
+
this.logger.info(`Removed ${methodsToUnenrich.length} duplicate method(s) unenriched in file '${sourceFile.absolutePath}'`);
|
|
197
203
|
return result;
|
|
198
204
|
}
|
|
199
205
|
/**
|
|
@@ -207,7 +213,11 @@ class FileEnricher {
|
|
|
207
213
|
var _a;
|
|
208
214
|
return (Object.assign(Object.assign({}, acc), { [method.srcData.displayName]: [
|
|
209
215
|
...((_a = acc[method.srcData.displayName]) !== null && _a !== void 0 ? _a : []),
|
|
210
|
-
|
|
216
|
+
{
|
|
217
|
+
line: method.srcData.possiblePos[0].position[0],
|
|
218
|
+
column: method.srcData.possiblePos[0].position[1],
|
|
219
|
+
uniqueId: method.uniqueId,
|
|
220
|
+
},
|
|
211
221
|
] }));
|
|
212
222
|
}, {});
|
|
213
223
|
return new Map(Object.entries(data));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-enricher.js","sourceRoot":"","sources":["../../../build-scanner/mappings/file-enricher.ts"],"names":[],"mappings":";;;AAAA,yBAAyB;AACzB,6BAA6B;AAE7B,2DAA4D;AAW5D,8FAAuF;AACvF,yCAA8C;AAC9C,iFAA6E;AAC7E,0CAA2C;AAyB3C,MAAa,mBAAmB;IAC9B,MAAM,CAAC,YAAY,CACjB,MAAc,EACd,mBAAwC,EACxC,IAAS,EACT,UAAkB,EAClB,iBAAoC,EACpC,MAAkC;QAElC,IAAI,MAAM,CAAC,kBAAkB,EAAE;YAC7B,OAAO,IAAI,uBAAuB,CAChC,MAAM,EACN,mBAAmB,EACnB,IAAI,EACJ,UAAU,EACV,iBAAiB,EACjB,MAAM,CACP,CAAC;SACH;QAED,OAAO,IAAI,YAAY,CACrB,MAAM,EACN,mBAAmB,EACnB,IAAI,EACJ,UAAU,EACV,iBAAiB,EACjB,MAAM,CACP,CAAC;IACJ,CAAC;CACF;AA7BD,kDA6BC;AAED,MAAa,YAAY;IACvB,YACmB,MAAc,EACd,mBAAwC,EACxC,IAAS,EACT,UAAkB,EAClB,iBAAoC,EACpC,MAA2B;QAL3B,WAAM,GAAN,MAAM,CAAQ;QACd,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,SAAI,GAAJ,IAAI,CAAK;QACT,eAAU,GAAV,UAAU,CAAQ;QAClB,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,WAAM,GAAN,MAAM,CAAqB;IAC3C,CAAC;IAEJ,WAAW,CAAC,GAAwB;QAClC,MAAM,MAAM,mCAA6B,GAAG,KAAE,KAAK,EAAE,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,GAAE,CAAC;QACtE,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE;YAC/B,IAAI,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,cAAc,EAAE;gBAC5C,IAAI,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE;oBAC3C,IAAI;wBACF,MAAM,iBAAiB,GAAG,IAAI,CAAC,gBAAgB,CAC7C,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,WAAW,CACjB,CAAC;wBACF,MAAM,eAAe,GAAG,IAAI,CAAC,WAAW,CACtC,iBAAiB,EACjB,IAAI,CAAC,OAAO,EACZ,gBAAgB,CAAC,MAAM,EACvB,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,mBAAmB,CACT,CAAC;wBAClB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,WAAW,CAC9B,iBAAiB,EACjB,IAAI,CAAC,QAAQ,EACb,gBAAgB,CAAC,MAAM,EACvB,IAAI,CAAC,gBAAgB,EACrB,EAAE,CACH,CAAC;wBAEF,2CAA2C;wBAC3C,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,MAAM;6BACvB,mDAAmD;4BACpD,CAAC,CAAC,IAAI,CAAC,kCAAkC,CACrC,eAAe,EACf,iBAAiB,EACjB,IAAI,CAAC,OAAO,CACb;4BACH,CAAC,CAAC,eAAe,CAAC;qBACrB;oBAAC,OAAO,CAAC,EAAE;wBACV,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,8BAA8B,IAAI,CAAC,YAAY,EAAE,EACjD,CAAC,CACF,CAAC;qBACH;iBACF;aACF;iBAAM;gBACL,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,QAAQ,IAAI,CAAC,YAAY,qDAAqD,CAC/E,CAAC;gBACF,IAAI,CAAC,mBAAmB,CAAC,cAAc,CACrC,IAAI,CAAC,YAAY,EACjB,sBAAsB,CACvB,CAAC;aACH;SACF;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,eAAe,CAAC,YAAoB;QAC1C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;YAChC,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,gBAAgB,YAAY,wCAAwC,CACrE,CAAC;YACF,OAAO,KAAK,CAAC;SACd;QACD,MAAM,eAAe,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QACvD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAE7C,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;YACxC,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,cAAc,SAAS,eAAe,YAAY,yCAAyC,CAC5F,CAAC;YACF,IAAI,CAAC,mBAAmB,CAAC,cAAc,CACrC,YAAY,EACZ,qBAAqB,CACtB,CAAC;YACF,OAAO,KAAK,CAAC;SACd;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,WAAW,CACjB,wBAAgD,EAChD,iBAAgC,EAChC,IAAsB,EACtB,2BAAmD,EACnD,SAAqB;;QAErB,MAAM,0BAA0B,GAC9B,IAAI,IAAI,gBAAgB,CAAC,MAAM;YAC7B,CAAC,CAAC,iBAAiB,CAAC,gBAAgB;YACpC,CAAC,CAAC,iBAAiB,CAAC,mBAAmB,CAAC;QAC5C,MAAM,wBAAwB,GAC5B,IAAI,IAAI,gBAAgB,CAAC,MAAM;YAC7B,CAAC,CAAC,iBAAiB,CAAC,mBAAmB;YACvC,CAAC,CAAC,EAAE,CAAC;QACT,MAAM,cAAc,GAClB,IAAI,IAAI,gBAAgB,CAAC,MAAM;YAC7B,CAAC,CAAC,iBAAiB,CAAC,OAAO;YAC3B,CAAC,CAAC,iBAAiB,CAAC,QAAQ,CAAC;QACjC,MAAM,4BAA4B,GAAG,IAAI,CAAC,mBAAmB,CAC3D,0BAA0B,CAC3B,CAAC;QACF,MAAM,0BAA0B,GAAG,IAAI,CAAC,mBAAmB,CACzD,wBAAwB,CACzB,CAAC;QACF,MAAM,wBAAwB,GAC5B,IAAI,KAAK,gBAAgB,CAAC,MAAM;YAC9B,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,2BAA2B,CAAC,CAAC;QAC5D,MAAM,aAAa,GAAG,EAAE,CAAC;QACzB,MAAM,yBAAyB,GAAG,EAAE,CAAC;QACrC,MAAM,UAAU,GAAG,EAAE,CAAC;QACtB,MAAM,uBAAuB,GAC3B,IAAI,KAAK,gBAAgB,CAAC,MAAM,IAAI,IAAI,CAAC,8BAA8B,EAAE;YACvE,CAAC,CAAC,2DAA0B,CAAC,WAAW,CAAC,iBAAiB,CAAC,OAAO,CAAC;YACnE,CAAC,CAAC,IAAI,CAAC;QACX,IAAI,sBAAsB,GAAG,CAAC,CAAC;QAE/B,KAAK,MAAM,CAAC,GAAG,EAAE,cAAc,CAAC,IAAI,MAAM,CAAC,OAAO,CAChD,0BAA0B,CAC3B,EAAE;YACD,MAAM,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAC5C,cAAc,EACd,0BAA0B,CAC3B,CAAC;YACF,MAAM,cAAc,GAClB,IAAI,KAAK,gBAAgB,CAAC,MAAM;gBAC9B,CAAC,CAAC,CAAC,CAAC;gBACJ,CAAC,CAAC,IAAI,CAAC,gBAAgB,CACnB,wBAAwB,CAAC,CAAC,GAAG,CAAC,EAC9B,wBAAwB,CACzB,CAAC;YACR,MAAM,sBAAsB,GAAG,uBAAuB;gBACpD,CAAC,CAAC,uBAAuB,CAAC,eAAe,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC;gBACrE,CAAC,CAAC,CAAC,CAAC,CAAC;YAEP,IAAI,gBAAgB,GAAG,CAAC,CAAC,EAAE;gBACzB,aAAa,CAAC,IAAI,CAAC,EAAE,WAAW,EAAE,CAAC,GAAG,EAAE,SAAS,EAAE,gBAAgB,EAAE,CAAC,CAAC;gBACvE,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,mBAAmB,MAAA,MAAA,MAAA,cAAc,CAC/B,gBAAgB,CACjB,0CAAE,OAAO,0CAAE,QAAQ,0CAAE,IAAI,CACxB,GAAG,CACJ,cAAc,iBAAiB,CAAC,YAAY,oBAAoB,CAClE,CAAC;aACH;iBAAM,IACL,cAAc,GAAG,CAAC,CAAC;iBACnB,MAAA,MAAA,cAAc,CAAC,cAAc,CAAC,0CAAE,gBAAgB,0CAAE,WAAW,CAAA,EAC7D;gBACA,aAAa,CAAC,IAAI,CAAC,EAAE,WAAW,EAAE,CAAC,GAAG,EAAE,SAAS,EAAE,cAAc,EAAE,CAAC,CAAC;gBACrE,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,mBAAmB,MAAA,MAAA,MAAA,cAAc,CAC/B,cAAc,CACf,0CAAE,OAAO,0CAAE,QAAQ,0CAAE,IAAI,CACxB,GAAG,CACJ,cAAc,iBAAiB,CAAC,YAAY,oEAAoE,CAClH,CAAC;aACH;iBAAM,IAAI,sBAAsB,GAAG,CAAC,CAAC,EAAE;gBACtC,aAAa,CAAC,IAAI,CAAC;oBACjB,WAAW,EAAE,CAAC,GAAG;oBACjB,SAAS,EAAE,sBAAsB;iBAClC,CAAC,CAAC;gBACH,sBAAsB,EAAE,CAAC;gBACzB,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,mBAAmB,MAAA,MAAA,MAAA,cAAc,CAC/B,gBAAgB,CACjB,0CAAE,OAAO,0CAAE,QAAQ,0CAAE,IAAI,CACxB,GAAG,CACJ,cAAc,SAAS,CAAC,GAAG,CAAC,CAAC,WAAW,aAAa,iBAAiB,CAAC,YAAY,0EAA0E,CAC/J,CAAC;aACH;iBAAM;gBACL,yBAAyB,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;gBACrC,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,oEAAoE,cAAc,CAAC,IAAI,CACrF,MAAM,CACP,cAAc,iBAAiB,CAAC,YAAY,8BAA8B,CAC5E,CAAC;aACH;SACF;QAED,IAAI,sBAAsB,GAAG,CAAC,EAAE;YAC9B,kCAAe,CAAC,SAAS,CACvB,uBAAc,CAAC,yBAAyB,EACxC,YAAY,sBAAsB,6DAA6D,CAChG,CAAC;SACH;QAED,IAAI,IAAI,KAAK,gBAAgB,CAAC,MAAM,EAAE;YACpC,KAAK,MAAM,CAAC,GAAG,EAAE,cAAc,CAAC,IAAI,MAAM,CAAC,OAAO,CAChD,4BAA4B,CAC7B,EAAE;gBACD,MAAM,kBAAkB,GAAG,IAAI,CAAC,gBAAgB,CAC9C,cAAc,EACd,wBAAwB,CACzB,CAAC;gBACF,MAAM,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAC5C,wBAAwB,CAAC,CAAC,GAAG,CAAC,EAC9B,2BAA2B,CAC5B,CAAC;gBACF,MAAM,WAAW,GACf,gBAAgB,GAAG,CAAC,CAAC;oBACrB,CAAA,MAAA,MAAA,cAAc,CAAC,CAAC,GAAG,CAAC,0CAAE,gBAAgB,0CAAE,WAAW,KAAI,IAAI,CAAC;gBAE9D,IAAI,kBAAkB,KAAK,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE;oBAC7C,UAAU,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;oBACtB,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,oBAAoB,iBAAiB,CAAC,YAAY,kBAAkB,cAAc,CAAC,GAAG,CAAC,CAAC,QAAQ,gCAAgC,CACjI,CAAC;iBACH;aACF;SACF;QACD,OAAO,EAAE,aAAa,EAAE,yBAAyB,EAAE,UAAU,EAAE,CAAC;IAClE,CAAC;IAEO,8BAA8B;QACpC,OAAO,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC;IACzC,CAAC;IAED;;;OAGG;IACK,kCAAkC,CACxC,eAA6B,EAC7B,UAAyB,EACzB,eAA6B;QAE7B,sDAAsD;QACtD,MAAM,YAAY,GAAiC,eAAe,CAAC,MAAM,CACvE,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;;YACd,MAAM,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC;YAChC,kDAAkD;YAClD,sDAAsD;YACtD,4FAA4F;YAC5F,MAAM,IAAI,GACR,MAAM,CAAC,gBAAgB,CAAC,aAAa;gBACrC,MAAM,CAAC,WAAW,KAAK,aAAa;gBACpC,MAAM,CAAC,WAAW,KAAK,aAAa,CAAC;YACvC,uCACK,GAAG,KACN,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,MAAA,GAAG,CAAC,IAAI,CAAC,mCAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,MAAA,GAAG,CAAC,IAAI,CAAC,mCAAI,EAAE,CAAC,EAAE,MAAM,CAAC,IACjE;QACJ,CAAC,EACD,EAAE,CACH,CAAC;QAEF,8BAA8B;QAC9B,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,MAAM,CACzD,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CACjC,CAAC;QAEF,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE;YAChC,uCAAuC;YACvC,OAAO,eAAe,CAAC;SACxB;QAED,+CAA+C;QAC/C,MAAM,qBAAqB,GACzB,IAAI,CAAC,sCAAsC,CAAC,UAAU,CAAC,CAAC;QAE1D,MAAM,mBAAmB,GAAG,OAAO,CACjC,eAAe,EACf,CAAC,CAAC,UAAU,EAAE,KAAK,CAAC,EAAE,EAAE;YACtB,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,mCAAmC,UAAU,SAAS,CACvD,CAAC;YAEF,MAAM,iBAAiB,GAAG,qBAAqB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAChE,IAAI,CAAC,iBAAiB,EAAE;gBACtB,4GAA4G;gBAC5G,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,iBAAiB,UAAU,OAAO,UAAU,CAAC,YAAY,0FAA0F,CACpJ,CAAC;gBACF,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC;aAC9C;YAED,sFAAsF;YACtF,mEAAmE;YACnE,oFAAoF;YACpF,0DAA0D;YAC1D,MAAM,aAAa,GAAG,iBAAiB,CAAC,GAAG,CACzC,CAAC,gBAAgB,EAAE,EAAE,CACnB,KAAK;iBACF,KAAK,EAAE;iBACP,IAAI,CACH,CAAC,EAAE,QAAQ,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE,CAC3D,IAAI,CAAC,GAAG,CAAC,WAAW,GAAG,gBAAgB,CAAC;gBACxC,IAAI,CAAC,GAAG,CAAC,WAAW,GAAG,gBAAgB,CAAC,CAC3C,CAAC,CAAC,CAAC,CACT,CAAC;YACF,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,GAAG,KAAK,CAAC,MAAM,GAAG,aAAa,CAAC,MAAM,kDAAkD,UAAU,EAAE,CACrG,CAAC;YACF,OAAO,KAAK;iBACT,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;iBACnD,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC;QACrC,CAAC,CACF,CAAC;QAEF,MAAM,MAAM,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YAC5C,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;gBAClD,OAAO,MAAM,CAAC;aACf;YACD,MAAM,gBAAgB,GAAG,eAAe,CAAC,IAAI,CAC3C,CAAC,cAAc,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,KAAK,cAAc,CAAC,QAAQ,CAChE,CAAC;YACF,OAAO,IAAI,CAAC,2BAA2B,CACrC,gBAAgB,EAChB,UAAU,CAAC,YAAY,EACvB,gBAAgB,CAAC,MAAM,CACV,CAAC;QAClB,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,WAAW,mBAAmB,CAAC,MAAM,4CAA4C,UAAU,CAAC,YAAY,GAAG,CAC5G,CAAC;QAEF,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;OAGG;IACK,sCAAsC,CAC5C,UAAyB;QAEzB,MAAM,IAAI,GAAG,UAAU,CAAC,OAAO;aAC5B,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,KAAK,aAAa,CAAC;aAC9D,MAAM,CACL,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;;YAAC,OAAA,iCACZ,GAAG,KACN,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;oBAC5B,GAAG,CAAC,MAAA,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,mCAAI,EAAE,CAAC;oBAC1C,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC;iBACrC,IACD,CAAA;SAAA,EACF,EAAE,CACH,CAAC;QACJ,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACvC,CAAC;IAES,gBAAgB,CACxB,iBAA2B,EAAE,EAC7B,qBAA6C;QAE7C,KAAK,MAAM,QAAQ,IAAI,cAAc,EAAE;YACrC,MAAM,SAAS,GAAG,qBAAqB,CAAC,QAAQ,CAAC,CAAC;YAClD,IAAI,SAAS,GAAG,CAAC,CAAC,EAAE;gBAClB,OAAO,SAAS,CAAC;aAClB;YACD;;;;;;qBAMS;YACT,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC1C,MAAM,uBAAuB,GAAG,GAAG,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;YAC/D,MAAM,gBAAgB,GAAG,qBAAqB,CAAC,uBAAuB,CAAC,CAAC;YACxE,IAAI,gBAAgB,GAAG,CAAC,CAAC,EAAE;gBACzB,qLAAqL;gBACrL,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,aAAa,QAAQ,6DAA6D,gBAAgB,yBAAyB,uBAAuB,GAAG,CACtJ,CAAC;gBACF,OAAO,gBAAgB,CAAC;aACzB;SACF;QACD,OAAO,CAAC,CAAC,CAAC;IACZ,CAAC;IAEO,WAAW,CACjB,iBAAgC,EAChC,SAAqB,EACrB,IAAsB,EACtB,iBAA4C,EAC5C,2BAAsD;QAEtD,MAAM,MAAM,GAAe,EAAE,CAAC;QAC9B,IAAI,iBAAiB,EAAE;YACrB,MAAM,EAAE,aAAa,EAAE,yBAAyB,EAAE,GAAG,IAAI,CAAC,WAAW,CACnE,iBAAiB,EACjB,iBAAiB,EACjB,IAAI,EACJ,2BAA2B,EAC3B,SAAS,CACV,CAAC;YACF,KAAK,MAAM,GAAG,IAAI,yBAAyB,EAAE;gBAC3C,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;gBAChC,MAAM,YAAY,GAAG,IAAI,CAAC,2BAA2B,CACnD,QAAQ,EACR,iBAAiB,CAAC,YAAY,EAC9B,IAAI,CACL,CAAC;gBACF,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;aAC3B;YAED,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE;gBAChC,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBAC7C,MAAM,YAAY,qBAAQ,QAAQ,CAAE,CAAC;gBACrC,IAAI,IAAI,KAAK,gBAAgB,CAAC,MAAM,EAAE;oBACpC,IAAI,CAAC,YAAY,CACf,YAA0B,EAC1B,iBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAC1C,CAAC;iBACH;gBACD,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBAC1B,IAAI,IAAI,KAAK,gBAAgB,CAAC,MAAM,EAAE;oBACpC,IAAI,CAAC,mBAAmB,CAAC,cAAc,CACrC,iBAAiB,CAAC,YAAY,EAC9B,YAAY,CAAC,QAAQ,CACtB,CAAC;iBACH;aACF;SACF;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,2BAA2B,CACjC,QAAkB,EAClB,QAAgB,EAChB,IAAsB;QAEtB,MAAM,YAAY,qBAAQ,QAAQ,CAAE,CAAC;QACrC,YAAY,CAAC,gBAAgB,CAAC,aAAa,GAAG,IAAI,CAAC;QACnD,IAAI,IAAI,KAAK,gBAAgB,CAAC,MAAM,EAAE;YACpC,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAC1C,QAAQ,EACR,YAAY,CAAC,QAAQ,CACtB,CAAC;SACH;QACD,OAAO,YAAY,CAAC;IACtB,CAAC;IAEO,mBAAmB,CAAC,WAAsC;QAGhE,MAAM,cAAc,GAAgC,EAAE,CAAC;QACvD,KAAK,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;YACzD,cAAc,CAAC,GAAG,CAAC,GAAG,cAAc,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;YAChD,cAAc,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACpC;QACD,OAAO,cAAc,CAAC;IACxB,CAAC;IAEO,YAAY,CAAC,eAA2B,EAAE,YAAiB;QACjE,eAAe,CAAC,WAAW,GAAG,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC;QAC/D,eAAe,CAAC,IAAI,qBAAQ,YAAY,CAAC,IAAI,CAAE,CAAC;QAChD,eAAe,CAAC,gBAAgB,qBAAQ,YAAY,CAAC,gBAAgB,CAAE,CAAC;QAExE,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,YAAY,CAAC,aAAa,EAAE;YACxD,eAAe,CAAC,QAAQ,GAAG,YAAY,CAAC,QAAQ,CAAC;YACjD,eAAe,CAAC,QAAQ,GAAG,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC;SAC1D;QAED,IAAI,eAAe,CAAC,gBAAgB,CAAC,OAAO,EAAE;YAC5C,eAAe,CAAC,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC;YACjD,eAAe,CAAC,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC;SACxD;QAED,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YAC1B,eAAe,CAAC,OAAO,GAAG,eAAe,CAAC,IAAI,CAAC;YAC/C,eAAe,CAAC,UAAU,GAAG,eAAe,CAAC,OAAO,CAAC;YACrD,eAAe,CAAC,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC;YACjD,eAAe,CAAC,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC;SACxD;IACH,CAAC;IAED,6DAA6D;IAE7D,gBAAgB,CAAC,YAAoB,EAAE,WAAmB;QACxD,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC;YAC5D,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC;YAC/B,CAAC,CAAC,EAAE,CAAC;QACP,cAAc,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAEvC,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAC7C,IAAI,SAAS,KAAK,MAAM,IAAI,SAAS,KAAK,MAAM,EAAE;YAChD,IAAI,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE;gBACxC,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;gBAC1D,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aAC5B;SACF;QACD,IAAI,SAAS,KAAK,KAAK,IAAI,SAAS,KAAK,MAAM,EAAE;YAC/C,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;YACjE,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;SACnC;QAED,MAAM,IAAI,GAAG;YACX,UAAU,EAAE,IAAI;YAChB,cAAc;YACd,4BAA4B,EAC1B,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,IAAI,CAAC,MAAM,CAAC,oBAAoB;YAC5D,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW;YAClC,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,gBAAgB,EACd,IAAI,CAAC,MAAM,CAAC,iBAAiB,IAAI,IAAI,CAAC,IAAI,CAAC,iBAAiB;YAC9D,eAAe,EAAE,IAAI;YACrB,kBAAkB,EAAE,IAAI,CAAC,IAAI,CAAC,kBAAkB;YAChD,yBAAyB,EAAE,IAAI,CAAC,IAAI,CAAC,yBAAyB;SAC/D,CAAC;QACF,MAAM,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAC3D,GAAG;YACD,IAAI;gBACF,OAAO,aAAa,CAAC,MAAM,CACzB,YAAY,EACZ,WAAW,EACX,WAAW,EACX,IAAI,EACJ,IAAI,EACJ,IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,mBAAmB,CACzB,CAAC;aACH;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,KAAK,CAAC,aAAa,EAAE;oBACvB,IAAI,CAAC,mBAAmB,CAAC,YAAY,CACnC,YAAY,EACZ,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CACvB,CAAC;oBACF,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;iBAClD;qBAAM;oBACL,MAAM,KAAK,CAAC;iBACb;aACF;SACF,QAAQ,IAAI,EAAE;IACjB,CAAC;CACF;AAvhBD,oCAuhBC;AAED,MAAa,uBAAwB,SAAQ,YAAY;IACpC,gBAAgB,CACjC,iBAA2B,EAAE,EAC7B,qBAA6C;QAE7C,KAAK,MAAM,QAAQ,IAAI,cAAc,EAAE;YACrC,MAAM,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAEnC,MAAM,SAAS,GAAG,IAAI,CAAC,kBAAkB,CACvC,QAAQ,CAAC,IAAI,CAAC,EACd,qBAAqB,CACtB,CAAC;YACF,IAAI,SAAS,GAAG,CAAC,CAAC,EAAE;gBAClB,OAAO,SAAS,CAAC;aAClB;SACF;QACD,OAAO,CAAC,CAAC,CAAC;IACZ,CAAC;IAED,kBAAkB,CAChB,IAAY,EACZ,qBAA6C;QAE7C,IAAI;YACF,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE;gBACtE,MAAM,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC7B,OAAO,IAAI,KAAK,QAAQ,CAAC,GAAG,CAAC,CAAC;YAChC,CAAC,CAAC,CAAC;YACH,OAAO,KAAK,CAAC;SACd;QAAC,OAAO,IAAI,EAAE;YACb,OAAO,CAAC,CAAC,CAAC;SACX;IACH,CAAC;CACF;AAjCD,0DAiCC;AAED,IAAK,gBAGJ;AAHD,WAAK,gBAAgB;IACnB,qCAAiB,CAAA;IACjB,qCAAiB,CAAA;AACnB,CAAC,EAHI,gBAAgB,KAAhB,gBAAgB,QAGpB"}
|
|
1
|
+
{"version":3,"file":"file-enricher.js","sourceRoot":"","sources":["../../../build-scanner/mappings/file-enricher.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,11 +25,20 @@ class HitsConverter {
|
|
|
25
25
|
new original_module_loader_1.OriginalModuleLoader(hits_collector_1.HitsCollector.resolveGlobalCoverageObject(), this.logger).load();
|
|
26
26
|
}
|
|
27
27
|
hitFilesData.forEach((fileHit) => {
|
|
28
|
+
var _a;
|
|
28
29
|
let relativePath = fileHit.filename;
|
|
29
30
|
if (fileHit.shouldResolveRelativePath) {
|
|
30
31
|
relativePath = this.relativePathResolver.getRelativePath(fileHit.filename);
|
|
31
32
|
}
|
|
32
33
|
const methodUniqueIdsWithPosition = this.createMethodIdsWithPosition(fileHit.hitMethods, relativePath, fileHit.filename, fileHit.uniqueIdKeysFromFile);
|
|
34
|
+
// skip the hit if it's not mapped to any of method, branch, or line number
|
|
35
|
+
// this may happen e.g. when we collected coverage for a transpiled function
|
|
36
|
+
// which does not occur in the original file
|
|
37
|
+
if (methodUniqueIdsWithPosition.length === 0 &&
|
|
38
|
+
fileHit.hitBranches.length === 0 &&
|
|
39
|
+
(((_a = fileHit.hitStatements) === null || _a === void 0 ? void 0 : _a.length) === 0 || !this.enableLineCoverage)) {
|
|
40
|
+
return { branchUniqueIds: [], methodUniqueIds: [] };
|
|
41
|
+
}
|
|
33
42
|
methodUniqueIds = methodUniqueIds.concat(methodUniqueIdsWithPosition.map((method) => method.uniqueId));
|
|
34
43
|
branchUniqueIds = branchUniqueIds.concat(this.createBranchIds(fileHit.hitBranches, relativePath, fileHit.filename));
|
|
35
44
|
if (this.enableLineCoverage) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hits-converter.js","sourceRoot":"","sources":["../../../common/footprints-process-v6/hits-converter.ts"],"names":[],"mappings":";;;AAgBA,0DAAqD;AACrD,wFAAmF;AACnF,qDAAiD;AACjD,0EAAoE;AAEpE,uEAAmE;AAEnE,MAAa,aAAa;IAWxB,YACE,oBAA0C,EAC1C,aAA4B,EAC5B,WAAmB,EACnB,MAAc,EACd,0BAA0B,GAAG,KAAK,EAC1B,qBAAqB,KAAK;QAA1B,uBAAkB,GAAlB,kBAAkB,CAAQ;QAT5B,qBAAgB,GAAa,EAAE,CAAC;QAC9B,eAAU,GAA8B,EAAE,CAAC;QAUnD,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;QACjD,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,0BAA0B,GAAG,0BAA0B,CAAC;QAC7D,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAEM,WAAW,CAAC,YAA4B;QAC7C,IAAI,eAAe,GAAa,EAAE,CAAC;QACnC,IAAI,eAAe,GAAa,EAAE,CAAC;QACnC,IAAI,cAAc,GAA6B,EAAE,CAAC;QAClD,IAAI,uBAAS,CAAC,gBAAgB,EAAE,EAAE;YAChC,IAAI,6CAAoB,CACtB,8BAAa,CAAC,2BAA2B,EAAE,EAC3C,IAAI,CAAC,MAAM,CACZ,CAAC,IAAI,EAAE,CAAC;SACV;QACD,YAAY,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"hits-converter.js","sourceRoot":"","sources":["../../../common/footprints-process-v6/hits-converter.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,7 +37,7 @@ class FootprintsProcess {
|
|
|
37
37
|
this.delegateEvents();
|
|
38
38
|
}
|
|
39
39
|
enqueueCurrentFootprints(execution, testName, isFinalFootprints = false) {
|
|
40
|
-
var _a, _b;
|
|
40
|
+
var _a, _b, _c;
|
|
41
41
|
return __awaiter(this, void 0, void 0, function* () {
|
|
42
42
|
this.currentExecutionBsid = execution.buildSessionId;
|
|
43
43
|
this.collectionInterval.next();
|
|
@@ -46,11 +46,19 @@ class FootprintsProcess {
|
|
|
46
46
|
this.logger.info(`Collecting hits for '${hitFilesData.length}' files`);
|
|
47
47
|
const convertedHits = this.hitsConverter.convertHits(hitFilesData);
|
|
48
48
|
this.logger.debug(`Converted total ${(_a = convertedHits === null || convertedHits === void 0 ? void 0 : convertedHits.branches) === null || _a === void 0 ? void 0 : _a.length} branches and ${(_b = convertedHits === null || convertedHits === void 0 ? void 0 : convertedHits.methods) === null || _b === void 0 ? void 0 : _b.length} methods.`);
|
|
49
|
-
|
|
50
|
-
|
|
49
|
+
const methodLineHitsLength = Object.keys((_c = convertedHits.methodLineHits) !== null && _c !== void 0 ? _c : {}).length;
|
|
50
|
+
if (convertedHits.methodLineHits) {
|
|
51
|
+
this.logger.debug(`Converted total ${methodLineHitsLength} method line hits.`);
|
|
52
|
+
}
|
|
53
|
+
if (convertedHits.methods.length > 0 ||
|
|
54
|
+
convertedHits.branches.length > 0 ||
|
|
55
|
+
methodLineHitsLength > 0) {
|
|
56
|
+
this.footprintsBuffer.addHit(convertedHits, this.collectionInterval.toJson(), execution.executionId, testName, this.isInitFootprints(), isFinalFootprints);
|
|
57
|
+
this.logger.debug(`Hits added successfully for execution ${execution.executionId} and test ${testName}.`);
|
|
58
|
+
}
|
|
59
|
+
else {
|
|
60
|
+
this.logger.warn(`Hits were dropped for execution ${execution.executionId} and test ${testName} because they were not mapped to valid method, branch, or line number in the original file.`);
|
|
51
61
|
}
|
|
52
|
-
this.footprintsBuffer.addHit(convertedHits, this.collectionInterval.toJson(), execution.executionId, testName, this.isInitFootprints(), isFinalFootprints);
|
|
53
|
-
this.logger.debug(`Hits added successfully for execution ${execution.executionId} and test ${testName}.`);
|
|
54
62
|
}
|
|
55
63
|
else {
|
|
56
64
|
this.logger.info('No files were hits, not collecting footprints');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../common/footprints-process-v6/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../common/footprints-process-v6/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,7 +28,9 @@ class NycReportExecutorFpv6 {
|
|
|
28
28
|
try {
|
|
29
29
|
const executionData = yield this.getCurrentExecution();
|
|
30
30
|
const footprintsV6File = yield this.convertToFootprints(executionData.executionId);
|
|
31
|
-
|
|
31
|
+
if (footprintsV6File) {
|
|
32
|
+
yield this.backendProxy.submitFootprintsV6(footprintsV6File, executionData.buildSessionId, executionData.testStage, this.agentConfig.buildSessionId.value);
|
|
33
|
+
}
|
|
32
34
|
return true;
|
|
33
35
|
}
|
|
34
36
|
catch (e) {
|
|
@@ -45,12 +47,20 @@ class NycReportExecutorFpv6 {
|
|
|
45
47
|
});
|
|
46
48
|
}
|
|
47
49
|
convertToFootprints(executionId) {
|
|
50
|
+
var _a, _b;
|
|
48
51
|
return __awaiter(this, void 0, void 0, function* () {
|
|
49
52
|
this.hitsCollector.globalCoverageObject = this.readReportFile();
|
|
50
53
|
const hitElements = yield this.hitsCollector.getHitElements();
|
|
51
54
|
const convertedFootprints = this.hitsConverter.convertHits(hitElements);
|
|
52
|
-
|
|
53
|
-
|
|
55
|
+
if (convertedFootprints.methods.length > 0 ||
|
|
56
|
+
convertedFootprints.branches.length > 0 ||
|
|
57
|
+
((_b = (_a = convertedFootprints.methodLineHits) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) > 0) {
|
|
58
|
+
this.footprintsBuffer.addHit(convertedFootprints, this.getCollectionInterval(), executionId, '', true, true);
|
|
59
|
+
return this.footprintsBuffer.createPacket();
|
|
60
|
+
}
|
|
61
|
+
else {
|
|
62
|
+
this.logger.warn(`Hits were dropped for execution ${executionId} because they were not mapped to valid method, branch, or line number in the original file.`);
|
|
63
|
+
}
|
|
54
64
|
});
|
|
55
65
|
}
|
|
56
66
|
getCollectionInterval() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nyc-report-executor-fpv6.js","sourceRoot":"","sources":["../../test-listener/nyc-report-executor-fpv6.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2BAAkC;AAKlC,8EAA0E;AAE1E,0FAAsF;AAItF,MAAa,qBAAqB;IAShC,YACE,YAA2B,EAC3B,aAA4B,EAC5B,aAA4B,EAC5B,gBAAkC,EAClC,WAAwB,EACxB,cAAsB,EACtB,MAAc;QAEd,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACzC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAEY,OAAO;;YAClB,IAAI;gBACF,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBACvD,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,mBAAmB,CACrD,aAAa,CAAC,WAAW,CAC1B,CAAC;gBACF,MAAM,IAAI,CAAC,YAAY,CAAC,kBAAkB,CACxC,gBAAgB,EAChB,aAAa,CAAC,cAAc,EAC5B,aAAa,CAAC,SAAS,EACvB,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,KAAK,CACtC,CAAC;
|
|
1
|
+
{"version":3,"file":"nyc-report-executor-fpv6.js","sourceRoot":"","sources":["../../test-listener/nyc-report-executor-fpv6.ts"],"names":[],"mappings":"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"}
|