scanoss 0.36.0 → 0.38.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 +14 -0
- package/build/main/cli/commands/dep.js +2 -2
- package/build/main/cli/commands/scan.js +35 -36
- package/build/main/sdk/Dependencies/DependencyScanner.d.ts +6 -1
- package/build/main/sdk/Dependencies/DependencyScanner.js +9 -4
- package/build/main/sdk/Dependencies/LocalDependency/DependencyTypes.d.ts +7 -1
- package/build/main/sdk/Dependencies/LocalDependency/LocalDependency.d.ts +4 -1
- package/build/main/sdk/Dependencies/LocalDependency/LocalDependency.js +9 -3
- package/build/main/sdk/Dependencies/LocalDependency/LocalDependency.spec.js +138 -1
- package/build/main/sdk/Dependencies/LocalDependency/parsers/buildGradleParser.d.ts +1 -1
- package/build/main/sdk/Dependencies/LocalDependency/parsers/buildGradleParser.js +59 -18
- package/build/main/sdk/Dependencies/LocalDependency/parsers/gradle/libsVersionsTomlParser.d.ts +27 -0
- package/build/main/sdk/Dependencies/LocalDependency/parsers/gradle/libsVersionsTomlParser.js +207 -0
- package/build/main/sdk/Dependencies/LocalDependency/parsers/parser.spec.js +158 -1
- package/build/main/sdk/scanner/Dispatcher/Dispatcher.js +3 -2
- package/build/main/sdk/scanner/ScanSettingsBuilder.d.ts +6 -1
- package/build/main/sdk/scanner/ScanSettingsBuilder.js +51 -3
- package/build/main/sdk/scanner/ScanSettingsBuilder.spec.js +55 -1
- package/build/main/sdk/scanner/Scannable/ScannableItem.d.ts +3 -0
- package/build/main/sdk/scanner/Scannable/ScannableItem.js +8 -1
- package/build/main/sdk/scanner/Scanner.d.ts +1 -0
- package/build/main/sdk/scanner/Scanner.js +31 -18
- package/build/main/sdk/scanner/ScannerCfg.d.ts +2 -0
- package/build/main/sdk/scanner/ScannerCfg.js +1 -1
- package/build/main/sdk/scanner/ScannerTypes.d.ts +3 -0
- package/build/main/sdk/scanner/ScannerTypes.js +1 -1
- package/build/main/sdk/scanner/ScannnerResultPostProcessor/interfaces/types.d.ts +11 -0
- package/build/main/sdk/scanner/ScannnerResultPostProcessor/rules/remove-rule.js +3 -2
- package/build/main/sdk/scanner/WfpProvider/WfpCalculator/HeaderFilter.d.ts +17 -0
- package/build/main/sdk/scanner/WfpProvider/WfpCalculator/HeaderFilter.js +313 -0
- package/build/main/sdk/scanner/WfpProvider/WfpCalculator/WfpCalculator.d.ts +1 -0
- package/build/main/sdk/scanner/WfpProvider/WfpCalculator/WfpCalculator.js +18 -2
- package/build/main/tsconfig.tsbuildinfo +1 -1
- package/build/module/cli/commands/dep.js +2 -2
- package/build/module/cli/commands/scan.js +33 -34
- package/build/module/sdk/Dependencies/DependencyScanner.d.ts +6 -1
- package/build/module/sdk/Dependencies/DependencyScanner.js +9 -4
- package/build/module/sdk/Dependencies/LocalDependency/DependencyTypes.d.ts +7 -1
- package/build/module/sdk/Dependencies/LocalDependency/LocalDependency.d.ts +4 -1
- package/build/module/sdk/Dependencies/LocalDependency/LocalDependency.js +9 -3
- package/build/module/sdk/Dependencies/LocalDependency/LocalDependency.spec.js +102 -1
- package/build/module/sdk/Dependencies/LocalDependency/parsers/buildGradleParser.d.ts +1 -1
- package/build/module/sdk/Dependencies/LocalDependency/parsers/buildGradleParser.js +58 -17
- package/build/module/sdk/Dependencies/LocalDependency/parsers/gradle/libsVersionsTomlParser.d.ts +27 -0
- package/build/module/sdk/Dependencies/LocalDependency/parsers/gradle/libsVersionsTomlParser.js +199 -0
- package/build/module/sdk/Dependencies/LocalDependency/parsers/parser.spec.js +158 -1
- package/build/module/sdk/scanner/Dispatcher/Dispatcher.js +3 -2
- package/build/module/sdk/scanner/ScanSettingsBuilder.d.ts +6 -1
- package/build/module/sdk/scanner/ScanSettingsBuilder.js +46 -3
- package/build/module/sdk/scanner/ScanSettingsBuilder.spec.js +55 -1
- package/build/module/sdk/scanner/Scannable/ScannableItem.d.ts +3 -0
- package/build/module/sdk/scanner/Scannable/ScannableItem.js +9 -1
- package/build/module/sdk/scanner/Scanner.d.ts +1 -0
- package/build/module/sdk/scanner/Scanner.js +27 -15
- package/build/module/sdk/scanner/ScannerCfg.d.ts +2 -0
- package/build/module/sdk/scanner/ScannerCfg.js +2 -1
- package/build/module/sdk/scanner/ScannerTypes.d.ts +3 -0
- package/build/module/sdk/scanner/ScannerTypes.js +1 -1
- package/build/module/sdk/scanner/ScannnerResultPostProcessor/interfaces/types.d.ts +11 -0
- package/build/module/sdk/scanner/ScannnerResultPostProcessor/rules/remove-rule.js +2 -2
- package/build/module/sdk/scanner/WfpProvider/WfpCalculator/HeaderFilter.d.ts +17 -0
- package/build/module/sdk/scanner/WfpProvider/WfpCalculator/HeaderFilter.js +306 -0
- package/build/module/sdk/scanner/WfpProvider/WfpCalculator/WfpCalculator.d.ts +1 -0
- package/build/module/sdk/scanner/WfpProvider/WfpCalculator/WfpCalculator.js +18 -2
- package/build/module/tsconfig.module.tsbuildinfo +1 -1
- package/package.json +3 -2
package/CHANGELOG.md
CHANGED
|
@@ -4,6 +4,19 @@ All notable changes to this project will be documented in this file. See [standa
|
|
|
4
4
|
|
|
5
5
|
## [Unreleased]
|
|
6
6
|
|
|
7
|
+
## [0.38.0] (2026-03-12)
|
|
8
|
+
### Added
|
|
9
|
+
- Added support for resolving Gradle dependencies from version catalog (`libs.versions.toml`)
|
|
10
|
+
- Added support for Gradle Kotlin DSL (`build.gradle.kts`) dependency parsing
|
|
11
|
+
|
|
12
|
+
## [0.37.0] (2026-03-02)
|
|
13
|
+
### Added
|
|
14
|
+
- Added `skip_headers` and `skip_headers_limit` support in `scanoss.json` `file_snippet` settings to filter license headers, comments, and imports before snippet matching
|
|
15
|
+
- Added `HeaderFilter` module for detecting and skipping file preambles (license blocks, comments, shebangs, imports) across 20+ programming languages
|
|
16
|
+
- Added `proxy`, `http_config` (base_uri, ignore_cert_errors) support in `scanoss.json` `file_snippet` settings
|
|
17
|
+
- Added `ScanSettingsBuilder` methods: `withSkipHeaders()`, `withSkipHeadersLimit()`, `withProxy()`, `withBaseUri()`, `withIgnoreCertErrors()`
|
|
18
|
+
- Centralized scan settings into `ScannerCfg.SCANOSS_SETTINGS`
|
|
19
|
+
|
|
7
20
|
## [0.36.0] (2026-02-27)
|
|
8
21
|
### Added
|
|
9
22
|
- Added support for scoped `requirements.txt` files (`dev-requirements.txt`, `requirements-tox.txt`, etc.) with automatic scope extraction from filename prefix/suffix
|
|
@@ -273,3 +286,4 @@ All notable changes to this project will be documented in this file. See [standa
|
|
|
273
286
|
### [0.34.0](https://github.com/scanoss/scanoss.js/compare/v0.33.0...v0.34.0) (2026-02-24)
|
|
274
287
|
### [0.35.0](https://github.com/scanoss/scanoss.js/compare/v0.34.0...v0.35.0) (2026-02-26)
|
|
275
288
|
### [0.36.0](https://github.com/scanoss/scanoss.js/compare/v0.35.0...v0.36.0) (2026-02-27)
|
|
289
|
+
### [0.37.0](https://github.com/scanoss/scanoss.js/compare/v0.36.0...v0.37.0) (2026-03-02)
|
|
@@ -39,7 +39,7 @@ async function depHandler(rootPath, options) {
|
|
|
39
39
|
tree.build();
|
|
40
40
|
fileList = tree.getFileList(new DependencyFilter_1.DependencyFilter(""));
|
|
41
41
|
}
|
|
42
|
-
const results = await dependencyScanner.scan(fileList);
|
|
42
|
+
const results = await dependencyScanner.scan(fileList, rootPath);
|
|
43
43
|
if (options.output) {
|
|
44
44
|
fs_1.default.promises.writeFile(options.output, JSON.stringify(results, null, 2));
|
|
45
45
|
}
|
|
@@ -47,4 +47,4 @@ async function depHandler(rootPath, options) {
|
|
|
47
47
|
console.log(JSON.stringify(results, null, 2));
|
|
48
48
|
}
|
|
49
49
|
}
|
|
50
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2NsaS9jb21tYW5kcy9kZXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFRQSxnQ0FvQ0M7QUE1Q0QsNENBQW9CO0FBQ3BCLGdGQUE2RTtBQUM3RSxzRkFBbUY7QUFDbkYsOENBQTJDO0FBQzNDLDhFQUEyRTtBQUMzRSx1Q0FBcUM7QUFDckMsb0RBQXlEO0FBRWxELEtBQUssVUFBVSxVQUFVLENBQUMsUUFBZ0IsRUFBRSxPQUFZO0lBQzdELGVBQU0sQ0FBQyxRQUFRLENBQUMsZUFBTSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUNuQyxJQUFHLE9BQU8sQ0FBQyxLQUFLO1FBQ2QsZUFBTSxDQUFDLFFBQVEsQ0FBQyxlQUFNLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ3RDLFFBQVEsR0FBRyxRQUFRLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFFLGtDQUFrQztJQUMzRSxRQUFRLEdBQUcsUUFBUSxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFFLDBDQUEwQztJQUNoRyxNQUFNLFlBQVksR0FBRyxNQUFNLElBQUEsa0JBQVEsRUFBQyxRQUFRLENBQUMsQ0FBQztJQUM5QyxNQUFNLG9CQUFvQixHQUFHLElBQUksMkNBQW9CLEVBQUUsQ0FBQztJQUN4RCxJQUFJLE9BQU8sQ0FBQyxNQUFNO1FBQUUsb0JBQW9CLENBQUMsT0FBTyxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUM7SUFDbEUsSUFBSSxPQUFPLENBQUMsTUFBTTtRQUFFLG9CQUFvQixDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDO0lBQ2xFLElBQUksT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQ2xCLG9CQUFvQixDQUFDLFdBQVcsR0FBRyxPQUFPLENBQUMsS0FBSyxDQUFDO1FBQ2pELG9CQUFvQixDQUFDLFVBQVUsR0FBRyxPQUFPLENBQUMsS0FBSyxDQUFDO0lBQ2xELENBQUM7SUFDRCxJQUFJLE9BQU8sQ0FBQyxHQUFHO1FBQUUsb0JBQW9CLENBQUMsT0FBTyxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUM7SUFDNUQsSUFBSSxPQUFPLENBQUMsZ0JBQWdCO1FBQUUsb0JBQW9CLENBQUMsa0JBQWtCLEdBQUcsSUFBSSxDQUFDO0lBRTdFLE1BQU0saUJBQWlCLEdBQUcsSUFBSSxxQ0FBaUIsQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO0lBRXRFLElBQUksUUFBUSxHQUFrQixFQUFFLENBQUM7SUFDakMsUUFBUSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUV4QixJQUFJLFlBQVksRUFBRSxDQUFDO1FBQ2pCLE1BQU0sSUFBSSxHQUFHLElBQUksV0FBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQ2hDLElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUNiLFFBQVEsR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksbUNBQWdCLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQztJQUN4RCxDQUFDO0lBRUQsTUFBTSxPQUFPLEdBQUcsTUFBTSxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFLFFBQVEsQ0FBQyxDQUFDO0lBRWpFLElBQUcsT0FBTyxDQUFDLE1BQU0sRUFBRSxDQUFDO1FBQ2xCLFlBQUUsQ0FBQyxRQUFRLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxNQUFNLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxPQUFPLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDMUUsQ0FBQztTQUFNLENBQUM7UUFDTixPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsT0FBTyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ2hELENBQUM7QUFFSCxDQUFDIn0=
|
|
@@ -108,7 +108,7 @@ async function streamAndTransformResults(resultPath, depResults, cryptoFiles, cr
|
|
|
108
108
|
});
|
|
109
109
|
}
|
|
110
110
|
async function scanHandler(rootPath, options) {
|
|
111
|
-
var _a, _b, _c, _d
|
|
111
|
+
var _a, _b, _c, _d;
|
|
112
112
|
if (options.debug)
|
|
113
113
|
Logger_1.logger.setLevel(Logger_1.Logger.Level.debug);
|
|
114
114
|
rootPath = path_1.default.resolve(rootPath);
|
|
@@ -121,6 +121,19 @@ async function scanHandler(rootPath, options) {
|
|
|
121
121
|
}
|
|
122
122
|
options.apiurl = url.origin;
|
|
123
123
|
}
|
|
124
|
+
let scanossSettings = null;
|
|
125
|
+
// Settings Ingestion
|
|
126
|
+
if (!options.skipSettingsFile) {
|
|
127
|
+
const settingsFilePath = await (0, helpers_1.getSettingsFilePath)(options.settings, rootPath);
|
|
128
|
+
if (settingsFilePath) {
|
|
129
|
+
try {
|
|
130
|
+
scanossSettings = JSON.parse(fs_1.default.readFileSync(settingsFilePath, "utf-8"));
|
|
131
|
+
}
|
|
132
|
+
catch (e) {
|
|
133
|
+
throw new Error(`SCANOSS Settings file cannot be found at: ${settingsFilePath}.`);
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
}
|
|
124
137
|
// Create dependency scanner and set parameters
|
|
125
138
|
let dependencyInput = [];
|
|
126
139
|
const dependencyScannerCfg = new DependencyScannerCfg_1.DependencyScannerCfg();
|
|
@@ -164,48 +177,34 @@ async function scanHandler(rootPath, options) {
|
|
|
164
177
|
}
|
|
165
178
|
if (options.obfuscate)
|
|
166
179
|
scannerCfg.WFP_OBFUSCATION = true;
|
|
167
|
-
const scanner = new Scanner_1.Scanner(scannerCfg);
|
|
168
180
|
let scannerInput = { fileList: [] };
|
|
169
181
|
// SBOM Ingestion
|
|
170
182
|
if (options.ignore) {
|
|
171
183
|
scannerInput.sbom = fs_1.default.readFileSync(options.ignore, "utf-8");
|
|
172
184
|
scannerInput.sbomMode = ScannerTypes_1.SbomMode.SBOM_IGNORE;
|
|
173
185
|
}
|
|
174
|
-
// Settings Ingestion
|
|
175
|
-
if (!options.skipSettingsFile) {
|
|
176
|
-
const settingsFilePath = await (0, helpers_1.getSettingsFilePath)(options.settings, rootPath);
|
|
177
|
-
if (settingsFilePath) {
|
|
178
|
-
try {
|
|
179
|
-
scannerInput.settings = JSON.parse(fs_1.default.readFileSync(settingsFilePath, "utf-8"));
|
|
180
|
-
}
|
|
181
|
-
catch (e) {
|
|
182
|
-
throw new Error(`SCANOSS Settings file cannot be found at: ${settingsFilePath}.`);
|
|
183
|
-
}
|
|
184
|
-
}
|
|
185
|
-
}
|
|
186
186
|
scannerInput.folderRoot = rootPath + path_1.default.sep; // This will remove the project root path from the results.
|
|
187
187
|
if (options.flags)
|
|
188
188
|
scannerInput.engineFlags = options.flags;
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
.
|
|
193
|
-
.
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
scannerInput.settings.settings = {};
|
|
207
|
-
scannerInput.settings.settings.file_snippet = fileSnippetSettings;
|
|
189
|
+
if (scanossSettings) {
|
|
190
|
+
scannerCfg.SCANOSS_SETTINGS = scanossSettings || {};
|
|
191
|
+
// Build scan settings from CLI options, merging with scanoss.json file_snippet settings
|
|
192
|
+
// Priority: scanoss.json file_snippet settings > CLI arguments
|
|
193
|
+
scannerCfg.SCANOSS_SETTINGS.settings.file_snippet = new ScanSettingsBuilder_1.ScanSettingsBuilder((_a = scanossSettings === null || scanossSettings === void 0 ? void 0 : scanossSettings.settings) === null || _a === void 0 ? void 0 : _a.file_snippet)
|
|
194
|
+
.withHonourFileExist(options.honourFileExts)
|
|
195
|
+
.withMinSnippetHits(options.minSnippetHits)
|
|
196
|
+
.withMinSnippetLines(options.minSnippetLines)
|
|
197
|
+
.withRanking(options.ranking)
|
|
198
|
+
.withRankingThreshold(options.rankingThreshold)
|
|
199
|
+
.withDependencyAnalysis(options.dependencies)
|
|
200
|
+
.withSkipHeaders()
|
|
201
|
+
.withSkipHeadersLimit()
|
|
202
|
+
.withProxy(options.proxy)
|
|
203
|
+
.withIgnoreCertErrors(options.ignoreCertErrors)
|
|
204
|
+
.withBaseUri(options.apiurl)
|
|
205
|
+
.build();
|
|
208
206
|
}
|
|
207
|
+
const scanner = new Scanner_1.Scanner(scannerCfg);
|
|
209
208
|
if (options.wfp)
|
|
210
209
|
scannerInput.wfpPath = rootPath;
|
|
211
210
|
const wfpMode = options.hpsm ? ScannerTypes_1.WinnowingMode.FULL_WINNOWING_HPSM : ScannerTypes_1.WinnowingMode.FULL_WINNOWING;
|
|
@@ -264,8 +263,8 @@ async function scanHandler(rootPath, options) {
|
|
|
264
263
|
}
|
|
265
264
|
// Dependency scanner
|
|
266
265
|
let pDependencyScanner = Promise.resolve({});
|
|
267
|
-
if (options.dependencies || ((
|
|
268
|
-
pDependencyScanner = dependencyScanner.scan(dependencyInput);
|
|
266
|
+
if (options.dependencies || ((_d = (_c = (_b = scannerInput === null || scannerInput === void 0 ? void 0 : scannerInput.settings) === null || _b === void 0 ? void 0 : _b.settings) === null || _c === void 0 ? void 0 : _c.file_snippet) === null || _d === void 0 ? void 0 : _d.dependency_analysis)) {
|
|
267
|
+
pDependencyScanner = dependencyScanner.scan(dependencyInput, rootPath);
|
|
269
268
|
}
|
|
270
269
|
const results = {
|
|
271
270
|
scanner: {},
|
|
@@ -364,4 +363,4 @@ async function scanHandler(rootPath, options) {
|
|
|
364
363
|
await streamAndTransformResults(scannerResultPath, results.dependencies, results.cryptography.files, results.cryptography.components, options.output);
|
|
365
364
|
}
|
|
366
365
|
}
|
|
367
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"scan.js","sourceRoot":"","sources":["../../../../src/cli/commands/scan.ts"],"names":[],"mappings":"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"}
|
|
366
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"scan.js","sourceRoot":"","sources":["../../../../src/cli/commands/scan.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,12 @@ export declare class DependencyScanner {
|
|
|
6
6
|
private config;
|
|
7
7
|
constructor(cfg?: DependencyScannerCfg);
|
|
8
8
|
scanFolder(path: string): Promise<IDependencyResponse>;
|
|
9
|
-
|
|
9
|
+
/**
|
|
10
|
+
* @param basePath - Scan root directory. Limits the scope of upward directory searches
|
|
11
|
+
* performed by parsers (e.g., finding gradle/libs.versions.toml).
|
|
12
|
+
* When omitted, searches may walk up to the filesystem root.
|
|
13
|
+
*/
|
|
14
|
+
scan(files: Array<string>, basePath?: string): Promise<IDependencyResponse>;
|
|
10
15
|
private getDependencies;
|
|
11
16
|
private purlAdapter;
|
|
12
17
|
private chunkPurls;
|
|
@@ -35,10 +35,15 @@ class DependencyScanner {
|
|
|
35
35
|
throw new Error('Specified path is not a directory');
|
|
36
36
|
const tree = new Tree_1.Tree(path);
|
|
37
37
|
tree.build();
|
|
38
|
-
return await this.scan(tree.getFileList());
|
|
38
|
+
return await this.scan(tree.getFileList(), path);
|
|
39
39
|
}
|
|
40
|
-
|
|
41
|
-
|
|
40
|
+
/**
|
|
41
|
+
* @param basePath - Scan root directory. Limits the scope of upward directory searches
|
|
42
|
+
* performed by parsers (e.g., finding gradle/libs.versions.toml).
|
|
43
|
+
* When omitted, searches may walk up to the filesystem root.
|
|
44
|
+
*/
|
|
45
|
+
async scan(files, basePath) {
|
|
46
|
+
let localDependencies = await this.localDependency.search(files, basePath);
|
|
42
47
|
if (localDependencies.files.length === 0)
|
|
43
48
|
return { filesList: [], status: { status: 'success', message: 'No dependencies found' } };
|
|
44
49
|
localDependencies = this.purlAdapter(localDependencies);
|
|
@@ -176,4 +181,4 @@ class DependencyScanner {
|
|
|
176
181
|
}
|
|
177
182
|
}
|
|
178
183
|
exports.DependencyScanner = DependencyScanner;
|
|
179
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
184
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"DependencyScanner.js","sourceRoot":"","sources":["../../../../src/sdk/Dependencies/DependencyScanner.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,13 @@ export interface ILocalDependency {
|
|
|
10
10
|
export interface ILocalDependencies {
|
|
11
11
|
files: Array<ILocalDependency>;
|
|
12
12
|
}
|
|
13
|
-
|
|
13
|
+
/**
|
|
14
|
+
* @param fileContent - Raw file content
|
|
15
|
+
* @param filePath - Absolute path to the file being parsed
|
|
16
|
+
* @param basePath - Scan root directory. Limits upward directory searches (e.g., finding gradle/libs.versions.toml).
|
|
17
|
+
* When omitted, parsers that walk the directory tree will search up to the filesystem root.
|
|
18
|
+
*/
|
|
19
|
+
export type ParserFuncType = (fileContent: string, filePath: string, basePath?: string) => Promise<ILocalDependency>;
|
|
14
20
|
export interface ParserDefinitions {
|
|
15
21
|
[key: string]: ParserFuncType;
|
|
16
22
|
}
|
|
@@ -4,7 +4,10 @@ export declare class LocalDependencies {
|
|
|
4
4
|
private listFilePattern;
|
|
5
5
|
constructor();
|
|
6
6
|
filterFiles(files: Array<string>): Array<string>;
|
|
7
|
-
|
|
7
|
+
/**
|
|
8
|
+
* @param basePath - Scan root directory. Limits the scope of upward directory searches within parsers.
|
|
9
|
+
*/
|
|
10
|
+
search(files: Array<string>, basePath?: string): Promise<ILocalDependencies>;
|
|
8
11
|
stringMatchWithWildcard(text: string, pattern: string): boolean;
|
|
9
12
|
private getParserFunc;
|
|
10
13
|
}
|
|
@@ -14,6 +14,7 @@ const rubyParser_1 = require("./parsers/rubyParser");
|
|
|
14
14
|
const golangParser_1 = require("./parsers/golangParser");
|
|
15
15
|
const nugetParser_1 = require("./parsers/nugetParser");
|
|
16
16
|
const buildGradleParser_1 = require("./parsers/buildGradleParser");
|
|
17
|
+
const libsVersionsTomlParser_1 = require("./parsers/gradle/libsVersionsTomlParser");
|
|
17
18
|
const PyProjectToml_1 = __importDefault(require("./parsers/python/PyProjectToml"));
|
|
18
19
|
class LocalDependencies {
|
|
19
20
|
constructor() {
|
|
@@ -38,6 +39,8 @@ class LocalDependencies {
|
|
|
38
39
|
'*.csproj': nugetParser_1.csprojParser,
|
|
39
40
|
'packages.config': nugetParser_1.packagesConfigParser,
|
|
40
41
|
'build.gradle': buildGradleParser_1.buildGradleParser,
|
|
42
|
+
'build.gradle.kts': buildGradleParser_1.buildGradleParser,
|
|
43
|
+
'libs.versions.toml': libsVersionsTomlParser_1.libsVersionsTomlParser,
|
|
41
44
|
'pyproject.toml': PyProjectToml_1.default,
|
|
42
45
|
};
|
|
43
46
|
this.listFilePattern = Object.keys(this.parserMap).filter((item) => item.includes('*'));
|
|
@@ -45,14 +48,17 @@ class LocalDependencies {
|
|
|
45
48
|
filterFiles(files) {
|
|
46
49
|
return files.filter((filepath) => this.getParserFunc(filepath));
|
|
47
50
|
}
|
|
48
|
-
|
|
51
|
+
/**
|
|
52
|
+
* @param basePath - Scan root directory. Limits the scope of upward directory searches within parsers.
|
|
53
|
+
*/
|
|
54
|
+
async search(files, basePath) {
|
|
49
55
|
let results = { files: [] };
|
|
50
56
|
for (const filePath of files) {
|
|
51
57
|
const parser = this.getParserFunc(filePath);
|
|
52
58
|
if (parser != null) {
|
|
53
59
|
try {
|
|
54
60
|
const fileContent = await fs_1.default.promises.readFile(filePath, 'utf8');
|
|
55
|
-
const dependency = await parser(fileContent, filePath);
|
|
61
|
+
const dependency = await parser(fileContent, filePath, basePath);
|
|
56
62
|
if (dependency.purls.length != 0)
|
|
57
63
|
results.files.push(dependency);
|
|
58
64
|
}
|
|
@@ -109,4 +115,4 @@ class LocalDependencies {
|
|
|
109
115
|
}
|
|
110
116
|
}
|
|
111
117
|
exports.LocalDependencies = LocalDependencies;
|
|
112
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
118
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9jYWxEZXBlbmRlbmN5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vc3JjL3Nkay9EZXBlbmRlbmNpZXMvTG9jYWxEZXBlbmRlbmN5L0xvY2FsRGVwZW5kZW5jeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSxnREFBd0I7QUFDeEIsNENBQW9CO0FBRXBCLGlEQUE2RztBQUM3Ryx1REFBa0Q7QUFDbEQsbURBSTZCO0FBQzdCLHFEQUFzRDtBQUN0RCxxREFBd0U7QUFDeEUseURBQWtFO0FBQ2xFLHVEQUEyRTtBQUMzRSxtRUFBZ0U7QUFDaEUsb0ZBQWlGO0FBQ2pGLG1GQUEyRDtBQUUzRCxNQUFhLGlCQUFpQjtJQUk1QjtRQUNFOzs7WUFHSTtRQUNKLElBQUksQ0FBQyxTQUFTLEdBQUc7WUFDZixrQkFBa0IsRUFBRSw2QkFBa0I7WUFDdEMsMkJBQTJCLEVBQUUsb0NBQXlCO1lBQ3RELG9CQUFvQixFQUFFLG1DQUF3QjtZQUM5QyxvQkFBb0IsRUFBRSxtQ0FBd0I7WUFDOUMsU0FBUyxFQUFFLHVCQUFTO1lBQ3BCLGNBQWMsRUFBRSx5QkFBYTtZQUM3QixtQkFBbUIsRUFBRSw2QkFBaUI7WUFDdEMsT0FBTyxFQUFFLDBCQUFhO1lBQ3RCLGNBQWMsRUFBRSw4QkFBaUI7WUFDakMsUUFBUSxFQUFFLDBCQUFXO1lBQ3JCLFFBQVEsRUFBRSwwQkFBVztZQUNyQixXQUFXLEVBQUUsMEJBQWM7WUFDM0IsZ0JBQWdCLEVBQUUsMkJBQWM7WUFDaEMsVUFBVSxFQUFFLDBCQUFZO1lBQ3hCLGlCQUFpQixFQUFFLGtDQUFvQjtZQUN2QyxjQUFjLEVBQUUscUNBQWlCO1lBQ2pDLGtCQUFrQixFQUFFLHFDQUFpQjtZQUNyQyxvQkFBb0IsRUFBRSwrQ0FBc0I7WUFDNUMsZ0JBQWdCLEVBQUUsdUJBQWE7U0FDaEMsQ0FBQztRQUVGLElBQUksQ0FBQyxlQUFlLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMs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
|
|
@@ -1,5 +1,42 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
36
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
37
|
+
};
|
|
2
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
+
const path_1 = __importDefault(require("path"));
|
|
3
40
|
const LocalDependency_1 = require("./LocalDependency");
|
|
4
41
|
const chai_1 = require("chai");
|
|
5
42
|
describe('Suit test for LocalDependency Scanner', () => {
|
|
@@ -20,15 +57,115 @@ describe('Suit test for LocalDependency Scanner', () => {
|
|
|
20
57
|
"/home/user/go.sum",
|
|
21
58
|
"/home/user/accept.csproj",
|
|
22
59
|
"/home/user/ignore2.c",
|
|
60
|
+
"/home/user/app/build.gradle.kts",
|
|
61
|
+
"/home/user/gradle/libs.versions.toml",
|
|
23
62
|
];
|
|
24
63
|
const expectedOut = [
|
|
25
64
|
"/home/user/go.sum",
|
|
26
65
|
"/home/user/accept.csproj",
|
|
66
|
+
"/home/user/app/build.gradle.kts",
|
|
67
|
+
"/home/user/gradle/libs.versions.toml",
|
|
27
68
|
];
|
|
28
69
|
const result = localDependencyScanner.filterFiles(files);
|
|
29
70
|
for (let i = 0; i < result.length; i++) {
|
|
30
71
|
(0, chai_1.expect)(expectedOut[i]).to.be.equal(result[i]);
|
|
31
72
|
}
|
|
32
73
|
});
|
|
74
|
+
describe('Catalog alias resolution integration (search)', () => {
|
|
75
|
+
const fixtureDir = path_1.default.resolve(__dirname, 'testdata', 'gradle-catalog');
|
|
76
|
+
const tomlPath = path_1.default.join(fixtureDir, 'gradle', 'libs.versions.toml');
|
|
77
|
+
const ktsPath = path_1.default.join(fixtureDir, 'app', 'build.gradle.kts');
|
|
78
|
+
it('resolves catalog aliases when TOML and .kts are both in the file list', async function () {
|
|
79
|
+
const ld = new LocalDependency_1.LocalDependencies();
|
|
80
|
+
const result = await ld.search([tomlPath, ktsPath]);
|
|
81
|
+
// TOML file produces its own purls
|
|
82
|
+
const tomlFile = result.files.find(f => f.file === tomlPath);
|
|
83
|
+
(0, chai_1.expect)(tomlFile).to.not.be.undefined;
|
|
84
|
+
(0, chai_1.expect)(tomlFile.purls.length).to.equal(3);
|
|
85
|
+
// .kts file should have 4 purls: 3 catalog aliases + 1 direct coordinate
|
|
86
|
+
const ktsFile = result.files.find(f => f.file === ktsPath);
|
|
87
|
+
(0, chai_1.expect)(ktsFile).to.not.be.undefined;
|
|
88
|
+
(0, chai_1.expect)(ktsFile.purls.length).to.equal(4);
|
|
89
|
+
// Catalog-resolved entries should have correct coordinates and scope
|
|
90
|
+
const hilt = ktsFile.purls.find(p => p.purl.includes('hilt-android'));
|
|
91
|
+
(0, chai_1.expect)(hilt).to.not.be.undefined;
|
|
92
|
+
(0, chai_1.expect)(hilt.purl).to.equal('pkg:maven/com.google.dagger/hilt-android');
|
|
93
|
+
(0, chai_1.expect)(hilt.scope).to.equal('implementation');
|
|
94
|
+
(0, chai_1.expect)(hilt.requirement).to.equal('2.48');
|
|
95
|
+
const junit = ktsFile.purls.find(p => p.purl.includes('junit'));
|
|
96
|
+
(0, chai_1.expect)(junit).to.not.be.undefined;
|
|
97
|
+
(0, chai_1.expect)(junit.purl).to.equal('pkg:maven/junit/junit');
|
|
98
|
+
(0, chai_1.expect)(junit.scope).to.equal('testImplementation');
|
|
99
|
+
(0, chai_1.expect)(junit.requirement).to.equal('4.13.2');
|
|
100
|
+
const coreKtx = ktsFile.purls.find(p => p.purl.includes('core-ktx'));
|
|
101
|
+
(0, chai_1.expect)(coreKtx).to.not.be.undefined;
|
|
102
|
+
(0, chai_1.expect)(coreKtx.purl).to.equal('pkg:maven/androidx.core/core-ktx');
|
|
103
|
+
(0, chai_1.expect)(coreKtx.scope).to.equal('implementation');
|
|
104
|
+
(0, chai_1.expect)(coreKtx.requirement).to.equal('1.12.0');
|
|
105
|
+
// Direct coordinate should also resolve with scope
|
|
106
|
+
const retrofit = ktsFile.purls.find(p => p.purl.includes('retrofit'));
|
|
107
|
+
(0, chai_1.expect)(retrofit).to.not.be.undefined;
|
|
108
|
+
(0, chai_1.expect)(retrofit.purl).to.equal('pkg:maven/com.squareup.retrofit2/retrofit');
|
|
109
|
+
(0, chai_1.expect)(retrofit.scope).to.equal('implementation');
|
|
110
|
+
(0, chai_1.expect)(retrofit.requirement).to.equal('2.9.0');
|
|
111
|
+
});
|
|
112
|
+
it('produces only direct coordinates when no TOML is available', async function () {
|
|
113
|
+
const ld = new LocalDependency_1.LocalDependencies();
|
|
114
|
+
// Only pass .kts with no TOML on disk at any ancestor directory
|
|
115
|
+
// Use a standalone .kts in a temp-like path where no libs.versions.toml exists
|
|
116
|
+
const standaloneKts = path_1.default.join(fixtureDir, 'app', 'build.gradle.kts');
|
|
117
|
+
// Create a copy of the fixture in a location with no TOML ancestor
|
|
118
|
+
const fs = await Promise.resolve().then(() => __importStar(require('fs')));
|
|
119
|
+
const os = await Promise.resolve().then(() => __importStar(require('os')));
|
|
120
|
+
const tmpDir = fs.mkdtempSync(path_1.default.join(os.tmpdir(), 'gradle-no-toml-'));
|
|
121
|
+
const tmpKts = path_1.default.join(tmpDir, 'build.gradle.kts');
|
|
122
|
+
fs.copyFileSync(standaloneKts, tmpKts);
|
|
123
|
+
try {
|
|
124
|
+
const result = await ld.search([tmpKts]);
|
|
125
|
+
const ktsFile = result.files.find(f => f.file === tmpKts);
|
|
126
|
+
(0, chai_1.expect)(ktsFile).to.not.be.undefined;
|
|
127
|
+
// Only the direct coordinate should resolve (catalog aliases have no TOML to resolve against)
|
|
128
|
+
(0, chai_1.expect)(ktsFile.purls.length).to.equal(1);
|
|
129
|
+
(0, chai_1.expect)(ktsFile.purls[0].purl).to.equal('pkg:maven/com.squareup.retrofit2/retrofit');
|
|
130
|
+
(0, chai_1.expect)(ktsFile.purls[0].scope).to.equal('implementation');
|
|
131
|
+
}
|
|
132
|
+
finally {
|
|
133
|
+
fs.unlinkSync(tmpKts);
|
|
134
|
+
fs.rmdirSync(tmpDir);
|
|
135
|
+
}
|
|
136
|
+
});
|
|
137
|
+
describe('Multi-module catalog resolution', () => {
|
|
138
|
+
const multiDir = path_1.default.resolve(__dirname, 'testdata', 'gradle-catalog-multimodule');
|
|
139
|
+
const rootToml = path_1.default.join(multiDir, 'gradle', 'libs.versions.toml');
|
|
140
|
+
const moduleAToml = path_1.default.join(multiDir, 'moduleA', 'gradle', 'libs.versions.toml');
|
|
141
|
+
const moduleAKts = path_1.default.join(multiDir, 'moduleA', 'build.gradle.kts');
|
|
142
|
+
const moduleBKts = path_1.default.join(multiDir, 'moduleB', 'build.gradle.kts');
|
|
143
|
+
it('each .kts resolves from its nearest TOML when all files are in the list', async function () {
|
|
144
|
+
const ld = new LocalDependency_1.LocalDependencies();
|
|
145
|
+
const result = await ld.search([rootToml, moduleAToml, moduleAKts, moduleBKts]);
|
|
146
|
+
// moduleA should resolve hilt-android from moduleA's own TOML
|
|
147
|
+
const moduleAFile = result.files.find(f => f.file === moduleAKts);
|
|
148
|
+
(0, chai_1.expect)(moduleAFile).to.not.be.undefined;
|
|
149
|
+
(0, chai_1.expect)(moduleAFile.purls.length).to.equal(1);
|
|
150
|
+
const hilt = moduleAFile.purls.find(p => p.purl.includes('hilt-android'));
|
|
151
|
+
(0, chai_1.expect)(hilt).to.not.be.undefined;
|
|
152
|
+
(0, chai_1.expect)(hilt.purl).to.equal('pkg:maven/com.google.dagger/hilt-android');
|
|
153
|
+
(0, chai_1.expect)(hilt.scope).to.equal('implementation');
|
|
154
|
+
(0, chai_1.expect)(hilt.requirement).to.equal('2.48');
|
|
155
|
+
// moduleB should resolve retrofit from root TOML (walks up past moduleB/ to root)
|
|
156
|
+
const moduleBFile = result.files.find(f => f.file === moduleBKts);
|
|
157
|
+
(0, chai_1.expect)(moduleBFile).to.not.be.undefined;
|
|
158
|
+
(0, chai_1.expect)(moduleBFile.purls.length).to.equal(1);
|
|
159
|
+
const retrofit = moduleBFile.purls.find(p => p.purl.includes('retrofit'));
|
|
160
|
+
(0, chai_1.expect)(retrofit).to.not.be.undefined;
|
|
161
|
+
(0, chai_1.expect)(retrofit.purl).to.equal('pkg:maven/com.squareup.retrofit2/retrofit');
|
|
162
|
+
(0, chai_1.expect)(retrofit.scope).to.equal('implementation');
|
|
163
|
+
(0, chai_1.expect)(retrofit.requirement).to.equal('2.9.0');
|
|
164
|
+
// No cross-contamination: moduleA should NOT have retrofit, moduleB should NOT have hilt
|
|
165
|
+
(0, chai_1.expect)(moduleAFile.purls.find(p => p.purl.includes('retrofit'))).to.be.undefined;
|
|
166
|
+
(0, chai_1.expect)(moduleBFile.purls.find(p => p.purl.includes('hilt'))).to.be.undefined;
|
|
167
|
+
});
|
|
168
|
+
});
|
|
169
|
+
});
|
|
33
170
|
});
|
|
34
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9jYWxEZXBlbmRlbmN5LnNwZWMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvc2RrL0RlcGVuZGVuY2llcy9Mb2NhbERlcGVuZGVuY3kvTG9jYWxEZXBlbmRlbmN5LnNwZWMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx1REFBc0Q7QUFDdEQsK0JBQXNDO0FBRXRDLFFBQVEsQ0FBQyx1Q0FBdUMsRUFBRSxHQUFHLEVBQUU7SUFFckQsRUFBRSxDQUFDLGtDQUFrQyxFQUFHO1FBQ3RDLE1BQU0sc0JBQXNCLEdBQUcsSUFBSSxtQ0FBaUIsRUFBRSxDQUFDO1FBQ3ZELElBQUEsYUFBTSxFQUFDLHNCQUFzQixDQUFDLHVCQUF1QixDQUFDLHNCQUFzQixFQUFFLFFBQVEsQ0FBQyxDQUFDLENBQUM7UUFDekYsSUFBQSxhQUFNLEVBQUMsc0JBQXNCLENBQUMsdUJBQXVCLENBQUMsc0JBQXNCLEVBQUUsU0FBUyxDQUFDLENBQUMsQ0FBQztRQUMxRixJQUFBLGFBQU0sRUFBQyxzQkFBc0IsQ0FBQyx1QkFBdUIsQ0FBQyxzQkFBc0IsRUFBRSxHQUFHLENBQUMsQ0FBQyxDQUFDO1FBQ3BGLElBQUEsYUFBTSxFQUFDLHNCQUFzQixDQUFDLHVCQUF1QixDQUFDLHNCQUFzQixFQUFFLFFBQVEsQ0FBQyxDQUFDLENBQUM7UUFDekYsSUFBQSxhQUFNLEVBQUMsc0JBQXNCLENBQUMsdUJBQXVCLENBQUMsMkJBQTJCLEVBQUUsU0FBUyxDQUFDLENBQUMsQ0FBQztRQUMvRixJQUFBLGFBQU0sRUFBQyxDQUFDLHNCQUFzQixDQUFDLHVCQUF1QixDQUFDLDJCQUEyQixFQUFFLFNBQVMsQ0FBQyxDQUFDLENBQUM7UUFDaEcsSUFBQSxhQUFNLEVBQUMsQ0FBQyxzQkFBc0IsQ0FBQyx1QkFBdUIsQ0FBQywyQkFBMkIsRUFBRSxRQUFRLENBQUMsQ0FBQyxDQUFDO0lBQ2pHLENBQUMsQ0FBQyxDQUFDO0lBSUgsRUFBRSxDQUFDLGtDQUFrQyxFQUFHO1FBQ3RDLE1BQU0sc0JBQXNCLEdBQUcsSUFBSSxtQ0FBaUIsRUFBRSxDQUFDO1FBQ3ZELE1BQU0sS0FBSyxHQUFHO1lBQ1oscUJBQXFCO1lBQ3JCLG1CQUFtQjtZQUNuQiwwQkFBMEI7WUFDMUIsc0JBQXNCO1NBQ3ZCLENBQUM7UUFFRixNQUFNLFdBQVcsR0FBRztZQUNsQixtQkFBbUI7WUFDbkIsMEJBQTBCO1NBQzNCLENBQUM7UUFFRixNQUFNLE1BQU0sR0FBRyxzQkFBc0IsQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLENBQUM7UUFFekQsS0FBSyxJQUFJLENBQUMsR0FBQyxDQUFDLEVBQUUsQ0FBQyxHQUFDLE1BQU0sQ0FBQyxNQUFNLEVBQUMsQ0FBQyxFQUFFLEVBQUMsQ0FBQztZQUNqQyxJQUFBLGFBQU0sRUFBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUNoRCxDQUFDO0lBQ0gsQ0FBQyxDQUFDLENBQUM7QUFFTCxDQUFDLENBQUMsQ0FBQyJ9
|
|
171
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"LocalDependency.spec.js","sourceRoot":"","sources":["../../../../../src/sdk/Dependencies/LocalDependency/LocalDependency.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { ILocalDependency } from '../DependencyTypes';
|
|
2
|
-
export declare function buildGradleParser(fileContent: string, filePath: string): Promise<ILocalDependency>;
|
|
2
|
+
export declare function buildGradleParser(fileContent: string, filePath: string, basePath?: string): Promise<ILocalDependency>;
|