scanoss 0.38.0 → 0.39.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 +12 -0
- package/build/main/sdk/Decompress/DecompressionManager.d.ts +8 -4
- package/build/main/sdk/Decompress/DecompressionManager.js +48 -41
- package/build/main/sdk/Decompress/Decompressor/DecompressZips.js +17 -2
- package/build/main/tsconfig.tsbuildinfo +1 -1
- package/build/module/sdk/Decompress/DecompressionManager.d.ts +8 -4
- package/build/module/sdk/Decompress/DecompressionManager.js +48 -41
- package/build/module/sdk/Decompress/Decompressor/DecompressZips.js +17 -2
- package/build/module/tsconfig.module.tsbuildinfo +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file. See [standa
|
|
|
4
4
|
|
|
5
5
|
## [Unreleased]
|
|
6
6
|
|
|
7
|
+
## [0.39.0] (2026-04-23)
|
|
8
|
+
### Added
|
|
9
|
+
- `DecompressionManager.decompress()` now returns `skippedByDepth: Array<string>`, a list of supported archive paths encountered beyond `decompressionLevel` and therefore not expanded. Allows callers to report which nested archives were left unexpanded.
|
|
10
|
+
### Changed
|
|
11
|
+
- **BREAKING:** `DecompressionManager.decompressRecursive()` return type changed from `Array<{path, error}>` to `{ failedFiles: Array<{path, error}>, skippedByDepth: Array<string> }`. Callers consuming this method directly must update to read `.failedFiles`.
|
|
12
|
+
|
|
13
|
+
## [0.38.1] (2026-04-08)
|
|
14
|
+
### Fixed
|
|
15
|
+
- Fixed decompression failing on Windows when scanning from UNC network paths (e.g. `\\server\share\...`). The `adm-zip` library internally calls `fs.chmodSync()` after extracting each file, which fails with `ENOENT` on UNC paths. Replaced with manual entry extraction to avoid the unnecessary chmod call.
|
|
16
|
+
|
|
7
17
|
## [0.38.0] (2026-03-12)
|
|
8
18
|
### Added
|
|
9
19
|
- Added support for resolving Gradle dependencies from version catalog (`libs.versions.toml`)
|
|
@@ -287,3 +297,5 @@ All notable changes to this project will be documented in this file. See [standa
|
|
|
287
297
|
### [0.35.0](https://github.com/scanoss/scanoss.js/compare/v0.34.0...v0.35.0) (2026-02-26)
|
|
288
298
|
### [0.36.0](https://github.com/scanoss/scanoss.js/compare/v0.35.0...v0.36.0) (2026-02-27)
|
|
289
299
|
### [0.37.0](https://github.com/scanoss/scanoss.js/compare/v0.36.0...v0.37.0) (2026-03-02)
|
|
300
|
+
### [0.38.0](https://github.com/scanoss/scanoss.js/compare/v0.37.0...v0.38.0) (2026-03-12)
|
|
301
|
+
### [0.38.1](https://github.com/scanoss/scanoss.js/compare/v0.38.0...v0.38.1) (2026-04-08)
|
|
@@ -13,9 +13,13 @@ export declare class DecompressionManager {
|
|
|
13
13
|
path: string;
|
|
14
14
|
error: string;
|
|
15
15
|
}>;
|
|
16
|
+
skippedByDepth: Array<string>;
|
|
17
|
+
}>;
|
|
18
|
+
decompressRecursive(archivePath: string, level: number): Promise<{
|
|
19
|
+
failedFiles: Array<{
|
|
20
|
+
path: string;
|
|
21
|
+
error: string;
|
|
22
|
+
}>;
|
|
23
|
+
skippedByDepth: Array<string>;
|
|
16
24
|
}>;
|
|
17
|
-
decompressRecursive(archivePath: string, level: number): Promise<Array<{
|
|
18
|
-
path: string;
|
|
19
|
-
error: string;
|
|
20
|
-
}>>;
|
|
21
25
|
}
|
|
@@ -37,59 +37,66 @@ class DecompressionManager {
|
|
|
37
37
|
}
|
|
38
38
|
async decompress(archivesPaths) {
|
|
39
39
|
const failedFiles = [];
|
|
40
|
+
const skippedByDepth = [];
|
|
40
41
|
for (const archivePath of archivesPaths) {
|
|
41
|
-
const
|
|
42
|
-
failedFiles.push(...
|
|
42
|
+
const result = await this.decompressRecursive(archivePath, 0);
|
|
43
|
+
failedFiles.push(...result.failedFiles);
|
|
44
|
+
skippedByDepth.push(...result.skippedByDepth);
|
|
43
45
|
}
|
|
44
46
|
const parentFolders = archivesPaths.map(archivePath => `${archivePath}${this.suffix}`);
|
|
45
|
-
return { parentFolders, failedFiles };
|
|
47
|
+
return { parentFolders, failedFiles, skippedByDepth };
|
|
46
48
|
}
|
|
47
49
|
async decompressRecursive(archivePath, level) {
|
|
48
50
|
const failedFiles = [];
|
|
49
|
-
|
|
50
|
-
return failedFiles;
|
|
51
|
-
const archiveRootPath = path_1.default.dirname(archivePath);
|
|
51
|
+
const skippedByDepth = [];
|
|
52
52
|
const archiveName = path_1.default.basename(archivePath);
|
|
53
|
-
let newFolderPath = `${archiveRootPath}${path_1.default.sep}${archiveName}${this.suffix}`;
|
|
54
53
|
const isSupported = this.decompressorList.some((d) => d.isSupported(archiveName));
|
|
55
|
-
if (isSupported)
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
54
|
+
if (!isSupported)
|
|
55
|
+
return { failedFiles, skippedByDepth };
|
|
56
|
+
// Supported archive but configured depth exceeded — record and stop
|
|
57
|
+
if (level >= this.decompressionLevel) {
|
|
58
|
+
skippedByDepth.push(archivePath);
|
|
59
|
+
return { failedFiles, skippedByDepth };
|
|
60
|
+
}
|
|
61
|
+
const archiveRootPath = path_1.default.dirname(archivePath);
|
|
62
|
+
let newFolderPath = `${archiveRootPath}${path_1.default.sep}${archiveName}${this.suffix}`;
|
|
63
|
+
let i = 0;
|
|
64
|
+
const r = new RegExp("(?<=" + this.suffix + ")-\\d+$"); //Selects last -X where X is a number
|
|
65
|
+
while (!this.decompressOverride && fs_1.default.existsSync(newFolderPath)) { //Search for a free name
|
|
66
|
+
newFolderPath = newFolderPath.replace(r, "");
|
|
67
|
+
newFolderPath += `-${i}`;
|
|
68
|
+
i++;
|
|
69
|
+
}
|
|
70
|
+
await fs_1.default.promises.mkdir(newFolderPath, { recursive: true });
|
|
71
|
+
//Search for decompressor and extract archive
|
|
72
|
+
let extractionFailed = false;
|
|
73
|
+
for (const d of this.decompressorList) {
|
|
74
|
+
if (d.isSupported(archiveName)) {
|
|
75
|
+
try {
|
|
76
|
+
await d.run(archivePath, newFolderPath);
|
|
78
77
|
}
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
const newFilesPath = tree.getFileList(new DecompressionFilter_1.DecompressionFilter(""));
|
|
85
|
-
for (const newFilePath of newFilesPath) {
|
|
86
|
-
const nestedFailed = await this.decompressRecursive(newFilePath, level + 1);
|
|
87
|
-
failedFiles.push(...nestedFailed);
|
|
78
|
+
catch (e) {
|
|
79
|
+
await fs_1.default.promises.rm(newFolderPath, { recursive: true, force: true });
|
|
80
|
+
const message = e instanceof Error ? e.message : String(e);
|
|
81
|
+
failedFiles.push({ path: archivePath, error: message });
|
|
82
|
+
extractionFailed = true;
|
|
88
83
|
}
|
|
84
|
+
break;
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
//Search for new archives (only if extraction succeeded)
|
|
88
|
+
if (!extractionFailed) {
|
|
89
|
+
const tree = new Tree_1.Tree(newFolderPath);
|
|
90
|
+
tree.build();
|
|
91
|
+
const newFilesPath = tree.getFileList(new DecompressionFilter_1.DecompressionFilter(""));
|
|
92
|
+
for (const newFilePath of newFilesPath) {
|
|
93
|
+
const nested = await this.decompressRecursive(newFilePath, level + 1);
|
|
94
|
+
failedFiles.push(...nested.failedFiles);
|
|
95
|
+
skippedByDepth.push(...nested.skippedByDepth);
|
|
89
96
|
}
|
|
90
97
|
}
|
|
91
|
-
return failedFiles;
|
|
98
|
+
return { failedFiles, skippedByDepth };
|
|
92
99
|
}
|
|
93
100
|
}
|
|
94
101
|
exports.DecompressionManager = DecompressionManager;
|
|
95
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
102
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGVjb21wcmVzc2lvbk1hbmFnZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvc2RrL0RlY29tcHJlc3MvRGVjb21wcmVzc2lvbk1hbmFnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsZ0RBQXdCO0FBQ3hCLDRDQUFvQjtBQUNwQix1Q0FBb0M7QUFDcEMsNkVBQTBFO0FBRTFFLGtFQUE4RDtBQUM5RCxnRUFBNkQ7QUFDN0QsOEVBQTJFO0FBQzNFLDhEQUEyRDtBQUUzRCxNQUFhLG9CQUFvQjtJQVNPLGlIQUFpSDtJQUV2SixZQUFZLHFCQUE2QixDQUFDLEVBQUUsU0FBaUIsV0FBVyxFQUFFLHFCQUE4QixLQUFLO1FBQzNHLElBQUksQ0FBQyxrQkFBa0IsR0FBRyxrQkFBa0IsQ0FBQztRQUM3QyxJQUFJLENBQUMsa0JBQWtCLEdBQUcsa0JBQWtCLENBQUM7UUFDN0MsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7UUFDckIsSUFBSSxDQUFDLGdCQUFnQixHQUFHO1lBQ3RCLElBQUksNkJBQWEsRUFBRTtZQUNuQixJQUFJLDhCQUFhLEVBQUU7WUFDbkIsSUFBSSwyQ0FBb0IsRUFBRTtZQUMxQixJQUFJLDJCQUFZLEVBQUU7U0FDbkIsQ0FBQztJQUVKLENBQUM7SUFFTSxlQUFlLENBQUMsQ0FBZTtRQUNwQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ2hDLENBQUM7SUFFTSxtQkFBbUI7UUFDeEIsTUFBTSxnQkFBZ0IsR0FBRyxFQUFFLENBQUM7UUFDNUIsSUFBSSxDQUFDLGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFO1lBQ2xDLGdCQUFnQixDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxtQkFBbUIsRUFBRSxDQUFDLENBQUE7UUFDbkQsQ0FBQyxDQUFDLENBQUM7UUFDSCxPQUFPLGdCQUFnQixDQUFDO0lB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
|
|
@@ -4,6 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.DecompressZip = void 0;
|
|
7
|
+
const path_1 = __importDefault(require("path"));
|
|
8
|
+
const fs_1 = __importDefault(require("fs"));
|
|
7
9
|
const Decompressor_1 = require("./Decompressor");
|
|
8
10
|
const adm_zip_1 = __importDefault(require("adm-zip"));
|
|
9
11
|
class DecompressZip extends Decompressor_1.Decompressor {
|
|
@@ -17,10 +19,23 @@ class DecompressZip extends Decompressor_1.Decompressor {
|
|
|
17
19
|
".mtar"
|
|
18
20
|
];
|
|
19
21
|
}
|
|
22
|
+
// Extract entries manually to avoid adm-zip's internal fs.chmodSync() call,
|
|
23
|
+
// which fails on Windows UNC paths (\\server\share\...) with ENOENT.
|
|
24
|
+
// See: https://github.com/cthackers/adm-zip/issues/162
|
|
20
25
|
async run(archivePath, destPath) {
|
|
21
26
|
const zip = new adm_zip_1.default(archivePath);
|
|
22
|
-
zip.
|
|
27
|
+
const entries = zip.getEntries();
|
|
28
|
+
for (const entry of entries) {
|
|
29
|
+
const entryPath = path_1.default.join(destPath, entry.entryName);
|
|
30
|
+
if (entry.isDirectory) {
|
|
31
|
+
fs_1.default.mkdirSync(entryPath, { recursive: true });
|
|
32
|
+
}
|
|
33
|
+
else {
|
|
34
|
+
fs_1.default.mkdirSync(path_1.default.dirname(entryPath), { recursive: true });
|
|
35
|
+
fs_1.default.writeFileSync(entryPath, entry.getData());
|
|
36
|
+
}
|
|
37
|
+
}
|
|
23
38
|
}
|
|
24
39
|
}
|
|
25
40
|
exports.DecompressZip = DecompressZip;
|
|
26
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
41
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGVjb21wcmVzc1ppcHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvc2RrL0RlY29tcHJlc3MvRGVjb21wcmVzc29yL0RlY29tcHJlc3NaaXBzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLGdEQUF3QjtBQUN4Qiw0Q0FBb0I7QUFFcEIsaURBQThDO0FBQzlDLHNEQUE2QjtBQUU3QixNQUFhLGFBQWMsU0FBUSwyQkFBWTtJQUU3QztRQUNFLEtBQUssRUFBRSxDQUFDO1FBQ1IsSUFBSSxDQUFDLGdCQUFnQixHQUFHO1lBQ3RCLE1BQU07WUFDTixNQUFNO1lBQ04sTUFBTTtZQUNOLE1BQU07WUFDTixPQUFPO1NBQ1IsQ0FBQTtJQUNILENBQUM7SUFFRCw0RUFBNEU7SUFDNUUscUVBQXFFO0lBQ3JFLHVEQUF1RDtJQUNoRCxLQUFLLENBQUMsR0FBRyxDQUFDLFdBQW1CLEVBQUUsUUFBZ0I7UUFDcEQsTUFBTSxHQUFHLEdBQUcsSUFBSSxpQkFBTSxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBQ3BDLE1BQU0sT0FBTyxHQUFHLEdBQUcsQ0FBQyxVQUFVLEVBQUUsQ0FBQztRQUNqQyxLQUFLLE1BQU0sS0FBSyxJQUFJLE9BQU8sRUFBRSxDQUFDO1lBQzVCLE1BQU0sU0FBUyxHQUFHLGNBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFLEtBQUssQ0FBQyxTQUFTLENBQUMsQ0FBQztZQUN2RCxJQUFJLEtBQUssQ0FBQyxXQUFXLEVBQUUsQ0FBQztnQkFDdEIsWUFBRSxDQUFDLFNBQVMsQ0FBQyxTQUFTLEVBQUUsRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztZQUMvQyxDQUFDO2lCQUFNLENBQUM7Z0JBQ04sWUFBRSxDQUFDLFNBQVMsQ0FBQyxjQUFJLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7Z0JBQzNELFlBQUUsQ0FBQyxhQUFhLENBQUMsU0FBUyxFQUFFLEtBQUssQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDO1lBQy9DLENBQUM7UUFDSCxDQUFDO0lBQ0gsQ0FBQztDQUVGO0FBOUJELHNDQThCQyJ9
|