scanoss 0.34.0 → 0.36.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 +15 -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/Dependencies/LocalDependency/LocalDependency.js +3 -1
- package/build/main/sdk/Dependencies/LocalDependency/parsers/parser.spec.js +49 -15
- package/build/main/sdk/Dependencies/LocalDependency/parsers/pyParser.d.ts +1 -0
- package/build/main/sdk/Dependencies/LocalDependency/parsers/pyParser.js +21 -1
- package/build/main/sdk/Dependencies/LocalDependency/parsers/python/PyProjectToml.js +7 -4
- 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/Dependencies/LocalDependency/LocalDependency.js +4 -2
- package/build/module/sdk/Dependencies/LocalDependency/parsers/parser.spec.js +50 -16
- package/build/module/sdk/Dependencies/LocalDependency/parsers/pyParser.d.ts +1 -0
- package/build/module/sdk/Dependencies/LocalDependency/parsers/pyParser.js +19 -1
- package/build/module/sdk/Dependencies/LocalDependency/parsers/python/PyProjectToml.js +7 -4
- 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
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import { ILocalDependency } from "../DependencyTypes";
|
|
2
2
|
export declare function requirementsParser(fileContent: string, filePath: string): Promise<ILocalDependency>;
|
|
3
3
|
export declare function pipRequirementsLockParser(fileContent: string, filePath: string): Promise<ILocalDependency>;
|
|
4
|
+
export declare function scopedRequirementsParser(fileContent: string, filePath: string): Promise<ILocalDependency>;
|
|
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.requirementsParser = requirementsParser;
|
|
7
7
|
exports.pipRequirementsLockParser = pipRequirementsLockParser;
|
|
8
|
+
exports.scopedRequirementsParser = scopedRequirementsParser;
|
|
8
9
|
const path_1 = __importDefault(require("path"));
|
|
9
10
|
const packageurl_js_1 = require("packageurl-js");
|
|
10
11
|
const utils_1 = require("./utils");
|
|
@@ -78,4 +79,23 @@ function pipRequirementsLockParser(fileContent, filePath) {
|
|
|
78
79
|
return Promise.resolve(results);
|
|
79
80
|
return Promise.resolve(parseRequirementsContent(fileContent, filePath));
|
|
80
81
|
}
|
|
81
|
-
|
|
82
|
+
// Parse scoped requirements files like dev-requirements.txt or requirements-dev.txt
|
|
83
|
+
// Extracts scope from the filename prefix/suffix
|
|
84
|
+
const SCOPED_REQ_PREFIX = /^(.+)-requirements\.txt$/;
|
|
85
|
+
const SCOPED_REQ_SUFFIX = /^requirements-(.+)\.txt$/;
|
|
86
|
+
function scopedRequirementsParser(fileContent, filePath) {
|
|
87
|
+
var _a;
|
|
88
|
+
const fileName = path_1.default.basename(filePath);
|
|
89
|
+
const prefixMatch = SCOPED_REQ_PREFIX.exec(fileName);
|
|
90
|
+
const suffixMatch = SCOPED_REQ_SUFFIX.exec(fileName);
|
|
91
|
+
const scope = (_a = prefixMatch === null || prefixMatch === void 0 ? void 0 : prefixMatch[1]) !== null && _a !== void 0 ? _a : suffixMatch === null || suffixMatch === void 0 ? void 0 : suffixMatch[1];
|
|
92
|
+
const results = { file: filePath, purls: [] };
|
|
93
|
+
if (!scope)
|
|
94
|
+
return Promise.resolve(results);
|
|
95
|
+
const parsed = parseRequirementsContent(fileContent, filePath);
|
|
96
|
+
for (const purl of parsed.purls) {
|
|
97
|
+
purl.scope = scope;
|
|
98
|
+
}
|
|
99
|
+
return Promise.resolve(parsed);
|
|
100
|
+
}
|
|
101
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHlQYXJzZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvc2RrL0RlcGVuZGVuY2llcy9Mb2NhbERlcGVuZGVuY3kvcGFyc2Vycy9weVBhcnNlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQXVEQSxnREFRQztBQUtELDhEQU9DO0FBTUQsNERBY0M7QUEvRkQsZ0RBQXdCO0FBQ3hCLGlEQUEyQztBQUUzQyxtQ0FBa0Q7QUFHbEQsU0FBUyxRQUFRLENBQUUsR0FBVzs7SUFDNUIsTUFBTSxHQUFHLEdBQUcsMERBQTBELENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ2pGLE9BQU87UUFDTCxJQUFJLEVBQUUsTUFBQSxHQUFHLGFBQUgsR0FBRyx1QkFBSCxHQUFHLENBQUUsTUFBTSwwQ0FBRSxJQUFJO1FBQ3ZCLEdBQUcsRUFBRSxNQUFBLEdBQUcsYUFBSCxHQUFHLHVCQUFILEdBQUcsQ0FBRSxNQUFNLDBDQUFFLEdBQUc7UUFDckIsT0FBTyxFQUFFLE1BQUEsR0FBRyxhQUFILEdBQUcsdUJBQUgsR0FBRyxDQUFFLE1BQU0sMENBQUUsT0FBTztLQUM5QixDQUFDO0FBQ0osQ0FBQztBQUVELE1BQU0sU0FBUyxHQUFHLE1BQU0sQ0FBQztBQUV6QixTQUFTLHdCQUF3QixDQUFDLFdBQW1CLEVBQUUsUUFBZ0I7SUFDbkUsTUFBTSxPQUFPLEdBQXFCLEVBQUMsSUFBSSxFQUFFLFFBQVEsRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFDLENBQUM7SUFDOUQsTUFBTSxLQUFLLEdBQWtCLFdBQVcsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUM7SUFFckQsS0FBSyxJQUFJLElBQUksSUFBSSxLQUFLLEVBQUUsQ0FBQztRQUNyQixJQUFJLEdBQUcsSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDO1FBQ25CLElBQUcsSUFBSSxDQUFDLE1BQU0sSUFBSSxDQUFDO1lBQUUsU0FBUztRQUM5QixJQUFHLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsSUFBSSxJQUFJLENBQUMsTUFBTSxHQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsK0JBQStCO1lBQ3hFLElBQUcsSUFBQSxrQkFBVSxFQUFDLElBQUksQ0FBQyxFQUFFLENBQUM7Z0JBQ2xCLHNGQUFzRjtnQkFDdEYsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQywrREFBK0QsQ0FBQyxDQUFDO2dCQUN4RixTQUFTO1lBQ2IsQ0FBQztpQkFDSSxJQUFHLElBQUEsbUJBQVcsRUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDO2dCQUFBLFNBQVM7WUFBQSxDQUFDLENBQUMsbUNBQW1DO2lCQUNyRSxJQUFHLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQztnQkFBQSxTQUFTO1lBQUEsQ0FBQyxDQUFDLDZDQUE2QztpQkFDbkYsSUFBRyxJQUFJLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUM7Z0JBQUEsU0FBUztZQUFBLENBQUMsQ0FBQywrQ0FBK0M7aUJBQ3BGLENBQUM7Z0JBRUYsTUFBTSxHQUFHLEdBQUcsUUFBUSxDQUFDLElBQUksQ0FBQyxDQUFDO2dCQUMzQixJQUFJLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxDQUFDO29CQUNiLE1BQU0sVUFBVSxHQUFHLElBQUksMEJBQVUsQ0FBQyxTQUFTLEVBQUUsU0FBUyxFQUFFLEdBQUcsQ0FBQyxJQUFJLEVBQUUsU0FBUyxFQUFFLFNBQVMsRUFBRSxTQUFTLENBQUMsQ0FBQyxRQUFRLEVBQUUsQ0FBQztvQkFDOUcsT0FBTyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsRUFBQyxJQUFJLEVBQUUsVUFBVSxFQUFDLENBQUMsQ0FBQztnQkFDekMsQ0FBQztxQkFBTSxJQUFJLEdBQUcsQ0FBQyxHQUFHLEtBQUssSUFBSSxFQUFFLENBQUM7b0JBQzVCLE1BQU0sVUFBVSxHQUFHLElBQUksMEJBQVUsQ0FBQyxTQUFTLEVBQUUsU0FBUyxFQUFFLEdBQUcsQ0FBQyxJQUFJLEVBQUUsR0FBRyxDQUFDLE9BQU8sRUFBRSxTQUFTLEVBQUUsU0FBUyxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUM7b0JBQ2hILE9BQU8sQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLEVBQUMsSUFBSSxFQUFFLFVBQVUsRUFBQyxDQUFDLENBQUM7Z0JBQ3pDLENBQUM7cUJBQU0sQ0FBQztvQkFDTixNQUFNLFVBQVUsR0FBRyxJQUFJLDBCQUFVLENBQUMsU0FBUyxFQUFFLFNBQVMsRUFBRSxHQUFHLENBQUMsSUFBSSxFQUFFLFNBQVMsRUFBRSxTQUFTLEVBQUUsU0FBUyxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUM7b0JBQzlHLE9BQU8sQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLEVBQUMsSUFBSSxFQUFFLFVBQVUsRUFBRSxXQUFXLEVBQUUsR0FBRyxDQUFDLEdBQUcsR0FBQyxHQUFHLENBQUMsT0FBTyxFQUFDLENBQUMsQ0FBQztnQkFDM0UsQ0FBQztZQUNMLENBQUM7UUFDTCxDQUFDO0lBQ0wsQ0FBQztJQUNILE9BQU8sT0FBTyxDQUFDO0FBQ2pCLENBQUM7QUFFRCxxREFBcUQ7QUFDckQsc0ZBQXNGO0FBQ3RGLE1BQU0sYUFBYSxHQUFHLGtCQUFrQixDQUFDO0FBQ3pDLFNBQWdCLGtCQUFrQixDQUFDLFdBQW1CLEVBQUUsUUFBZ0I7SUFFcEUscUVBQXFFO0lBQ3JFLE1BQU0sT0FBTyxHQUFxQixFQUFDLElBQUksRUFBRSxRQUFRLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBQyxDQUFDO0lBQzlELElBQUcsY0FBSSxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUMsSUFBSSxhQUFhO1FBQ3ZDLE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUVwQyxPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsd0JBQXdCLENBQUMsV0FBVyxFQUFFLFFBQVEsQ0FBQyxDQUFDLENBQUM7QUFDNUUsQ0FBQztBQUVELDZFQUE2RTtBQUM3RSwwRUFBMEU7QUFDMUUsTUFBTSxrQkFBa0IsR0FBRywyQkFBMkIsQ0FBQztBQUN2RCxTQUFnQix5QkFBeUIsQ0FBQyxXQUFtQixFQUFFLFFBQWdCO0lBRTNFLE1BQU0sT0FBTyxHQUFxQixFQUFDLElBQUksRUFBRSxRQUFRLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBQyxDQUFDO0lBQzlELElBQUcsY0FBSSxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUMsSUFBSSxrQkFBa0I7UUFDNUMsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBRXBDLE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FBQyx3QkFBd0IsQ0FBQyxXQUFXLEVBQUUsUUFBUSxDQUFDLENBQUMsQ0FBQztBQUM1RSxDQUFDO0FBRUQsb0ZBQW9GO0FBQ3BGLGlEQUFpRDtBQUNqRCxNQUFNLGlCQUFpQixHQUFHLDBCQUEwQixDQUFDO0FBQ3JELE1BQU0saUJBQWlCLEdBQUcsMEJBQTBCLENBQUM7QUFDckQsU0FBZ0Isd0JBQXdCLENBQUMsV0FBbUIsRUFBRSxRQUFnQjs7SUFDMUUsTUFBTSxRQUFRLEdBQUcsY0FBSSxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUN6QyxNQUFNLFdBQVcsR0FBRyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDckQsTUFBTSxXQUFXLEdBQUcsaUJBQWlCLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ3JELE1BQU0sS0FBSyxHQUFHLE1BQUEsV0FBVyxhQUFYLFdBQVcsdUJBQVgsV0FBVyxDQUFHLENBQUMsQ0FBQyxtQ0FBSSxXQUFXLGFBQVgsV0FBVyx1QkFBWCxXQUFXLENBQUcsQ0FBQyxDQUFDLENBQUM7SUFFbkQsTUFBTSxPQUFPLEdBQXFCLEVBQUMsSUFBSSxFQUFFLFFBQVEsRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFDLENBQUM7SUFDOUQsSUFBSSxDQUFDLEtBQUs7UUFBRSxPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7SUFFNUMsTUFBTSxNQUFNLEdBQUcsd0JBQXdCLENBQUMsV0FBVyxFQUFFLFFBQVEsQ0FBQyxDQUFDO0lBQy9ELEtBQUssTUFBTSxJQUFJLElBQUksTUFBTSxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQzlCLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO0lBQ3ZCLENBQUM7SUFDRCxPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7QUFDbkMsQ0FBQyJ9
|
|
@@ -85,13 +85,16 @@ const pyProjectToml = async (fileContent, filePath) => {
|
|
|
85
85
|
}
|
|
86
86
|
// Fallback: Try Poetry format
|
|
87
87
|
// Matches [tool.poetry.dependencies], [tool.poetry.dev-dependencies], [tool.poetry.group.<name>.dependencies]
|
|
88
|
-
const rPoetryDepsSection = /\[tool\.poetry(?:\.group\.[\w-]+)?\.(?:dev-)?dependencies\]\s*\n([\s\S]*?)(?=\n\s*\[|$)/g;
|
|
88
|
+
const rPoetryDepsSection = /\[tool\.poetry(?:\.group\.([\w-]+))?\.(?:(dev-)?)dependencies\]\s*\n([\s\S]*?)(?=\n\s*\[|$)/g;
|
|
89
89
|
const poetryMatches = fileContent.matchAll(rPoetryDepsSection);
|
|
90
90
|
for (const match of poetryMatches) {
|
|
91
|
-
const
|
|
92
|
-
|
|
91
|
+
const groupName = match[1]; // e.g. "dev", "test", "ci", "doc" (undefined for non-group sections)
|
|
92
|
+
const isLegacyDev = !!match[2]; // "dev-" prefix in [tool.poetry.dev-dependencies]
|
|
93
|
+
const scope = isLegacyDev ? 'dev' : groupName !== null && groupName !== void 0 ? groupName : 'dependency';
|
|
94
|
+
const deps = parsePoetryDeps(match[3]);
|
|
95
|
+
result.purls.push(...deps.map(d => ({ ...d, scope })));
|
|
93
96
|
}
|
|
94
97
|
return result;
|
|
95
98
|
};
|
|
96
99
|
exports.default = pyProjectToml;
|
|
97
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
100
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUHlQcm9qZWN0VG9tbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3NyYy9zZGsvRGVwZW5kZW5jaWVzL0xvY2FsRGVwZW5kZW5jeS9wYXJzZXJzL3B5dGhvbi9QeVByb2plY3RUb21sLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBRUEsTUFBTSxvQkFBb0IsR0FBRyxJQUFJLE1BQU0sQ0FBQywwQ0FBMEMsQ0FBQyxDQUFDO0FBQ3BGLE1BQU0sb0JBQW9CLEdBQUcsSUFBSSxNQUFNLENBQUUsOENBQThDLENBQUMsQ0FBQztBQUV6RixNQUFNLFVBQVUsR0FBRyxXQUFXLENBQUM7QUFFL0I7OztHQUdHO0FBQ0gsTUFBTSxlQUFlLEdBQUcsQ0FBQyxjQUFzQixFQUE0QyxFQUFFO0lBQzNGLE1BQU0sT0FBTyxHQUE2QyxFQUFFLENBQUM7SUFDN0QsTUFBTSxLQUFLLEdBQUcsY0FBYyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUV6QyxLQUFLLE1BQU0sSUFBSSxJQUFJLEtBQUssRUFBRSxDQUFDO1FBQ3pCLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUM1QixJQUFJLENBQUMsT0FBTyxJQUFJLE9BQU8sQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDO1lBQUUsU0FBUztRQUVsRCxNQUFNLE9BQU8sR0FBRyxPQUFPLENBQUMsS0FBSyxDQUFDLDJCQUEyQixDQUFDLENBQUM7UUFDM0QsSUFBSSxDQUFDLE9BQU87WUFBRSxTQUFTO1FBRXZCLE1BQU0sSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUN4QixNQUFNLEtBQUssR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUM7UUFFaEMsaUNBQWlDO1FBQ2pDLElBQUksSUFBSSxDQUFDLFdBQVcsRUFBRSxLQUFLLFFBQVE7WUFBRSxTQUFTO1FBRTlDLElBQUksV0FBVyxHQUFrQixJQUFJLENBQUM7UUFFdEMsSUFBSSxLQUFLLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxJQUFJLEtBQUssQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQztZQUNuRCw4Q0FBOEM7WUFDOUMsTUFBTSxHQUFHLEdBQUcsS0FBSyxDQUFDLE9BQU8sQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDOUMsSUFBSSxHQUFHLElBQUksR0FBRyxLQUFLLEdBQUc7Z0JBQUUsV0FBVyxHQUFHLEdBQUcsQ0FBQztRQUM1QyxDQUFDO2FBQU0sSUFBSSxLQUFLLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUM7WUFDakMsOERBQThEO1lBQzlELE1BQU0sWUFBWSxHQUFHLEtBQUssQ0FBQyxLQUFLLENBQUMsZ0NBQWdDLENBQUMsQ0FBQztZQUNuRSxJQUFJLFlBQVksRUFBRSxDQUFDO2dCQUNqQixNQUFNLEdBQUcsR0FBRyxZQUFZLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUM7Z0JBQ25DLElBQUksR0FBRyxJQUFJLEdBQUcsS0FBSyxHQUFHO29CQUFFLFdBQVcsR0FBRyxHQUFHLENBQUM7WUFDNUMsQ0FBQztRQUNILENBQUM7UUFFRCxNQUFNLElBQUksR0FBRyxVQUFVLEdBQUcsSUFBSSxDQUFDO1FBQy9CLE9BQU8sQ0FBQyxJQUFJLENBQUM7WUFDWCxJQUFJO1lBQ0osR0FBRyxDQUFDLFdBQVcsS0FBSyxJQUFJLElBQUksRUFBRSxXQUFXLEVBQUUsQ0FBQztTQUM3QyxDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsT0FBTyxPQUFPLENBQUM7QUFDakIsQ0FBQyxDQUFDO0FBRUYsTUFBTSxhQUFhLEdBQUcsS0FBSyxFQUFFLFdBQW1CLEVBQUMsUUFBZ0IsRUFBNkIsRUFBRTtJQUM5RixNQUFNLE1BQU0sR0FBcUIsRUFBQyxJQUFJLEVBQUUsUUFBUSxFQUFFLEtBQUssRUFBRSxFQUFFLEVBQUMsQ0FBQztJQUU3RCwyQkFBMkI7SUFDM0IsTUFBTSxpQkFBaUIsR0FBRyxXQUFXLENBQUMsS0FBSyxDQUFDLG9CQUFvQixDQUFDLENBQUM7SUFDbEUsSUFBSSxpQkFBaUIsRUFBRSxDQUFDO1FBQ3RCLE1BQU0sZ0JBQWdCLEdBQUcsaUJBQWlCLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLG9CQUFvQixDQUFDLENBQUM7UUFDMUUsSUFBSSxnQkFBZ0IsRUFBRSxDQUFDO1lBQ3JCLE1BQU0sUUFBUSxHQUFHLGdCQUFnQixDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsRUFBRSxDQUFDO1lBRWhEOzs7OztjQUtFO1lBRUYscUZBQXFGO1lBRXJGLE1BQU0sSUFBSSxHQUFJLFFBQVE7aUJBQ25CLE9BQU8sQ0FBQyxHQUFHLEVBQUUsSUFBSSxDQUFDLENBQUMsc0RBQXNEO2lCQUN6RSxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUksd0ZBQXdGO2lCQUN2RyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLG1CQUFtQixFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsbURBQW1EO2lCQUNoRyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsTUFBTSxLQUFLLENBQUMsQ0FBRSxDQUFBLENBQUUsb0NBQW9DO1lBR3JFLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUU7Z0JBQ2YsQ0FBQyxHQUFHLENBQUMsQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQyxDQUFBLENBQUUsOEhBQThIO2dCQUMxSixDQUFDLEdBQUcsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxRQUFRLEVBQUUsRUFBRSxDQUFDLENBQUEsQ0FBQyxvR0FBb0c7Z0JBRWhJLE1BQU0sZ0JBQWdCLEdBQUcsQ0FBQyxDQUFDLEtBQUssQ0FBQyw4QkFBOEIsQ0FBQyxDQUFDO2dCQUNqRSxNQUFNLFdBQVcsR0FBRyxnQkFBZ0IsQ0FBQyxDQUFDLENBQUMsZ0JBQWdCLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQTtnQkFFakUsSUFBSSxJQUFJLEdBQUcsQ0FBQyxDQUFDO2dCQUNiLElBQUksV0FBVztvQkFBRSxJQUFJLEdBQUcsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxXQUFXLEVBQUUsRUFBRSxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUM7Z0JBRTFELElBQUksR0FBRyxVQUFVLEdBQUcsSUFBSSxDQUFDO2dCQUV6QixNQUFNLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQztvQkFDaEIsSUFBSTtvQkFDSixHQUFHLENBQUMsV0FBVyxLQUFLLElBQUksSUFBSSxFQUFFLFdBQVcsRUFBRSxDQUFDO2lCQUM3QyxDQUFDLENBQUE7WUFDSixDQUFDLENBQUMsQ0FBQTtZQUNGLE9BQU8sTUFBTSxDQUFDO1FBQ2hCLENBQUM7SUFDSCxDQUFDO0lBRUQsOEJBQThCO0lBQzlCLDhHQUE4RztJQUM5RyxNQUFNLGtCQUFrQixHQUFHLDhGQUE4RixDQUFDO0lBQzFILE1BQU0sYUFBYSxHQUFHLFdBQVcsQ0FBQyxRQUFRLENBQUMsa0JBQWtCLENBQUMsQ0FBQztJQUMvRCxLQUFLLE1BQU0sS0FBSyxJQUFJLGFBQWEsRUFBRSxDQUFDO1FBQ2xDLE1BQU0sU0FBUyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFHLHFFQUFxRTtRQUNuRyxNQUFNLFdBQVcsR0FBRyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsa0RBQWtEO1FBQ2xGLE1BQU0sS0FBSyxHQUFHLFdBQVcsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxTQUFTLGFBQVQsU0FBUyxjQUFULFNBQVMsR0FBSSxZQUFZLENBQUM7UUFDOUQsTUFBTSxJQUFJLEdBQUcsZUFBZSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ3ZDLE1BQU0sQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxHQUFHLENBQUMsRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUN6RCxDQUFDO0lBRUQsT0FBTyxNQUFNLENBQUM7QUFDaEIsQ0FBQyxDQUFDO0FBRUYsa0JBQWUsYUFBYSxDQUFDIn0=
|
|
@@ -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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2NhblNldHRpbmdzQnVpbGRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9zZGsvc2Nhbm5lci9TY2FuU2V0dGluZ3NCdWlsZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUVBLFNBQVMsU0FBUyxDQUFDLEtBQXVCO0lBQ3hDLElBQUksT0FBTyxLQUFLLEtBQUssUUFBUTtRQUFFLE9BQU8sS0FBSyxLQUFLLE1BQU0sQ0FBQztJQUN2RCxPQUFPLEtBQUssQ0FBQztBQUNmLENBQUM7QUFFRCxNQUFhLG1CQUFtQjtJQUk5QixZQUFZLG1CQUF5QztRQUZwQyx3QkFBbUIsR0FBd0IsRUFBRSxDQUFDO1FBRzdELElBQUksQ0FBQyxtQkFBbUIsR0FBRyxtQkFBbUIsQ0FBQztJQUNqRCxDQUFDO0lBRUQsK0RBQStEO0lBQy9ELGlDQUFpQztJQUNqQyxrQkFBa0IsQ0FBQyxRQUEwQjs7UUFDM0MsTUFBTSxpQkFBaUIsR0FBRyxRQUFRLElBQUksSUFBSSxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQztRQUMxRSxNQUFNLE1BQU0sR0FBRyxNQUFBLE1BQUEsSUFBSSxDQUFDLG1CQUFtQiwwQ0FBRSxnQkFBZ0IsbUNBQUksaUJBQWlCLENBQUM7UUFDL0UsSUFBSSxNQUFNLElBQUksSUFBSSxJQUFJLE1BQU0sS0FBSyxDQUFDLEVBQUUsQ0FBQztZQUNuQyxJQUFJLENBQUMsbUJBQW1CLENBQUMsZ0JBQWdCLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsTUFBTSxDQUFDLENBQUM7UUFDbEUsQ0FBQztRQUNELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVELGlDQUFpQztJQUNqQyxtQkFBbUIsQ0FBQyxRQUEwQjs7UUFDNUMsTUFBTSxrQkFBa0IsR0FBRyxRQUFRLElBQUksSUFBSSxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQztRQUMzRSxNQUFNLE1BQU0sR0FBRyxNQUFBLE1BQUEsSUFBSSxDQUFDLG1CQUFtQiwwQ0FBRSxpQkFBaUIsbUNBQUksa0JBQWtCLENBQUM7UUFDakYsSUFBSSxNQUFNLElBQUksSUFBSSxJQUFJLE1BQU0sS0FBSyxDQUFDLEVBQUUsQ0FBQztZQUNuQyxJQUFJLENBQUMsbUJBQW1CLENBQUMsaUJBQWlCLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsTUFBTSxDQUFDLENBQUM7UUFDbkUsQ0FBQztRQUNELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVELDhCQUE4QjtJQUM5QixXQUFXLENBQUMsUUFBMkI7O1FBQ3JDLE1BQU0sVUFBVSxHQUFHLFFBQVEsSUFBSSxJQUFJLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDO1FBQ3RFLE1BQU0sTUFBTSxHQUFHLE1BQUEsTUFBQSxJQUFJLENBQUMsbUJBQW1CLDBDQUFFLGVBQWUsbUNBQUksVUFBVSxDQUFDO1FBQ3ZFLElBQUksTUFBTSxJQUFJLElBQUksRUFBRSxDQUFDO1lBQ25CLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxlQUFlLEdBQUcsTUFBTSxDQUFDO1FBQ3BELENBQUM7UUFDRCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFRCx3REFBd0Q7SUFDeEQsb0JBQW9CLENBQUMsUUFBMEI7O1FBQzdDLE1BQU0scUJBQXFCLEdBQUcsRUFBRSxDQUFDO1FBQ2pDLE1BQU0sbUJBQW1CLEdBQUcsUUFBUSxJQUFJLElBQUksQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUM7UUFDNUUsTUFBTSxNQUFNLEdBQUcsTUFBQSxNQUFBLElBQUksQ0FBQyxtQkFBbUIsMENBQUUsaUJBQWlCLG1DQUFJLG1CQUFtQixDQUFDO1FBQ2xGLElBQUksTUFBTSxJQUFJLElBQUksSUFBSSxNQUFNLEtBQUssQ0FBQyxDQUFDLEVBQUUsQ0FBQztZQUNwQyxJQUFJLE9BQU8sR0FBRyxNQUFNLENBQUM7WUFDckIsSUFBSSxPQUFPLEdBQUcscUJBQXFCLEVBQUUsQ0FBQztnQkFDcEMsT0FBTyxDQUFDLEtBQUssQ0FBQyxvQ0FBb0MsT0FBTyw2QkFBNkIscUJBQXFCLGlCQUFpQixxQkFBcUIsR0FBRyxDQUFDLENBQUM7Z0JBQ3RKLE9BQU8sR0FBRyxxQkFBcUIsQ0FBQztZQUNsQyxDQUFDO2lCQUFNLElBQUksT0FBTyxHQUFHLENBQUMsQ0FBQyxFQUFFLENBQUM7Z0JBQ3hCLE9BQU8sQ0FBQyxLQUFLLENBQUMsb0NBQW9DLE9BQU8sZ0RBQWdELENBQUMsQ0FBQztnQkFDM0csT0FBTyxHQUFHLENBQUMsQ0FBQyxDQUFDO1lBQ2YsQ0FBQztZQUNELElBQUksT0FBTyxLQUFLLENBQUMsQ0FBQyxFQUFFLENBQUM7Z0JBQ25CLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxpQkFBaUIsR0FBRyxPQUFPLENBQUM7WUFDdkQsQ0FBQztRQUNILENBQUM7UUFDRCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFRCw4QkFBOEI7SUFDOUIsbUJBQW1CLENBQUMsUUFBMkI7O1FBQzdDLE1BQU0saUJBQWlCLEdBQUcsUUFBUSxJQUFJLElBQUksQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUM7UUFDN0UsTUFBTSxNQUFNLEdBQUcsTUFBQSxNQUFBLElBQUksQ0FBQyxtQkFBbUIsMENBQUUsZ0JBQWdCLG1DQUFJLGlCQUFpQixDQUFDO1FBQy9FLElBQUksTUFBTSxJQUFJLElBQUksRUFBRSxDQUFDO1lBQ25CLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxnQkFBZ0IsR0FBRyxNQUFNLENBQUM7UUFDckQsQ0FBQztRQUNELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVELDhCQUE4QjtJQUM5QixzQkFBc0IsQ0FBQyxRQUEyQjs7UUFDaEQsTUFBTSxxQkFBcUIsR0FBRyxRQUFRLElBQUksSUFBSSxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQztRQUNqRixNQUFNLE1BQU0sR0FBRyxNQUFBLE1BQUEsSUFBSSxDQUFDLG1CQUFtQiwwQ0FBRSxtQkFBbUIsbUNBQUkscUJBQXFCLENBQUM7UUFDdEYsSUFBSSxNQUFNLElBQUksSUFBSSxFQUFFLENBQUM7WUFDbkIsSUFBSSxDQUFDLG1CQUFtQixDQUFDLG1CQUFtQixHQUFHLE1BQU0sQ0FBQztRQUN4RCxDQUFDO1FBQ0QsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQsS0FBSztRQUNILElBQUksTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFLENBQUM7WUFDckQsT0FBTyxJQUFJLENBQUMsbUJBQW1CLENBQUM7UUFDbEMsQ0FBQztRQUNELE9BQU8sU0FBUyxDQUFDO0lBQ25CLENBQUM7Q0FDRjtBQXRGRCxrREFzRkMifQ==
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|