slnodejs 6.1.1017 → 6.1.1025
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 +3 -3
- package/tsOutputs/build-scanner/instrumentation/browser-instrumenter.js +73 -3
- package/tsOutputs/build-scanner/instrumentation/browser-instrumenter.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/sl-mapper.js +35 -0
- package/tsOutputs/build-scanner/js_diff/sl-mapper.js.map +1 -1
- package/tsOutputs/build-scanner/mappings/ensure-files-handler.service.js +30 -0
- package/tsOutputs/build-scanner/mappings/ensure-files-handler.service.js.map +1 -1
- package/tsOutputs/build-scanner/mappings/file-path-fixer.js +20 -11
- package/tsOutputs/build-scanner/mappings/file-path-fixer.js.map +1 -1
- package/tsOutputs/build-scanner/mappings/files-container.js +2 -1
- package/tsOutputs/build-scanner/mappings/files-container.js.map +1 -1
- package/tsOutputs/cli-parse/cli.js +4 -2
- package/tsOutputs/cli-parse/cli.js.map +1 -1
- package/tsOutputs/cli-parse/contracts.d.ts +2 -0
- package/tsOutputs/cli-parse/contracts.js.map +1 -1
- package/tsOutputs/cli-parse/executors/build-args-dto.js +1 -0
- package/tsOutputs/cli-parse/executors/build-args-dto.js.map +1 -1
- package/tsOutputs/cli-parse/executors/build-executor.js +28 -2
- package/tsOutputs/cli-parse/executors/build-executor.js.map +1 -1
- package/tsOutputs/common/config-process/config.d.ts +1 -0
- package/tsOutputs/common/config-process/config.js +1 -0
- package/tsOutputs/common/config-process/config.js.map +1 -1
- package/tsOutputs/common/constants/sl-env-vars.d.ts +3 -0
- package/tsOutputs/common/constants/sl-env-vars.js +3 -0
- package/tsOutputs/common/constants/sl-env-vars.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/contracts.d.ts +1 -0
- package/tsOutputs/common/footprints-process-v6/hits-collector.d.ts +4 -0
- package/tsOutputs/common/footprints-process-v6/hits-collector.js +21 -1
- package/tsOutputs/common/footprints-process-v6/hits-collector.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/hits-converter.d.ts +1 -1
- package/tsOutputs/common/footprints-process-v6/hits-converter.js +9 -5
- package/tsOutputs/common/footprints-process-v6/hits-converter.js.map +1 -1
- package/tsOutputs/common/utils/tail-file-reader.d.ts +6 -0
- package/tsOutputs/common/utils/tail-file-reader.js +56 -0
- package/tsOutputs/common/utils/tail-file-reader.js.map +1 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "slnodejs",
|
|
3
|
-
"version": "6.1.
|
|
3
|
+
"version": "6.1.1025",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "tsOutputs/api.js",
|
|
6
6
|
"workspaces": [
|
|
@@ -38,6 +38,7 @@
|
|
|
38
38
|
"dependencies": {
|
|
39
39
|
"@babel/generator": "7.18.9",
|
|
40
40
|
"@babel/parser": "7.18.9",
|
|
41
|
+
"@jridgewell/gen-mapping": "0.3.5",
|
|
41
42
|
"ast-traverse": "0.1.1",
|
|
42
43
|
"ast-types": "0.15.1",
|
|
43
44
|
"async": "2.6.4",
|
|
@@ -75,8 +76,7 @@
|
|
|
75
76
|
"triple-beam": "~1.3.0",
|
|
76
77
|
"util": "0.12.4",
|
|
77
78
|
"uuid": "3.1.0",
|
|
78
|
-
"winston": "3.8.0"
|
|
79
|
-
"@jridgewell/gen-mapping": "0.3.5"
|
|
79
|
+
"winston": "3.8.0"
|
|
80
80
|
},
|
|
81
81
|
"devDependencies": {
|
|
82
82
|
"@miovision/eslint-plugin-disallow-date": "2.0.0",
|
|
@@ -11,6 +11,7 @@ var mkdirp = require('mkdirp');
|
|
|
11
11
|
var async = require('async');
|
|
12
12
|
const os = require('os');
|
|
13
13
|
const { promisify } = require('util');
|
|
14
|
+
const path = require('path');
|
|
14
15
|
var fileAndFolderUtils = require('../file-and-folder-utils');
|
|
15
16
|
const { CliProgress } = require("../../common/cli-progress");
|
|
16
17
|
var ValidationUtils = require("../../common/utils/validation-utils").ValidationUtils;
|
|
@@ -25,7 +26,7 @@ var CiaEnvVars = SlEnvVars.CIA;
|
|
|
25
26
|
const request = require('sl-request');
|
|
26
27
|
const requestAsync = promisify(request);
|
|
27
28
|
const { OUT_OF_MEMORY } = require("./process-pool/contracts");
|
|
28
|
-
const { writeFileSync, mkdirSync } = require('fs');
|
|
29
|
+
const { writeFileSync, mkdirSync, createWriteStream } = require('fs');
|
|
29
30
|
const { resolve, dirname } = require('path');
|
|
30
31
|
const { FilesUtils } = require('../../common');
|
|
31
32
|
const PARALLALIZATION_THRESHOLD = 0;
|
|
@@ -93,8 +94,22 @@ BrowserInstrumenter.prototype._onComplete = function (callback) {
|
|
|
93
94
|
if (this.opts.copyAllFilesToOutput) {
|
|
94
95
|
fileAndFolderUtils.copyDir(this.opts.sourceRoot, this.opts.outputPath, this.opts.files, function (err) {
|
|
95
96
|
_this.logger.info(`Finished copying all files to output. Error: ${err}`);
|
|
96
|
-
|
|
97
|
-
|
|
97
|
+
// If embedCorrectUniqueId is enabled, wait for it to complete before continuing
|
|
98
|
+
if (_this.opts.embedCorrectUniqueId) {
|
|
99
|
+
_this._embedCorrectUniqueIdForAllFiles()
|
|
100
|
+
.then(() => {
|
|
101
|
+
_this._printSummaries();
|
|
102
|
+
return callback(err, _this.files);
|
|
103
|
+
})
|
|
104
|
+
.catch((embedError) => {
|
|
105
|
+
_this.logger.error(`Error embedding unique ids: ${embedError}`);
|
|
106
|
+
return callback(embedError, _this.files);
|
|
107
|
+
});
|
|
108
|
+
}
|
|
109
|
+
else {
|
|
110
|
+
_this._printSummaries();
|
|
111
|
+
return callback(err, _this.files);
|
|
112
|
+
}
|
|
98
113
|
});
|
|
99
114
|
}
|
|
100
115
|
else {
|
|
@@ -124,6 +139,57 @@ BrowserInstrumenter.prototype._onFileInstrumented = function (inputFile) {
|
|
|
124
139
|
this.files.instrumented.push(inputFile);
|
|
125
140
|
this.logger.debug(`Processed '${inputFile}'.`);
|
|
126
141
|
};
|
|
142
|
+
BrowserInstrumenter.prototype._embedCorrectUniqueIdForAllFiles = function () {
|
|
143
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
144
|
+
const BATCH_SIZE = this.opts.embedCorrectUniqueIdFileBatchSize;
|
|
145
|
+
const files = [...this.files.instrumented];
|
|
146
|
+
// Process files in batches
|
|
147
|
+
for (let i = 0; i < files.length; i += BATCH_SIZE) {
|
|
148
|
+
const batchNumber = i / BATCH_SIZE + 1;
|
|
149
|
+
const totalBatches = Math.ceil(files.length / BATCH_SIZE);
|
|
150
|
+
this.logger.debug(`Embedding correct unique id for batch ${batchNumber} of ${totalBatches}`);
|
|
151
|
+
const batch = files.slice(i, i + BATCH_SIZE);
|
|
152
|
+
const promises = batch.map(inputFile => this._embedUniqueIdForFile(inputFile));
|
|
153
|
+
try {
|
|
154
|
+
yield Promise.all(promises);
|
|
155
|
+
this.logger.debug(`Batch processing completed for batch ${batchNumber} of ${totalBatches}`);
|
|
156
|
+
}
|
|
157
|
+
catch (error) {
|
|
158
|
+
this.logger.error(`Batch processing failed: ${error}`);
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
});
|
|
162
|
+
};
|
|
163
|
+
BrowserInstrumenter.prototype._embedUniqueIdForFile = function (inputFile) {
|
|
164
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
165
|
+
const inputFilePath = path.resolve(this.opts.sourceRoot, inputFile);
|
|
166
|
+
const outputFilePath = path.resolve(this.opts.outputPath, inputFile);
|
|
167
|
+
try {
|
|
168
|
+
this.logger.debug(`Embedding correct unique id for '${inputFilePath}'.`);
|
|
169
|
+
const slMappingContent = this.slMapper.getEmbeddedFileContent(inputFilePath);
|
|
170
|
+
if (!slMappingContent.length) {
|
|
171
|
+
return;
|
|
172
|
+
}
|
|
173
|
+
yield new Promise((resolve, reject) => {
|
|
174
|
+
const writeStream = createWriteStream(outputFilePath, { flags: 'a' });
|
|
175
|
+
writeStream.on('error', (error) => {
|
|
176
|
+
this.logger.error(`Write stream error for '${inputFilePath}': ${error}`);
|
|
177
|
+
reject(error);
|
|
178
|
+
});
|
|
179
|
+
writeStream.on('finish', () => {
|
|
180
|
+
this.logger.debug(`Embedded correct unique id for '${inputFilePath}'.`);
|
|
181
|
+
resolve();
|
|
182
|
+
});
|
|
183
|
+
writeStream.write(slMappingContent);
|
|
184
|
+
writeStream.end();
|
|
185
|
+
});
|
|
186
|
+
}
|
|
187
|
+
catch (error) {
|
|
188
|
+
this.logger.error(`Failed to embed correct unique id for '${inputFilePath}'. Error: ${error}`);
|
|
189
|
+
throw error;
|
|
190
|
+
}
|
|
191
|
+
});
|
|
192
|
+
};
|
|
127
193
|
BrowserInstrumenter.prototype._validate = function (callback) {
|
|
128
194
|
var _a, _b;
|
|
129
195
|
var opts = this.opts;
|
|
@@ -428,9 +494,13 @@ BrowserInstrumenter.prototype._formatErrorMessage = function (fileWithErrors) {
|
|
|
428
494
|
});
|
|
429
495
|
return messageFormatter.content;
|
|
430
496
|
};
|
|
497
|
+
BrowserInstrumenter.prototype._setEmbedCorrectUniqueIdFileBatchSize = function (batchSize) {
|
|
498
|
+
this.opts.embedCorrectUniqueIdFileBatchSize = batchSize;
|
|
499
|
+
};
|
|
431
500
|
BrowserInstrumenter.prototype.createConfigObject = function (opts, workspacePath) {
|
|
432
501
|
// Should load all env vars starting With 'SL_'
|
|
433
502
|
var agentConfig = new ConfigLoader().loadAgentConfiguration();
|
|
503
|
+
this._setEmbedCorrectUniqueIdFileBatchSize(agentConfig.embedCorrectUniqueIdFileBatchSize.value);
|
|
434
504
|
// TODO - why don't we copy opts as a whole and just override the fields that require logic?
|
|
435
505
|
const configObject = {
|
|
436
506
|
customerId: opts.customerId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser-instrumenter.js","sourceRoot":"","sources":["../../../build-scanner/instrumentation/browser-instrumenter.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"browser-instrumenter.js","sourceRoot":"","sources":["../../../build-scanner/instrumentation/browser-instrumenter.js"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,8 @@ exports.BrowserSlMapper = exports.NodeV8RawCoverageSlMapper = exports.SlMapper =
|
|
|
13
13
|
const fs_1 = require("fs");
|
|
14
14
|
const path_1 = require("path");
|
|
15
15
|
const mkdirp_1 = require("mkdirp");
|
|
16
|
+
const sl_mapper_tokenizer_1 = require("../../common/sl-mapper-tokenizer");
|
|
17
|
+
const files_container_1 = require("../mappings/files-container");
|
|
16
18
|
/**
|
|
17
19
|
* Map between uniqueId in generated file to relevant uniqueId in source file.
|
|
18
20
|
* This object will be added to 'window' object due to instrumentation, in order to resolve uniquId's in browser agent
|
|
@@ -33,6 +35,9 @@ class SlMapper {
|
|
|
33
35
|
addUniqueIdMapping(_sourceUniqueId, _targetUniqueId) {
|
|
34
36
|
return;
|
|
35
37
|
}
|
|
38
|
+
addEmbeddedMapping(filePath, mapping) {
|
|
39
|
+
return;
|
|
40
|
+
}
|
|
36
41
|
toJSON() {
|
|
37
42
|
const mappings = {};
|
|
38
43
|
this._sourcePathMappings.forEach((value, key) => {
|
|
@@ -76,6 +81,10 @@ class NodeV8RawCoverageSlMapper extends SlMapper {
|
|
|
76
81
|
}
|
|
77
82
|
exports.NodeV8RawCoverageSlMapper = NodeV8RawCoverageSlMapper;
|
|
78
83
|
class BrowserSlMapper extends SlMapper {
|
|
84
|
+
constructor() {
|
|
85
|
+
super(...arguments);
|
|
86
|
+
this.embeddedMapping = {};
|
|
87
|
+
}
|
|
79
88
|
addFileMapping(_sourcePath, _targetPath) {
|
|
80
89
|
// We don't need file mapping for browser agent
|
|
81
90
|
return;
|
|
@@ -83,6 +92,10 @@ class BrowserSlMapper extends SlMapper {
|
|
|
83
92
|
addUniqueIdMapping(sourcePath, targetPath) {
|
|
84
93
|
this._sourcePathMappings.set(sourcePath, targetPath);
|
|
85
94
|
}
|
|
95
|
+
addEmbeddedMapping(filePath, mapping) {
|
|
96
|
+
this.logger.debug(`Adding embedded mapping for file: ${filePath}`);
|
|
97
|
+
this.embeddedMapping[filePath] = mapping;
|
|
98
|
+
}
|
|
86
99
|
writeToFile() {
|
|
87
100
|
const filePath = (0, path_1.resolve)(this.outputPath);
|
|
88
101
|
const outputFolder = (0, path_1.dirname)(filePath);
|
|
@@ -95,6 +108,28 @@ class BrowserSlMapper extends SlMapper {
|
|
|
95
108
|
this.logger.error(`Failed to write sl-mapping file Error: ${e}`);
|
|
96
109
|
}
|
|
97
110
|
}
|
|
111
|
+
getEmbeddedFileContent(filePath) {
|
|
112
|
+
const filePaths = (0, files_container_1.iterateSubPathes)(filePath);
|
|
113
|
+
let fileContent = '';
|
|
114
|
+
for (const possibleFilePath of filePaths) {
|
|
115
|
+
if (!this.embeddedMapping[possibleFilePath]) {
|
|
116
|
+
this.logger.debug(`No embedded mapping found for file using key: ${possibleFilePath}`);
|
|
117
|
+
continue;
|
|
118
|
+
}
|
|
119
|
+
this.logger.debug(`Found embedded mapping for file using key: ${possibleFilePath}`);
|
|
120
|
+
const tokenizedMapping = new sl_mapper_tokenizer_1.SlMapperTokenizer().tokenizeSlMapping(this.embeddedMapping[possibleFilePath]);
|
|
121
|
+
fileContent += `\nif(window) {\n` +
|
|
122
|
+
` window.slMappings = window.slMappings || {};\n` +
|
|
123
|
+
` window.slMappings['${this.buildSessionId}'] = window.slMappings['${this.buildSessionId}'] || {};\n` +
|
|
124
|
+
` Object.assign(window.slMappings['${this.buildSessionId}'], ${JSON.stringify(tokenizedMapping)});\n` +
|
|
125
|
+
`}`;
|
|
126
|
+
}
|
|
127
|
+
if (!fileContent.length) {
|
|
128
|
+
this.logger.debug(`No embedded mapping found for file using all possible keys: ${filePath}`);
|
|
129
|
+
return '';
|
|
130
|
+
}
|
|
131
|
+
return fileContent;
|
|
132
|
+
}
|
|
98
133
|
getFileContent() {
|
|
99
134
|
return 'var slMapping =' + JSON.stringify(this.toJSON(), null, '\t') + '\n' +
|
|
100
135
|
' if(window && (!window.$Sealights || !window.$Sealights.slMapping)){\n' +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sl-mapper.js","sourceRoot":"","sources":["../../../build-scanner/js_diff/sl-mapper.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,2BAAiC;AACjC,+BAAsC;AACtC,mCAA4B;
|
|
1
|
+
{"version":3,"file":"sl-mapper.js","sourceRoot":"","sources":["../../../build-scanner/js_diff/sl-mapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ const SourceFileNotifier = require("../js_diff/source-files-notifier");
|
|
|
10
10
|
const utils = require("../utils");
|
|
11
11
|
const ignored_files_handler_1 = require("../../common/ignored-files-handler");
|
|
12
12
|
const data_cleansing_utils_1 = require("../../common/utils/data-cleansing-utils");
|
|
13
|
+
const fs_1 = require("fs");
|
|
13
14
|
class EnsureFilesHandlerService {
|
|
14
15
|
constructor(logger, opts, filesContainer, filePathFixer, scmRootDir, config, fileToCommitsMap, diagnostic) {
|
|
15
16
|
this.logger = logger;
|
|
@@ -39,6 +40,7 @@ class EnsureFilesHandlerService {
|
|
|
39
40
|
this.sourceFilesNotifier = new SourceFileNotifier(logger);
|
|
40
41
|
}
|
|
41
42
|
ensureProcess(req) {
|
|
43
|
+
const filesToAppendUniqueId = [];
|
|
42
44
|
const result = Object.assign(Object.assign({}, req), { files: [] });
|
|
43
45
|
if (this.config.removeSensitiveData) {
|
|
44
46
|
result.meta = data_cleansing_utils_1.DataCleansingUtils.removeSensitiveData(req.meta);
|
|
@@ -46,6 +48,15 @@ class EnsureFilesHandlerService {
|
|
|
46
48
|
for (const scannedFile of req.files) {
|
|
47
49
|
const actualScannedFileObject = new ActualFile(scannedFile.logicalPath, scannedFile.absolutePath);
|
|
48
50
|
this.handleMappingOneFile(scannedFile, actualScannedFileObject);
|
|
51
|
+
// Only append unique id details if autoResolveProjectRoot is true and the file has methods so we don't write to the file unnecesarily
|
|
52
|
+
// This is done in two-stages on purpose, because at this stage we already have the content so we don't need to read it again later on
|
|
53
|
+
// But at this stage we don't have the uniqueIdKey so we need to read it again later on, which is a cheaper operation
|
|
54
|
+
if (this.opts.autoResolveProjectRoot && scannedFile.methods.length > 0) {
|
|
55
|
+
filesToAppendUniqueId.push({
|
|
56
|
+
absolutePath: scannedFile.absolutePath,
|
|
57
|
+
content: actualScannedFileObject.getContent(),
|
|
58
|
+
});
|
|
59
|
+
}
|
|
49
60
|
}
|
|
50
61
|
result.files = this.filesDataContainer.files;
|
|
51
62
|
result.files = this.filePathFixer.fixFilePathes(result.files);
|
|
@@ -57,8 +68,27 @@ class EnsureFilesHandlerService {
|
|
|
57
68
|
if (this.config.excludeNestedMethods) {
|
|
58
69
|
this.deleteNestedAnonymousMethods(resultAfterEnrich);
|
|
59
70
|
}
|
|
71
|
+
filesToAppendUniqueId.forEach((fileDetails, index) => {
|
|
72
|
+
this.appendUniqueIdToFile(fileDetails.absolutePath, fileDetails.content, resultAfterEnrich.files[index].methods[0]);
|
|
73
|
+
});
|
|
60
74
|
return { output: resultAfterEnrich };
|
|
61
75
|
}
|
|
76
|
+
/**
|
|
77
|
+
* At the bottom of the file add a new line with a comment of the format // SL_UNIQUE_ID_KEY: {uniqueIdKey}
|
|
78
|
+
* We use this to construct the footprints during the coverage-listening stage by taking the uniqueIdKey from the file itself and adding just the method position
|
|
79
|
+
* Since path calculations can be unreliable due to transformations we use uniqueIdSample which we are sure is the final format of the uniqueId
|
|
80
|
+
*/
|
|
81
|
+
appendUniqueIdToFile(absolutePath, fileContent, methodSample) {
|
|
82
|
+
try {
|
|
83
|
+
const uniqueIdSample = methodSample.uniqueId;
|
|
84
|
+
const uniqueIdKey = uniqueIdSample.split('@')[0];
|
|
85
|
+
this.logger.debug(`Appending uniqueId to file ${absolutePath} with uniqueIdKey ${uniqueIdKey}`);
|
|
86
|
+
(0, fs_1.writeFileSync)(absolutePath, fileContent + `\n// SL_UNIQUE_ID_KEY: ${uniqueIdKey}`);
|
|
87
|
+
}
|
|
88
|
+
catch (e) {
|
|
89
|
+
this.logger.error(`Error appending uniqueId to file ${absolutePath}: ${e}. This might result in no coverage for this file in the coverage-listening stage.`);
|
|
90
|
+
}
|
|
91
|
+
}
|
|
62
92
|
filterIgnoredSourceFiles(result) {
|
|
63
93
|
const ignoredFilesHandler = utils.createSlIgnore(ignored_files_handler_1.IgnoredFilesHandler.GENERATED_IGNORE_FILE_NAME, this.opts, this.logger);
|
|
64
94
|
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,+BAAiC;AAEjC,yDAA0D;AAC1D,6DAAgE;AAChE,mDAAkF;AAClF,uEAAwE;AACxE,kCAAoC;AACpC,8EAAuE;AAIvE,kFAA2E;AAC3E,MAAa,yBAAyB;IAsBlC,YACqB,MAAM,EACf,IAAS,EACT,cAAiC,EACjC,aAA6B,EAC7B,UAAkB,EAClB,MAAkC,EAClC,gBAA2C,EAClC,UAA+B;QAP/B,WAAM,GAAN,MAAM,CAAA;QACf,SAAI,GAAJ,IAAI,CAAK;QACT,mBAAc,GAAd,cAAc,CAAmB;QACjC,kBAAa,GAAb,aAAa,CAAgB;QAC7B,eAAU,GAAV,UAAU,CAAQ;QAClB,WAAM,GAAN,MAAM,CAA4B;QAClC,qBAAgB,GAAhB,gBAAgB,CAA2B;QAClC,eAAU,GAAV,UAAU,CAAqB;QA5BnC,mBAAc,GAAG,aAAa,CAAC;QAC/B,2BAAsB,GAAG,mBAAmB,CAAC;QAC7C,sBAAiB,GAAG,QAAQ,CAAC;QAC7B,sBAAiB,GAAG,WAAW,CAAC;QAChC,qBAAgB,GAAG,UAAU,CAAC;QAC9B,0BAAqB,GAAG,GAAG,CAAC,CAAC,0CAA0C;QACvE,iBAAY,GAAG,cAAc,CAAC;QAC9B,0BAAqB,GAAG;YACrC,IAAI,CAAC,sBAAsB;YAC3B,IAAI,CAAC,iBAAiB;YACtB,IAAI,CAAC,qBAAqB;YAC1B,IAAI,CAAC,YAAY;YACjB,IAAI,CAAC,iBAAiB;YACtB,IAAI,CAAC,gBAAgB;SAExB,CAAC;QAEM,uBAAkB,GAAG,IAAI,yCAAkB,EAAE,CAAC;QAYlD,IAAI,CAAC,mBAAmB,GAAG,IAAI,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAC9D,CAAC;IAED,aAAa,CAAC,GAAwB;QAClC,MAAM,MAAM,mCACL,GAAG,KACN,KAAK,EAAE,EAAE,GACZ,CAAC;QACF,IAAI,IAAI,CAAC,MAAM,CAAC,mBAAmB,EAAE;YACjC,MAAM,CAAC,IAAI,GAAG,yCAAkB,CAAC,mBAAmB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;SAClE;QAED,KAAK,MAAM,WAAW,IAAI,GAAG,CAAC,KAAK,EAAE;YACjC,MAAM,uBAAuB,GAAG,IAAI,UAAU,CAAC,WAAW,CAAC,WAAW,EAAE,WAAW,CAAC,YAAY,CAAC,CAAC;YAClG,IAAI,CAAC,oBAAoB,CAAC,WAAW,EAAE,uBAAuB,CAAC,CAAC;
|
|
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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"}
|
|
@@ -17,6 +17,7 @@ class FilePathFixer {
|
|
|
17
17
|
this.prefix = '';
|
|
18
18
|
this.projectRoot = '';
|
|
19
19
|
this.removeAutoGeneratedFiles = false;
|
|
20
|
+
this.embeddedMapping = {};
|
|
20
21
|
validation_utils_1.ValidationUtils.verifyNotNullOrEmptyMultiParams([
|
|
21
22
|
{ value: filesContainer, paramName: 'filesContainer' },
|
|
22
23
|
{ value: slMapper, paramName: 'slMapper' },
|
|
@@ -67,8 +68,21 @@ class FilePathFixer {
|
|
|
67
68
|
for (const fileToFix of duplicatesMatchFiles) {
|
|
68
69
|
this.fixOneFile(fileToFix, `${prefixToAdd}${fileToFix.logicalPath}`);
|
|
69
70
|
}
|
|
71
|
+
if (this.embedCorrectUniqueId) {
|
|
72
|
+
Object.keys(this.embeddedMapping).forEach(filePath => {
|
|
73
|
+
this.slMapper.addEmbeddedMapping(filePath, this.embeddedMapping[filePath]);
|
|
74
|
+
});
|
|
75
|
+
}
|
|
70
76
|
return uniqueFiles;
|
|
71
77
|
}
|
|
78
|
+
addEmbeddedMapping(filePath, mapping) {
|
|
79
|
+
if (this.embeddedMapping[filePath]) {
|
|
80
|
+
this.embeddedMapping[filePath][mapping.sourcePath] = mapping.targetPath;
|
|
81
|
+
}
|
|
82
|
+
else {
|
|
83
|
+
this.embeddedMapping[filePath] = { [mapping.sourcePath]: mapping.targetPath };
|
|
84
|
+
}
|
|
85
|
+
}
|
|
72
86
|
fixOneFile(file, filePath) {
|
|
73
87
|
const fixedFilePath = files_utils_1.FilesUtils.adjustPathSlashes(filePath);
|
|
74
88
|
this.slMapper.addFileMapping(file.logicalPath, fixedFilePath);
|
|
@@ -76,12 +90,6 @@ class FilePathFixer {
|
|
|
76
90
|
file.physicalPath = fixedFilePath;
|
|
77
91
|
file.absolutePath = this.getAbsolutePath(fixedFilePath);
|
|
78
92
|
file.methods.forEach(method => {
|
|
79
|
-
// Use the uniqueIdKey which is the generated data key (matches nyc) as uniqueId
|
|
80
|
-
if (this.embedCorrectUniqueId) {
|
|
81
|
-
method.uniqueId = method.uniqueIdKey;
|
|
82
|
-
delete method.uniqueIdKey;
|
|
83
|
-
return;
|
|
84
|
-
}
|
|
85
93
|
method.uniqueId = `${file.logicalPath}@${method.position.join(',')}`;
|
|
86
94
|
if (this.isRawCoverage) {
|
|
87
95
|
const pathToScannedFile = this.getPathFromUniqueIdKey(method.uniqueIdKey);
|
|
@@ -91,18 +99,19 @@ class FilePathFixer {
|
|
|
91
99
|
});
|
|
92
100
|
}
|
|
93
101
|
this.slMapper.addUniqueIdMapping(method.uniqueIdKey, method.uniqueId);
|
|
102
|
+
if (this.embedCorrectUniqueId) {
|
|
103
|
+
this.addEmbeddedMapping(file.transpiledFile, { sourcePath: method.uniqueIdKey, targetPath: method.uniqueId });
|
|
104
|
+
}
|
|
94
105
|
delete method.uniqueIdKey;
|
|
95
106
|
});
|
|
96
107
|
// TODO: do that only when --usebranchcoverage provided
|
|
97
108
|
file.branches.forEach(branch => {
|
|
98
109
|
const position = (0, file_element_utils_1.getBranchPosition)(branch);
|
|
99
|
-
if (this.embedCorrectUniqueId) {
|
|
100
|
-
branch.uniqueId = branch.uniqueIdKey;
|
|
101
|
-
delete branch.uniqueIdKey;
|
|
102
|
-
return;
|
|
103
|
-
}
|
|
104
110
|
branch.uniqueId = `${file.logicalPath}|${position.join(',')}|${branch.index}`;
|
|
105
111
|
this.slMapper.addUniqueIdMapping(branch.uniqueIdKey, branch.uniqueId);
|
|
112
|
+
if (this.embedCorrectUniqueId) {
|
|
113
|
+
this.addEmbeddedMapping(file.transpiledFile, { sourcePath: branch.uniqueIdKey, targetPath: branch.uniqueId });
|
|
114
|
+
}
|
|
106
115
|
delete branch.uniqueIdKey;
|
|
107
116
|
});
|
|
108
117
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-path-fixer.js","sourceRoot":"","sources":["../../../build-scanner/mappings/file-path-fixer.ts"],"names":[],"mappings":";;;AAAA,+BAAiD;AAEjD,gEAA4D;AAE5D,6DAAyD;AAEzD,iFAA6E;AAI7E,0EAAsE;AAEtE,MAAa,aAAa;
|
|
1
|
+
{"version":3,"file":"file-path-fixer.js","sourceRoot":"","sources":["../../../build-scanner/mappings/file-path-fixer.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.FilesContainer = void 0;
|
|
12
|
+
exports.iterateSubPathes = exports.FilesContainer = void 0;
|
|
13
13
|
const glob_1 = require("glob");
|
|
14
14
|
const utils = require("../utils");
|
|
15
15
|
/**
|
|
@@ -86,4 +86,5 @@ function* iterateSubPathes(filePath) {
|
|
|
86
86
|
yield key;
|
|
87
87
|
}
|
|
88
88
|
}
|
|
89
|
+
exports.iterateSubPathes = iterateSubPathes;
|
|
89
90
|
//# sourceMappingURL=files-container.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"files-container.js","sourceRoot":"","sources":["../../../build-scanner/mappings/files-container.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAA4B;AAE5B,kCAAkC;AAElC;;GAEG;AACH,MAAa,cAAc;IAEvB,YAAsB,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;QAChC,IAAI,CAAC,oBAAoB,GAAG,EAAE,CAAC;IACnC,CAAC;IAED,MAAM,CAAO,MAAM,CAAC,MAAc,EAAE,cAAsB,OAAO,CAAC,GAAG,EAAE,EAAE,SAA4B,iBAAiB;;YAClH,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC,MAAM,CAAC,CAAC;YAElD,MAAM,KAAK,GAAG,WAAI,CAAC,IAAI,CAAC,MAAM,EAAE;gBAC5B,GAAG,EAAE,WAAW;gBAChB,MAAM;gBACN,KAAK,EAAE,IAAI;aACd,CAAC,CAAA;YAEF,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;gBACrB,cAAc,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YACzC,CAAC,CAAC,CAAC;YACH,OAAO,cAAc,CAAC;QAC1B,CAAC;KAAA;IAED,MAAM,CAAO,eAAe,CAAC,MAAc,EAAE,KAAe;;YACxD,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC,MAAM,CAAC,CAAC;YAClD,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;gBACrB,cAAc,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YACzC,CAAC,CAAC,CAAC;YACH,OAAO,cAAc,CAAC;QAC1B,CAAC;KAAA;IAED;;;;;;OAMG;IACH,WAAW,CAAC,QAAgB;QACxB,KAAK,MAAM,OAAO,IAAI,gBAAgB,CAAC,QAAQ,CAAC,EAAE;YAC9C,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YAC9E,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACrD;IACL,CAAC;IAED;;OAEG;IACH,WAAW,CAAC,WAAmB;QAC3B,IAAI,UAAU,GAAa,IAAI,CAAC;QAChC,KAAK,MAAM,OAAO,IAAI,gBAAgB,CAAC,WAAW,CAAC,EAAE;YACjD,UAAU,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC;YACxD,IAAI,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,MAAK,CAAC,EAAE;gBAC1B,MAAM;aACT;SACJ;QAED,IAAI,UAAU,KAAK,IAAI,EAAE;YACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC;SACtD;QAED,OAAO,UAAU,CAAC;IACtB,CAAC;IAES,cAAc,CAAC,WAAW;QAChC,OAAO,GAAG,WAAW,kCAAkC,CAAC;IAC5D,CAAC;CACJ;AAjED,wCAiEC;AAED,
|
|
1
|
+
{"version":3,"file":"files-container.js","sourceRoot":"","sources":["../../../build-scanner/mappings/files-container.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAA4B;AAE5B,kCAAkC;AAElC;;GAEG;AACH,MAAa,cAAc;IAEvB,YAAsB,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;QAChC,IAAI,CAAC,oBAAoB,GAAG,EAAE,CAAC;IACnC,CAAC;IAED,MAAM,CAAO,MAAM,CAAC,MAAc,EAAE,cAAsB,OAAO,CAAC,GAAG,EAAE,EAAE,SAA4B,iBAAiB;;YAClH,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC,MAAM,CAAC,CAAC;YAElD,MAAM,KAAK,GAAG,WAAI,CAAC,IAAI,CAAC,MAAM,EAAE;gBAC5B,GAAG,EAAE,WAAW;gBAChB,MAAM;gBACN,KAAK,EAAE,IAAI;aACd,CAAC,CAAA;YAEF,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;gBACrB,cAAc,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YACzC,CAAC,CAAC,CAAC;YACH,OAAO,cAAc,CAAC;QAC1B,CAAC;KAAA;IAED,MAAM,CAAO,eAAe,CAAC,MAAc,EAAE,KAAe;;YACxD,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC,MAAM,CAAC,CAAC;YAClD,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;gBACrB,cAAc,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YACzC,CAAC,CAAC,CAAC;YACH,OAAO,cAAc,CAAC;QAC1B,CAAC;KAAA;IAED;;;;;;OAMG;IACH,WAAW,CAAC,QAAgB;QACxB,KAAK,MAAM,OAAO,IAAI,gBAAgB,CAAC,QAAQ,CAAC,EAAE;YAC9C,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YAC9E,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACrD;IACL,CAAC;IAED;;OAEG;IACH,WAAW,CAAC,WAAmB;QAC3B,IAAI,UAAU,GAAa,IAAI,CAAC;QAChC,KAAK,MAAM,OAAO,IAAI,gBAAgB,CAAC,WAAW,CAAC,EAAE;YACjD,UAAU,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC;YACxD,IAAI,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,MAAK,CAAC,EAAE;gBAC1B,MAAM;aACT;SACJ;QAED,IAAI,UAAU,KAAK,IAAI,EAAE;YACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC;SACtD;QAED,OAAO,UAAU,CAAC;IACtB,CAAC;IAES,cAAc,CAAC,WAAW;QAChC,OAAO,GAAG,WAAW,kCAAkC,CAAC;IAC5D,CAAC;CACJ;AAjED,wCAiEC;AAED,QAAe,CAAC,CAAC,gBAAgB,CAAC,QAAgB;IAC9C,MAAM,kBAAkB,GAAG,KAAK,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAC7D,MAAM,KAAK,GAAG,kBAAkB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAE5C,KAAK,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;QACnC,MAAM,YAAY,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;QACtC,MAAM,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAChD,MAAM,GAAG,CAAC;KACb;AACL,CAAC;AATD,4CASC"}
|
|
@@ -125,12 +125,13 @@ const options = {
|
|
|
125
125
|
'enableLineCoverage': 'Enable line level mapping for coverage in this build',
|
|
126
126
|
'splitPreambleIntoFile': 'Move the instrumentation config to a separate file, this requires the file to be available through the CDN.',
|
|
127
127
|
'useRelativeSlMapping': 'Key in sl-mapping will be relative to worspacepath, make sure to use when scanning an application which will be statically instruemented afterwards.',
|
|
128
|
-
'embedCorrectUniqueId': '
|
|
128
|
+
'embedCorrectUniqueId': 'Embeds the uniqueId mapping in the instrumented files',
|
|
129
129
|
'preambleFileName': 'Used together with splitPreambleIntoFile to define a custom name (default: sl-preamble-config.js)',
|
|
130
130
|
'preambleFileUrl': `Used together with preambleFileName to define a custom url (default: "" which equals to root,
|
|
131
131
|
you can pass like https://example.com/a/b/c or relative like a/b/c).
|
|
132
132
|
** Important: Only use this if you need a different server than the one used for the instrumented files,
|
|
133
|
-
** Important: actual url will be {preambleFileUrl}/{preambleFileName}
|
|
133
|
+
** Important: actual url will be {preambleFileUrl}/{preambleFileName}`,
|
|
134
|
+
'autoResolveProjectRoot': 'Turns on auto resolve project root, when this feature is enabled additional data will be appended to the end of the scanned code, which will be used to resolve the project root when running with a test listener',
|
|
134
135
|
};
|
|
135
136
|
const customCommander = new custom_commander_1.CustomCommander();
|
|
136
137
|
const program = customCommander.getCommander();
|
|
@@ -261,6 +262,7 @@ function createBuildOptions({ command, description }) {
|
|
|
261
262
|
.option('--embedCorrectUniqueId', options.embedCorrectUniqueId, false)
|
|
262
263
|
.option('--preambleFileName <preambleFileName>', options.preambleFileName)
|
|
263
264
|
.option('--preambleFileUrl <preambleFileUrl>', options.preambleFileUrl)
|
|
265
|
+
.option('--autoResolveProjectRoot', options.autoResolveProjectRoot, false)
|
|
264
266
|
.action(function (cmd) {
|
|
265
267
|
return __awaiter(this, void 0, void 0, function* () {
|
|
266
268
|
setWorkspacepath(cmd);
|