slnodejs 6.1.1028 → 6.1.1030
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/mappings/ensure-files-handler.service.js +16 -10
- package/tsOutputs/build-scanner/mappings/ensure-files-handler.service.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/contracts.d.ts +1 -1
- package/tsOutputs/common/footprints-process-v6/hits-collector.d.ts +2 -2
- package/tsOutputs/common/footprints-process-v6/hits-collector.js +6 -6
- package/tsOutputs/common/footprints-process-v6/hits-collector.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/hits-converter.d.ts +2 -1
- package/tsOutputs/common/footprints-process-v6/hits-converter.js +43 -8
- package/tsOutputs/common/footprints-process-v6/hits-converter.js.map +1 -1
- package/tsOutputs/common/source-map-reader.js +11 -3
- package/tsOutputs/common/source-map-reader.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "slnodejs",
|
|
3
|
-
"version": "6.1.
|
|
3
|
+
"version": "6.1.1030",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "tsOutputs/api.js",
|
|
6
6
|
"workspaces": [
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
"chalk": "2.4.1",
|
|
46
46
|
"cli-progress": "3.11.2",
|
|
47
47
|
"commander": "4.1.0",
|
|
48
|
-
"
|
|
48
|
+
"cookie": "1.0.2",
|
|
49
49
|
"fileset": "2.0.3",
|
|
50
50
|
"glob": "8.1.0",
|
|
51
51
|
"ignore": "5.2.0",
|
|
@@ -53,7 +53,6 @@
|
|
|
53
53
|
"istanbul-lib-instrument": "3.0.0",
|
|
54
54
|
"istanbul-lib-source-maps": "^4.0.1",
|
|
55
55
|
"jwt-decode": "3.1.2",
|
|
56
|
-
"cookie": "1.0.2",
|
|
57
56
|
"lodash.clonedeep": "^4.5.0",
|
|
58
57
|
"lodash.filter": "^4.6.0",
|
|
59
58
|
"lodash.flatmap": "^4.5.0",
|
|
@@ -68,6 +67,7 @@
|
|
|
68
67
|
"read-json-sync": "1.1.1",
|
|
69
68
|
"rimraf": "3.0.2",
|
|
70
69
|
"shell-quote": "1.7.3",
|
|
70
|
+
"sl-convert-source-map": "^1.0.1",
|
|
71
71
|
"sl-esprima-ast-utils": "0.0.7",
|
|
72
72
|
"sl-istanbul-lib-instrument": "6.0.2",
|
|
73
73
|
"sl-request": "1.0.5",
|
|
@@ -54,6 +54,7 @@ class EnsureFilesHandlerService {
|
|
|
54
54
|
if (this.opts.autoResolveProjectRoot && scannedFile.methods.length > 0) {
|
|
55
55
|
filesToAppendUniqueId.push({
|
|
56
56
|
absolutePath: scannedFile.absolutePath,
|
|
57
|
+
physicalPath: scannedFile.physicalPath,
|
|
57
58
|
content: actualScannedFileObject.getContent(),
|
|
58
59
|
});
|
|
59
60
|
}
|
|
@@ -68,25 +69,30 @@ class EnsureFilesHandlerService {
|
|
|
68
69
|
if (this.config.excludeNestedMethods) {
|
|
69
70
|
this.deleteNestedAnonymousMethods(resultAfterEnrich);
|
|
70
71
|
}
|
|
71
|
-
filesToAppendUniqueId.forEach((fileDetails
|
|
72
|
-
|
|
72
|
+
filesToAppendUniqueId.forEach((fileDetails) => {
|
|
73
|
+
const uniqueMethodsIdPrefixes = new Set(resultAfterEnrich.files.reduce((accumulator, current) => {
|
|
74
|
+
if (current.transpiledFile === fileDetails.physicalPath) {
|
|
75
|
+
return [...accumulator, ...current.methods.map(method => method.uniqueId.split('@')[0])];
|
|
76
|
+
}
|
|
77
|
+
return accumulator;
|
|
78
|
+
}, []));
|
|
79
|
+
this.appendUniqueIdsToFile(fileDetails.absolutePath, fileDetails.content, Array.from(uniqueMethodsIdPrefixes));
|
|
73
80
|
});
|
|
74
81
|
return { output: resultAfterEnrich };
|
|
75
82
|
}
|
|
76
83
|
/**
|
|
77
|
-
* At the bottom of the file add a new line with a comment of the format //
|
|
84
|
+
* At the bottom of the file add a new line with a comment of the format // SL_UNIQUE_ID_KEYS: {uniqueIdKey1},{uniqueIdKey2}
|
|
78
85
|
* 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
|
|
86
|
+
* Since path calculations can be unreliable due to transformations we use uniqueMethodIdPrefixes which we are sure is the final format of the uniqueIds
|
|
80
87
|
*/
|
|
81
|
-
|
|
88
|
+
appendUniqueIdsToFile(absolutePath, fileContent, uniqueMethodIdPrefixes) {
|
|
82
89
|
try {
|
|
83
|
-
const
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
(0, fs_1.writeFileSync)(absolutePath, fileContent + `\n// SL_UNIQUE_ID_KEY: ${uniqueIdKey}`);
|
|
90
|
+
const uniqueIdKeys = uniqueMethodIdPrefixes.join(',');
|
|
91
|
+
this.logger.debug(`Appending uniqueIds to file ${absolutePath} with uniqueIdKeys ${uniqueIdKeys}`);
|
|
92
|
+
(0, fs_1.writeFileSync)(absolutePath, fileContent + `\n// SL_UNIQUE_ID_KEYS: ${uniqueIdKeys}`);
|
|
87
93
|
}
|
|
88
94
|
catch (e) {
|
|
89
|
-
this.logger.error(`Error appending
|
|
95
|
+
this.logger.error(`Error appending uniqueIds to file ${absolutePath}: ${e}. This might result in no coverage for this file in the coverage-listening stage.`);
|
|
90
96
|
}
|
|
91
97
|
}
|
|
92
98
|
filterIgnoredSourceFiles(result) {
|
|
@@ -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,2BAAmC;AAEnC,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,qBAAqB,
|
|
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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"}
|
|
@@ -177,7 +177,7 @@ export interface IHitFileData {
|
|
|
177
177
|
filename: string;
|
|
178
178
|
shouldResolveRelativePath: boolean;
|
|
179
179
|
hitStatements?: IStatementData[];
|
|
180
|
-
|
|
180
|
+
uniqueIdKeysFromFile?: string[];
|
|
181
181
|
}
|
|
182
182
|
export type IPosition = IPositionShort | IPositionFull;
|
|
183
183
|
export interface IPositionShort {
|
|
@@ -4,14 +4,14 @@ export declare class HitsCollector {
|
|
|
4
4
|
private enableLineCoverage;
|
|
5
5
|
protected _globalCoverageObject: IIstanbulProcessMetrics;
|
|
6
6
|
protected projectRootUniqueIdMap: {
|
|
7
|
-
[key: string]: string;
|
|
7
|
+
[key: string]: string[];
|
|
8
8
|
};
|
|
9
9
|
protected _latestCoverageSnapshot: IIstanbulProcessMetrics;
|
|
10
10
|
protected logger: Logger;
|
|
11
11
|
protected errors: Array<Record<string, unknown>>;
|
|
12
12
|
constructor(logger: Logger, globalCoverageObject?: IIstanbulProcessMetrics, enableLineCoverage?: boolean);
|
|
13
13
|
getHitElements(): Promise<IHitFileData[]>;
|
|
14
|
-
private
|
|
14
|
+
private extractUniqueIdsFromFileOnce;
|
|
15
15
|
get latestCoverageSnapshot(): IIstanbulProcessMetrics;
|
|
16
16
|
set latestCoverageSnapshot(value: IIstanbulProcessMetrics);
|
|
17
17
|
get globalCoverageObject(): IIstanbulProcessMetrics;
|
|
@@ -35,29 +35,29 @@ class HitsCollector {
|
|
|
35
35
|
new original_module_loader_1.OriginalModuleLoader(globalCoverage, this.logger).load();
|
|
36
36
|
}
|
|
37
37
|
for (const filename in globalCoverage) {
|
|
38
|
-
yield this.
|
|
38
|
+
yield this.extractUniqueIdsFromFileOnce(filename);
|
|
39
39
|
const { fileCoverageSnapshot, currentFileCoverage, shouldResolveRelativePath } = this.getFileCoverageObjects(filename);
|
|
40
40
|
const hitMethods = this.getHitMethods(currentFileCoverage, fileCoverageSnapshot);
|
|
41
41
|
const hitBranches = this.getHitBranches(currentFileCoverage, fileCoverageSnapshot);
|
|
42
42
|
const hitStatements = this.enableLineCoverage ? this.getHitStatements(currentFileCoverage, fileCoverageSnapshot) : [];
|
|
43
43
|
if (hitMethods.length || hitBranches.length || hitStatements.length) {
|
|
44
|
-
hitFilesData.push(Object.assign(Object.assign({ filename, hitMethods, hitBranches, shouldResolveRelativePath }, (this.enableLineCoverage && { hitStatements })), {
|
|
44
|
+
hitFilesData.push(Object.assign(Object.assign({ filename, hitMethods, hitBranches, shouldResolveRelativePath }, (this.enableLineCoverage && { hitStatements })), { uniqueIdKeysFromFile: this.projectRootUniqueIdMap[filename] }));
|
|
45
45
|
}
|
|
46
46
|
}
|
|
47
47
|
this.updateCoverageSnapshot(globalCoverage);
|
|
48
48
|
return hitFilesData;
|
|
49
49
|
});
|
|
50
50
|
}
|
|
51
|
-
|
|
51
|
+
extractUniqueIdsFromFileOnce(filename) {
|
|
52
52
|
return __awaiter(this, void 0, void 0, function* () {
|
|
53
53
|
if (this.projectRootUniqueIdMap[filename]) {
|
|
54
54
|
return;
|
|
55
55
|
}
|
|
56
56
|
try {
|
|
57
57
|
const lastLine = yield tail_file_reader_1.tailFileReader.read(filename, 1); // Read the last line
|
|
58
|
-
const
|
|
59
|
-
if (
|
|
60
|
-
this.projectRootUniqueIdMap[filename] =
|
|
58
|
+
const uniqueIdKeys = lastLine.match(/SL_UNIQUE_ID_KEYS:\s*(.+)$/);
|
|
59
|
+
if (uniqueIdKeys) {
|
|
60
|
+
this.projectRootUniqueIdMap[filename] = uniqueIdKeys[1].split(',');
|
|
61
61
|
}
|
|
62
62
|
}
|
|
63
63
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hits-collector.js","sourceRoot":"","sources":["../../../common/footprints-process-v6/hits-collector.ts"],"names":[],"mappings":";;;;;;;;;;;;AAQA,0DAAmD;AACnD,wFAAiF;AAEjF,uEAAmE;AACnE,gEAA2D;AAG3D;;GAEG;AACH,MAAM,+BAA+B,GAAG,CAAC,cAAc,CAAC,CAAC;AACzD,MAAa,aAAa;IAQtB,YAAY,MAAc,EAAE,oBAA8C,EAAU,qBAAqB,KAAK;QAA1B,uBAAkB,GAAlB,kBAAkB,CAAQ;QANpG,2BAAsB,
|
|
1
|
+
{"version":3,"file":"hits-collector.js","sourceRoot":"","sources":["../../../common/footprints-process-v6/hits-collector.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,7 +36,8 @@ export declare class HitsConverter {
|
|
|
36
36
|
protected getStartLoc(hit: IMethodData): IPosition;
|
|
37
37
|
protected getLeaveStartLoc(hit: IBranchHit, leaveIdx: number, absolutePath: string): IPosition;
|
|
38
38
|
private createBranchIds;
|
|
39
|
-
protected getMethodUniqueId(startLoc: IPositionFull, relativePath: string, absolutePath: string,
|
|
39
|
+
protected getMethodUniqueId(startLoc: IPositionFull, relativePath: string, absolutePath: string, uniqueIdKeysFromFile?: string[]): string;
|
|
40
|
+
private findCorrectUniqueIdKey;
|
|
40
41
|
protected getBranchUniqueId(startLoc: IPosition, relativePath: string, absolutePath: string, leaveIndex: number): string;
|
|
41
42
|
private resolveIdParts;
|
|
42
43
|
private buildMethodUniqueId;
|
|
@@ -29,7 +29,7 @@ class HitsConverter {
|
|
|
29
29
|
if (fileHit.shouldResolveRelativePath) {
|
|
30
30
|
relativePath = this.relativePathResolver.getRelativePath(fileHit.filename);
|
|
31
31
|
}
|
|
32
|
-
const methodUniqueIdsWithPosition = this.createMethodIdsWithPosition(fileHit.hitMethods, relativePath, fileHit.filename, fileHit.
|
|
32
|
+
const methodUniqueIdsWithPosition = this.createMethodIdsWithPosition(fileHit.hitMethods, relativePath, fileHit.filename, fileHit.uniqueIdKeysFromFile);
|
|
33
33
|
methodUniqueIds = methodUniqueIds.concat(methodUniqueIdsWithPosition.map(method => method.uniqueId));
|
|
34
34
|
branchUniqueIds = branchUniqueIds.concat(this.createBranchIds(fileHit.hitBranches, relativePath, fileHit.filename));
|
|
35
35
|
if (this.enableLineCoverage) {
|
|
@@ -83,17 +83,17 @@ class HitsConverter {
|
|
|
83
83
|
});
|
|
84
84
|
return Array.from(uniqueLinesMap);
|
|
85
85
|
}
|
|
86
|
-
createMethodIdsWithPosition(hitFunctions, relativePath, absolutePath,
|
|
86
|
+
createMethodIdsWithPosition(hitFunctions, relativePath, absolutePath, uniqueIdKeysFromFile) {
|
|
87
87
|
const methodsIdsWithPosition = [];
|
|
88
88
|
hitFunctions.forEach(hit => {
|
|
89
89
|
methodsIdsWithPosition.push({
|
|
90
|
-
uniqueId: this.getMethodUniqueId(this.getStartLoc(hit), relativePath, absolutePath,
|
|
90
|
+
uniqueId: this.getMethodUniqueId(this.getStartLoc(hit), relativePath, absolutePath, uniqueIdKeysFromFile),
|
|
91
91
|
start: hit.loc.start,
|
|
92
92
|
end: hit.loc.end
|
|
93
93
|
});
|
|
94
94
|
if (this.getDecl(hit) && this.getDeclStart(hit)) {
|
|
95
95
|
methodsIdsWithPosition.push({
|
|
96
|
-
uniqueId: this.getMethodUniqueId(this.getDeclStart(hit), relativePath, absolutePath,
|
|
96
|
+
uniqueId: this.getMethodUniqueId(this.getDeclStart(hit), relativePath, absolutePath, uniqueIdKeysFromFile),
|
|
97
97
|
start: hit.decl.start,
|
|
98
98
|
end: hit.decl.end
|
|
99
99
|
});
|
|
@@ -143,11 +143,16 @@ class HitsConverter {
|
|
|
143
143
|
});
|
|
144
144
|
return branchIds;
|
|
145
145
|
}
|
|
146
|
-
getMethodUniqueId(startLoc, relativePath, absolutePath,
|
|
146
|
+
getMethodUniqueId(startLoc, relativePath, absolutePath, uniqueIdKeysFromFile) {
|
|
147
147
|
const idParts = this.resolveIdParts(startLoc, relativePath, absolutePath);
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
148
|
+
// If we have uniqueIdKeysFromFile attempt to map to the correct uniqueId and project root
|
|
149
|
+
if (uniqueIdKeysFromFile === null || uniqueIdKeysFromFile === void 0 ? void 0 : uniqueIdKeysFromFile.length) {
|
|
150
|
+
const matchingKey = this.findCorrectUniqueIdKey(idParts.relativePath, uniqueIdKeysFromFile);
|
|
151
|
+
if (matchingKey) {
|
|
152
|
+
const uniqueId = `${matchingKey}@${this.formatLoc(idParts.start)}`;
|
|
153
|
+
this.logger.debug(`Found matching uniqueId key ${matchingKey} for file ${idParts.relativePath}, returning ${uniqueId} as final uniqueId for footprints`);
|
|
154
|
+
return uniqueId;
|
|
155
|
+
}
|
|
151
156
|
}
|
|
152
157
|
if (sl_env_vars_1.SlEnvVars.isUseNewUniqueId()) {
|
|
153
158
|
const uniqueIdKey = idParts.relativePath + '@' + this.formatLoc(idParts.start);
|
|
@@ -159,6 +164,36 @@ class HitsConverter {
|
|
|
159
164
|
}
|
|
160
165
|
return this.buildMethodUniqueId(idParts);
|
|
161
166
|
}
|
|
167
|
+
findCorrectUniqueIdKey(path, uniqueIdKeys) {
|
|
168
|
+
if (!path || !(uniqueIdKeys === null || uniqueIdKeys === void 0 ? void 0 : uniqueIdKeys.length)) {
|
|
169
|
+
return undefined;
|
|
170
|
+
}
|
|
171
|
+
const matchingKeys = [];
|
|
172
|
+
// Find the key that matches the end of the path
|
|
173
|
+
for (const key of uniqueIdKeys) {
|
|
174
|
+
if (!key) {
|
|
175
|
+
continue;
|
|
176
|
+
}
|
|
177
|
+
// Check for exact match
|
|
178
|
+
if (key === path) {
|
|
179
|
+
return key;
|
|
180
|
+
}
|
|
181
|
+
// Check if the key is a suffix of the path
|
|
182
|
+
if (path.endsWith(key)) {
|
|
183
|
+
matchingKeys.push(key);
|
|
184
|
+
}
|
|
185
|
+
// Check the opposite
|
|
186
|
+
if (key.endsWith(path)) {
|
|
187
|
+
matchingKeys.push(key);
|
|
188
|
+
}
|
|
189
|
+
}
|
|
190
|
+
// If there is only one matching key, return it
|
|
191
|
+
if (matchingKeys.length === 1) {
|
|
192
|
+
return matchingKeys[0];
|
|
193
|
+
}
|
|
194
|
+
// If there are multiple matching keys, return the longest one
|
|
195
|
+
return matchingKeys.sort((a, b) => b.length - a.length)[0];
|
|
196
|
+
}
|
|
162
197
|
getBranchUniqueId(startLoc, relativePath, absolutePath, leaveIndex) {
|
|
163
198
|
let uniqueId;
|
|
164
199
|
const parts = this.resolveIdParts(startLoc, relativePath, absolutePath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hits-converter.js","sourceRoot":"","sources":["../../../common/footprints-process-v6/hits-converter.ts"],"names":[],"mappings":";;;AAeA,0DAAmD;AACnD,wFAAiF;AACjF,qDAA+C;AAC/C,0EAAkE;AAElE,uEAAiE;AAEjE,MAAa,aAAa;IAYtB,YAAY,oBAA0C,EAAE,aAA4B,EAAE,WAAmB,EAAE,MAAc,EAAE,0BAA0B,GAAG,KAAK,EAAU,qBAAqB,KAAK;QAA1B,uBAAkB,GAAlB,kBAAkB,CAAQ;QAJzL,qBAAgB,GAAa,EAAE,CAAC;QAC9B,eAAU,GAA4B,EAAE,CAAC;QAI/C,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;IACzB,CAAC;IAEM,WAAW,CAAC,YAA4B;QAC3C,IAAI,eAAe,GAAa,EAAE,CAAC;QACnC,IAAI,eAAe,GAAa,EAAE,CAAC;QACnC,IAAI,cAAc,GAA6B,EAAE,CAAC;QAClD,IAAG,uBAAS,CAAC,gBAAgB,EAAE,EAAE;YAC7B,IAAI,6CAAoB,CAAC,8BAAa,CAAC,2BAA2B,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;SAC7F;QACD,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YAC3B,IAAI,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC;YACpC,IAAI,OAAO,CAAC,yBAAyB,EAAE;gBACnC,YAAY,GAAG,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;aAC7E;YACD,MAAM,2BAA2B,GAAG,IAAI,CAAC,2BAA2B,CAAC,OAAO,CAAC,UAAU,EAAE,YAAY,EAAE,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"hits-converter.js","sourceRoot":"","sources":["../../../common/footprints-process-v6/hits-converter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.SourceMapReader = void 0;
|
|
4
|
-
const ConvertSourceMap = require("convert-source-map");
|
|
4
|
+
const ConvertSourceMap = require("sl-convert-source-map");
|
|
5
5
|
const path = require("path");
|
|
6
6
|
const fs = require("fs");
|
|
7
7
|
const validation_utils_1 = require("./utils/validation-utils");
|
|
@@ -23,7 +23,16 @@ class SourceMapReader {
|
|
|
23
23
|
}
|
|
24
24
|
this.logger.debug(`About to resolve source map data for '${this.filename}'`);
|
|
25
25
|
const sourceMapData = ConvertSourceMap.fromSource(generatedContent) ||
|
|
26
|
-
ConvertSourceMap.fromMapFileSource(generatedContent,
|
|
26
|
+
ConvertSourceMap.fromMapFileSource(generatedContent, (filename) => {
|
|
27
|
+
try {
|
|
28
|
+
const mapPath = path.resolve(path.dirname(this.filename), filename);
|
|
29
|
+
return fs.readFileSync(mapPath, 'utf-8');
|
|
30
|
+
}
|
|
31
|
+
catch (e) {
|
|
32
|
+
this.logger.error(`Failed to read source map file: ${filename}`, e);
|
|
33
|
+
return null;
|
|
34
|
+
}
|
|
35
|
+
});
|
|
27
36
|
if (sourceMapData && sourceMapData.sourcemap) {
|
|
28
37
|
this.logger.info(`Found source map data for '${this.filename}'`);
|
|
29
38
|
return sourceMapData.sourcemap;
|
|
@@ -35,7 +44,6 @@ class SourceMapReader {
|
|
|
35
44
|
}
|
|
36
45
|
else {
|
|
37
46
|
if (this.isUsingSourceURL(generatedContent)) {
|
|
38
|
-
//TODO: Fix message
|
|
39
47
|
this.logger.info('Seems source map comment is in unsupported format...');
|
|
40
48
|
}
|
|
41
49
|
this.logger.debug(`Couldn't find source map data for '${this.filename}'`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"source-map-reader.js","sourceRoot":"","sources":["../../common/source-map-reader.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"source-map-reader.js","sourceRoot":"","sources":["../../common/source-map-reader.ts"],"names":[],"mappings":"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"}
|