slnodejs 6.0.42 → 6.1.10
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 +70 -21
- package/browser-agent/dist/browser-agent-all.min.js +16 -16
- package/browser-agent/package.json +2 -2
- package/package.json +6 -5
- package/tsOutputs/api.d.ts +0 -2
- package/tsOutputs/api.js +1 -2
- package/tsOutputs/build-scanner/ast-utils.js +1 -1
- package/tsOutputs/build-scanner/ast-utils.js.map +1 -1
- package/tsOutputs/build-scanner/build-diff-process.js +15 -9
- package/tsOutputs/build-scanner/build-diff-process.js.map +1 -1
- package/tsOutputs/build-scanner/file-system/actual-file.js +38 -18
- package/tsOutputs/build-scanner/file-system/actual-file.js.map +1 -1
- package/tsOutputs/build-scanner/instrumentation/markup-file-instrumenter.js +0 -3
- package/tsOutputs/build-scanner/instrumentation/markup-file-instrumenter.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/dry-run-files-mapping.js +1 -1
- package/tsOutputs/build-scanner/js_diff/dry-run-files-mapping.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/file-signature.js +7 -4
- package/tsOutputs/build-scanner/js_diff/file-signature.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/files-mapping.js +6 -23
- package/tsOutputs/build-scanner/js_diff/files-mapping.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/generated-file-signature.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/guess-method-location.js +3 -0
- package/tsOutputs/build-scanner/js_diff/guess-method-location.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/method-signature.js +3 -1
- package/tsOutputs/build-scanner/js_diff/method-signature.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/sl-mapper.js +61 -0
- package/tsOutputs/build-scanner/js_diff/sl-mapper.js.map +1 -1
- package/tsOutputs/build-scanner/js_diff/source-data-enricher.js +1 -1
- package/tsOutputs/build-scanner/js_diff/source-data-enricher.js.map +1 -1
- package/tsOutputs/build-scanner/mappings/ensure-files-handler.service.js +214 -0
- package/tsOutputs/build-scanner/mappings/ensure-files-handler.service.js.map +1 -0
- package/tsOutputs/build-scanner/mappings/file-element-utils.js +47 -0
- package/tsOutputs/build-scanner/mappings/file-element-utils.js.map +1 -0
- package/tsOutputs/build-scanner/mappings/file-enricher.js +210 -0
- package/tsOutputs/build-scanner/mappings/file-enricher.js.map +1 -0
- package/tsOutputs/build-scanner/mappings/files-data-container.js +52 -0
- package/tsOutputs/build-scanner/mappings/files-data-container.js.map +1 -0
- package/tsOutputs/build-scanner/mappings/scm-file-fixer.js +80 -0
- package/tsOutputs/build-scanner/mappings/scm-file-fixer.js.map +1 -0
- package/tsOutputs/cli-parse/executors/dry-run/build-mapping-data.js +1 -1
- package/tsOutputs/cli-parse/executors/dry-run/build-mapping-data.js.map +1 -1
- package/tsOutputs/cli-parse/executors/dry-run/dry-run-executor.js +8 -6
- package/tsOutputs/cli-parse/executors/dry-run/dry-run-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/dry-run/footprints-data.js +77 -17
- package/tsOutputs/cli-parse/executors/dry-run/footprints-data.js.map +1 -1
- package/tsOutputs/cli-parse/executors/dry-run/helper-methods.js +8 -3
- package/tsOutputs/cli-parse/executors/dry-run/helper-methods.js.map +1 -1
- package/tsOutputs/common/config-process/config.js +1 -1
- package/tsOutputs/common/config-process/config.js.map +1 -1
- package/tsOutputs/common/footprints-process-v6/hits-converter.js +10 -1
- package/tsOutputs/common/footprints-process-v6/hits-converter.js.map +1 -1
- package/tsOutputs/common/http/backend-proxy.d.ts +1 -0
- package/tsOutputs/common/http/backend-proxy.js +10 -0
- package/tsOutputs/common/http/backend-proxy.js.map +1 -1
- package/tsOutputs/common/http/contracts.d.ts +78 -1
- package/tsOutputs/common/http/contracts.js.map +1 -1
- package/tsOutputs/common/scm/git-cloner.js +138 -0
- package/tsOutputs/common/scm/git-cloner.js.map +1 -0
- package/tsOutputs/common/state-tracker.js +2 -5
- package/tsOutputs/common/state-tracker.js.map +1 -1
- package/tsOutputs/common/utils/files-utils.d.ts +1 -0
- package/tsOutputs/common/utils/files-utils.js +9 -0
- package/tsOutputs/common/utils/files-utils.js.map +1 -1
- package/tsOutputs/test-listener/nyc-report-executor-fpv6.js +7 -0
- package/tsOutputs/test-listener/nyc-report-executor-fpv6.js.map +1 -1
|
@@ -0,0 +1,210 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __assign = (this && this.__assign) || function () {
|
|
3
|
+
__assign = Object.assign || function(t) {
|
|
4
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
5
|
+
s = arguments[i];
|
|
6
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
7
|
+
t[p] = s[p];
|
|
8
|
+
}
|
|
9
|
+
return t;
|
|
10
|
+
};
|
|
11
|
+
return __assign.apply(this, arguments);
|
|
12
|
+
};
|
|
13
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
14
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
15
|
+
if (ar || !(i in from)) {
|
|
16
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
17
|
+
ar[i] = from[i];
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
21
|
+
};
|
|
22
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
23
|
+
exports.FileEnricher = void 0;
|
|
24
|
+
var FileSignature = require("../js_diff/file-signature");
|
|
25
|
+
var path = require("path");
|
|
26
|
+
var EntitiesMapper = require("../entities-mapper");
|
|
27
|
+
var fs = require("fs");
|
|
28
|
+
var logger_1 = require("../../common/logger");
|
|
29
|
+
var logger = logger_1.LoggerFactory.getCreateApplicationLogger();
|
|
30
|
+
var FileEnricher = /** @class */ (function () {
|
|
31
|
+
function FileEnricher(logger, opts, scmRootDir, scmFilesContainer, config) {
|
|
32
|
+
this.logger = logger;
|
|
33
|
+
this.opts = opts;
|
|
34
|
+
this.scmRootDir = scmRootDir;
|
|
35
|
+
this.scmFilesContainer = scmFilesContainer;
|
|
36
|
+
this.config = config;
|
|
37
|
+
}
|
|
38
|
+
FileEnricher.prototype.enrichFiles = function (res) {
|
|
39
|
+
var result = __assign(__assign({}, res), { files: __spreadArray([], res.files, true) });
|
|
40
|
+
for (var _i = 0, _a = result.files; _i < _a.length; _i++) {
|
|
41
|
+
var file = _a[_i];
|
|
42
|
+
if (file.absolutePath && file.fromSourceMaps) {
|
|
43
|
+
if (this.isFileSupported(file.absolutePath)) {
|
|
44
|
+
var currentFileSource = this.getFileSignature(file);
|
|
45
|
+
file.methods = this.enrichItems(currentFileSource, file.methods, CodeElementsType.METHOD, file.positionToMethod, file.endPositionToMethod);
|
|
46
|
+
file.branches = this.enrichItems(currentFileSource, file.branches, CodeElementsType.BRANCH, file.positionToBranch, {});
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
else {
|
|
50
|
+
logger.info("File " + file.absolutePath + " not resolved from source maps, skipping enrichment");
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
return result;
|
|
54
|
+
};
|
|
55
|
+
FileEnricher.prototype.isFileSupported = function (absolutePath) {
|
|
56
|
+
if (!fs.existsSync(absolutePath)) {
|
|
57
|
+
logger.warn("Source file '" + absolutePath + "' does not exists, skipping enrichment");
|
|
58
|
+
return false;
|
|
59
|
+
}
|
|
60
|
+
var validExtensions = ['.ts', '.jsx', '.js', '.tsx'];
|
|
61
|
+
var extension = path.extname(absolutePath);
|
|
62
|
+
if (!validExtensions.includes(extension)) {
|
|
63
|
+
logger.info("Extension '" + extension + "' for file '" + absolutePath + "' is not supported, skipping enrichment");
|
|
64
|
+
return false;
|
|
65
|
+
}
|
|
66
|
+
return true;
|
|
67
|
+
};
|
|
68
|
+
FileEnricher.prototype.getItemsMap = function (resolvePositionToElement, currentFileSource, type, resolveEndPositionToElement) {
|
|
69
|
+
var _a, _b, _c, _d;
|
|
70
|
+
var sourceFileStartPositionMap = type == CodeElementsType.METHOD ? currentFileSource.positionToMethod : currentFileSource.positionToBranchMap;
|
|
71
|
+
var sourceFileEndPositionMap = type == CodeElementsType.METHOD ? currentFileSource.endPositionToMethod : {};
|
|
72
|
+
var sourceElements = type == CodeElementsType.METHOD ? currentFileSource.methods : currentFileSource.branches;
|
|
73
|
+
var sourceFileIdxToStartPosition = this.itemIndexToPosition(sourceFileStartPositionMap);
|
|
74
|
+
var resolvedIdxToStartPosition = this.itemIndexToPosition(resolvePositionToElement);
|
|
75
|
+
var resolvedIdxToEndPosition = type === CodeElementsType.BRANCH ? {} : this.itemIndexToPosition(resolveEndPositionToElement);
|
|
76
|
+
var itemsToEnrich = [];
|
|
77
|
+
var itemsToMarkAsAutoGenerate = [];
|
|
78
|
+
var itemsToAdd = [];
|
|
79
|
+
for (var _i = 0, _e = Object.entries(resolvedIdxToStartPosition); _i < _e.length; _i++) {
|
|
80
|
+
var _f = _e[_i], idx = _f[0], startPositions = _f[1];
|
|
81
|
+
var sourceIdxByStart = this.getIdxByPosition(startPositions, sourceFileStartPositionMap);
|
|
82
|
+
var sourceIdxByEnd = type === CodeElementsType.BRANCH ? -1 : this.getIdxByPosition(resolvedIdxToEndPosition[+idx], sourceFileEndPositionMap);
|
|
83
|
+
if (sourceIdxByStart > -1) {
|
|
84
|
+
itemsToEnrich.push({ resolvedIdx: +idx, sourceIdx: sourceIdxByStart });
|
|
85
|
+
logger.debug("Item starts at '" + sourceElements[sourceIdxByStart].position + "' in file '" + currentFileSource.absolutePath + "' will be enriched");
|
|
86
|
+
}
|
|
87
|
+
else if (sourceIdxByEnd > -1 && ((_b = (_a = sourceElements[sourceIdxByEnd]) === null || _a === void 0 ? void 0 : _a.techSpecificInfo) === null || _b === void 0 ? void 0 : _b.isDecorated)) {
|
|
88
|
+
itemsToEnrich.push({ resolvedIdx: +idx, sourceIdx: sourceIdxByEnd });
|
|
89
|
+
logger.debug("Item starts at '" + sourceElements[sourceIdxByEnd].position + "' in file '" + currentFileSource.absolutePath + "' is a decorated method, will be enriched by end position matching");
|
|
90
|
+
}
|
|
91
|
+
else {
|
|
92
|
+
itemsToMarkAsAutoGenerate.push(+idx);
|
|
93
|
+
logger.debug("Could not find source element in any of the following positions '" + startPositions.join(' || ') + "' in file '" + currentFileSource.absolutePath + "', marking as auto generated");
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
if (type === CodeElementsType.METHOD) {
|
|
97
|
+
for (var _g = 0, _h = Object.entries(sourceFileIdxToStartPosition); _g < _h.length; _g++) {
|
|
98
|
+
var _j = _h[_g], idx = _j[0], startPositions = _j[1];
|
|
99
|
+
var resolvedIdxByStart = this.getIdxByPosition(startPositions, resolvePositionToElement);
|
|
100
|
+
var resolvedIdxByEnd = this.getIdxByPosition(resolvedIdxToEndPosition[+idx], resolveEndPositionToElement);
|
|
101
|
+
var isDecorated = resolvedIdxByEnd > -1 && ((_d = (_c = sourceElements[+idx]) === null || _c === void 0 ? void 0 : _c.techSpecificInfo) === null || _d === void 0 ? void 0 : _d.isDecorated) == true;
|
|
102
|
+
if (resolvedIdxByStart === -1 && !isDecorated) {
|
|
103
|
+
itemsToAdd.push(+idx);
|
|
104
|
+
logger.debug("Element in file '" + currentFileSource.absolutePath + "' at position '" + sourceElements[idx].position + "' not exists in generated file, adding it from source");
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
return { itemsToEnrich: itemsToEnrich, itemsToMarkAsAutoGenerate: itemsToMarkAsAutoGenerate, itemsToAdd: itemsToAdd };
|
|
109
|
+
};
|
|
110
|
+
FileEnricher.prototype.getIdxByPosition = function (startPositions, sourceFilePositionMap) {
|
|
111
|
+
if (startPositions === void 0) { startPositions = []; }
|
|
112
|
+
for (var _i = 0, startPositions_1 = startPositions; _i < startPositions_1.length; _i++) {
|
|
113
|
+
var position = startPositions_1[_i];
|
|
114
|
+
var sourceIdx = sourceFilePositionMap[position];
|
|
115
|
+
if (sourceIdx > -1) {
|
|
116
|
+
return sourceIdx;
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
return -1;
|
|
120
|
+
};
|
|
121
|
+
FileEnricher.prototype.enrichItems = function (currentFileSource, codeItems, type, positionToElement, resolveEndPositionToElement) {
|
|
122
|
+
var result = [];
|
|
123
|
+
if (currentFileSource) {
|
|
124
|
+
var _a = this.getItemsMap(positionToElement, currentFileSource, type, resolveEndPositionToElement), itemsToEnrich = _a.itemsToEnrich, itemsToMarkAsAutoGenerate = _a.itemsToMarkAsAutoGenerate, itemsToAdd = _a.itemsToAdd;
|
|
125
|
+
for (var _i = 0, itemsToMarkAsAutoGenerate_1 = itemsToMarkAsAutoGenerate; _i < itemsToMarkAsAutoGenerate_1.length; _i++) {
|
|
126
|
+
var idx = itemsToMarkAsAutoGenerate_1[_i];
|
|
127
|
+
var codeItem = codeItems[idx];
|
|
128
|
+
var codeItemCopy = __assign({}, codeItem);
|
|
129
|
+
codeItemCopy.techSpecificInfo.autoGenerated = true;
|
|
130
|
+
result.push(codeItemCopy);
|
|
131
|
+
}
|
|
132
|
+
for (var _b = 0, itemsToEnrich_1 = itemsToEnrich; _b < itemsToEnrich_1.length; _b++) {
|
|
133
|
+
var item = itemsToEnrich_1[_b];
|
|
134
|
+
var codeItem = codeItems[item.resolvedIdx];
|
|
135
|
+
var codeItemCopy = __assign({}, codeItem);
|
|
136
|
+
if (type === CodeElementsType.METHOD) {
|
|
137
|
+
this.handleMethod(codeItemCopy, currentFileSource.methods[item.sourceIdx]);
|
|
138
|
+
}
|
|
139
|
+
result.push(codeItemCopy);
|
|
140
|
+
}
|
|
141
|
+
for (var _c = 0, itemsToAdd_1 = itemsToAdd; _c < itemsToAdd_1.length; _c++) {
|
|
142
|
+
var idx = itemsToAdd_1[_c];
|
|
143
|
+
if (type === CodeElementsType.METHOD) {
|
|
144
|
+
var codeItem = currentFileSource.methods[idx];
|
|
145
|
+
result.push(EntitiesMapper.toServerMethod(codeItem));
|
|
146
|
+
}
|
|
147
|
+
else {
|
|
148
|
+
var codeItem = currentFileSource.branches[idx];
|
|
149
|
+
result.push(EntitiesMapper.toServerBranch(codeItem));
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
return result;
|
|
154
|
+
};
|
|
155
|
+
FileEnricher.prototype.itemIndexToPosition = function (positionMap) {
|
|
156
|
+
var itemToPosition = {};
|
|
157
|
+
for (var _i = 0, _a = Object.entries(positionMap); _i < _a.length; _i++) {
|
|
158
|
+
var _b = _a[_i], position = _b[0], idx = _b[1];
|
|
159
|
+
itemToPosition[idx] = itemToPosition[idx] || [];
|
|
160
|
+
itemToPosition[idx].push(position);
|
|
161
|
+
}
|
|
162
|
+
return itemToPosition;
|
|
163
|
+
};
|
|
164
|
+
FileEnricher.prototype.handleMethod = function (resolvedMethod, method) {
|
|
165
|
+
resolvedMethod.displayName = method.srcData.displayName;
|
|
166
|
+
resolvedMethod.meta = __assign({}, method.meta);
|
|
167
|
+
resolvedMethod.techSpecificInfo = __assign({}, method.techSpecificInfo);
|
|
168
|
+
if (resolvedMethod.techSpecificInfo.isAsync) {
|
|
169
|
+
resolvedMethod.hash = method.srcData.hash;
|
|
170
|
+
resolvedMethod.sigHash = method.srcData.sigHash;
|
|
171
|
+
}
|
|
172
|
+
};
|
|
173
|
+
FileEnricher.prototype.getFileSignature = function (file) {
|
|
174
|
+
var _a;
|
|
175
|
+
var currentPlugs = (_a = this.opts.babylonPlugins) !== null && _a !== void 0 ? _a : [];
|
|
176
|
+
var opts = {
|
|
177
|
+
es6Modules: true,
|
|
178
|
+
babylonPlugins: ['classProperties'].concat(currentPlugs),
|
|
179
|
+
projectRoot: this.opts.projectRoot,
|
|
180
|
+
scmRootDir: this.scmRootDir,
|
|
181
|
+
isBranchCoverage: this.config.useBranchCoverage || this.opts.usebranchcoverage
|
|
182
|
+
};
|
|
183
|
+
var extension = path.extname(file.absolutePath);
|
|
184
|
+
if (extension === '.ts' || extension === '.tsx') {
|
|
185
|
+
opts.babylonPlugins.push('typescript');
|
|
186
|
+
}
|
|
187
|
+
var fileContent = fs.readFileSync(file.absolutePath, 'utf-8');
|
|
188
|
+
do {
|
|
189
|
+
try {
|
|
190
|
+
return FileSignature.create(file.absolutePath, file.logicalPath, fileContent, null, opts, this.scmFilesContainer, this.logger);
|
|
191
|
+
}
|
|
192
|
+
catch (error) {
|
|
193
|
+
if (error.missingPlugin) {
|
|
194
|
+
opts.babylonPlugins = __spreadArray([error.missingPlugin[0]], opts.babylonPlugins, true);
|
|
195
|
+
}
|
|
196
|
+
else {
|
|
197
|
+
throw error;
|
|
198
|
+
}
|
|
199
|
+
}
|
|
200
|
+
} while (true);
|
|
201
|
+
};
|
|
202
|
+
return FileEnricher;
|
|
203
|
+
}());
|
|
204
|
+
exports.FileEnricher = FileEnricher;
|
|
205
|
+
var CodeElementsType;
|
|
206
|
+
(function (CodeElementsType) {
|
|
207
|
+
CodeElementsType["BRANCH"] = "branch";
|
|
208
|
+
CodeElementsType["METHOD"] = "method";
|
|
209
|
+
})(CodeElementsType || (CodeElementsType = {}));
|
|
210
|
+
//# sourceMappingURL=file-enricher.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"file-enricher.js","sourceRoot":"","sources":["../../../build-scanner/mappings/file-enricher.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.FilesDataContainer = void 0;
|
|
4
|
+
var FilesDataContainer = /** @class */ (function () {
|
|
5
|
+
function FilesDataContainer() {
|
|
6
|
+
this._files = {};
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(FilesDataContainer.prototype, "files", {
|
|
9
|
+
get: function () {
|
|
10
|
+
return Object.values(this._files);
|
|
11
|
+
},
|
|
12
|
+
enumerable: false,
|
|
13
|
+
configurable: true
|
|
14
|
+
});
|
|
15
|
+
FilesDataContainer.prototype.addFile = function (file) {
|
|
16
|
+
if (!(file.absolutePath in this._files)) {
|
|
17
|
+
this._files[file.absolutePath] = file;
|
|
18
|
+
}
|
|
19
|
+
};
|
|
20
|
+
FilesDataContainer.prototype.addMethod = function (path, method) {
|
|
21
|
+
var _a;
|
|
22
|
+
this._files[path] = this._files[path] || this.createEmptyFileData(path);
|
|
23
|
+
var index = this._files[path].methods.push(method) - 1;
|
|
24
|
+
this._files[path].positionToMethod[method.position.join(',')] = index;
|
|
25
|
+
this._files[path].endPositionToMethod[method.endPosition.join(',')] = index;
|
|
26
|
+
if ((_a = method.meta.identifierPosition) === null || _a === void 0 ? void 0 : _a.every(function (x) { return x !== null; })) {
|
|
27
|
+
this._files[path].positionToMethod[method.meta.identifierPosition.join(',')] = index;
|
|
28
|
+
}
|
|
29
|
+
};
|
|
30
|
+
FilesDataContainer.prototype.addBranch = function (path, branch) {
|
|
31
|
+
this._files[path] = this._files[path] || this.createEmptyFileData(path);
|
|
32
|
+
var index = this._files[path].branches.push(branch) - 1;
|
|
33
|
+
this._files[path].positionToBranch[branch.position.join(',') + "|" + branch.index] = index;
|
|
34
|
+
};
|
|
35
|
+
FilesDataContainer.prototype.createEmptyFileData = function (cleanPath) {
|
|
36
|
+
return {
|
|
37
|
+
lines: [],
|
|
38
|
+
methods: [],
|
|
39
|
+
branches: [],
|
|
40
|
+
logicalPath: cleanPath,
|
|
41
|
+
physicalPath: '',
|
|
42
|
+
hash: '',
|
|
43
|
+
fromSourceMaps: true,
|
|
44
|
+
positionToMethod: {},
|
|
45
|
+
positionToBranch: {},
|
|
46
|
+
endPositionToMethod: {}
|
|
47
|
+
};
|
|
48
|
+
};
|
|
49
|
+
return FilesDataContainer;
|
|
50
|
+
}());
|
|
51
|
+
exports.FilesDataContainer = FilesDataContainer;
|
|
52
|
+
//# sourceMappingURL=files-data-container.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"files-data-container.js","sourceRoot":"","sources":["../../../build-scanner/mappings/files-data-container.ts"],"names":[],"mappings":";;;AAEA;IAAA;QAEY,WAAM,GAAgC,EAAE,CAAC;IA2CrD,CAAC;IAzCG,sBAAI,qCAAK;aAAT;YACI,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACtC,CAAC;;;OAAA;IAED,oCAAO,GAAP,UAAQ,IAAc;QAClB,IAAG,CAAC,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,MAAM,CAAC,EAAE;YACpC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC;SACzC;IACL,CAAC;IAED,sCAAS,GAAT,UAAU,IAAY,EAAE,MAAkB;;QACtC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;QACxE,IAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACzD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC;QACtE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,mBAAmB,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC;QAC5E,IAAG,MAAA,MAAM,CAAC,IAAI,CAAC,kBAAkB,0CAAE,KAAK,CAAC,UAAA,CAAC,IAAG,OAAA,CAAC,KAAI,IAAI,EAAT,CAAS,CAAC,EAAE;YACrD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC;SACxF;IACL,CAAC;IAED,sCAAS,GAAT,UAAU,IAAY,EAAE,MAAkB;QACtC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;QACxE,IAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC1D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,gBAAgB,CAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,SAAI,MAAM,CAAC,KAAO,CAAC,GAAG,KAAK,CAAC;IAC/F,CAAC;IAEO,gDAAmB,GAA3B,UAA4B,SAAS;QACjC,OAAO;YACH,KAAK,EAAE,EAAE;YACT,OAAO,EAAE,EAAE;YACX,QAAQ,EAAE,EAAE;YACZ,WAAW,EAAE,SAAS;YACtB,YAAY,EAAE,EAAE;YAChB,IAAI,EAAE,EAAE;YACR,cAAc,EAAE,IAAI;YACpB,gBAAgB,EAAC,EAAE;YACnB,gBAAgB,EAAC,EAAE;YACnB,mBAAmB,EAAC,EAAE;SACzB,CAAC;IACN,CAAC;IAEL,yBAAC;AAAD,CAAC,AA7CD,IA6CC;AA7CY,gDAAkB"}
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
3
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
4
|
+
if (ar || !(i in from)) {
|
|
5
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
6
|
+
ar[i] = from[i];
|
|
7
|
+
}
|
|
8
|
+
}
|
|
9
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.ScmFileFixer = void 0;
|
|
13
|
+
var files_utils_1 = require("../../common/utils/files-utils");
|
|
14
|
+
var path_1 = require("path");
|
|
15
|
+
var logger_1 = require("../../common/logger");
|
|
16
|
+
var file_element_utils_1 = require("./file-element-utils");
|
|
17
|
+
var logger = logger_1.LoggerFactory.getCreateApplicationLogger();
|
|
18
|
+
var ScmFileFixer = /** @class */ (function () {
|
|
19
|
+
function ScmFileFixer(scmFilesContainer, slMapper) {
|
|
20
|
+
this.scmFilesContainer = scmFilesContainer;
|
|
21
|
+
this.slMapper = slMapper;
|
|
22
|
+
}
|
|
23
|
+
ScmFileFixer.prototype.fixFilesPath = function (uniqueFiles, scmRootDir) {
|
|
24
|
+
var duplicatesMatchFiles = [];
|
|
25
|
+
var prefixToAdd = '';
|
|
26
|
+
var uniqueFileCopy = __spreadArray([], uniqueFiles, true);
|
|
27
|
+
for (var _i = 0, uniqueFiles_1 = uniqueFiles; _i < uniqueFiles_1.length; _i++) {
|
|
28
|
+
var file = uniqueFiles_1[_i];
|
|
29
|
+
var filesFromScm = this.fixPathByScm(file.logicalPath);
|
|
30
|
+
if (filesFromScm.length > 1) {
|
|
31
|
+
duplicatesMatchFiles.push(file);
|
|
32
|
+
}
|
|
33
|
+
else if (filesFromScm.length === 1) {
|
|
34
|
+
var fullScmFilePath = filesFromScm[0];
|
|
35
|
+
prefixToAdd = fullScmFilePath.replace(file.logicalPath, '');
|
|
36
|
+
this.fixOneFile(file, fullScmFilePath, scmRootDir);
|
|
37
|
+
}
|
|
38
|
+
else {
|
|
39
|
+
logger.info("Cannot find file " + file.logicalPath + " in git. File is auto generated.");
|
|
40
|
+
var indexToRemove = uniqueFileCopy.indexOf(file);
|
|
41
|
+
uniqueFileCopy.splice(indexToRemove, 1);
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
for (var _a = 0, duplicatesMatchFiles_1 = duplicatesMatchFiles; _a < duplicatesMatchFiles_1.length; _a++) {
|
|
45
|
+
var fileToFix = duplicatesMatchFiles_1[_a];
|
|
46
|
+
var fullScmFile = files_utils_1.FilesUtils.adjustPathSlashes("" + prefixToAdd + fileToFix.logicalPath);
|
|
47
|
+
this.fixOneFile(fileToFix, fullScmFile, scmRootDir);
|
|
48
|
+
}
|
|
49
|
+
return uniqueFileCopy;
|
|
50
|
+
};
|
|
51
|
+
ScmFileFixer.prototype.fixOneFile = function (file, fullScmFilePath, scmRootDir) {
|
|
52
|
+
var _this = this;
|
|
53
|
+
file.logicalPath = files_utils_1.FilesUtils.adjustPathSlashes(fullScmFilePath);
|
|
54
|
+
file.physicalPath = files_utils_1.FilesUtils.adjustPathSlashes(fullScmFilePath);
|
|
55
|
+
file.absolutePath = (0, path_1.join)(scmRootDir, file.physicalPath);
|
|
56
|
+
file.methods.forEach(function (method) {
|
|
57
|
+
method.uniqueId = files_utils_1.FilesUtils.adjustPathSlashes(file.logicalPath) + "@" + method.position.join(',');
|
|
58
|
+
_this.slMapper.addUniqueId(method.uniqueIdKey, method.uniqueId);
|
|
59
|
+
delete method.uniqueIdKey;
|
|
60
|
+
});
|
|
61
|
+
file.branches.forEach(function (branch) {
|
|
62
|
+
var position = (0, file_element_utils_1.getBranchPosition)(branch);
|
|
63
|
+
branch.uniqueId = files_utils_1.FilesUtils.adjustPathSlashes(file.logicalPath) + "|" + position.join(',') + "|" + branch.index;
|
|
64
|
+
_this.slMapper.addUniqueId(branch.uniqueIdKey, branch.uniqueId);
|
|
65
|
+
delete branch.uniqueIdKey;
|
|
66
|
+
});
|
|
67
|
+
};
|
|
68
|
+
ScmFileFixer.prototype.fixPathByScm = function (sourceFile) {
|
|
69
|
+
var gitFiles = this.scmFilesContainer.getScmPath(sourceFile);
|
|
70
|
+
if (gitFiles === null) {
|
|
71
|
+
return [];
|
|
72
|
+
}
|
|
73
|
+
else {
|
|
74
|
+
return gitFiles;
|
|
75
|
+
}
|
|
76
|
+
};
|
|
77
|
+
return ScmFileFixer;
|
|
78
|
+
}());
|
|
79
|
+
exports.ScmFileFixer = ScmFileFixer;
|
|
80
|
+
//# sourceMappingURL=scm-file-fixer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"scm-file-fixer.js","sourceRoot":"","sources":["../../../build-scanner/mappings/scm-file-fixer.ts"],"names":[],"mappings":"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"}
|
|
@@ -130,7 +130,7 @@ var BuildMappingData = /** @class */ (function (_super) {
|
|
|
130
130
|
console.log(chalk_1.default.blue('Done scanning\n\n'));
|
|
131
131
|
buildMappingData.validate();
|
|
132
132
|
buildMappingData.buildMapping = buildMappingData.dryRunProxy.buildMappingRequest;
|
|
133
|
-
buildMappingData.uniqueIds = (0, helper_methods_1.
|
|
133
|
+
buildMappingData.uniqueIds = (0, helper_methods_1.getUniqueIdsBuildMap)(buildMappingData.buildMapping.files);
|
|
134
134
|
buildMappingData.files = (0, helper_methods_1.uniqueIdsToFoldersByDepth)(buildMappingData.uniqueIds, buildArguments.depth);
|
|
135
135
|
buildMappingData.saveDataToFiles();
|
|
136
136
|
buildMappingData.storeThirdParties();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-mapping-data.js","sourceRoot":"","sources":["../../../../cli-parse/executors/dry-run/build-mapping-data.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"build-mapping-data.js","sourceRoot":"","sources":["../../../../cli-parse/executors/dry-run/build-mapping-data.ts"],"names":[],"mappings":"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"}
|
|
@@ -96,7 +96,7 @@ var DryRunExecutor = /** @class */ (function (_super) {
|
|
|
96
96
|
return __generator(this, function (_b) {
|
|
97
97
|
switch (_b.label) {
|
|
98
98
|
case 0:
|
|
99
|
-
_b.trys.push([0,
|
|
99
|
+
_b.trys.push([0, 4, , 5]);
|
|
100
100
|
this.validateArgs(args);
|
|
101
101
|
dryRunProxy = new dry_run_proxy_1.DryRunProxy();
|
|
102
102
|
this.init(dryRunProxy);
|
|
@@ -107,18 +107,20 @@ var DryRunExecutor = /** @class */ (function (_super) {
|
|
|
107
107
|
return [4 /*yield*/, this.verifyBuildMappingData(buildMappingData)];
|
|
108
108
|
case 2:
|
|
109
109
|
_b.sent();
|
|
110
|
-
|
|
110
|
+
return [4 /*yield*/, footprints_data_1.FootprintsData.run(buildArguments, this.logger, dryRunProxy)];
|
|
111
|
+
case 3:
|
|
112
|
+
footprintsData = _b.sent();
|
|
111
113
|
this.validateIds(buildMappingData, footprintsData, buildArguments.depth);
|
|
112
114
|
this.printResult(dryRunProxy, args, footprintsData, buildMappingData);
|
|
113
115
|
if ((_a = buildMappingData.buildMappingResult) === null || _a === void 0 ? void 0 : _a.err) {
|
|
114
116
|
throw buildMappingData.buildMappingResult.err;
|
|
115
117
|
}
|
|
116
|
-
return [3 /*break*/,
|
|
117
|
-
case
|
|
118
|
+
return [3 /*break*/, 5];
|
|
119
|
+
case 4:
|
|
118
120
|
e_1 = _b.sent();
|
|
119
121
|
console.log(chalk_1.default.red(Constants.DONE_WITH_ERROR_MSG + " '" + e_1 + "'"));
|
|
120
|
-
return [3 /*break*/,
|
|
121
|
-
case
|
|
122
|
+
return [3 /*break*/, 5];
|
|
123
|
+
case 5: return [2 /*return*/];
|
|
122
124
|
}
|
|
123
125
|
});
|
|
124
126
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dry-run-executor.js","sourceRoot":"","sources":["../../../../cli-parse/executors/dry-run/dry-run-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA8C;AAE9C,oEAA+D;AAC/D,qCAAwC;AACxC,yBAAyC;AAEzC,qDAAuD;AACvD,kFAA8E;AAC9E,iCAAyC;AACzC,6BAA0B;AAC1B,2DAU8B;AAC9B,+BAA4B;AAC5B,+BAA0B;AAC1B,4FAAmH;AACnH,wCAA2C;AAC3C,oDAA+C;AAC/C,2DAAsD;AACtD,qDAAiD;AACjD,mDAA4F;AAC5F,iDAAqD;AAErD;IAAoC,kCAA0C;IAA9E;QAAA,qEAgMC;QA/La,iBAAW,GAAG,QAAQ,CAAC;QACzB,kBAAY,GAAuC,IAAI,GAAG,EAAiC,CAAC;;IA8LxG,CAAC;IA5LgB,gCAAO,GAApB,UAAqB,IAAiB,EAAE,SAAoB;;;;;;;;wBAEpD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;wBAClB,WAAW,GAAG,IAAI,2BAAW,EAAE,CAAC;wBACtC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;wBACjB,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;wBACjB,qBAAM,qCAAgB,CAAC,GAAG,CAAC,WAAW,EAAE,cAAc,EAAE,IAAI,CAAC,MAAM,CAAC,EAAA;;wBAAvF,gBAAgB,GAAG,SAAoE;wBAC7F,qBAAM,IAAI,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,EAAA;;wBAAnD,SAAmD,CAAC;
|
|
1
|
+
{"version":3,"file":"dry-run-executor.js","sourceRoot":"","sources":["../../../../cli-parse/executors/dry-run/dry-run-executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,15 +14,56 @@ var __extends = (this && this.__extends) || (function () {
|
|
|
14
14
|
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
|
|
15
15
|
};
|
|
16
16
|
})();
|
|
17
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
18
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
19
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
20
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
21
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
22
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
23
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
24
|
+
});
|
|
25
|
+
};
|
|
26
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
27
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
28
|
+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
29
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
30
|
+
function step(op) {
|
|
31
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
32
|
+
while (_) try {
|
|
33
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
34
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
35
|
+
switch (op[0]) {
|
|
36
|
+
case 0: case 1: t = op; break;
|
|
37
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
38
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
39
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
40
|
+
default:
|
|
41
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
42
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
43
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
44
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
45
|
+
if (t[2]) _.ops.pop();
|
|
46
|
+
_.trys.pop(); continue;
|
|
47
|
+
}
|
|
48
|
+
op = body.call(thisArg, _);
|
|
49
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
50
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
51
|
+
}
|
|
52
|
+
};
|
|
17
53
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
54
|
exports.FootprintsData = void 0;
|
|
19
55
|
var config_1 = require("../../../common/config-process/config");
|
|
20
|
-
var nyc_report_executor_1 = require("../../../test-listener/nyc-report-executor");
|
|
21
56
|
var agent_instance_data_1 = require("../../agent-instance-data");
|
|
22
57
|
var Constants = require("../../constants/constants");
|
|
23
58
|
var helper_methods_1 = require("./helper-methods");
|
|
24
59
|
var base_data_1 = require("./base-data");
|
|
25
60
|
var chalk_1 = require("chalk");
|
|
61
|
+
var nyc_report_executor_fpv6_1 = require("../../../test-listener/nyc-report-executor-fpv6");
|
|
62
|
+
var hits_collector_1 = require("../../../common/footprints-process-v6/hits-collector");
|
|
63
|
+
var hits_converter_1 = require("../../../common/footprints-process-v6/hits-converter");
|
|
64
|
+
var relative_path_resolver_1 = require("../../../common/footprints-process-v6/relative-path-resolver");
|
|
65
|
+
var source_map_data_1 = require("../../../common/footprints-process-v6/source-map-data");
|
|
66
|
+
var footprints_buffer_1 = require("../../../common/footprints-process-v6/footprints-buffer");
|
|
26
67
|
var FootprintsData = /** @class */ (function (_super) {
|
|
27
68
|
__extends(FootprintsData, _super);
|
|
28
69
|
function FootprintsData(buildArguments, logger) {
|
|
@@ -32,10 +73,17 @@ var FootprintsData = /** @class */ (function (_super) {
|
|
|
32
73
|
_this.logger = logger;
|
|
33
74
|
return _this;
|
|
34
75
|
}
|
|
35
|
-
FootprintsData.prototype.getFootprintsFile = function () {
|
|
76
|
+
FootprintsData.prototype.getFootprintsFile = function (dryRunProxy) {
|
|
36
77
|
var agentConfig = new config_1.AgentConfig();
|
|
37
|
-
|
|
38
|
-
|
|
78
|
+
var projectRoot = this.buildArguments.nycProjectRoot;
|
|
79
|
+
agentConfig.projectRoot.value = projectRoot;
|
|
80
|
+
var hitsCollector = new hits_collector_1.HitsCollector(this.logger);
|
|
81
|
+
var relativePathResolver = new relative_path_resolver_1.RelativePathResolver(projectRoot);
|
|
82
|
+
var sourceMapData = new source_map_data_1.SourceMapData(this.logger);
|
|
83
|
+
var hitsConverter = new hits_converter_1.HitsConverter(relativePathResolver, sourceMapData, projectRoot, this.logger);
|
|
84
|
+
var footprintsBuffer = new footprints_buffer_1.FootprintsBuffer(agent_instance_data_1.agentInstanceData, agentConfig);
|
|
85
|
+
var nycReportExecutorFpv6 = new nyc_report_executor_fpv6_1.NycReportExecutorFpv6(dryRunProxy, hitsCollector, hitsConverter, footprintsBuffer, agentConfig, this.buildArguments.report, this.logger);
|
|
86
|
+
return nycReportExecutorFpv6.dryRun();
|
|
39
87
|
};
|
|
40
88
|
FootprintsData.prototype.saveDataToFiles = function () {
|
|
41
89
|
(0, helper_methods_1.saveDataToFile)(Constants.FOOTPRINTS, this.footprints);
|
|
@@ -43,19 +91,31 @@ var FootprintsData = /** @class */ (function (_super) {
|
|
|
43
91
|
};
|
|
44
92
|
FootprintsData.prototype.printVerbose = function () {
|
|
45
93
|
};
|
|
46
|
-
FootprintsData.run = function (buildArguments, logger) {
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
94
|
+
FootprintsData.run = function (buildArguments, logger, dryRunProxy) {
|
|
95
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
96
|
+
var footprintsData, _a;
|
|
97
|
+
return __generator(this, function (_b) {
|
|
98
|
+
switch (_b.label) {
|
|
99
|
+
case 0:
|
|
100
|
+
footprintsData = new FootprintsData(buildArguments, logger);
|
|
101
|
+
if (!buildArguments.hasNycReport) {
|
|
102
|
+
return [2 /*return*/, footprintsData];
|
|
103
|
+
}
|
|
104
|
+
console.log(chalk_1.default.blue('Reading nyc report\n\n'));
|
|
105
|
+
_a = footprintsData;
|
|
106
|
+
return [4 /*yield*/, footprintsData.getFootprintsFile(dryRunProxy)];
|
|
107
|
+
case 1:
|
|
108
|
+
_a.footprints = _b.sent();
|
|
109
|
+
if (footprintsData.footprints) {
|
|
110
|
+
footprintsData.uniqueIds = (0, helper_methods_1.getUniqueIdsFootprints)(footprintsData.footprints);
|
|
111
|
+
footprintsData.files = (0, helper_methods_1.uniqueIdsToFoldersByDepth)(footprintsData.uniqueIds, buildArguments.depth);
|
|
112
|
+
footprintsData.saveDataToFiles();
|
|
113
|
+
}
|
|
114
|
+
console.log(chalk_1.default.blue('Done reading nyc report\n\n'));
|
|
115
|
+
return [2 /*return*/, footprintsData];
|
|
116
|
+
}
|
|
117
|
+
});
|
|
118
|
+
});
|
|
59
119
|
};
|
|
60
120
|
Object.defineProperty(FootprintsData.prototype, "footprints", {
|
|
61
121
|
get: function () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"footprints-data.js","sourceRoot":"","sources":["../../../../cli-parse/executors/dry-run/footprints-data.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"footprints-data.js","sourceRoot":"","sources":["../../../../cli-parse/executors/dry-run/footprints-data.ts"],"names":[],"mappings":"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"}
|