slnodejs 6.1.500 → 6.1.509
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/browser-agent/dist/browser-agent-all.js +5083 -4248
- package/browser-agent/dist/browser-agent-all.min.js +3 -3
- package/browser-agent/package.json +1 -1
- package/package.json +1 -1
- package/tsOutputs/build-scanner/js_diff/files-mapping.js +10 -2
- package/tsOutputs/build-scanner/js_diff/files-mapping.js.map +1 -1
- package/tsOutputs/build-scanner/mappings/ensure-files-handler.service.js +24 -12
- package/tsOutputs/build-scanner/mappings/ensure-files-handler.service.js.map +1 -1
- package/tsOutputs/build-scanner/mappings/file-enricher.js +15 -0
- package/tsOutputs/build-scanner/mappings/file-enricher.js.map +1 -1
- package/tsOutputs/build-scanner/utils.js +5 -0
- package/tsOutputs/build-scanner/utils.js.map +1 -1
package/package.json
CHANGED
|
@@ -356,9 +356,17 @@ FilesMapping.prototype._isMarkupFile = function (filename) {
|
|
|
356
356
|
return result;
|
|
357
357
|
};
|
|
358
358
|
FilesMapping.prototype._resolveProjectRoot = function () {
|
|
359
|
-
|
|
359
|
+
let projectRoot;
|
|
360
360
|
if (this.options.projectRoot) {
|
|
361
|
-
|
|
361
|
+
const normalizedRoot = path.normalize(this.options.projectRoot);
|
|
362
|
+
if (utils.isAbsolutePath(normalizedRoot)) {
|
|
363
|
+
// absolute path is fine
|
|
364
|
+
projectRoot = normalizedRoot;
|
|
365
|
+
}
|
|
366
|
+
else {
|
|
367
|
+
// relative path should be resolved first
|
|
368
|
+
projectRoot = path.resolve(process.cwd(), normalizedRoot);
|
|
369
|
+
}
|
|
362
370
|
this.diagnosticCollector.projectRootResolved(projectRoot, 'command-argument');
|
|
363
371
|
this.logger.info(`Project root set to '${projectRoot}' from 'sourceRoot'`);
|
|
364
372
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"files-mapping.js","sourceRoot":"","sources":["../../../build-scanner/js_diff/files-mapping.js"],"names":[],"mappings":"AAAA,IAAI,kBAAkB,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;AAC7D,IAAI,mBAAmB,GAAG,OAAO,CAAC,oCAAoC,CAAC,CAAC,mBAAmB,CAAC;AAC5F,IAAI,qBAAqB,GAAG,OAAO,CAAC,wCAAwC,CAAC,CAAC,qBAAqB,CAAC;AACpG,IAAI,iBAAiB,GAAG,OAAO,CAAC,oDAAoD,CAAC,CAAC,iBAAiB,CAAC;AACxG,IAAI,eAAe,GAAG,OAAO,CAAC,4CAA4C,CAAC,CAAC,eAAe,CAAC;AAC5F,IAAI,SAAS,GAAG,OAAO,CAAC,oCAAoC,CAAC,CAAC,SAAS,CAAC;AACxE,IAAI,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC3B,IAAI,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC3B,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AACvB,IAAI,UAAU,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AACvD,IAAI,KAAK,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAChC,IAAI,aAAa,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;AACnD,IAAI,sBAAsB,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AACnE,IAAI,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AACvC,IAAI,iBAAiB,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;AAC1D,IAAI,qBAAqB,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AAClE,IAAI,cAAc,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AACnD,IAAI,kBAAkB,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;AAC3D,IAAI,mBAAmB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;AAC3D,IAAI,mBAAmB,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;AAG7D,IAAI,YAAY,GAAG,UAAU,CAAC;AAC9B,IAAI,mBAAmB,GAAG,QAAQ,CAAC;AACnC,IAAI,WAAW,GAAG,SAAS,CAAC;AAC5B,IAAI,mBAAmB,GAAG,QAAQ,CAAC;AACnC,IAAI,gCAAgC,GAAG,CAAC,CAAC,CAAC;AAE1C,gEAAgE;AAChE,SAAS,YAAY,CAAC,aAAa,EAAE,mBAAmB,EAAE,MAAM;IAC5D,IAAI,CAAC,aAAa,GAAG,aAAa,IAAI,EAAE,CAAC;IACzC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;IACjD,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC;IAClD,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;IACvB,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAC;IAC7B,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC;IACzB,IAAI,CAAC,aAAa,CAAC,cAAc,GAAG,EAAE,CAAC;IACvC,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC,CAAS,gBAAgB;IAChD,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC;IACzB,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;IAC/C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACrB,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACtD,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC,cAAc,CAAC,mBAAmB,CAAC,qBAAqB,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC1G,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;IAC9C,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC;IAClC,IAAI,CAAC,uBAAuB,GAAG,EAAE,CAAC;IAClC,IAAI,CAAC,mBAAmB,GAAG,IAAI,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAC3D,IAAI,CAAC,QAAQ,GAAG;QACZ,OAAO,EAAE,CAAC;QACV,QAAQ,EAAE,CAAC;KACd,CAAC;AACN,CAAC;AAED,YAAY,CAAC,SAAS,CAAC,OAAO,GAAG;IAC7B,IAAI,OAAO,GAAG,IAAI,CAAA;IAClB,IAAI,OAAO,GAAG,IAAI,OAAO,CAAC,UAAU,OAAO;QACvC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;QACpD,OAAO,CAAC,mDAAmD,EAAE,CAAC;QAC9D,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,WAAW,EAAE,OAAO;YACvD,IAAI,UAAU,GAAG,CAAC,OAAO,IAAI,OAAO,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YAC9D,OAAO,CAAC,cAAc,CAAC,WAAW,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,kBAAkB,GAAG,EAAE,CAAC;QAChC,OAAO,CAAC,eAAe,EAAE,CAAC;QAC1B,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,UAAU,aAAa;YAClD,OAAO,CAAC,oBAAoB,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;QACH,IAAI,OAAO,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;YACnC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;YACnD,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,UAAU,IAAI,EAAE,GAAG;gBAC9C,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,GAAG,GAAG,GAAG,eAAe,GAAG,IAAI,CAAC,YAAY,GAAG,GAAG,CAAC,CAAC;YAC9E,CAAC,CAAC,CAAC;SACN;QACD,IAAI,SAAS,GAAG,IAAI,CAAC;QACrB,IAAI,OAAO,CAAC,YAAY,CAAC,MAAM,EAAE;YAC7B,IAAI,OAAO,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;YAChD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC1B,SAAS,GAAG,KAAK,CAAC;SACrB;QACD,IAAI,SAAS,CAAC,gBAAgB,EAAE,EAAE;YAC9B,OAAO,CAAC,iBAAiB,EAAE,CAAC;SAC/B;QAED,OAAO,CAAC,WAAW,CAAC,KAAK,GAAG,OAAO,CAAC,cAAc,CAAC;QACnD,OAAO,CAAC,WAAW,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QAChD,eAAe,CAAC,eAAe,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC;QACjE,OAAO,OAAO,CAAC,SAAS,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;IACH,OAAO,OAAO,CAAC;AACnB,CAAC,CAAA;AAED,YAAY,CAAC,SAAS,CAAC,oBAAoB,GAAG,UAAU,aAAa;IACjE,IAAI,OAAO,GAAG,IAAI,CAAC;IACnB,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC;QACrC,IAAI,UAAU,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;QACpG,IAAI,YAAY,GAAG,cAAc,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;QACpD,YAAY,CAAC,WAAW,GAAG,CAAC,CAAC,WAAW,CAAC;QACzC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACtC,OAAO,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;IAC/B,CAAC,CAAC,CAAA;IACF,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC;QAEtC,iFAAiF;QACjF,IAAI,mBAAmB,CAAC,eAAe,CAAC,CAAC,CAAC,kBAAkB,CAAC,EAAE;YAC3D,CAAC,CAAC,kBAAkB,GAAG,gCAAgC,CAAC;SAC3D;QACD,IAAI,YAAY,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;QACtG,IAAI,YAAY,GAAG,cAAc,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;QACpD,YAAY,CAAC,WAAW,GAAG,CAAC,CAAC,WAAW,CAAC;QACzC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACzC,OAAO,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;IAChC,CAAC,CAAC,CAAA;AACN,CAAC,CAAA;AAED,gHAAgH;AAChH,YAAY,CAAC,SAAS,CAAC,mDAAmD,GAAG;IACzE,IAAI,OAAO,GAAG,IAAI,CAAA;IAClB,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,UAAU,gBAAgB;QAC5D,IAAI,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EACzC;YACI,GAAG,EAAE,OAAO,CAAC,OAAO,CAAC,aAAa;YAClC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,aAAa;SACxC,CAAC,CAAC;QAEP,YAAY,CAAC,OAAO,CAAC,UAAU,WAAW;YACtC,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,WAAW,CAAC,EAAE;gBAC1C,OAAO,CAAC,kBAAkB,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC;gBAC/C,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;aAC1C;QACL,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAA;AAED,YAAY,CAAC,SAAS,CAAC,cAAc,GAAG,UAAU,WAAW,EAAE,OAAO,EAAE,UAAU;IAC9E,IAAI,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;IACzE,YAAY,GAAG,KAAK,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;IACrD,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;IACnD,IAAI,kBAAkB,GAAG,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IAClF,IAAI,kBAAkB,EAAC;QACnB,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QACnD,OAAO;KACV;IACD,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACpD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,GAAG,CAAC,OAAO,GAAG,CAAC,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,IAAI,GAAG,YAAY,CAAC,CAAC;IACrG,IAAI,OAAO,GAAG,IAAI,CAAC,sBAAsB,CAAC,YAAY,CAAC,CAAC;IACxD,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE;QACnB,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;QACpD,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;QACtD,OAAO,CAAC,YAAY,GAAG,YAAY,CAAC;QACpC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAClC,IAAI,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;KACxE;SACI;QACD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACpC,IAAI,CAAC,mBAAmB,CAAC,6BAA6B,CAAC,YAAY,CAAC,CAAC;KACxE;AACL,CAAC,CAAA;AAED,YAAY,CAAC,SAAS,CAAC,eAAe,GAAG,UAAU,YAAY,EAAE,gBAAgB,EAAE,OAAO;IACtF,IAAI,QAAQ,GAAG,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IACzC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE;QACpB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAgB,GAAG,iBAAiB,CAAC,CAAC;QACpD,OAAO,IAAI,CAAC;KACf;IACD,iDAAiD;IACjD,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE;QAC5C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,GAAG,CAAC,OAAO,GAAG,CAAC,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,IAAI,GAAG,YAAY,CAAC,CAAC;QACnG,iCAAiC;QACjC,OAAO,IAAI,CAAC;KACf;IACD,OAAO,KAAK,CAAC;AACjB,CAAC,CAAA;AAED,YAAY,CAAC,SAAS,CAAC,mBAAmB,GAAG,UAAU,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,IAAI,EAAE,iBAAiB;IAC/H,IAAI,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACvJ,OAAO,MAAM,CAAC;AAClB,CAAC,CAAA;AAED,YAAY,CAAC,SAAS,CAAC,sBAAsB,GAAG,UAAU,YAAY;IAClE,IAAI,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IAC9D,IAAI,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;QACjC,YAAY,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;KAC5C;IACD,IAAI,gBAAgB,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,iBAAiB,IAAI,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC;IAClG,IAAI,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;IACpE,IAAI,WAAW,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC;IAC1C,IAAI,UAAU,GAAG,UAAU,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAExD,IAAI,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,EAAE;QAClC,WAAW,GAAG,IAAI,CAAC,4BAA4B,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;KAC9E;IACD,IAAI,cAAc,GAAG,CAAC,iBAAiB,CAAC,CAAC;IAEzC,IAAG,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;QAC5B,cAAc,GAAG,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;KACtE;IAED,IAAI,IAAI,GAAG;QACP,UAAU,EAAE,IAAI;QAChB,cAAc,EAAE,cAAc;QAC9B,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW;QACrC,UAAU,EAAE,IAAI,CAAC,aAAa,CAAC,UAAU;QACzC,gBAAgB,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,iBAAiB,IAAI,IAAI,CAAC,OAAO,CAAC,iBAAiB;QAC5F,aAAa,EAAE,IAAI,CAAC,OAAO,CAAC,aAAa;QACzC,oBAAoB,EAAE,IAAI,CAAC,OAAO,CAAC,oBAAoB;KAC1D,CAAC;IACF,IAAI,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAC3C,IAAI,SAAS,KAAK,MAAM,IAAI,SAAS,KAAK,MAAM,EAAE;QAC9C,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;KAClC;IACD,IAAI,SAAS,KAAK,KAAK,IAAI,SAAS,KAAK,MAAM,EAAE;QAC7C,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;KACzC;IACD,IAAI;QACA,IAAI,aAAa,GAAG,IAAI,CAAC,mBAAmB,CAAC,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;QAC9I,OAAO,aAAa,CAAC;KACxB;IAAC,OAAO,CAAC,EAAE;QACR,IAAI,OAAO,GAAG,kCAAkC,GAAG,YAAY,GAAG,YAAY,GAAG,CAAC,CAAC,OAAO,GAAG,GAAG,CAAC;QACjG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC3B,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAC1C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAC3B,OAAO;YACH,QAAQ,EAAE,IAAI;SACjB,CAAC;KACL;AACL,CAAC,CAAC;AAEF,YAAY,CAAC,SAAS,CAAC,aAAa,GAAG,UAAU,MAAM,EAAE,SAAS;IAC9D,OAAO,MAAM,CAAC,KAAK,CAAC;QAChB,SAAS,EAAE,SAAS;KACvB,CAAC,CAAC;AACP,CAAC,CAAA;AAGD,YAAY,CAAC,SAAS,CAAC,mBAAmB,GAAG,UAAU,OAAO;IAC1D,IAAI,CAAC,OAAO,CAAC,OAAO;QAChB,OAAO,EAAE,CAAC;IACd,OAAO,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,WAAW,EAAE,mBAAmB,CAAC,CAAC;IAAA,CAAC;AAChF,CAAC,CAAA;AAID,YAAY,CAAC,SAAS,CAAC,oBAAoB,GAAG,UAAU,OAAO;IAC3D,IAAI,CAAC,OAAO,CAAC,QAAQ;QACjB,OAAO,EAAE,CAAA;IACb,OAAO,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,YAAY,EAAE,mBAAmB,CAAC,CAAC;AAEhF,CAAC,CAAA;AAED,YAAY,CAAC,SAAS,CAAC,mBAAmB,GAAG,UAAU,OAAO,EAAE,GAAG,EAAE,WAAW;IAC5E,IAAI,gBAAgB,GAAG,EAAE,CAAC;IAC1B,IAAI,OAAO,GAAG,IAAI,CAAC;IACnB,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,UAAU,OAAO;QAClC,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;IACH,OAAO,gBAAgB,CAAC;AAC5B,CAAC,CAAA;AAED,YAAY,CAAC,SAAS,CAAC,uBAAuB,GAAG,UAAU,OAAO,EAAE,WAAW,EAAE,WAAW;IACxF,IAAI,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE;QAClE,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;KAC7B;SAAM;QACH,IAAI,WAAW,KAAK,mBAAmB,EAAE;YACrC,mBAAmB,CAAC,gBAAgB,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;SAC9D;QACD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,GAAG,WAAW,GAAG,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;KACjG;AACL,CAAC,CAAA;AAED,YAAY,CAAC,SAAS,CAAC,uBAAuB,GAAG;IAC7C,OAAO,+EAA+E;QAClF,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC;QAC5B,qFAAqF,CAAC;AAC9F,CAAC,CAAA;AAED,YAAY,CAAC,SAAS,CAAC,kBAAkB,GAAG,UAAU,QAAQ,EAAE,gBAAgB;IAC5E,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,EAAE;QACpC,IAAI,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;QACnE,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC;QAC7C,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;KACtC;IACD,OAAO,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;AAC7C,CAAC,CAAA;AAED,YAAY,CAAC,SAAS,CAAC,kBAAkB,GAAG,UAAU,QAAQ,EAAE,gBAAgB;IAC5E,IAAI,OAAO,GAAG,IAAI,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,IAAI,QAAQ,CAAC;IACtE,IAAI,OAAO,GAAG;QACV,WAAW,EAAE,QAAQ;QACrB,YAAY,EAAE,OAAO;QACrB,OAAO,EAAE,EAAE;QACX,KAAK,EAAE,EAAE;QACT,QAAQ,EAAE,EAAE;QACZ,YAAY,EAAE,gBAAgB;KACjC,CAAC;IACF,OAAO,OAAO,CAAC;AACnB,CAAC,CAAA;AAED,YAAY,CAAC,SAAS,CAAC,oBAAoB,GAAG,UAAU,gBAAgB;IACpE,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE;QAChC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAC1C,OAAO;KACV;IACD,gBAAgB,GAAG,KAAK,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;IAC7D,IAAI,UAAU,GAAG,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IACxE,IAAI,YAAY,GAAG,gBAAgB,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IAC5D,IAAI,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;QACjC,YAAY,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;KAC5C;IACD,OAAO,YAAY,CAAC;AACxB,CAAC,CAAC;AAEF,YAAY,CAAC,SAAS,CAAC,sBAAsB,GAAG;IAC5C,OAAO,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,gBAAgB,IAAI,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC;AAChG,CAAC,CAAA;AAED,YAAY,CAAC,SAAS,CAAC,wBAAwB,GAAG;IAC9C,IAAI,SAAS,GAAG;QACZ,IAAI,EAAE,CAAC,IAAI,CAAC,OAAO;QACnB,gBAAgB,EAAE,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB;QAChE,gBAAgB,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,gBAAgB;KACzD,CAAA;IACD,IAAI,OAAO,GAAG,KAAK,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;IACpD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,8CAA8C,GAAG,OAAO,CAAC,CAAC;AAC7E,CAAC,CAAA;AAED,YAAY,CAAC,SAAS,CAAC,gBAAgB,GAAG,UAAU,MAAM,EAAE,MAAM,EAAE,IAAI;IACpE,IAAI,CAAC,MAAM,EAAE;QACT,OAAO;KACV;IACD,wEAAwE;IACxE,4EAA4E;IAC5E,oDAAoD;IACpD,MAAM,CAAC,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAC;IAClD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC/B,CAAC,CAAA;AAED,YAAY,CAAC,SAAS,CAAC,qBAAqB,GAAG;IAC3C,IAAI,CAAC,qBAAqB,GAAG,IAAI,qBAAqB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACpE,IAAI,OAAO,GAAG,IAAI,CAAC;IACnB,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,UAAU,IAAI;QACtC,OAAO,CAAC,qBAAqB,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;IAC5D,CAAC,CAAC,CAAC;AACP,CAAC,CAAA;AAED,YAAY,CAAC,SAAS,CAAC,iBAAiB,GAAG;IACvC,IAAI,OAAO,GAAG,IAAI,CAAC;IACnB,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,UAAU,IAAI;QACtC,IAAI,SAAS,GAAG,IAAI,iBAAiB,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QACxE,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC/B,SAAS,CAAC,OAAO,EAAE,CAAC;QACpB,IAAI,GAAG,GAAG,SAAS,CAAC,YAAY,CAAC;QACjC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YAC7B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;SAC9D;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YAC9B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;SAChE;IACL,CAAC,CAAC,CAAA;AACN,CAAC,CAAA;AAGD,YAAY,CAAC,SAAS,CAAC,gBAAgB,GAAG,UAAU,GAAG,EAAE,WAAW;IAChE,IAAI,MAAM,GAAG,EAAE,CAAA;IACf,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACjC,IAAI,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;QACrB,IAAI,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC;QACnC,IAAI,WAAW,CAAC,WAAW,CAAC,EAAE;YAC1B,OAAO,CAAC,QAAQ,GAAG,WAAW,CAAC,WAAW,CAAC,CAAC;YAC5C,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACxB;KACJ;IACD,OAAO,MAAM,CAAC;AAClB,CAAC,CAAA;AAED,YAAY,CAAC,SAAS,CAAC,4BAA4B,GAAG,UAAU,QAAQ,EAAE,WAAW;IACjF,IAAI,OAAO,GAAG,IAAI,iBAAiB,CAAC,WAAW,EAAE,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACxE,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAC5B,IAAI,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IACpC,IAAI,CAAC,UAAU,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;QACxC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2BAA2B,QAAQ,EAAE,CAAC,CAAC;QACxD,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;KAC7B;IACD,IAAI,YAAY,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAC5C,OAAO,YAAY,CAAC;AACxB,CAAC,CAAC;AAEF,YAAY,CAAC,SAAS,CAAC,aAAa,GAAG,UAAU,QAAQ;IACrD,IAAI,GAAG,GAAG,IAAI,qBAAqB,EAAE,CAAC;IACtC,IAAI,cAAc,GAAG,GAAG,CAAC,iBAAiB,EAAE,CAAC;IAC7C,IAAI,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACvC,IAAI,MAAM,GAAG,CAAC,KAAK,CAAC,yBAAyB,CAAC,cAAc,CAAC,IAAI,KAAK,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC;IAChG,OAAO,MAAM,CAAC;AAClB,CAAC,CAAA;AAED,YAAY,CAAC,SAAS,CAAC,mBAAmB,GAAG;IACzC,IAAI,WAAW,CAAC;IAChB,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;QAC1B,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;QACvC,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC;QAC9E,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,wBAAwB,WAAW,qBAAqB,CAAC,CAAA;KAC7E;SAAM,IAAI,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE;QACtC,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC;QAC5C,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QACjE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,wBAAwB,WAAW,oBAAoB,CAAC,CAAA;KAC5E;SAAM;QACH,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAC5B,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QACjE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,wBAAwB,WAAW,eAAe,CAAC,CAAC;KACxE;IACD,OAAO,KAAK,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;AAChD,CAAC,CAAA;AAED,oCAAoC;AACpC,YAAY,CAAC,SAAS,CAAC,iBAAiB,GAAG,UAAU,QAAQ,EAAE,YAAY;IACvE,OAAO,IAAI,UAAU,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;AAC9D,CAAC,CAAA;AAED,YAAY,CAAC,SAAS,CAAC,eAAe,GAAG;IACrC,IAAI,OAAO,GAAG,IAAI,CAAC;IACnB,IAAI,kBAAkB,GAAG,IAAI,CAAC,8BAA8B,EAAE,CAAC;IAC/D,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,UAAU,SAAS;QAC3C,IAAI,SAAS,YAAY,sBAAsB,EAAE;YAC7C,IAAI,wBAAwB,GAAG,OAAO,CAAC,uBAAuB,CAAC,kBAAkB,EAAE,SAAS,CAAC,CAAC;YAC9F,OAAO,CAAC,gBAAgB,CAAC,SAAS,EAAE,wBAAwB,CAAC,CAAC;SACjE;IACL,CAAC,CAAC,CAAA;AAEN,CAAC,CAAC;AAGF,YAAY,CAAC,SAAS,CAAC,gBAAgB,GAAG,UAAU,kBAAkB,EAAE,mBAAmB;IACvF,IAAI;QACA,IAAI,kBAAkB,GAAG,IAAI,kBAAkB,CAAC,kBAAkB,EAAE,mBAAmB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACtG,kBAAkB,CAAC,UAAU,EAAE,CAAC;KACnC;IAAC,OAAO,CAAC,EAAE;QACR,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,yCAAyC,kBAAkB,CAAC,gBAAgB,cAAc,CAAC,GAAG,CAAC,CAAC;KACpH;AACL,CAAC,CAAA;AAED,YAAY,CAAC,SAAS,CAAC,8BAA8B,GAAG;IACpD,IAAI,OAAO,GAAG,IAAI,CAAC;IACnB,IAAI,kBAAkB,GAAG,EAAE,CAAC;IAC5B,IAAI,eAAe,GAAG,EAAE,CAAC;IACzB,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,UAAU,GAAG;QACrC,IAAI,GAAG,YAAY,sBAAsB,EAAE;YACvC,eAAe,GAAG,eAAe,CAAC,MAAM,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC,CAAC;SACtE;IACL,CAAC,CAAC,CAAC;IACH,eAAe,GAAG,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IAC9D,eAAe,GAAG,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC;IACxD,eAAe,CAAC,OAAO,CAAC,UAAU,QAAQ;QACtC,IAAI,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE;YAC/B,IAAI,SAAS,GAAG,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC;YACzD,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE;gBACrB,kBAAkB,CAAC,QAAQ,CAAC,GAAG,SAAS,CAAC;aAC5C;SACJ;aAAM;YACH,qBAAqB;SACxB;IACL,CAAC,CAAC,CAAC;IACH,OAAO,kBAAkB,CAAC;AAC9B,CAAC,CAAA;AAED,YAAY,CAAC,SAAS,CAAC,uBAAuB,GAAG,UAAU,gBAAgB,EAAE,kBAAkB;IAC3F,IAAI,OAAO,GAAG,IAAI,CAAC;IACnB,IAAI,WAAW,GAAG,kBAAkB,CAAC,kBAAkB,EAAE,CAAC;IAC1D,IAAI,kBAAkB,GAAG,EAAE,CAAC;IAC5B,WAAW,CAAC,OAAO,CAAC,UAAU,UAAU;QACpC,IAAI,gBAAgB,CAAC,UAAU,CAAC,EAAE;YAC9B,kBAAkB,CAAC,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC;SACzD;aAAM;YACH,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,wCAAwC,UAAU,GAAG,CAAC,CAAA;SAC7E;IACL,CAAC,CAAC,CAAA;IACF,OAAO,kBAAkB,CAAC;AAC9B,CAAC,CAAA;AAED,YAAY,CAAC,SAAS,CAAC,WAAW,GAAG,UAAU,YAAY;IACvD,IAAI,cAAc,GAAG,SAAS,CAAC;IAC/B,IAAI,gBAAgB,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;IAC3E,OAAO,UAAU,CAAC,OAAO,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC;AAC9D,CAAC,CAAA;AACD,MAAM,CAAC,OAAO,GAAG,YAAY,CAAC"}
|
|
1
|
+
{"version":3,"file":"files-mapping.js","sourceRoot":"","sources":["../../../build-scanner/js_diff/files-mapping.js"],"names":[],"mappings":"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"}
|
|
@@ -48,18 +48,7 @@ class EnsureFilesHandlerService {
|
|
|
48
48
|
this.handleMappingOneFile(scannedFile, actualScannedFileObject);
|
|
49
49
|
}
|
|
50
50
|
result.files = this.filesDataContainer.files;
|
|
51
|
-
|
|
52
|
-
result.files = this.filePathFixer.fixFilePathes(result.files, this.scmRootDir);
|
|
53
|
-
}
|
|
54
|
-
else {
|
|
55
|
-
// TODO: resolve projectRoot in build-diff-process.ts when it will be merged
|
|
56
|
-
let root = this.opts.projectRoot || process.cwd();
|
|
57
|
-
if (root === '.') {
|
|
58
|
-
root = process.cwd();
|
|
59
|
-
}
|
|
60
|
-
root = (0, path_1.normalize)(root);
|
|
61
|
-
result.files = this.filePathFixer.fixFilePathes(result.files, root);
|
|
62
|
-
}
|
|
51
|
+
result.files = this.filePathFixer.fixFilePathes(result.files, this.resolveProjectRoot());
|
|
63
52
|
this.setCommitIndexes(result.files);
|
|
64
53
|
this.filterIgnoredSourceFiles(result);
|
|
65
54
|
const enricher = new file_enricher_1.FileEnricher(this.logger, this.diagnostic, this.opts, this.scmRootDir, this.filesContainer, this.config);
|
|
@@ -67,6 +56,29 @@ class EnsureFilesHandlerService {
|
|
|
67
56
|
this.deleteRedundantFields(resultAfterEnrich);
|
|
68
57
|
return { output: resultAfterEnrich };
|
|
69
58
|
}
|
|
59
|
+
resolveProjectRoot() {
|
|
60
|
+
// TODO: resolve projectRoot in build-diff-process.ts when it will be merged
|
|
61
|
+
let root;
|
|
62
|
+
if (this.opts.projectRoot) {
|
|
63
|
+
const normalizedRoot = (0, path_1.normalize)(this.opts.projectRoot);
|
|
64
|
+
if (utils.isAbsolutePath(normalizedRoot)) {
|
|
65
|
+
// absolute path is fine
|
|
66
|
+
root = normalizedRoot;
|
|
67
|
+
}
|
|
68
|
+
else {
|
|
69
|
+
// relative path should be resolved first
|
|
70
|
+
root = (0, path_1.resolve)(process.cwd(), normalizedRoot);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
else if (this.opts.scm === 'git') {
|
|
74
|
+
root = this.scmRootDir;
|
|
75
|
+
}
|
|
76
|
+
else {
|
|
77
|
+
root = process.cwd();
|
|
78
|
+
}
|
|
79
|
+
root = utils.adjustPathSlashes(root);
|
|
80
|
+
return root;
|
|
81
|
+
}
|
|
70
82
|
filterIgnoredSourceFiles(result) {
|
|
71
83
|
const ignoredFilesHandler = utils.createSlIgnore(ignored_files_handler_1.IgnoredFilesHandler.GENERATED_IGNORE_FILE_NAME, this.opts, this.logger);
|
|
72
84
|
result.files = result.files.filter(file => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ensure-files-handler.service.js","sourceRoot":"","sources":["../../../build-scanner/mappings/ensure-files-handler.service.ts"],"names":[],"mappings":";;;AAAA,iEAA4D;AAC5D,+
|
|
1
|
+
{"version":3,"file":"ensure-files-handler.service.js","sourceRoot":"","sources":["../../../build-scanner/mappings/ensure-files-handler.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.FileEnricher = void 0;
|
|
4
4
|
const FileSignature = require("../js_diff/file-signature");
|
|
5
5
|
const path = require("path");
|
|
6
|
+
const cockpit_notifier_1 = require("../../common/agent-events/cockpit-notifier");
|
|
6
7
|
const fs = require("fs");
|
|
7
8
|
class FileEnricher {
|
|
8
9
|
constructor(logger, diagnosticCollector, opts, scmRootDir, scmFilesContainer, config) {
|
|
@@ -95,6 +96,20 @@ class FileEnricher {
|
|
|
95
96
|
if (sourceIdx > -1) {
|
|
96
97
|
return sourceIdx;
|
|
97
98
|
}
|
|
99
|
+
/*
|
|
100
|
+
We observed an issue in certain customer applications (typically React with arrow functions)
|
|
101
|
+
where from the source-map module we might receive a miss-matched position of the column index by +1.
|
|
102
|
+
We added the permutation bellow in order to shift the column by 1 index which gives us one additional
|
|
103
|
+
chance to match and enrich the method from the source file.
|
|
104
|
+
https://sealights.atlassian.net/wiki/spaces/DEV/pages/3307667506/Node+Agent+-+Source+File+enrichment+process+index+adjustment+impact
|
|
105
|
+
*/
|
|
106
|
+
const [row, column] = position.split(',');
|
|
107
|
+
const anotherPossiblePosition = `${row},${Number(column) - 1}`;
|
|
108
|
+
const anotherSourceIdx = sourceFilePositionMap[anotherPossiblePosition];
|
|
109
|
+
if (anotherSourceIdx > -1) {
|
|
110
|
+
cockpit_notifier_1.CockpitNotifier.sendWarning(`Position '${position}' not matched at initial map, matched at alternate index '${anotherSourceIdx}' with position data '${anotherPossiblePosition}'`);
|
|
111
|
+
return anotherSourceIdx;
|
|
112
|
+
}
|
|
98
113
|
}
|
|
99
114
|
return -1;
|
|
100
115
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-enricher.js","sourceRoot":"","sources":["../../../build-scanner/mappings/file-enricher.ts"],"names":[],"mappings":";;;AAAA,2DAA4D;AAE5D,6BAA8B;
|
|
1
|
+
{"version":3,"file":"file-enricher.js","sourceRoot":"","sources":["../../../build-scanner/mappings/file-enricher.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ var readJsonSync = require('read-json-sync');
|
|
|
4
4
|
const fileAndFolderUtils = require('./file-and-folder-utils');
|
|
5
5
|
const { IgnoredFilesHandler } = require('../common/ignored-files-handler');
|
|
6
6
|
const { CockpitNotifier } = require('../common/agent-events/cockpit-notifier');
|
|
7
|
+
const path = require('path');
|
|
7
8
|
module.exports = {
|
|
8
9
|
parseToken: function parseToken(parsedToken, parsedArgs) {
|
|
9
10
|
try {
|
|
@@ -39,6 +40,10 @@ module.exports = {
|
|
|
39
40
|
path = (path || "").replace(/\\/g, '/');
|
|
40
41
|
return path;
|
|
41
42
|
},
|
|
43
|
+
isAbsolutePath: function isAbsolutePath(pathStr) {
|
|
44
|
+
// Win absolute path can't be resolved on linux so we should try to use win specific implementation by purpose via path.win32
|
|
45
|
+
return path.posix.isAbsolute(pathStr) || path.win32.isAbsolute(pathStr);
|
|
46
|
+
},
|
|
42
47
|
expandCommaSeparatedValues: function expandCommaSeparatedValues(arr, delim) {
|
|
43
48
|
delim = delim || ',';
|
|
44
49
|
arr = arr || [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../build-scanner/utils.js"],"names":[],"mappings":"AAAA,IAAI,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AACtC,IAAI,SAAS,GAAG,uCAAuC,CAAC;AACxD,IAAI,YAAY,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAC7C,MAAM,kBAAkB,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;AAC9D,MAAM,EAAC,mBAAmB,EAAC,GAAG,OAAO,CAAC,iCAAiC,CAAC,CAAC;AACzE,MAAM,EAAC,eAAe,EAAC,GAAG,OAAO,CAAC,yCAAyC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../build-scanner/utils.js"],"names":[],"mappings":"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"}
|