scanoss 0.34.0 → 0.35.0
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 +9 -1
- package/build/main/cli/bin/cli-bin.js +6 -1
- package/build/main/cli/commands/helpers.js +5 -2
- package/build/main/cli/commands/scan.js +25 -4
- package/build/main/index.d.ts +1 -0
- package/build/main/index.js +2 -1
- package/build/main/sdk/scanner/Dispatcher/DispatchableItem.d.ts +4 -0
- package/build/main/sdk/scanner/Dispatcher/DispatchableItem.js +7 -1
- package/build/main/sdk/scanner/Dispatcher/Dispatcher.d.ts +1 -0
- package/build/main/sdk/scanner/Dispatcher/Dispatcher.js +20 -8
- package/build/main/sdk/scanner/ScanSettingsBuilder.d.ts +13 -0
- package/build/main/sdk/scanner/ScanSettingsBuilder.js +95 -0
- package/build/main/sdk/scanner/ScanSettingsBuilder.spec.d.ts +1 -0
- package/build/main/sdk/scanner/ScanSettingsBuilder.spec.js +238 -0
- package/build/main/sdk/scanner/Scanner.js +4 -2
- package/build/main/sdk/scanner/ScannnerResultPostProcessor/interfaces/types.d.ts +13 -1
- package/build/main/tsconfig.tsbuildinfo +1 -1
- package/build/module/cli/bin/cli-bin.js +6 -1
- package/build/module/cli/commands/helpers.js +5 -2
- package/build/module/cli/commands/scan.js +24 -4
- package/build/module/index.d.ts +1 -0
- package/build/module/index.js +2 -1
- package/build/module/sdk/scanner/Dispatcher/DispatchableItem.d.ts +4 -0
- package/build/module/sdk/scanner/Dispatcher/DispatchableItem.js +8 -1
- package/build/module/sdk/scanner/Dispatcher/Dispatcher.d.ts +1 -0
- package/build/module/sdk/scanner/Dispatcher/Dispatcher.js +20 -8
- package/build/module/sdk/scanner/ScanSettingsBuilder.d.ts +13 -0
- package/build/module/sdk/scanner/ScanSettingsBuilder.js +86 -0
- package/build/module/sdk/scanner/ScanSettingsBuilder.spec.d.ts +1 -0
- package/build/module/sdk/scanner/ScanSettingsBuilder.spec.js +236 -0
- package/build/module/sdk/scanner/Scanner.js +4 -2
- package/build/module/sdk/scanner/ScannnerResultPostProcessor/interfaces/types.d.ts +13 -1
- package/build/module/tsconfig.module.tsbuildinfo +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,11 +3,19 @@
|
|
|
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
|
## [Unreleased]
|
|
6
|
+
- Upcoming changes...
|
|
7
|
+
|
|
8
|
+
## [0.35.0] (2026-02-26)
|
|
9
|
+
### Added
|
|
10
|
+
- Implemented scan tuning parameters via CLI options and `scanoss.json` settings file (`file_snippet` section)
|
|
11
|
+
- Added `ScanSettingsBuilder` for constructing file snippet scan settings with priority: `scanoss.json` > CLI arguments
|
|
12
|
+
- Supported settings: `min_snippet_hits`, `min_snippet_lines`, `ranking_enabled`, `ranking_threshold`, `honour_file_exts`, `dependency_analysis`
|
|
6
13
|
|
|
7
14
|
## [0.34.0] (2026-02-24)
|
|
8
15
|
### Added
|
|
9
16
|
- Added support for `pnpm-lock.yaml` dependency parsing (v5, v6, and v9+ lockfile formats with transitive dependency scope resolution)
|
|
10
17
|
- Added support for `pip_requirements_lock.txt` (`pip-compile` / `pip-tools` lock file) dependency parsing
|
|
18
|
+
- Added support for new archive decompression format: `.mtar`
|
|
11
19
|
|
|
12
20
|
## [0.33.0] (2026-02-11)
|
|
13
21
|
### Added
|
|
@@ -25,7 +33,6 @@ All notable changes to this project will be documented in this file. See [standa
|
|
|
25
33
|
- Used indirect dynamic import to prevent bundlers from converting ESM `import()` to `require()`
|
|
26
34
|
- Fixed `libarchive.js` worker initialization for paths containing spaces
|
|
27
35
|
|
|
28
|
-
|
|
29
36
|
## [0.31.2] (2026-02-03)
|
|
30
37
|
### Fixed
|
|
31
38
|
- Fixed CryptographyScanner hang when processing empty file list
|
|
@@ -259,3 +266,4 @@ All notable changes to this project will be documented in this file. See [standa
|
|
|
259
266
|
### [0.32.0](https://github.com/scanoss/scanoss.js/compare/v0.31.2...v0.32.0) (2026-02-09)
|
|
260
267
|
### [0.33.0](https://github.com/scanoss/scanoss.js/compare/v0.32.0...v0.33.0) (2026-02-11)
|
|
261
268
|
### [0.34.0](https://github.com/scanoss/scanoss.js/compare/v0.33.0...v0.34.0) (2026-02-24)
|
|
269
|
+
### [0.35.0](https://github.com/scanoss/scanoss.js/compare/v0.34.0...v0.35.0) (2026-02-26)
|
|
@@ -29,6 +29,11 @@ async function main() {
|
|
|
29
29
|
scan.addOption(new commander_1.Option("-o, --output <filename>", "Output result file name (optional - default stdout)"));
|
|
30
30
|
scan.addOption(new commander_1.Option("-f, --format <format>", "Result output format").choices(["json", "html"]));
|
|
31
31
|
scan.addOption(new commander_1.Option("-F, --flags <flags>", "Scanning engine flags (1: disable snippet matching, 2 enable snippet ids, 4: disable dependencies, 8: disable licenses, 16: disable copyrights,32: disable vulnerabilities, 64: disable quality, 128: disable cryptography,256: disable best match, 512: Report identified files)"));
|
|
32
|
+
scan.addOption(new commander_1.Option(" --min-snippet-hits <number>", "Minimum snippet hits required. A value of 0 defers to server configuration (optional)"));
|
|
33
|
+
scan.addOption(new commander_1.Option(" --min-snippet-lines <number>", "Minimum snippet lines required. A value of 0 defers to server configuration (optional)"));
|
|
34
|
+
scan.addOption(new commander_1.Option(" --ranking <value>", "Enable or disable ranking (optional - default: server configuration)").choices(["true", "false"]));
|
|
35
|
+
scan.addOption(new commander_1.Option(" --ranking-threshold <number>", "Ranking threshold value. Valid range: -1 to 10. A value of -1 defers to server configuration (optional)"));
|
|
36
|
+
scan.addOption(new commander_1.Option(" --honour-file-exts <value>", "Honour file extensions during scanning. When not set, defers to server configuration (optional)").choices(["true", "false"]));
|
|
32
37
|
scan.addOption(new commander_1.Option("-P, --post-size postsize>", "Number of kilobytes to limit the post to while scanning (optional - default 32)"));
|
|
33
38
|
scan.addOption(new commander_1.Option("-R, --max-retry <retry>", "Max number of retries for each POST (optional -default 5)"));
|
|
34
39
|
scan.addOption(new commander_1.Option("-M, --timeout <timeout>", "Timeout (in seconds) for API communication (optional -default 120)"));
|
|
@@ -144,4 +149,4 @@ catch (e) {
|
|
|
144
149
|
console.error(e);
|
|
145
150
|
process.exit(1);
|
|
146
151
|
}
|
|
147
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cli-bin.js","sourceRoot":"","sources":["../../../../src/cli/bin/cli-bin.ts"],"names":[],"mappings":"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"}
|
|
152
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cli-bin.js","sourceRoot":"","sources":["../../../../src/cli/bin/cli-bin.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,8 +39,11 @@ async function getSettingsFilePath(settingsFilePath, scanPath) {
|
|
|
39
39
|
return null;
|
|
40
40
|
}
|
|
41
41
|
function validateSettingsFile(settings) {
|
|
42
|
+
if (!settings.bom && !settings.settings) {
|
|
43
|
+
throw new Error("[ SETTINGS FILE ]: Missing required 'bom' or 'settings' key");
|
|
44
|
+
}
|
|
42
45
|
if (!settings.bom) {
|
|
43
|
-
|
|
46
|
+
return true;
|
|
44
47
|
}
|
|
45
48
|
const { bom } = settings;
|
|
46
49
|
if (bom.include) {
|
|
@@ -70,4 +73,4 @@ function validateSettingsFile(settings) {
|
|
|
70
73
|
}
|
|
71
74
|
return true;
|
|
72
75
|
}
|
|
73
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
76
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9jbGkvY29tbWFuZHMvaGVscGVycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUF1QkEsd0RBRUM7QUFFRCxrREFVQztBQUVELG9EQTBDQztBQWpGRCxnREFBMkI7QUFDM0IsNENBQW9CO0FBQ3BCLGdEQUF3QjtBQU1YLFFBQUEscUJBQXFCLEdBQUcsY0FBYyxDQUFDO0FBRXBELDBHQUEwRztBQUNuRyxNQUFNLFFBQVEsR0FBRyxDQUFDLElBQVksRUFBb0IsRUFBRTtJQUN6RCxPQUFPLElBQUksT0FBTyxDQUFDLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUFFO1FBQ3JDLFlBQUUsQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUMsR0FBRyxFQUFFLEtBQUssRUFBRSxFQUFFO1lBQzNCLElBQUksR0FBRyxFQUFFLENBQUM7Z0JBQ1IsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQ2QsQ0FBQztpQkFBTSxDQUFDO2dCQUNOLE9BQU8sQ0FBQyxLQUFLLENBQUMsV0FBVyxFQUFFLENBQUMsQ0FBQztZQUMvQixDQUFDO1FBQ0gsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDLENBQUMsQ0FBQztBQUNMLENBQUMsQ0FBQTtBQVZZLFFBQUEsUUFBUSxZQVVwQjtBQUVELFNBQWdCLHNCQUFzQixDQUFDLElBQVk7SUFDakQsT0FBTyxjQUFPLENBQUMsUUFBUSxDQUFDLElBQUksRUFBQyxjQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUE7QUFDckQsQ0FBQztBQUVNLEtBQUssVUFBVSxtQkFBbUIsQ0FBQyxnQkFBK0IsRUFBRSxRQUFlO0lBRXhGLElBQUksZ0JBQWdCLEVBQUUsQ0FBQztRQUNyQixPQUFPLGdCQUFnQixDQUFDO0lBQzFCLENBQUM7SUFDRCxNQUFNLEtBQUssR0FBRyxNQUFNLFlBQUUsQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ2xELElBQUksS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBQyxFQUFFLENBQUMsQ0FBQyxLQUFLLDZCQUFxQixDQUFDLEVBQUUsQ0FBQztRQUNsRCxPQUFPLGNBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFLDZCQUFxQixDQUFDLENBQUM7SUFDcEQsQ0FBQztJQUNELE9BQU8sSUFBSSxDQUFDO0FBQ2QsQ0FBQztBQUVELFNBQWdCLG9CQUFvQixDQUFDLFFBQWtCO0lBQ3JELElBQUksQ0FBQyxRQUFRLENBQUMsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLFFBQVEsRUFBRSxDQUFDO1FBQ3hDLE1BQU0sSUFBSSxLQUFLLENBQUMsNkRBQTZELENBQUMsQ0FBQztJQUNqRixDQUFDO0lBRUQsSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLEVBQUUsQ0FBQztRQUNsQixPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFRCxNQUFNLEVBQUUsR0FBRyxFQUFFLEdBQUcsUUFBUSxDQUFDO0lBRXpCLElBQUksR0FBRyxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ2hCLElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDO1lBQ2hDLE9BQU8sSUFBSSxLQUFLLENBQUMsK0NBQStDLENBQUMsQ0FBQztRQUNwRSxDQUFDO1FBRUQsR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLEVBQUUsS0FBSyxFQUFFLEVBQUU7WUFDbEMsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztnQkFDZixNQUFNLElBQUksS0FBSyxDQUFDLGlFQUFpRSxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksRUFBQyxJQUFJLEVBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDO1lBQ2xILENBQUM7UUFDSCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxJQUFJLEdBQUcsQ0FBQyxNQUFNLEVBQUUsQ0FBQztRQUNmLElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDO1lBQy9CLE1BQU0sSUFBSSxLQUFLLENBQUMsOENBQThDLENBQUMsQ0FBQztRQUNsRSxDQUFDO0lBQ0gsQ0FBQztJQUVELElBQUksR0FBRyxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ2hCLElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDO1lBQ2hDLE1BQU0sSUFBSSxLQUFLLENBQUMsK0NBQStDLENBQUMsQ0FBQztRQUNuRSxDQUFDO1FBRUQsR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLEVBQUUsS0FBSyxFQUFFLEVBQUU7WUFDbEMsSUFBSSxDQUFDLElBQUksQ0FBQyxZQUFZLEVBQUUsQ0FBQztnQkFDdkIsTUFBTSxJQUFJLEtBQUssQ0FBQyx5RUFBeUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLEVBQUMsSUFBSSxFQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUMxSCxDQUFDO1FBQ0gsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsT0FBTyxJQUFJLENBQUM7QUFDZCxDQUFDIn0=
|
|
@@ -32,6 +32,7 @@ const stream_json_1 = require("stream-json");
|
|
|
32
32
|
const StreamObject_1 = require("stream-json/streamers/StreamObject");
|
|
33
33
|
const os_1 = require("os");
|
|
34
34
|
const Logger_1 = require("../../sdk/Logger/Logger");
|
|
35
|
+
const ScanSettingsBuilder_1 = require("../../sdk/scanner/ScanSettingsBuilder");
|
|
35
36
|
/**
|
|
36
37
|
* Stream JSON scanner results and transform into new structure
|
|
37
38
|
* @param resultPath Path to the scanner JSON results file
|
|
@@ -107,6 +108,7 @@ async function streamAndTransformResults(resultPath, depResults, cryptoFiles, cr
|
|
|
107
108
|
});
|
|
108
109
|
}
|
|
109
110
|
async function scanHandler(rootPath, options) {
|
|
111
|
+
var _a, _b, _c, _d, _e;
|
|
110
112
|
if (options.debug)
|
|
111
113
|
Logger_1.logger.setLevel(Logger_1.Logger.Level.debug);
|
|
112
114
|
rootPath = path_1.default.resolve(rootPath);
|
|
@@ -174,8 +176,7 @@ async function scanHandler(rootPath, options) {
|
|
|
174
176
|
const settingsFilePath = await (0, helpers_1.getSettingsFilePath)(options.settings, rootPath);
|
|
175
177
|
if (settingsFilePath) {
|
|
176
178
|
try {
|
|
177
|
-
|
|
178
|
-
scannerInput.settings = scanossSettings;
|
|
179
|
+
scannerInput.settings = JSON.parse(fs_1.default.readFileSync(settingsFilePath, "utf-8"));
|
|
179
180
|
}
|
|
180
181
|
catch (e) {
|
|
181
182
|
throw new Error(`SCANOSS Settings file cannot be found at: ${settingsFilePath}.`);
|
|
@@ -185,6 +186,26 @@ async function scanHandler(rootPath, options) {
|
|
|
185
186
|
scannerInput.folderRoot = rootPath + path_1.default.sep; // This will remove the project root path from the results.
|
|
186
187
|
if (options.flags)
|
|
187
188
|
scannerInput.engineFlags = options.flags;
|
|
189
|
+
// Build scan settings from CLI options, merging with scanoss.json file_snippet settings
|
|
190
|
+
// Priority: scanoss.json file_snippet settings > CLI arguments
|
|
191
|
+
const fileSnippetSettings = new ScanSettingsBuilder_1.ScanSettingsBuilder((_b = (_a = scannerInput === null || scannerInput === void 0 ? void 0 : scannerInput.settings) === null || _a === void 0 ? void 0 : _a.settings) === null || _b === void 0 ? void 0 : _b.file_snippet)
|
|
192
|
+
.withHonourFileExist(options.honourFileExts)
|
|
193
|
+
.withMinSnippetHits(options.minSnippetHits)
|
|
194
|
+
.withMinSnippetLines(options.minSnippetLines)
|
|
195
|
+
.withRanking(options.ranking)
|
|
196
|
+
.withRankingThreshold(options.rankingThreshold)
|
|
197
|
+
.withDependencyAnalysis(options.dependencies)
|
|
198
|
+
.build();
|
|
199
|
+
// When file snippet settings are produced (from CLI args or scanoss.json),
|
|
200
|
+
// ensure the settings hierarchy exists before assigning.
|
|
201
|
+
// scannerInput.settings may be undefined if no scanoss.json file was loaded.
|
|
202
|
+
if (fileSnippetSettings) {
|
|
203
|
+
if (!scannerInput.settings)
|
|
204
|
+
scannerInput.settings = { settings: {} };
|
|
205
|
+
if (!scannerInput.settings.settings)
|
|
206
|
+
scannerInput.settings.settings = {};
|
|
207
|
+
scannerInput.settings.settings.file_snippet = fileSnippetSettings;
|
|
208
|
+
}
|
|
188
209
|
if (options.wfp)
|
|
189
210
|
scannerInput.wfpPath = rootPath;
|
|
190
211
|
const wfpMode = options.hpsm ? ScannerTypes_1.WinnowingMode.FULL_WINNOWING_HPSM : ScannerTypes_1.WinnowingMode.FULL_WINNOWING;
|
|
@@ -243,7 +264,7 @@ async function scanHandler(rootPath, options) {
|
|
|
243
264
|
}
|
|
244
265
|
// Dependency scanner
|
|
245
266
|
let pDependencyScanner = Promise.resolve({});
|
|
246
|
-
if (options.dependencies) {
|
|
267
|
+
if (options.dependencies || ((_e = (_d = (_c = scannerInput === null || scannerInput === void 0 ? void 0 : scannerInput.settings) === null || _c === void 0 ? void 0 : _c.settings) === null || _d === void 0 ? void 0 : _d.file_snippet) === null || _e === void 0 ? void 0 : _e.dependency_analysis)) {
|
|
247
268
|
pDependencyScanner = dependencyScanner.scan(dependencyInput);
|
|
248
269
|
}
|
|
249
270
|
const results = {
|
|
@@ -343,4 +364,4 @@ async function scanHandler(rootPath, options) {
|
|
|
343
364
|
await streamAndTransformResults(scannerResultPath, results.dependencies, results.cryptography.files, results.cryptography.components, options.output);
|
|
344
365
|
}
|
|
345
366
|
}
|
|
346
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"scan.js","sourceRoot":"","sources":["../../../../src/cli/commands/scan.ts"],"names":[],"mappings":"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"}
|
|
367
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"scan.js","sourceRoot":"","sources":["../../../../src/cli/commands/scan.ts"],"names":[],"mappings":"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"}
|
package/build/main/index.d.ts
CHANGED
|
@@ -5,6 +5,7 @@ export * from './sdk/scanner/ScannerTypes';
|
|
|
5
5
|
export * from './sdk/scanner/ScannerCfg';
|
|
6
6
|
export * from './sdk/scanner/WfpProvider/WfpCalculator/WfpCalculator';
|
|
7
7
|
export * from './sdk/scanner/ScannnerResultPostProcessor/interfaces/types';
|
|
8
|
+
export * from './sdk/scanner/ScanSettingsBuilder';
|
|
8
9
|
export * from './sdk/scanner/Fingerprint';
|
|
9
10
|
export { IWfpProviderInput } from './sdk/scanner/WfpProvider/WfpProvider';
|
|
10
11
|
export * from './sdk/Dependencies/DependencyTypes';
|
package/build/main/index.js
CHANGED
|
@@ -24,6 +24,7 @@ __exportStar(require("./sdk/scanner/ScannerTypes"), exports);
|
|
|
24
24
|
__exportStar(require("./sdk/scanner/ScannerCfg"), exports);
|
|
25
25
|
__exportStar(require("./sdk/scanner/WfpProvider/WfpCalculator/WfpCalculator"), exports);
|
|
26
26
|
__exportStar(require("./sdk/scanner/ScannnerResultPostProcessor/interfaces/types"), exports);
|
|
27
|
+
__exportStar(require("./sdk/scanner/ScanSettingsBuilder"), exports);
|
|
27
28
|
// *** Fingerprint exports *** //
|
|
28
29
|
__exportStar(require("./sdk/scanner/Fingerprint"), exports);
|
|
29
30
|
// *** Dependency scanner exports *** //
|
|
@@ -63,4 +64,4 @@ __exportStar(require("./sdk/Clients/Dependency/DependencyGRPCClient"), exports);
|
|
|
63
64
|
__exportStar(require("./sdk/Clients/http/HttpClient"), exports);
|
|
64
65
|
var Logger_1 = require("./sdk/Logger/Logger");
|
|
65
66
|
Object.defineProperty(exports, "logger", { enumerable: true, get: function () { return Logger_1.logger; } });
|
|
66
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
67
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFHQSwyREFBeUM7QUFFekMsK0JBQStCO0FBQy9CLHdFQUFzRDtBQUV0RCxrQ0FBa0M7QUFDbEMsd0RBQXNDO0FBQ3RDLDZEQUEyQztBQUMzQywyREFBeUM7QUFDekMsd0ZBQXNFO0FBQ3RFLDZGQUEyRTtBQUMzRSxvRUFBaUQ7QUFFakQsaUNBQWlDO0FBQ2pDLDREQUEwQztBQUcxQyx3Q0FBd0M7QUFDeEMscUVBQW1EO0FBQ25ELDBFQUF3RDtBQUN4RCx1RUFBcUQ7QUFDckQscUZBQW1FO0FBRW5FLDBDQUEwQztBQUMxQyx5RUFBdUQ7QUFDdkQsK0RBQTZDO0FBQzdDLHVFQUFxRDtBQUVyRCwwQ0FBMEM7QUFDMUMsMkVBQXlEO0FBQ3pELGtFQUErQztBQUMvQyx1RUFBb0Q7QUFFcEQsd0NBQXdDO0FBQ3hDLHFFQUFtRDtBQUNuRCx3RUFBc0Q7QUFDdEQsNkVBQTJEO0FBQzNELGdGQUE4RDtBQUM5RCxnRkFBOEQ7QUFFOUQsMkJBQTJCO0FBQzNCLHNEQUFvQztBQUNwQyx3RUFBc0Q7QUFDdEQsNkVBQTJEO0FBQzNELDJGQUF5RTtBQUN6RSwyRkFBeUU7QUFDekUsOEZBQTRFO0FBQzVFLDZGQUEyRTtBQUUzRSxtQkFBbUI7QUFDbkIsd0VBQXNEO0FBRXRELHVCQUF1QjtBQUN2Qiw0REFBMEM7QUFHMUMsb0ZBQWtFO0FBQ2xFLGdGQUE4RDtBQUc5RCxpQkFBaUI7QUFDakIsZ0VBQTZDO0FBRTdDLDhDQUE2QztBQUFwQyxnR0FBQSxNQUFNLE9BQUEifQ==
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { FingerprintPackage } from '../WfpProvider/FingerprintPackage';
|
|
2
2
|
import FormData from 'form-data';
|
|
3
3
|
import { SbomMode } from '../ScannerTypes';
|
|
4
|
+
import { FileSnippetSettings } from "../ScannnerResultPostProcessor/interfaces/types";
|
|
4
5
|
export declare class DispatchableItem {
|
|
5
6
|
private form;
|
|
6
7
|
private errorCounter;
|
|
@@ -8,15 +9,18 @@ export declare class DispatchableItem {
|
|
|
8
9
|
private engineFlags;
|
|
9
10
|
private sbom;
|
|
10
11
|
private sbomMode;
|
|
12
|
+
private scanSettings;
|
|
11
13
|
constructor();
|
|
12
14
|
private _uuid;
|
|
13
15
|
get uuid(): string;
|
|
14
16
|
set uuid(uuid: string);
|
|
15
17
|
getForm(): FormData;
|
|
18
|
+
getScanSettings(): FileSnippetSettings | undefined;
|
|
16
19
|
increaseErrorCounter(): void;
|
|
17
20
|
getErrorCounter(): number;
|
|
18
21
|
setFingerprintPackage(fingerprintPackage: FingerprintPackage): void;
|
|
19
22
|
getFingerprintPackage(): FingerprintPackage;
|
|
20
23
|
setEngineFlags(engineFlags: number): void;
|
|
21
24
|
setSbom(sbom: string, sbomMode: SbomMode): void;
|
|
25
|
+
setScanSettings(fileSnippetSettings: FileSnippetSettings): void;
|
|
22
26
|
}
|
|
@@ -27,6 +27,9 @@ class DispatchableItem {
|
|
|
27
27
|
}
|
|
28
28
|
return this.form;
|
|
29
29
|
}
|
|
30
|
+
getScanSettings() {
|
|
31
|
+
return this.scanSettings;
|
|
32
|
+
}
|
|
30
33
|
increaseErrorCounter() {
|
|
31
34
|
this.errorCounter += 1;
|
|
32
35
|
}
|
|
@@ -46,6 +49,9 @@ class DispatchableItem {
|
|
|
46
49
|
this.sbom = sbom;
|
|
47
50
|
this.sbomMode = sbomMode;
|
|
48
51
|
}
|
|
52
|
+
setScanSettings(fileSnippetSettings) {
|
|
53
|
+
this.scanSettings = fileSnippetSettings;
|
|
54
|
+
}
|
|
49
55
|
}
|
|
50
56
|
exports.DispatchableItem = DispatchableItem;
|
|
51
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
57
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGlzcGF0Y2hhYmxlSXRlbS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3NyYy9zZGsvc2Nhbm5lci9EaXNwYXRjaGVyL0Rpc3BhdGNoYWJsZUl0ZW0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQ0EsMERBQWlDO0FBSWpDLE1BQWEsZ0JBQWdCO0lBZTNCO1FBQ0UsSUFBSSxDQUFDLFlBQVksR0FBRyxDQUFDLENBQUM7UUFDdEIsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLG1CQUFRLEVBQUUsQ0FBQztJQUM3QixDQUFDO0lBSUQsSUFBVyxJQUFJO1FBQ2IsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDO0lBQ3BCLENBQUM7SUFFRCxJQUFXLElBQUksQ0FBQyxJQUFZO1FBQzFCLElBQUksQ0FBQyxLQUFLLEdBQUcsSUFBSSxDQUFDO0lBQ3BCLENBQUM7SUFFTSxPQUFPO1FBQ1osSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLG1CQUFRLEVBQUUsQ0FBQztRQUUzQixJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FDZCxNQUFNLEVBQ04sTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsa0JBQWtCLENBQUMsVUFBVSxFQUFFLENBQUMsRUFDakQsVUFBVSxDQUNYLENBQUM7UUFDRixJQUFJLElBQUksQ0FBQyxXQUFXO1lBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxFQUFFLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUVsRSxJQUFJLElBQUksQ0FBQyxRQUFRLElBQUksSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDO1lBQy9CLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLFFBQVEsRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDdEMsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxFQUFFLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUMxQyxDQUFDO1FBRUQsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDO0lBQ25CLENBQUM7SUFFTSxlQUFlO1FBQ3BCLE9BQU8sSUFBSSxDQUFDLFlBQVksQ0FBQztJQUMzQixDQUFDO0lBRU0sb0JBQW9CO1FBQ3pCLElBQUksQ0FBQyxZQUFZLElBQUksQ0FBQyxDQUFDO0lBQ3pCLENBQUM7SUFFTSxlQUFlO1FBQ3BCLE9BQU8sSUFBSSxDQUFDLFlBQVksQ0FBQztJQUMzQixDQUFDO0lBRU0scUJBQXFCLENBQUMsa0JBQXNDO1FBQ2pFLElBQUksQ0FBQyxrQkFBa0IsR0FBRyxrQkFBa0IsQ0FBQztJQUMvQyxDQUFDO0lBRU0scUJBQXFCO1FBQzFCLE9BQU8sSUFBSSxDQUFDLGtCQUFrQixDQUFDO0lBQ2pDLENBQUM7SUFFTSxjQUFjLENBQUMsV0FBbUI7UUFDdkMsSUFBSSxDQUFDLFdBQVcsR0FBRyxXQUFXLENBQUM7SUFDakMsQ0FBQztJQUVNLE9BQU8sQ0FBQyxJQUFZLEVBQUUsUUFBa0I7UUFDN0MsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUM7UUFDakIsSUFBSSxDQUFDLFFBQVEsR0FBRyxRQUFRLENBQUM7SUFDM0IsQ0FBQztJQUVNLGVBQWUsQ0FBQyxtQkFBd0M7UUFDN0QsSUFBSSxDQUFDLFlBQVksR0FBRyxtQkFBbUIsQ0FBQztJQUMxQyxDQUFDO0NBQ0Y7QUFoRkQsNENBZ0ZDIn0=
|
|
@@ -15,5 +15,6 @@ export declare class Dispatcher extends EventEmitter {
|
|
|
15
15
|
emitUnrecoberableError(error: any, disptItem: any, response: string): void;
|
|
16
16
|
emitNoDispatchedItem(disptItem: any): void;
|
|
17
17
|
errorHandler(error: Error, disptItem: DispatchableItem, response: string): void;
|
|
18
|
+
private buildScanSettingsHeader;
|
|
18
19
|
dispatch(item: DispatchableItem): Promise<void>;
|
|
19
20
|
}
|
|
@@ -138,6 +138,13 @@ class Dispatcher extends eventemitter3_1.default {
|
|
|
138
138
|
return;
|
|
139
139
|
}
|
|
140
140
|
}
|
|
141
|
+
buildScanSettingsHeader(fileSnippetSettings) {
|
|
142
|
+
if (!fileSnippetSettings || Object.keys(fileSnippetSettings).length === 0) {
|
|
143
|
+
return undefined;
|
|
144
|
+
}
|
|
145
|
+
const jsonStr = JSON.stringify(fileSnippetSettings);
|
|
146
|
+
return Buffer.from(jsonStr).toString('base64');
|
|
147
|
+
}
|
|
141
148
|
async dispatch(item) {
|
|
142
149
|
const timeoutController = this.globalAbortController.getAbortController();
|
|
143
150
|
const timeoutId = setTimeout(() => timeoutController.abort(), this.scannerCfg.TIMEOUT);
|
|
@@ -145,17 +152,22 @@ class Dispatcher extends eventemitter3_1.default {
|
|
|
145
152
|
try {
|
|
146
153
|
this.emit(ScannerTypes_1.ScannerEvents.DISPATCHER_WFP_SENDED);
|
|
147
154
|
const scanURL = new URL('/scan/direct', this.scannerCfg.API_URL);
|
|
155
|
+
const headers = {
|
|
156
|
+
'User-Agent': this.scannerCfg.CLIENT_TIMESTAMP
|
|
157
|
+
? this.scannerCfg.CLIENT_TIMESTAMP
|
|
158
|
+
: `scanoss-js/v${Utils_1.Utils.getPackageVersion()}`,
|
|
159
|
+
'X-Session': this.scannerCfg.API_KEY,
|
|
160
|
+
'x-request-id': item.uuid,
|
|
161
|
+
};
|
|
162
|
+
const scanSettingsHeader = this.buildScanSettingsHeader(item.getScanSettings());
|
|
163
|
+
if (scanSettingsHeader) {
|
|
164
|
+
headers['scanoss-settings'] = scanSettingsHeader;
|
|
165
|
+
}
|
|
148
166
|
const response = await (0, node_fetch_1.default)(scanURL.href, {
|
|
149
167
|
agent: this.proxyAgent,
|
|
150
168
|
method: 'post',
|
|
151
169
|
body: item.getForm(),
|
|
152
|
-
headers
|
|
153
|
-
'User-Agent': this.scannerCfg.CLIENT_TIMESTAMP
|
|
154
|
-
? this.scannerCfg.CLIENT_TIMESTAMP
|
|
155
|
-
: `scanoss-js/v${Utils_1.Utils.getPackageVersion()}`,
|
|
156
|
-
'X-Session': this.scannerCfg.API_KEY,
|
|
157
|
-
'x-request-id': item.uuid,
|
|
158
|
-
},
|
|
170
|
+
headers,
|
|
159
171
|
signal: timeoutController.signal,
|
|
160
172
|
});
|
|
161
173
|
clearTimeout(timeoutId);
|
|
@@ -181,4 +193,4 @@ class Dispatcher extends eventemitter3_1.default {
|
|
|
181
193
|
}
|
|
182
194
|
}
|
|
183
195
|
exports.Dispatcher = Dispatcher;
|
|
184
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
196
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Dispatcher.js","sourceRoot":"","sources":["../../../../../src/sdk/scanner/Dispatcher/Dispatcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { FileSnippetSettings } from "./ScannnerResultPostProcessor/interfaces/types";
|
|
2
|
+
export declare class ScanSettingsBuilder {
|
|
3
|
+
private readonly settingsFileSnippet;
|
|
4
|
+
private readonly fileSnippetSettings;
|
|
5
|
+
constructor(settingsFileSnippet?: FileSnippetSettings);
|
|
6
|
+
withMinSnippetHits(cliValue?: number | string): this;
|
|
7
|
+
withMinSnippetLines(cliValue?: number | string): this;
|
|
8
|
+
withRanking(cliValue?: boolean | string): this;
|
|
9
|
+
withRankingThreshold(cliValue?: number | string): this;
|
|
10
|
+
withHonourFileExist(cliValue?: boolean | string): this;
|
|
11
|
+
withDependencyAnalysis(cliValue?: boolean | string): this;
|
|
12
|
+
build(): FileSnippetSettings | undefined;
|
|
13
|
+
}
|
|
@@ -0,0 +1,95 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ScanSettingsBuilder = void 0;
|
|
4
|
+
function toBoolean(value) {
|
|
5
|
+
if (typeof value === 'string')
|
|
6
|
+
return value === 'true';
|
|
7
|
+
return value;
|
|
8
|
+
}
|
|
9
|
+
class ScanSettingsBuilder {
|
|
10
|
+
constructor(settingsFileSnippet) {
|
|
11
|
+
this.fileSnippetSettings = {};
|
|
12
|
+
this.settingsFileSnippet = settingsFileSnippet;
|
|
13
|
+
}
|
|
14
|
+
// Priority: scanoss.json file_snippet settings > CLI arguments
|
|
15
|
+
// 0 means defer to server config
|
|
16
|
+
withMinSnippetHits(cliValue) {
|
|
17
|
+
var _a, _b;
|
|
18
|
+
const cliMinSnippetHits = cliValue != null ? Number(cliValue) : undefined;
|
|
19
|
+
const merged = (_b = (_a = this.settingsFileSnippet) === null || _a === void 0 ? void 0 : _a.min_snippet_hits) !== null && _b !== void 0 ? _b : cliMinSnippetHits;
|
|
20
|
+
if (merged != null && merged !== 0) {
|
|
21
|
+
this.fileSnippetSettings.min_snippet_hits = Math.max(0, merged);
|
|
22
|
+
}
|
|
23
|
+
return this;
|
|
24
|
+
}
|
|
25
|
+
// 0 means defer to server config
|
|
26
|
+
withMinSnippetLines(cliValue) {
|
|
27
|
+
var _a, _b;
|
|
28
|
+
const cliMinSnippetLines = cliValue != null ? Number(cliValue) : undefined;
|
|
29
|
+
const merged = (_b = (_a = this.settingsFileSnippet) === null || _a === void 0 ? void 0 : _a.min_snippet_lines) !== null && _b !== void 0 ? _b : cliMinSnippetLines;
|
|
30
|
+
if (merged != null && merged !== 0) {
|
|
31
|
+
this.fileSnippetSettings.min_snippet_lines = Math.max(0, merged);
|
|
32
|
+
}
|
|
33
|
+
return this;
|
|
34
|
+
}
|
|
35
|
+
// Only send if explicitly set
|
|
36
|
+
withRanking(cliValue) {
|
|
37
|
+
var _a, _b;
|
|
38
|
+
const cliRanking = cliValue != null ? toBoolean(cliValue) : undefined;
|
|
39
|
+
const merged = (_b = (_a = this.settingsFileSnippet) === null || _a === void 0 ? void 0 : _a.ranking_enabled) !== null && _b !== void 0 ? _b : cliRanking;
|
|
40
|
+
if (merged != null) {
|
|
41
|
+
this.fileSnippetSettings.ranking_enabled = merged;
|
|
42
|
+
}
|
|
43
|
+
return this;
|
|
44
|
+
}
|
|
45
|
+
// -1 means defer to server config, valid range -1 to 10
|
|
46
|
+
withRankingThreshold(cliValue) {
|
|
47
|
+
var _a, _b;
|
|
48
|
+
const MAX_RANKING_THRESHOLD = 10;
|
|
49
|
+
const cliRankingThreshold = cliValue != null ? Number(cliValue) : undefined;
|
|
50
|
+
const merged = (_b = (_a = this.settingsFileSnippet) === null || _a === void 0 ? void 0 : _a.ranking_threshold) !== null && _b !== void 0 ? _b : cliRankingThreshold;
|
|
51
|
+
if (merged != null && merged !== -1) {
|
|
52
|
+
let clamped = merged;
|
|
53
|
+
if (clamped > MAX_RANKING_THRESHOLD) {
|
|
54
|
+
console.error(`WARNING: ranking-threshold value ${clamped} exceeds maximum allowed (${MAX_RANKING_THRESHOLD}). Setting to ${MAX_RANKING_THRESHOLD}.`);
|
|
55
|
+
clamped = MAX_RANKING_THRESHOLD;
|
|
56
|
+
}
|
|
57
|
+
else if (clamped < -1) {
|
|
58
|
+
console.error(`WARNING: ranking-threshold value ${clamped} is below minimum allowed (-1). Setting to -1.`);
|
|
59
|
+
clamped = -1;
|
|
60
|
+
}
|
|
61
|
+
if (clamped !== -1) {
|
|
62
|
+
this.fileSnippetSettings.ranking_threshold = clamped;
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
return this;
|
|
66
|
+
}
|
|
67
|
+
// Only send if explicitly set
|
|
68
|
+
withHonourFileExist(cliValue) {
|
|
69
|
+
var _a, _b;
|
|
70
|
+
const cliHonourFileExts = cliValue != null ? toBoolean(cliValue) : undefined;
|
|
71
|
+
const merged = (_b = (_a = this.settingsFileSnippet) === null || _a === void 0 ? void 0 : _a.honour_file_exts) !== null && _b !== void 0 ? _b : cliHonourFileExts;
|
|
72
|
+
if (merged != null) {
|
|
73
|
+
this.fileSnippetSettings.honour_file_exts = merged;
|
|
74
|
+
}
|
|
75
|
+
return this;
|
|
76
|
+
}
|
|
77
|
+
// Only send if explicitly set
|
|
78
|
+
withDependencyAnalysis(cliValue) {
|
|
79
|
+
var _a, _b;
|
|
80
|
+
const cliDependencyAnalysis = cliValue != null ? toBoolean(cliValue) : undefined;
|
|
81
|
+
const merged = (_b = (_a = this.settingsFileSnippet) === null || _a === void 0 ? void 0 : _a.dependency_analysis) !== null && _b !== void 0 ? _b : cliDependencyAnalysis;
|
|
82
|
+
if (merged != null) {
|
|
83
|
+
this.fileSnippetSettings.dependency_analysis = merged;
|
|
84
|
+
}
|
|
85
|
+
return this;
|
|
86
|
+
}
|
|
87
|
+
build() {
|
|
88
|
+
if (Object.keys(this.fileSnippetSettings).length > 0) {
|
|
89
|
+
return this.fileSnippetSettings;
|
|
90
|
+
}
|
|
91
|
+
return undefined;
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
exports.ScanSettingsBuilder = ScanSettingsBuilder;
|
|
95
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2NhblNldHRpbmdzQnVpbGRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9zZGsvc2Nhbm5lci9TY2FuU2V0dGluZ3NCdWlsZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUVBLFNBQVMsU0FBUyxDQUFDLEtBQXVCO0lBQ3hDLElBQUksT0FBTyxLQUFLLEtBQUssUUFBUTtRQUFFLE9BQU8sS0FBSyxLQUFLLE1BQU0sQ0FBQztJQUN2RCxPQUFPLEtBQUssQ0FBQztBQUNmLENBQUM7QUFFRCxNQUFhLG1CQUFtQjtJQUk5QixZQUFZLG1CQUF5QztRQUZwQyx3QkFBbUIsR0FBd0IsRUFBRSxDQUFDO1FBRzdELElBQUksQ0FBQyxtQkFBbUIsR0FBRyxtQkFBbUIsQ0FBQztJQUNqRCxDQUFDO0lBRUQsK0RBQStEO0lBQy9ELGlDQUFpQztJQUNqQyxrQkFBa0IsQ0FBQyxRQUEwQjs7UUFDM0MsTUFBTSxpQkFBaUIsR0FBRyxRQUFRLElBQUksSUFBSSxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQztRQUMxRSxNQUFNLE1BQU0sR0FBRyxNQUFBLE1BQUEsSUFBSSxDQUFDLG1CQUFtQiwwQ0FBRSxnQkFBZ0IsbUNBQUksaUJBQWlCLENBQUM7UUFDL0UsSUFBSSxNQUFNLElBQUksSUFBSSxJQUFJLE1BQU0sS0FBSyxDQUFDLEVBQUUsQ0FBQztZQUNuQyxJQUFJLENBQUMsbUJBQW1CLENBQUMsZ0JBQWdCLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsTUFBTSxDQUFDLENBQUM7UUFDbEUsQ0FBQztRQUNELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVELGlDQUFpQztJQUNqQyxtQkFBbUIsQ0FBQyxRQUEwQjs7UUFDNUMsTUFBTSxrQkFBa0IsR0FBRyxRQUFRLElBQUksSUFBSSxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsUUFBUSxD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
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|