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>;
|
|
@@ -70,4 +70,22 @@ export function pipRequirementsLockParser(fileContent, filePath) {
|
|
|
70
70
|
return Promise.resolve(results);
|
|
71
71
|
return Promise.resolve(parseRequirementsContent(fileContent, filePath));
|
|
72
72
|
}
|
|
73
|
-
|
|
73
|
+
// Parse scoped requirements files like dev-requirements.txt or requirements-dev.txt
|
|
74
|
+
// Extracts scope from the filename prefix/suffix
|
|
75
|
+
const SCOPED_REQ_PREFIX = /^(.+)-requirements\.txt$/;
|
|
76
|
+
const SCOPED_REQ_SUFFIX = /^requirements-(.+)\.txt$/;
|
|
77
|
+
export function scopedRequirementsParser(fileContent, filePath) {
|
|
78
|
+
const fileName = path.basename(filePath);
|
|
79
|
+
const prefixMatch = SCOPED_REQ_PREFIX.exec(fileName);
|
|
80
|
+
const suffixMatch = SCOPED_REQ_SUFFIX.exec(fileName);
|
|
81
|
+
const scope = prefixMatch?.[1] ?? suffixMatch?.[1];
|
|
82
|
+
const results = { file: filePath, purls: [] };
|
|
83
|
+
if (!scope)
|
|
84
|
+
return Promise.resolve(results);
|
|
85
|
+
const parsed = parseRequirementsContent(fileContent, filePath);
|
|
86
|
+
for (const purl of parsed.purls) {
|
|
87
|
+
purl.scope = scope;
|
|
88
|
+
}
|
|
89
|
+
return Promise.resolve(parsed);
|
|
90
|
+
}
|
|
91
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHlQYXJzZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvc2RrL0RlcGVuZGVuY2llcy9Mb2NhbERlcGVuZGVuY3kvcGFyc2Vycy9weVBhcnNlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLElBQUksTUFBTSxNQUFNLENBQUM7QUFDeEIsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUUzQyxPQUFPLEVBQUUsV0FBVyxFQUFFLFVBQVUsRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUdsRCxTQUFTLFFBQVEsQ0FBRSxHQUFXO0lBQzVCLE1BQU0sR0FBRyxHQUFHLDBEQUEwRCxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUNqRixPQUFPO1FBQ0wsSUFBSSxFQUFFLEdBQUcsRUFBRSxNQUFNLEVBQUUsSUFBSTtRQUN2QixHQUFHLEVBQUUsR0FBRyxFQUFFLE1BQU0sRUFBRSxHQUFHO1FBQ3JCLE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxFQUFFLE9BQU87S0FDOUIsQ0FBQztBQUNKLENBQUM7QUFFRCxNQUFNLFNBQVMsR0FBRyxNQUFNLENBQUM7QUFFekIsU0FBUyx3QkFBd0IsQ0FBQyxXQUFtQixFQUFFLFFBQWdCO0lBQ25FLE1BQU0sT0FBTyxHQUFxQixFQUFDLElBQUksRUFBRSxRQUFRLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBQyxDQUFDO0lBQzlELE1BQU0sS0FBSyxHQUFrQixXQUFXLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBRXJELEtBQUssSUFBSSxJQUFJLElBQUksS0FBSyxFQUFFLENBQUM7UUFDckIsSUFBSSxHQUFHLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUNuQixJQUFHLElBQUksQ0FBQyxNQUFNLElBQUksQ0FBQztZQUFFLFNBQVM7UUFDOUIsSUFBRyxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLElBQUks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
|
|
@@ -83,13 +83,16 @@ const pyProjectToml = async (fileContent, filePath) => {
|
|
|
83
83
|
}
|
|
84
84
|
// Fallback: Try Poetry format
|
|
85
85
|
// Matches [tool.poetry.dependencies], [tool.poetry.dev-dependencies], [tool.poetry.group.<name>.dependencies]
|
|
86
|
-
const rPoetryDepsSection = /\[tool\.poetry(?:\.group\.[\w-]+)?\.(?:dev-)?dependencies\]\s*\n([\s\S]*?)(?=\n\s*\[|$)/g;
|
|
86
|
+
const rPoetryDepsSection = /\[tool\.poetry(?:\.group\.([\w-]+))?\.(?:(dev-)?)dependencies\]\s*\n([\s\S]*?)(?=\n\s*\[|$)/g;
|
|
87
87
|
const poetryMatches = fileContent.matchAll(rPoetryDepsSection);
|
|
88
88
|
for (const match of poetryMatches) {
|
|
89
|
-
const
|
|
90
|
-
|
|
89
|
+
const groupName = match[1]; // e.g. "dev", "test", "ci", "doc" (undefined for non-group sections)
|
|
90
|
+
const isLegacyDev = !!match[2]; // "dev-" prefix in [tool.poetry.dev-dependencies]
|
|
91
|
+
const scope = isLegacyDev ? 'dev' : groupName ?? 'dependency';
|
|
92
|
+
const deps = parsePoetryDeps(match[3]);
|
|
93
|
+
result.purls.push(...deps.map(d => ({ ...d, scope })));
|
|
91
94
|
}
|
|
92
95
|
return result;
|
|
93
96
|
};
|
|
94
97
|
export default pyProjectToml;
|
|
95
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
98
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUHlQcm9qZWN0VG9tbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3NyYy9zZGsvRGVwZW5kZW5jaWVzL0xvY2FsRGVwZW5kZW5jeS9wYXJzZXJzL3B5dGhvbi9QeVByb2plY3RUb21sLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE1BQU0sb0JBQW9CLEdBQUcsSUFBSSxNQUFNLENBQUMsMENBQTBDLENBQUMsQ0FBQztBQUNwRixNQUFNLG9CQUFvQixHQUFHLElBQUksTUFBTSxDQUFFLDhDQUE4QyxDQUFDLENBQUM7QUFFekYsTUFBTSxVQUFVLEdBQUcsV0FBVyxDQUFDO0FBRS9COzs7R0FHRztBQUNILE1BQU0sZUFBZSxHQUFHLENBQUMsY0FBc0IsRUFBNEMsRUFBRTtJQUMzRixNQUFNLE9BQU8sR0FBNkMsRUFBRSxDQUFDO0lBQzdELE1BQU0sS0FBSyxHQUFHLGNBQWMsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUM7SUFFekMsS0FBSyxNQUFNLElBQUksSUFBSSxLQUFLLEVBQUUsQ0FBQztRQUN6QixNQUFNLE9BQU8sR0FBRyxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7UUFDNUIsSUFBSSxDQUFDLE9BQU8sSUFBSSxPQUFPLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQztZQUFFLFNBQVM7UUFFbEQsTUFBTSxPQUFPLEdBQUcsT0FBTyxDQUFDLEtBQUssQ0FBQywyQkFBMkIsQ0FBQyxDQUFDO1FBQzNELElBQUksQ0FBQyxPQUFPO1lBQUUsU0FBUztRQUV2QixNQUFNLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDeEIsTUFBTSxLQUFLLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDO1FBRWhDLGlDQUFpQztRQUNqQyxJQUFJLElBQUksQ0FBQyxXQUFXLEVBQUUsS0FBSyxRQUFRO1lBQUUsU0FBUztRQUU5QyxJQUFJLFdBQVcsR0FBa0Is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
|
|
@@ -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
|
}
|
|
@@ -6,6 +6,7 @@ export class DispatchableItem {
|
|
|
6
6
|
engineFlags;
|
|
7
7
|
sbom;
|
|
8
8
|
sbomMode;
|
|
9
|
+
scanSettings;
|
|
9
10
|
constructor() {
|
|
10
11
|
this.errorCounter = 0;
|
|
11
12
|
this.form = new FormData();
|
|
@@ -28,6 +29,9 @@ export class DispatchableItem {
|
|
|
28
29
|
}
|
|
29
30
|
return this.form;
|
|
30
31
|
}
|
|
32
|
+
getScanSettings() {
|
|
33
|
+
return this.scanSettings;
|
|
34
|
+
}
|
|
31
35
|
increaseErrorCounter() {
|
|
32
36
|
this.errorCounter += 1;
|
|
33
37
|
}
|
|
@@ -47,5 +51,8 @@ export class DispatchableItem {
|
|
|
47
51
|
this.sbom = sbom;
|
|
48
52
|
this.sbomMode = sbomMode;
|
|
49
53
|
}
|
|
54
|
+
setScanSettings(fileSnippetSettings) {
|
|
55
|
+
this.scanSettings = fileSnippetSettings;
|
|
56
|
+
}
|
|
50
57
|
}
|
|
51
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
58
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGlzcGF0Y2hhYmxlSXRlbS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3NyYy9zZGsvc2Nhbm5lci9EaXNwYXRjaGVyL0Rpc3BhdGNoYWJsZUl0ZW0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxRQUFRLE1BQU0sV0FBVyxDQUFDO0FBSWpDLE1BQU0sT0FBTyxnQkFBZ0I7SUFDbkIsSUFBSSxDQUFXO0lBRWYsWUFBWSxDQUFTO0lBRXJCLGtCQUFrQixDQUFxQjtJQUV2QyxXQUFXLENBQVM7SUFFcEIsSUFBSSxDQUFTO0lBRWIsUUFBUSxDQUFXO0lBRW5CLFlBQVksQ0FBc0I7SUFFMUM7UUFDRSxJQUFJLENBQUMsWUFBWSxHQUFHLENBQUMsQ0FBQztRQUN0QixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksUUFBUSxFQUFFLENBQUM7SUFDN0IsQ0FBQztJQUVPLEtBQUssQ0FBUztJQUV0QixJQUFXLElBQUk7UUFDYixPQUFPLElBQUksQ0FBQyxLQUFLLENBQUM7SUFDcEIsQ0FBQztJQUVELElBQVcsSUFBSSxDQUFDLElBQVk7UUFDMUIsSUFBSSxDQUFDLEtBQUssR0FBRyxJQUFJLENBQUM7SUFDcEIsQ0FBQztJQUVNLE9BQU87UUFDWixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksUUFBUSxFQUFFLENBQUM7UUFFM0IsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQ2QsTUFBTSxFQUNOLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLGtCQUFrQixDQUFDLFVBQVUsRUFBRSxDQUFDLEVBQ2pELFVBQVUsQ0FDWCxDQUFDO1FBQ0YsSUFBSSxJQUFJLENBQUMsV0FBVztZQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sRUFBRSxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUM7UUFFbEUsSUFBSSxJQUFJLENBQUMsUUFBUSxJQUFJLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztZQUMvQixJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQ3RDLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDMUMsQ0FBQztRQUVELE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQztJQUNuQixDQUFDO0lBRU0sZUFBZTtRQUNwQixPQUFPLElBQUksQ0FBQyxZQUFZLENBQUM7SUFDM0IsQ0FBQztJQUVNLG9CQUFvQjtRQUN6QixJQUFJLENBQUMsWUFBWSxJQUFJLENBQUMsQ0FBQztJQUN6QixDQUFDO0lBRU0sZUFBZTtRQUNwQixPQUFPLElBQUksQ0FBQyxZQUFZLENBQUM7SUFDM0IsQ0FBQztJQUVNLHFCQUFxQixDQUFDLGtCQUFzQztRQUNqRSxJQUFJLENBQUMsa0JBQWtCLEdBQUcsa0JBQWtCLENBQUM7SUFDL0MsQ0FBQztJQUVNLHFCQUFxQjtRQUMxQixPQUFPLElBQUksQ0FBQyxrQkFBa0IsQ0FBQztJQUNqQyxDQUFDO0lBRU0sY0FBYyxDQUFDLFdBQW1CO1FBQ3ZDLElBQUksQ0FBQyxXQUFXLEdBQUcsV0FBVyxDQUFDO0lBQ2pDLENBQUM7SUFFTSxPQUFPLENBQUMsSUFBWSxFQUFFLFFBQWtCO1FBQzdDLElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDO1FBQ2pCLElBQUksQ0FBQyxRQUFRLEdBQUcsUUFBUSxDQUFDO0lBQzNCLENBQUM7SUFFTSxlQUFlLENBQUMsbUJBQXdDO1FBQzdELElBQUksQ0FBQyxZQUFZLEdBQUcsbUJBQW1CLENBQUM7SUFDMUMsQ0FBQztDQUNGIn0=
|
|
@@ -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
|
}
|
|
@@ -136,6 +136,13 @@ export class Dispatcher extends EventEmitter {
|
|
|
136
136
|
return;
|
|
137
137
|
}
|
|
138
138
|
}
|
|
139
|
+
buildScanSettingsHeader(fileSnippetSettings) {
|
|
140
|
+
if (!fileSnippetSettings || Object.keys(fileSnippetSettings).length === 0) {
|
|
141
|
+
return undefined;
|
|
142
|
+
}
|
|
143
|
+
const jsonStr = JSON.stringify(fileSnippetSettings);
|
|
144
|
+
return Buffer.from(jsonStr).toString('base64');
|
|
145
|
+
}
|
|
139
146
|
async dispatch(item) {
|
|
140
147
|
const timeoutController = this.globalAbortController.getAbortController();
|
|
141
148
|
const timeoutId = setTimeout(() => timeoutController.abort(), this.scannerCfg.TIMEOUT);
|
|
@@ -143,17 +150,22 @@ export class Dispatcher extends EventEmitter {
|
|
|
143
150
|
try {
|
|
144
151
|
this.emit(ScannerEvents.DISPATCHER_WFP_SENDED);
|
|
145
152
|
const scanURL = new URL('/scan/direct', this.scannerCfg.API_URL);
|
|
153
|
+
const headers = {
|
|
154
|
+
'User-Agent': this.scannerCfg.CLIENT_TIMESTAMP
|
|
155
|
+
? this.scannerCfg.CLIENT_TIMESTAMP
|
|
156
|
+
: `scanoss-js/v${Utils.getPackageVersion()}`,
|
|
157
|
+
'X-Session': this.scannerCfg.API_KEY,
|
|
158
|
+
'x-request-id': item.uuid,
|
|
159
|
+
};
|
|
160
|
+
const scanSettingsHeader = this.buildScanSettingsHeader(item.getScanSettings());
|
|
161
|
+
if (scanSettingsHeader) {
|
|
162
|
+
headers['scanoss-settings'] = scanSettingsHeader;
|
|
163
|
+
}
|
|
146
164
|
const response = await fetch(scanURL.href, {
|
|
147
165
|
agent: this.proxyAgent,
|
|
148
166
|
method: 'post',
|
|
149
167
|
body: item.getForm(),
|
|
150
|
-
headers
|
|
151
|
-
'User-Agent': this.scannerCfg.CLIENT_TIMESTAMP
|
|
152
|
-
? this.scannerCfg.CLIENT_TIMESTAMP
|
|
153
|
-
: `scanoss-js/v${Utils.getPackageVersion()}`,
|
|
154
|
-
'X-Session': this.scannerCfg.API_KEY,
|
|
155
|
-
'x-request-id': item.uuid,
|
|
156
|
-
},
|
|
168
|
+
headers,
|
|
157
169
|
signal: timeoutController.signal,
|
|
158
170
|
});
|
|
159
171
|
clearTimeout(timeoutId);
|
|
@@ -178,4 +190,4 @@ export class Dispatcher extends EventEmitter {
|
|
|
178
190
|
}
|
|
179
191
|
}
|
|
180
192
|
}
|
|
181
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
193
|
+
//# 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,86 @@
|
|
|
1
|
+
function toBoolean(value) {
|
|
2
|
+
if (typeof value === 'string')
|
|
3
|
+
return value === 'true';
|
|
4
|
+
return value;
|
|
5
|
+
}
|
|
6
|
+
export class ScanSettingsBuilder {
|
|
7
|
+
settingsFileSnippet;
|
|
8
|
+
fileSnippetSettings = {};
|
|
9
|
+
constructor(settingsFileSnippet) {
|
|
10
|
+
this.settingsFileSnippet = settingsFileSnippet;
|
|
11
|
+
}
|
|
12
|
+
// Priority: scanoss.json file_snippet settings > CLI arguments
|
|
13
|
+
// 0 means defer to server config
|
|
14
|
+
withMinSnippetHits(cliValue) {
|
|
15
|
+
const cliMinSnippetHits = cliValue != null ? Number(cliValue) : undefined;
|
|
16
|
+
const merged = this.settingsFileSnippet?.min_snippet_hits ?? cliMinSnippetHits;
|
|
17
|
+
if (merged != null && merged !== 0) {
|
|
18
|
+
this.fileSnippetSettings.min_snippet_hits = Math.max(0, merged);
|
|
19
|
+
}
|
|
20
|
+
return this;
|
|
21
|
+
}
|
|
22
|
+
// 0 means defer to server config
|
|
23
|
+
withMinSnippetLines(cliValue) {
|
|
24
|
+
const cliMinSnippetLines = cliValue != null ? Number(cliValue) : undefined;
|
|
25
|
+
const merged = this.settingsFileSnippet?.min_snippet_lines ?? cliMinSnippetLines;
|
|
26
|
+
if (merged != null && merged !== 0) {
|
|
27
|
+
this.fileSnippetSettings.min_snippet_lines = Math.max(0, merged);
|
|
28
|
+
}
|
|
29
|
+
return this;
|
|
30
|
+
}
|
|
31
|
+
// Only send if explicitly set
|
|
32
|
+
withRanking(cliValue) {
|
|
33
|
+
const cliRanking = cliValue != null ? toBoolean(cliValue) : undefined;
|
|
34
|
+
const merged = this.settingsFileSnippet?.ranking_enabled ?? cliRanking;
|
|
35
|
+
if (merged != null) {
|
|
36
|
+
this.fileSnippetSettings.ranking_enabled = merged;
|
|
37
|
+
}
|
|
38
|
+
return this;
|
|
39
|
+
}
|
|
40
|
+
// -1 means defer to server config, valid range -1 to 10
|
|
41
|
+
withRankingThreshold(cliValue) {
|
|
42
|
+
const MAX_RANKING_THRESHOLD = 10;
|
|
43
|
+
const cliRankingThreshold = cliValue != null ? Number(cliValue) : undefined;
|
|
44
|
+
const merged = this.settingsFileSnippet?.ranking_threshold ?? cliRankingThreshold;
|
|
45
|
+
if (merged != null && merged !== -1) {
|
|
46
|
+
let clamped = merged;
|
|
47
|
+
if (clamped > MAX_RANKING_THRESHOLD) {
|
|
48
|
+
console.error(`WARNING: ranking-threshold value ${clamped} exceeds maximum allowed (${MAX_RANKING_THRESHOLD}). Setting to ${MAX_RANKING_THRESHOLD}.`);
|
|
49
|
+
clamped = MAX_RANKING_THRESHOLD;
|
|
50
|
+
}
|
|
51
|
+
else if (clamped < -1) {
|
|
52
|
+
console.error(`WARNING: ranking-threshold value ${clamped} is below minimum allowed (-1). Setting to -1.`);
|
|
53
|
+
clamped = -1;
|
|
54
|
+
}
|
|
55
|
+
if (clamped !== -1) {
|
|
56
|
+
this.fileSnippetSettings.ranking_threshold = clamped;
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
return this;
|
|
60
|
+
}
|
|
61
|
+
// Only send if explicitly set
|
|
62
|
+
withHonourFileExist(cliValue) {
|
|
63
|
+
const cliHonourFileExts = cliValue != null ? toBoolean(cliValue) : undefined;
|
|
64
|
+
const merged = this.settingsFileSnippet?.honour_file_exts ?? cliHonourFileExts;
|
|
65
|
+
if (merged != null) {
|
|
66
|
+
this.fileSnippetSettings.honour_file_exts = merged;
|
|
67
|
+
}
|
|
68
|
+
return this;
|
|
69
|
+
}
|
|
70
|
+
// Only send if explicitly set
|
|
71
|
+
withDependencyAnalysis(cliValue) {
|
|
72
|
+
const cliDependencyAnalysis = cliValue != null ? toBoolean(cliValue) : undefined;
|
|
73
|
+
const merged = this.settingsFileSnippet?.dependency_analysis ?? cliDependencyAnalysis;
|
|
74
|
+
if (merged != null) {
|
|
75
|
+
this.fileSnippetSettings.dependency_analysis = merged;
|
|
76
|
+
}
|
|
77
|
+
return this;
|
|
78
|
+
}
|
|
79
|
+
build() {
|
|
80
|
+
if (Object.keys(this.fileSnippetSettings).length > 0) {
|
|
81
|
+
return this.fileSnippetSettings;
|
|
82
|
+
}
|
|
83
|
+
return undefined;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2NhblNldHRpbmdzQnVpbGRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9zZGsvc2Nhbm5lci9TY2FuU2V0dGluZ3NCdWlsZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLFNBQVMsU0FBUyxDQUFDLEtBQXVCO0lBQ3hDLElBQUksT0FBTyxLQUFLLEtBQUssUUFBUTtRQUFFLE9BQU8sS0FBSyxLQUFLLE1BQU0sQ0FBQztJQUN2RCxPQUFPLEtBQUssQ0FBQztBQUNmLENBQUM7QUFFRCxNQUFNLE9BQU8sbUJBQW1CO0lBQ2IsbUJBQW1CLENBQWtDO0lBQ3JELG1CQUFtQixHQUF3QixFQUFFLENBQUM7SUFFL0QsWUFBWSxtQkFBeUM7UUFDbkQsSUFBSSxDQUFDLG1CQUFtQixHQUFHLG1CQUFtQixDQUFDO0lBQ2pELENBQUM7SUFFRCwrREFBK0Q7SUFDL0QsaUNBQWlDO0lBQ2pDLGtCQUFrQixDQUFDLFFBQTBCO1FBQzNDLE1BQU0saUJBQWlCLEdBQUcsUUFBUSxJQUFJLElBQUksQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUM7UUFDMUUsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLG1CQUFtQixFQUFFLGdCQUFnQixJQUFJLGlCQUFpQixDQUFDO1FBQy9FLElBQUksTUFBTSxJQUFJLElBQUksSUFBSSxNQUFNLEtBQUssQ0FBQyxFQUFFLENBQUM7WUFDbkMsSUFBSSxDQUFDLG1CQUFtQixDQUFDLGdCQUFnQixHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFLE1BQU0sQ0FBQyxDQUFDO1FBQ2xFLENBQUM7UUFDRCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFRCxpQ0FBaUM7SUFDakMsbUJBQW1CLENBQUMsUUFBMEI7UUFDNUMsTUFBTSxrQkFBa0IsR0FBRyxRQUFRLElBQUksSUFBSSxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMs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
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,236 @@
|
|
|
1
|
+
import { expect } from 'chai';
|
|
2
|
+
import { ScanSettingsBuilder } from './ScanSettingsBuilder';
|
|
3
|
+
describe('ScanSettingsBuilder', () => {
|
|
4
|
+
describe('build()', () => {
|
|
5
|
+
it('should return undefined when no properties are set', () => {
|
|
6
|
+
const result = new ScanSettingsBuilder().build();
|
|
7
|
+
expect(result).to.be.undefined;
|
|
8
|
+
});
|
|
9
|
+
it('should return undefined when no CLI values and no settings file', () => {
|
|
10
|
+
const result = new ScanSettingsBuilder()
|
|
11
|
+
.withMinSnippetHits(undefined)
|
|
12
|
+
.withMinSnippetLines(undefined)
|
|
13
|
+
.withRanking(undefined)
|
|
14
|
+
.withRankingThreshold(undefined)
|
|
15
|
+
.withHonourFileExist(undefined)
|
|
16
|
+
.build();
|
|
17
|
+
expect(result).to.be.undefined;
|
|
18
|
+
});
|
|
19
|
+
});
|
|
20
|
+
describe('Priority: settings file > CLI arguments', () => {
|
|
21
|
+
it('should use settings file value when both CLI and settings file are provided', () => {
|
|
22
|
+
const settingsFile = { min_snippet_hits: 5 };
|
|
23
|
+
const result = new ScanSettingsBuilder(settingsFile)
|
|
24
|
+
.withMinSnippetHits(10)
|
|
25
|
+
.build();
|
|
26
|
+
expect(result).to.deep.equal({ min_snippet_hits: 5 });
|
|
27
|
+
});
|
|
28
|
+
it('should use CLI value when settings file does not have the property', () => {
|
|
29
|
+
const settingsFile = {};
|
|
30
|
+
const result = new ScanSettingsBuilder(settingsFile)
|
|
31
|
+
.withMinSnippetHits(10)
|
|
32
|
+
.build();
|
|
33
|
+
expect(result).to.deep.equal({ min_snippet_hits: 10 });
|
|
34
|
+
});
|
|
35
|
+
it('should use CLI value when no settings file is provided', () => {
|
|
36
|
+
const result = new ScanSettingsBuilder()
|
|
37
|
+
.withMinSnippetHits(10)
|
|
38
|
+
.build();
|
|
39
|
+
expect(result).to.deep.equal({ min_snippet_hits: 10 });
|
|
40
|
+
});
|
|
41
|
+
});
|
|
42
|
+
describe('withMinSnippetHits()', () => {
|
|
43
|
+
it('should set min_snippet_hits from CLI value', () => {
|
|
44
|
+
const result = new ScanSettingsBuilder().withMinSnippetHits(3).build();
|
|
45
|
+
expect(result).to.deep.equal({ min_snippet_hits: 3 });
|
|
46
|
+
});
|
|
47
|
+
it('should not set when CLI value is 0 (defer to server)', () => {
|
|
48
|
+
const result = new ScanSettingsBuilder().withMinSnippetHits(0).build();
|
|
49
|
+
expect(result).to.be.undefined;
|
|
50
|
+
});
|
|
51
|
+
it('should clamp negative values to 0', () => {
|
|
52
|
+
const result = new ScanSettingsBuilder().withMinSnippetHits(-5).build();
|
|
53
|
+
expect(result).to.deep.equal({ min_snippet_hits: 0 });
|
|
54
|
+
});
|
|
55
|
+
it('should parse string CLI values to number', () => {
|
|
56
|
+
const result = new ScanSettingsBuilder().withMinSnippetHits('3').build();
|
|
57
|
+
expect(result).to.deep.equal({ min_snippet_hits: 3 });
|
|
58
|
+
});
|
|
59
|
+
});
|
|
60
|
+
describe('withMinSnippetLines()', () => {
|
|
61
|
+
it('should set min_snippet_lines from CLI value', () => {
|
|
62
|
+
const result = new ScanSettingsBuilder().withMinSnippetLines(5).build();
|
|
63
|
+
expect(result).to.deep.equal({ min_snippet_lines: 5 });
|
|
64
|
+
});
|
|
65
|
+
it('should not set when CLI value is 0 (defer to server)', () => {
|
|
66
|
+
const result = new ScanSettingsBuilder().withMinSnippetLines(0).build();
|
|
67
|
+
expect(result).to.be.undefined;
|
|
68
|
+
});
|
|
69
|
+
it('should clamp negative values to 0', () => {
|
|
70
|
+
const result = new ScanSettingsBuilder().withMinSnippetLines(-3).build();
|
|
71
|
+
expect(result).to.deep.equal({ min_snippet_lines: 0 });
|
|
72
|
+
});
|
|
73
|
+
it('should parse string CLI values to number', () => {
|
|
74
|
+
const result = new ScanSettingsBuilder().withMinSnippetLines('5').build();
|
|
75
|
+
expect(result).to.deep.equal({ min_snippet_lines: 5 });
|
|
76
|
+
});
|
|
77
|
+
});
|
|
78
|
+
describe('withRanking()', () => {
|
|
79
|
+
it('should set ranking_enabled to true', () => {
|
|
80
|
+
const result = new ScanSettingsBuilder().withRanking(true).build();
|
|
81
|
+
expect(result).to.deep.equal({ ranking_enabled: true });
|
|
82
|
+
});
|
|
83
|
+
it('should set ranking_enabled to false', () => {
|
|
84
|
+
const result = new ScanSettingsBuilder().withRanking(false).build();
|
|
85
|
+
expect(result).to.deep.equal({ ranking_enabled: false });
|
|
86
|
+
});
|
|
87
|
+
it('should not set when CLI value is undefined', () => {
|
|
88
|
+
const result = new ScanSettingsBuilder().withRanking(undefined).build();
|
|
89
|
+
expect(result).to.be.undefined;
|
|
90
|
+
});
|
|
91
|
+
it('should prefer settings file over CLI', () => {
|
|
92
|
+
const settingsFile = { ranking_enabled: false };
|
|
93
|
+
const result = new ScanSettingsBuilder(settingsFile).withRanking(true).build();
|
|
94
|
+
expect(result).to.deep.equal({ ranking_enabled: false });
|
|
95
|
+
});
|
|
96
|
+
it('should parse string "true" to boolean true', () => {
|
|
97
|
+
const result = new ScanSettingsBuilder().withRanking('true').build();
|
|
98
|
+
expect(result).to.deep.equal({ ranking_enabled: true });
|
|
99
|
+
});
|
|
100
|
+
it('should parse string "false" to boolean false', () => {
|
|
101
|
+
const result = new ScanSettingsBuilder().withRanking('false').build();
|
|
102
|
+
expect(result).to.deep.equal({ ranking_enabled: false });
|
|
103
|
+
});
|
|
104
|
+
});
|
|
105
|
+
describe('withRankingThreshold()', () => {
|
|
106
|
+
it('should set ranking_threshold from CLI value', () => {
|
|
107
|
+
const result = new ScanSettingsBuilder().withRankingThreshold(5).build();
|
|
108
|
+
expect(result).to.deep.equal({ ranking_threshold: 5 });
|
|
109
|
+
});
|
|
110
|
+
it('should not set when CLI value is -1 (defer to server)', () => {
|
|
111
|
+
const result = new ScanSettingsBuilder().withRankingThreshold(-1).build();
|
|
112
|
+
expect(result).to.be.undefined;
|
|
113
|
+
});
|
|
114
|
+
it('should clamp values exceeding max (10) to 10', () => {
|
|
115
|
+
const result = new ScanSettingsBuilder().withRankingThreshold(15).build();
|
|
116
|
+
expect(result).to.deep.equal({ ranking_threshold: 10 });
|
|
117
|
+
});
|
|
118
|
+
it('should clamp values below -1 to -1 and not set (defer to server)', () => {
|
|
119
|
+
const result = new ScanSettingsBuilder().withRankingThreshold(-5).build();
|
|
120
|
+
expect(result).to.be.undefined;
|
|
121
|
+
});
|
|
122
|
+
it('should accept boundary value 0', () => {
|
|
123
|
+
const result = new ScanSettingsBuilder().withRankingThreshold(0).build();
|
|
124
|
+
expect(result).to.deep.equal({ ranking_threshold: 0 });
|
|
125
|
+
});
|
|
126
|
+
it('should accept boundary value 10', () => {
|
|
127
|
+
const result = new ScanSettingsBuilder().withRankingThreshold(10).build();
|
|
128
|
+
expect(result).to.deep.equal({ ranking_threshold: 10 });
|
|
129
|
+
});
|
|
130
|
+
it('should parse string CLI values to number', () => {
|
|
131
|
+
const result = new ScanSettingsBuilder().withRankingThreshold('6').build();
|
|
132
|
+
expect(result).to.deep.equal({ ranking_threshold: 6 });
|
|
133
|
+
});
|
|
134
|
+
});
|
|
135
|
+
describe('withHonourFileExist()', () => {
|
|
136
|
+
it('should set honour_file_exts to true', () => {
|
|
137
|
+
const result = new ScanSettingsBuilder().withHonourFileExist(true).build();
|
|
138
|
+
expect(result).to.deep.equal({ honour_file_exts: true });
|
|
139
|
+
});
|
|
140
|
+
it('should set honour_file_exts to false', () => {
|
|
141
|
+
const result = new ScanSettingsBuilder().withHonourFileExist(false).build();
|
|
142
|
+
expect(result).to.deep.equal({ honour_file_exts: false });
|
|
143
|
+
});
|
|
144
|
+
it('should not set when CLI value is undefined', () => {
|
|
145
|
+
const result = new ScanSettingsBuilder().withHonourFileExist(undefined).build();
|
|
146
|
+
expect(result).to.be.undefined;
|
|
147
|
+
});
|
|
148
|
+
it('should parse string "true" to boolean true', () => {
|
|
149
|
+
const result = new ScanSettingsBuilder().withHonourFileExist('true').build();
|
|
150
|
+
expect(result).to.deep.equal({ honour_file_exts: true });
|
|
151
|
+
});
|
|
152
|
+
it('should parse string "false" to boolean false', () => {
|
|
153
|
+
const result = new ScanSettingsBuilder().withHonourFileExist('false').build();
|
|
154
|
+
expect(result).to.deep.equal({ honour_file_exts: false });
|
|
155
|
+
});
|
|
156
|
+
});
|
|
157
|
+
describe('withDependencyAnalysis()', () => {
|
|
158
|
+
it('should set dependency_analysis to true', () => {
|
|
159
|
+
const result = new ScanSettingsBuilder().withDependencyAnalysis(true).build();
|
|
160
|
+
expect(result).to.deep.equal({ dependency_analysis: true });
|
|
161
|
+
});
|
|
162
|
+
it('should set dependency_analysis to false', () => {
|
|
163
|
+
const result = new ScanSettingsBuilder().withDependencyAnalysis(false).build();
|
|
164
|
+
expect(result).to.deep.equal({ dependency_analysis: false });
|
|
165
|
+
});
|
|
166
|
+
it('should not set when CLI value is undefined', () => {
|
|
167
|
+
const result = new ScanSettingsBuilder().withDependencyAnalysis(undefined).build();
|
|
168
|
+
expect(result).to.be.undefined;
|
|
169
|
+
});
|
|
170
|
+
it('should prefer settings file over CLI', () => {
|
|
171
|
+
const settingsFile = { dependency_analysis: true };
|
|
172
|
+
const result = new ScanSettingsBuilder(settingsFile).withDependencyAnalysis(false).build();
|
|
173
|
+
expect(result).to.deep.equal({ dependency_analysis: true });
|
|
174
|
+
});
|
|
175
|
+
it('should parse string "true" to boolean true', () => {
|
|
176
|
+
const result = new ScanSettingsBuilder().withDependencyAnalysis('true').build();
|
|
177
|
+
expect(result).to.deep.equal({ dependency_analysis: true });
|
|
178
|
+
});
|
|
179
|
+
it('should parse string "false" to boolean false', () => {
|
|
180
|
+
const result = new ScanSettingsBuilder().withDependencyAnalysis('false').build();
|
|
181
|
+
expect(result).to.deep.equal({ dependency_analysis: false });
|
|
182
|
+
});
|
|
183
|
+
});
|
|
184
|
+
describe('Chaining all methods', () => {
|
|
185
|
+
it('should build complete settings from all CLI values', () => {
|
|
186
|
+
const result = new ScanSettingsBuilder()
|
|
187
|
+
.withMinSnippetHits(3)
|
|
188
|
+
.withMinSnippetLines(5)
|
|
189
|
+
.withRanking(true)
|
|
190
|
+
.withRankingThreshold(7)
|
|
191
|
+
.withHonourFileExist(true)
|
|
192
|
+
.build();
|
|
193
|
+
expect(result).to.deep.equal({
|
|
194
|
+
min_snippet_hits: 3,
|
|
195
|
+
min_snippet_lines: 5,
|
|
196
|
+
ranking_enabled: true,
|
|
197
|
+
ranking_threshold: 7,
|
|
198
|
+
honour_file_exts: true,
|
|
199
|
+
});
|
|
200
|
+
});
|
|
201
|
+
it('should merge settings file with CLI values correctly', () => {
|
|
202
|
+
const settingsFile = {
|
|
203
|
+
min_snippet_hits: 2,
|
|
204
|
+
ranking_enabled: true,
|
|
205
|
+
};
|
|
206
|
+
const result = new ScanSettingsBuilder(settingsFile)
|
|
207
|
+
.withMinSnippetHits(10)
|
|
208
|
+
.withMinSnippetLines(8)
|
|
209
|
+
.withRanking(false)
|
|
210
|
+
.withRankingThreshold(5)
|
|
211
|
+
.withHonourFileExist(true)
|
|
212
|
+
.build();
|
|
213
|
+
expect(result).to.deep.equal({
|
|
214
|
+
min_snippet_hits: 2, // from settings file (priority)
|
|
215
|
+
min_snippet_lines: 8, // from CLI (not in settings file)
|
|
216
|
+
ranking_enabled: true, // from settings file (priority)
|
|
217
|
+
ranking_threshold: 5, // from CLI (not in settings file)
|
|
218
|
+
honour_file_exts: true, // from CLI (not in settings file)
|
|
219
|
+
});
|
|
220
|
+
});
|
|
221
|
+
it('should only include properties that were explicitly set', () => {
|
|
222
|
+
const result = new ScanSettingsBuilder()
|
|
223
|
+
.withMinSnippetHits(3)
|
|
224
|
+
.withRanking(true)
|
|
225
|
+
.build();
|
|
226
|
+
expect(result).to.deep.equal({
|
|
227
|
+
min_snippet_hits: 3,
|
|
228
|
+
ranking_enabled: true,
|
|
229
|
+
});
|
|
230
|
+
expect(result).to.not.have.property('min_snippet_lines');
|
|
231
|
+
expect(result).to.not.have.property('ranking_threshold');
|
|
232
|
+
expect(result).to.not.have.property('honour_file_exts');
|
|
233
|
+
});
|
|
234
|
+
});
|
|
235
|
+
});
|
|
236
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ScanSettingsBuilder.spec.js","sourceRoot":"","sources":["../../../../src/sdk/scanner/ScanSettingsBuilder.spec.ts"],"names":[],"mappings":"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"}
|