scanoss 0.28.0-beta.1 → 0.28.1
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/CHANGELOG.md +10 -4
- package/build/main/cli/commands/scan.js +9 -115
- package/build/main/sdk/Clients/Dependency/DependencyHttpClient.js +2 -1
- package/build/main/sdk/Clients/Dependency/IDependencyClient.d.ts +1 -0
- package/build/main/sdk/Decompress/DecompressionManager.js +8 -2
- package/build/main/sdk/Dependencies/DependencyScanner.js +3 -5
- package/build/main/sdk/Dependencies/DependencyTypes.d.ts +1 -0
- package/build/main/sdk/scanner/Scanner.d.ts +0 -9
- package/build/main/sdk/scanner/Scanner.js +34 -139
- package/build/main/sdk/scanner/ScannerCfg.js +2 -2
- package/build/main/tsconfig.tsbuildinfo +1 -1
- package/build/module/cli/commands/scan.js +9 -115
- package/build/module/sdk/Clients/Dependency/DependencyHttpClient.js +2 -1
- package/build/module/sdk/Clients/Dependency/IDependencyClient.d.ts +1 -0
- package/build/module/sdk/Decompress/DecompressionManager.js +8 -2
- package/build/module/sdk/Dependencies/DependencyScanner.js +3 -5
- package/build/module/sdk/Dependencies/DependencyTypes.d.ts +1 -0
- package/build/module/sdk/scanner/Scanner.d.ts +0 -9
- package/build/module/sdk/scanner/Scanner.js +34 -141
- package/build/module/sdk/scanner/ScannerCfg.js +2 -2
- package/build/module/tsconfig.module.tsbuildinfo +1 -1
- package/package.json +1 -3
package/CHANGELOG.md
CHANGED
|
@@ -2,9 +2,14 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
|
4
4
|
|
|
5
|
-
|
|
5
|
+
|
|
6
|
+
## [0.28.1] (2025-12-10)
|
|
6
7
|
### Changed
|
|
7
|
-
-
|
|
8
|
+
- Deleted zip folders on extraction failure
|
|
9
|
+
|
|
10
|
+
## [0.28.0] (2025-12-10)
|
|
11
|
+
### Added
|
|
12
|
+
- Added `requirement` field in dependency response
|
|
8
13
|
|
|
9
14
|
## [0.27.0] (2025-11-11)
|
|
10
15
|
### Added
|
|
@@ -181,5 +186,6 @@ All notable changes to this project will be documented in this file. See [standa
|
|
|
181
186
|
### [0.24.0](https://github.com/scanoss/scanoss.js/compare/v0.23.0...v0.24.0) (2025-09-23)
|
|
182
187
|
### [0.25.0](https://github.com/scanoss/scanoss.js/compare/v0.24.0...v0.25.0) (2025-10-01)
|
|
183
188
|
### [0.26.0](https://github.com/scanoss/scanoss.js/compare/v0.25.0...v0.26.0) (2025-10-30)
|
|
184
|
-
### [0.27.0](https://github.com/scanoss/scanoss.js/compare/v0.26.0...v0.
|
|
185
|
-
### [0.28.0
|
|
189
|
+
### [0.27.0](https://github.com/scanoss/scanoss.js/compare/v0.26.0...v0.26.1) (2025-11-11)
|
|
190
|
+
### [0.28.0](https://github.com/scanoss/scanoss.js/compare/v0.27.0...v0.28.1) (2025-12-10)
|
|
191
|
+
### [0.28.1](https://github.com/scanoss/scanoss.js/compare/v0.28.0...v0.28.1) (2025-12-10)
|
|
@@ -28,83 +28,7 @@ const LicenseObligationDataProvider_1 = require("../../sdk/Report/DataLayer/Data
|
|
|
28
28
|
const CryptographyDataProvider_1 = require("../../sdk/Report/DataLayer/DataProviders/CryptographyDataProvider");
|
|
29
29
|
const CryptoCfg_1 = require("../../sdk/Cryptography/CryptoCfg");
|
|
30
30
|
const CryptographyScanner_1 = require("../../sdk/Cryptography/CryptographyScanner");
|
|
31
|
-
const stream_json_1 = require("stream-json");
|
|
32
|
-
const StreamObject_1 = require("stream-json/streamers/StreamObject");
|
|
33
|
-
const os_1 = require("os");
|
|
34
31
|
const Logger_1 = require("../../sdk/Logger/Logger");
|
|
35
|
-
/**
|
|
36
|
-
* Stream JSON scanner results and transform into new structure
|
|
37
|
-
* @param resultPath Path to the scanner JSON results file
|
|
38
|
-
* @param depResults Dependency results to include
|
|
39
|
-
* @param cryptoFiles Cryptography files to include
|
|
40
|
-
* @param cryptoComponents Cryptography components to include
|
|
41
|
-
* @param outputPath Output file path (optional, writes to stdout if not provided)
|
|
42
|
-
*/
|
|
43
|
-
async function streamAndTransformResults(resultPath, depResults, cryptoFiles, cryptoComponents, outputPath) {
|
|
44
|
-
const pipeline = fs_1.default.createReadStream(resultPath)
|
|
45
|
-
.pipe((0, stream_json_1.parser)())
|
|
46
|
-
.pipe((0, StreamObject_1.streamObject)());
|
|
47
|
-
return new Promise((resolve, reject) => {
|
|
48
|
-
// Create write stream or use stdout
|
|
49
|
-
const writeStream = outputPath
|
|
50
|
-
? fs_1.default.createWriteStream(outputPath)
|
|
51
|
-
: process.stdout;
|
|
52
|
-
let firstScannerKey = true;
|
|
53
|
-
// Helper to indent JSON output
|
|
54
|
-
const indentLines = (jsonStr, spaces) => {
|
|
55
|
-
const indent = ' '.repeat(spaces);
|
|
56
|
-
return jsonStr.split(os_1.EOL).map((line, idx) => idx === 0 ? line : indent + line).join(os_1.EOL);
|
|
57
|
-
};
|
|
58
|
-
// Start the result object
|
|
59
|
-
writeStream.write(`{${os_1.EOL}`);
|
|
60
|
-
writeStream.write(` "scanner": {${os_1.EOL}`);
|
|
61
|
-
pipeline.on('data', (data) => {
|
|
62
|
-
// Stream each key-value pair from scanner results
|
|
63
|
-
if (!firstScannerKey) {
|
|
64
|
-
writeStream.write(`,${os_1.EOL}`);
|
|
65
|
-
}
|
|
66
|
-
const valueJson = JSON.stringify(data.value, null, 2);
|
|
67
|
-
const indentedValue = indentLines(valueJson, 4);
|
|
68
|
-
writeStream.write(` ${JSON.stringify(data.key)}: ${indentedValue}`);
|
|
69
|
-
firstScannerKey = false;
|
|
70
|
-
});
|
|
71
|
-
pipeline.on('end', () => {
|
|
72
|
-
// Close scanner object and add other fields
|
|
73
|
-
writeStream.write(`${os_1.EOL} },${os_1.EOL}`);
|
|
74
|
-
const depJson = JSON.stringify(depResults, null, 2);
|
|
75
|
-
const indentedDep = indentLines(depJson, 2);
|
|
76
|
-
writeStream.write(` "dependencies": ${indentedDep},${os_1.EOL}`);
|
|
77
|
-
writeStream.write(` "cryptography": {${os_1.EOL}`);
|
|
78
|
-
const filesJson = JSON.stringify(cryptoFiles, null, 2);
|
|
79
|
-
const indentedFiles = indentLines(filesJson, 4);
|
|
80
|
-
writeStream.write(` "files": ${indentedFiles},${os_1.EOL}`);
|
|
81
|
-
const componentsJson = JSON.stringify(cryptoComponents, null, 2);
|
|
82
|
-
const indentedComponents = indentLines(componentsJson, 4);
|
|
83
|
-
writeStream.write(` "components": ${indentedComponents}${os_1.EOL}`);
|
|
84
|
-
writeStream.write(` }${os_1.EOL}`);
|
|
85
|
-
writeStream.write('}');
|
|
86
|
-
if (outputPath) {
|
|
87
|
-
writeStream.end(() => resolve());
|
|
88
|
-
}
|
|
89
|
-
else {
|
|
90
|
-
writeStream.write(os_1.EOL);
|
|
91
|
-
resolve();
|
|
92
|
-
}
|
|
93
|
-
});
|
|
94
|
-
pipeline.on('error', (error) => {
|
|
95
|
-
if (outputPath && writeStream !== process.stdout) {
|
|
96
|
-
writeStream.destroy();
|
|
97
|
-
}
|
|
98
|
-
reject(error);
|
|
99
|
-
});
|
|
100
|
-
if (outputPath) {
|
|
101
|
-
writeStream.on('error', (error) => {
|
|
102
|
-
pipeline.destroy();
|
|
103
|
-
reject(error);
|
|
104
|
-
});
|
|
105
|
-
}
|
|
106
|
-
});
|
|
107
|
-
}
|
|
108
32
|
async function scanHandler(rootPath, options) {
|
|
109
33
|
if (options.debug)
|
|
110
34
|
Logger_1.logger.setLevel(Logger_1.Logger.Level.debug);
|
|
@@ -252,7 +176,6 @@ async function scanHandler(rootPath, options) {
|
|
|
252
176
|
const [scannerResultPath, depResults] = await Promise.all([pScanner, pDependencyScanner]);
|
|
253
177
|
results.scanner = JSON.parse(await fs_1.default.promises.readFile(scannerResultPath, "utf-8"));
|
|
254
178
|
results.dependencies = depResults;
|
|
255
|
-
// Cryptography scanning
|
|
256
179
|
if (options.cryptography) {
|
|
257
180
|
const cfg = new CryptoCfg_1.CryptoCfg();
|
|
258
181
|
if (options.algorithmRules)
|
|
@@ -284,21 +207,9 @@ async function scanHandler(rootPath, options) {
|
|
|
284
207
|
return { ...c, file: c.file.replace(rootPath, "") };
|
|
285
208
|
});
|
|
286
209
|
results.cryptography.files = localCrypto.fileList;
|
|
287
|
-
// Component Cryptography
|
|
210
|
+
// Component Cryptography
|
|
288
211
|
if (options.key) {
|
|
289
|
-
|
|
290
|
-
const scannerData = await new Promise((resolve, reject) => {
|
|
291
|
-
const pipeline = fs_1.default.createReadStream(scannerResultPath)
|
|
292
|
-
.pipe((0, stream_json_1.parser)())
|
|
293
|
-
.pipe((0, StreamObject_1.streamObject)());
|
|
294
|
-
const scannerResults = {};
|
|
295
|
-
pipeline.on('data', (data) => {
|
|
296
|
-
scannerResults[data.key] = data.value;
|
|
297
|
-
});
|
|
298
|
-
pipeline.on('end', () => resolve(scannerResults));
|
|
299
|
-
pipeline.on('error', reject);
|
|
300
|
-
});
|
|
301
|
-
let componentList = Object.values(scannerData).flat();
|
|
212
|
+
let componentList = Object.values(results.scanner).flat();
|
|
302
213
|
componentList = componentList.filter((component) => component.id !== "none");
|
|
303
214
|
const cryptoRequest = componentList.map((c) => {
|
|
304
215
|
return { purl: c.purl[0], requirement: c.version };
|
|
@@ -306,21 +217,8 @@ async function scanHandler(rootPath, options) {
|
|
|
306
217
|
results.cryptography.components = await cryptoScanner.scanComponents(cryptoRequest);
|
|
307
218
|
}
|
|
308
219
|
}
|
|
309
|
-
|
|
220
|
+
let resultString = JSON.stringify(results, null, 2);
|
|
310
221
|
if (options.format && options.format.toLowerCase() === "html") {
|
|
311
|
-
// For HTML format, we need to load scanner results into memory
|
|
312
|
-
const scannerData = await new Promise((resolve, reject) => {
|
|
313
|
-
const pipeline = fs_1.default.createReadStream(scannerResultPath)
|
|
314
|
-
.pipe((0, stream_json_1.parser)())
|
|
315
|
-
.pipe((0, StreamObject_1.streamObject)());
|
|
316
|
-
const scannerResults = {};
|
|
317
|
-
pipeline.on('data', (data) => {
|
|
318
|
-
scannerResults[data.key] = data.value;
|
|
319
|
-
});
|
|
320
|
-
pipeline.on('end', () => resolve(scannerResults));
|
|
321
|
-
pipeline.on('error', reject);
|
|
322
|
-
});
|
|
323
|
-
results.scanner = scannerData;
|
|
324
222
|
const dataProviderManager = new DataProviderManager_1.DataProviderManager();
|
|
325
223
|
dataProviderManager.addDataProvider(new ComponentDataProvider_1.ComponentDataProvider(results.scanner, results.dependencies));
|
|
326
224
|
dataProviderManager.addDataProvider(new DependencyDataProvider_1.DependencyDataProvider(results.dependencies));
|
|
@@ -329,15 +227,11 @@ async function scanHandler(rootPath, options) {
|
|
|
329
227
|
dataProviderManager.addDataProvider(new LicenseObligationDataProvider_1.LicenseObligationDataProvider(results.scanner, results.dependencies));
|
|
330
228
|
dataProviderManager.addDataProvider(new CryptographyDataProvider_1.CryptographyDataProvider(results.cryptography.files, results.cryptography.components));
|
|
331
229
|
const report = new Report_1.Report(dataProviderManager);
|
|
332
|
-
|
|
333
|
-
if (options.output)
|
|
334
|
-
await fs_1.default.promises.writeFile(options.output, resultString);
|
|
335
|
-
else
|
|
336
|
-
console.log(resultString);
|
|
337
|
-
}
|
|
338
|
-
else {
|
|
339
|
-
// For JSON format, stream the transformation
|
|
340
|
-
await streamAndTransformResults(scannerResultPath, results.dependencies, results.cryptography.files, results.cryptography.components, options.output);
|
|
230
|
+
resultString = await report.getHTML();
|
|
341
231
|
}
|
|
232
|
+
if (options.output)
|
|
233
|
+
await fs_1.default.promises.writeFile(options.output, resultString);
|
|
234
|
+
else
|
|
235
|
+
console.log(resultString);
|
|
342
236
|
}
|
|
343
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"scan.js","sourceRoot":"","sources":["../../../../src/cli/commands/scan.ts"],"names":[],"mappings":"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"}
|
|
237
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"scan.js","sourceRoot":"","sources":["../../../../src/cli/commands/scan.ts"],"names":[],"mappings":"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"}
|
|
@@ -53,6 +53,7 @@ class DependencyHttpClient extends HttpClient_1.HttpClient {
|
|
|
53
53
|
component: dep.component,
|
|
54
54
|
purl: dep.purl,
|
|
55
55
|
version: dep.version,
|
|
56
|
+
requirement: dep.requirement,
|
|
56
57
|
licensesList: dep.licenses.map(license => ({
|
|
57
58
|
name: license.name,
|
|
58
59
|
spdxId: license.spdx_id,
|
|
@@ -72,4 +73,4 @@ class DependencyHttpClient extends HttpClient_1.HttpClient {
|
|
|
72
73
|
}
|
|
73
74
|
}
|
|
74
75
|
exports.DependencyHttpClient = DependencyHttpClient;
|
|
75
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
76
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGVwZW5kZW5jeUh0dHBDbGllbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvc2RrL0NsaWVudHMvRGVwZW5kZW5jeS9EZXBlbmRlbmN5SHR0cENsaWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxtREFBZ0Q7QUFHaEQsZ0RBQTZDO0FBRTdDOzs7R0FHRztBQUNILE1BQWEsb0JBQXFCLFNBQVEsdUJBQVU7SUFDbEQ7OztPQUdHO0lBQ0gsWUFBWSxZQUEwQjtRQUNwQyxLQUFLLENBQUMsWUFBWSxDQUFDLENBQUM7SUFDdEIsQ0FBQztJQUVEOzs7OztPQUtHO0lBQ0ksS0FBSyxDQUFDLGVBQWUsQ0FBQyxHQUFzQjtRQUNqRCxJQUFHLENBQUM7WUFDRixNQUFNLEdBQUcsR0FBRyxHQUFHLElBQUksQ0FBQyxPQUFPLEVBQUUsK0JBQStCLENBQUM7WUFDN0QsZUFBTSxDQUFDLEtBQUssQ0FBQyx3QkFBd0IsR0FBRyxFQUFFLENBQUMsQ0FBQztZQUM1QyxNQUFNLFFBQVEsR0FBRyxNQUFNLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLEdBQUcsQ0FBQyxDQUFDO1lBQzNDLElBQUksUUFBUSxDQUFDLEVBQUUsRUFBRSxDQUFDO2dCQUNoQixPQUFPLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxNQUFNLFFBQVEsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDO1lBQzFELENBQUM7WUFDRCxNQUFNLFNBQVMsR0FBRyxNQUFNLFFBQVEsQ0FBQyxJQUFJLEVBQUUsQ0FBQztZQUN4QyxNQUFNLFlBQVksR0FBRywrQkFBK0IsUUFBUSxDQUFDLE1BQU0sSUFBSSxRQUFRLENBQUMsVUFBVSxNQUFNLFNBQVMsRUFBRSxDQUFDO1lBQzVHLE1BQU0sSUFBSSxLQUFLLENBQUMsWUFBWSxDQUFDLENBQUM7UUFDaEMsQ0FBQztRQUFDLE9BQU8sS0FBSyxFQUFFLENBQUM7WUFDZixNQUFNLElBQUksQ0FBQyxXQUFXLENBQUMsS0FBSyxFQUFFLDRCQUE0QixDQUFDLENBQUM7UUFDOUQsQ0FBQztJQUNILENBQUM7SUFDRDs7Ozs7T0FLRztJQUNLLG9CQUFvQixDQUFDLFlBQWlCO1FBQzVDLG1DQUFtQztRQUNuQyxNQUFNLFNBQVMsR0FBRyxZQUFZLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUM7WUFDaEQsSUFBSSxFQUFFLElBQUksQ0FBQyxJQUFJO1lBQ2YsRUFBRSxFQUFFLElBQUksQ0FBQyxFQUFFO1lBQ1gsTUFBTSxFQUFFLElBQUksQ0FBQyxNQUFNO1lBQ25CLGdCQUFnQixFQUFFLElBQUksQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQztnQkFDOUMsU0FBUyxFQUFFLEdBQUcsQ0FBQyxTQUFTO2dCQUN4QixJQUFJLEVBQUUsR0FBRyxDQUFDLElBQUk7Z0JBQ2QsT0FBTyxFQUFFLEdBQUcsQ0FBQyxPQUFPO2dCQUNwQixXQUFXLEVBQUUsR0FBRyxDQUFDLFdBQVc7Z0JBQzVCLFlBQVksRUFBRSxHQUFHLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDLENBQUM7b0JBQ3pDLElBQUksRUFBRSxPQUFPLENBQUMsSUFBSTtvQkFDbEIsTUFBTSxFQUFFLE9BQU8sQ0FBQyxPQUFPO29CQUN2QixjQUFjLEVBQUUsT0FBTyxDQUFDLGdCQUFnQjtvQkFDeEMsR0FBRyxFQUFFLE9BQU8sQ0FBQyxHQUFHO2lCQUNqQixDQUFDLENBQUM7Z0JBQ0gsR0FBRyxFQUFFLEdBQUcsQ0FBQyxHQUFHO2dCQUNaLE9BQU8sRUFBRSxHQUFHLENBQUMsT0FBTztnQkFDcEIsOEVBQThFO2dCQUM5RSxLQUFLLEVBQUUsR0FBRyxDQUFDLEtBQUssSUFBSSxjQUFjO2FBQ25DLENBQUMsQ0FBQztTQUNKLENBQUMsQ0FBQyxDQUFDO1FBQ0osT0FBTztZQUNMLFNBQVMsRUFBRSxTQUFTO1lBQ3BCLE1BQU0sRUFBRSxZQUFZLENBQUMsTUFBTTtTQUM1QixDQUFDO0lBQ0osQ0FBQztDQUNGO0FBaEVELG9EQWdFQyJ9
|
|
@@ -56,7 +56,13 @@ class DecompressionManager {
|
|
|
56
56
|
//Search for decompressor and extract archive
|
|
57
57
|
for (const d of this.decompressorList) {
|
|
58
58
|
if (d.isSupported(archiveName)) {
|
|
59
|
-
|
|
59
|
+
try {
|
|
60
|
+
await d.run(archivePath, newFolderPath);
|
|
61
|
+
}
|
|
62
|
+
catch (e) {
|
|
63
|
+
await fs_1.default.promises.rm(newFolderPath, { recursive: true, force: true });
|
|
64
|
+
throw new Error(e);
|
|
65
|
+
}
|
|
60
66
|
break;
|
|
61
67
|
}
|
|
62
68
|
}
|
|
@@ -71,4 +77,4 @@ class DecompressionManager {
|
|
|
71
77
|
}
|
|
72
78
|
}
|
|
73
79
|
exports.DecompressionManager = DecompressionManager;
|
|
74
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
80
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGVjb21wcmVzc2lvbk1hbmFnZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvc2RrL0RlY29tcHJlc3MvRGVjb21wcmVzc2lvbk1hbmFnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsZ0RBQXdCO0FBQ3hCLDRDQUFvQjtBQUNwQix1Q0FBb0M7QUFDcEMsNkVBQTBFO0FBRTFFLGtFQUE4RDtBQUM5RCxnRUFBNkQ7QUFFN0QsTUFBYSxvQkFBb0I7SUFTTyxpSEFBaUg7SUFFdkosWUFBWSxxQkFBNkIsQ0FBQyxFQUFFLFNBQWlCLFdBQVcsRUFBRSxxQkFBOEIsS0FBSztRQUMzRyxJQUFJLENBQUMsa0JBQWtCLEdBQUcsa0JBQWtCLENBQUM7UUFDN0MsSUFBSSxDQUFDLGtCQUFrQixHQUFHLGtCQUFrQixDQUFDO1FBQzdDLElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDO1FBQ3JCLElBQUksQ0FBQyxnQkFBZ0IsR0FBRztZQUN0QixJQUFJLDZCQUFhLEVBQUU7WUFDbkIsSUFBSSw4QkFBYSxFQUFFO1NBQ3BCLENBQUM7SUFFSixDQUFDO0lBRU0sZUFBZSxDQUFDLENBQWU7UUFDcEMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNoQyxDQUFDO0lBRU0sbUJBQW1CO1FBQ3hCLE1BQU0sZ0JBQWdCLEdBQUcsRUFBRSxDQUFDO1FBQzVCLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtZQUNsQyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsbUJBQW1CLEVBQUUsQ0FBQyxDQUFBO1FBQ25ELENBQUMsQ0FBQyxDQUFDO1FBQ0gsT0FBTyxnQkFBZ0IsQ0FBQztJQUMxQixDQUFDO0lBRU0sS0FBSyxDQUFDLFVBQVUsQ0FBQyxhQUE0QjtRQUNsRCxLQUFLLE1BQU0sV0FBVyxJQUFJLGFBQWE7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
|
|
@@ -168,14 +168,12 @@ class DependencyScanner {
|
|
|
168
168
|
const filename = file.file;
|
|
169
169
|
for (const dependency of file.dependenciesList) {
|
|
170
170
|
const localDependencyData = localDependencyInfo[filename + dependency.purl];
|
|
171
|
-
if (localDependencyData === null || localDependencyData === void 0 ? void 0 : localDependencyData.scope)
|
|
172
|
-
dependency[
|
|
173
|
-
if ((localDependencyData === null || localDependencyData === void 0 ? void 0 : localDependencyData.requirement) && dependency.version == '') {
|
|
174
|
-
dependency.version = localDependencyData.requirement;
|
|
171
|
+
if (localDependencyData === null || localDependencyData === void 0 ? void 0 : localDependencyData.scope) {
|
|
172
|
+
dependency["scope"] = localDependencyData.scope;
|
|
175
173
|
}
|
|
176
174
|
}
|
|
177
175
|
}
|
|
178
176
|
}
|
|
179
177
|
}
|
|
180
178
|
exports.DependencyScanner = DependencyScanner;
|
|
181
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
179
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"DependencyScanner.js","sourceRoot":"","sources":["../../../../src/sdk/Dependencies/DependencyScanner.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,8 +23,6 @@ export declare class Scanner extends EventEmitter {
|
|
|
23
23
|
private responseBuffer;
|
|
24
24
|
private filesNotScanned;
|
|
25
25
|
private settings;
|
|
26
|
-
private wfpWriteStream;
|
|
27
|
-
private resultWriteStream;
|
|
28
26
|
constructor(scannerCfg?: ScannerCfg);
|
|
29
27
|
private getScanFolderId;
|
|
30
28
|
private removeWorkingDir;
|
|
@@ -58,16 +56,9 @@ export declare class Scanner extends EventEmitter {
|
|
|
58
56
|
private bufferToFiles;
|
|
59
57
|
private finishJob;
|
|
60
58
|
private finishScan;
|
|
61
|
-
/**
|
|
62
|
-
* Convert NDJSON file to a single JSON object using streams
|
|
63
|
-
* Reads NDJSON line by line and writes formatted JSON
|
|
64
|
-
*/
|
|
65
|
-
private convertNDJSONToJSON;
|
|
66
59
|
private reportLog;
|
|
67
60
|
private errorHandler;
|
|
68
61
|
private createOutputFiles;
|
|
69
|
-
private initializeWriteStreams;
|
|
70
|
-
private closeWriteStreams;
|
|
71
62
|
private appendOutputFiles;
|
|
72
63
|
private isValidInput;
|
|
73
64
|
private abort;
|