@ffflorian/jszip-cli - npm Package Compare versions

Comparing version 1.3.0 to 1.4.0

dist/BuildService.d.ts

@@ -18,2 +18,3 @@ /// <reference types="node" />
     private addFile;
+    private addLink;
     private checkEntry;
@@ -20,0 +21,0 @@ private checkOutput;

dist/BuildService.js

@@ -114,2 +114,3 @@ "use strict";
                         }
+                        this.logger.info("Saving finished zip file to \"" + this.outputFile + "\" ...");
                         return [4 /*yield*/, this.fileService.writeFile(data, this.outputFile)];
@@ -127,15 +128,25 @@ case 4:
     };
-    BuildService.prototype.addFile = function (entry) {
+    BuildService.prototype.addFile = function (entry, isLink) {
+        if (isLink === void 0) { isLink = false; }
         return __awaiter(this, void 0, void 0, function () {
-            var resolvedPath, zipPath, fileData, fileStat;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var resolvedPath, zipPath, fileData, _a, fileStat;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         resolvedPath = entry.resolvedPath, zipPath = entry.zipPath;
-                        return [4 /*yield*/, this.fileService.readFile(resolvedPath)];
+                        if (!isLink) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.fileService.readLink(resolvedPath)];
                     case 1:
-                        fileData = _a.sent();
+                        _a = _b.sent();
+                        return [3 /*break*/, 4];
+                    case 2: return [4 /*yield*/, this.fileService.readFile(resolvedPath)];
+                    case 3:
+                        _a = _b.sent();
+                        _b.label = 4;
+                    case 4:
+                        fileData = _a;
                         return [4 /*yield*/, this.fileService.fileStat(resolvedPath)];
-                    case 2:
-                        fileStat = _a.sent();
+                    case 5:
+                        fileStat = _b.sent();
+                        this.logger.info("Adding file \"" + resolvedPath + "\" to ZIP file ...");
                         return [4 /*yield*/, this.jszip.file(zipPath, fileData, {
@@ -147,4 +158,4 @@ createFolders: true,
                             })];
-                    case 3:
-                        _a.sent();
+                    case 6:
+                        _b.sent();
                         this.compressedFilesCount++;
@@ -156,2 +167,30 @@ return [2 /*return*/];
     };
+    BuildService.prototype.addLink = function (entry) {
+        return __awaiter(this, void 0, void 0, function () {
+            var resolvedPath, zipPath, realPath;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        resolvedPath = entry.resolvedPath, zipPath = entry.zipPath;
+                        if (!this.options.dereferenceLinks) return [3 /*break*/, 3];
+                        return [4 /*yield*/, this.fileService.getRealPath(resolvedPath)];
+                    case 1:
+                        realPath = _a.sent();
+                        this.logger.info("Found real path \"" + realPath + " for symbolic link\".");
+                        return [4 /*yield*/, this.checkEntry({
+                                resolvedPath: realPath,
+                                zipPath: zipPath,
+                            })];
+                    case 2:
+                        _a.sent();
+                        return [3 /*break*/, 5];
+                    case 3: return [4 /*yield*/, this.addFile(entry, true)];
+                    case 4:
+                        _a.sent();
+                        _a.label = 5;
+                    case 5: return [2 /*return*/];
+                }
+            });
+        });
+    };
     BuildService.prototype.checkEntry = function (entry) {
@@ -170,19 +209,27 @@ return __awaiter(this, void 0, void 0, function () {
                         }
-                        this.logger.info("Found " + entry.resolvedPath + ". Adding to the ZIP file.");
                         if (!fileStat.isDirectory()) return [3 /*break*/, 3];
+                        this.logger.info("Found directory \"" + entry.resolvedPath + "\".");
                         return [4 /*yield*/, this.walkDir(entry)];
                     case 2:
                         _a.sent();
-                        return [3 /*break*/, 6];
+                        return [3 /*break*/, 8];
                     case 3:
-                        if (!(fileStat.isFile() || fileStat.isSymbolicLink())) return [3 /*break*/, 5];
+                        if (!fileStat.isFile()) return [3 /*break*/, 5];
+                        this.logger.info("Found file \"" + entry.resolvedPath + "\".");
                         return [4 /*yield*/, this.addFile(entry)];
                     case 4:
                         _a.sent();
-                        return [3 /*break*/, 6];
+                        return [3 /*break*/, 8];
                     case 5:
+                        if (!fileStat.isSymbolicLink()) return [3 /*break*/, 7];
+                        this.logger.info("Found symbolic link \"" + entry.resolvedPath + "\".");
+                        return [4 /*yield*/, this.addLink(entry)];
+                    case 6:
+                        _a.sent();
+                        return [3 /*break*/, 8];
+                    case 7:
                         this.logger.info("Unknown file type.", { fileStat: fileStat });
                         console.info("Can't read: " + entry.resolvedPath + ". Ignoring.");
-                        _a.label = 6;
-                    case 6: return [2 /*return*/];
+                        _a.label = 8;
+                    case 8: return [2 /*return*/];
                 }
@@ -227,3 +274,3 @@ });
         return __awaiter(this, void 0, void 0, function () {
-            var files, _i, files_1, file, newZipPath, newResolvedPath;
+            var dirEntries, _i, dirEntries_1, dirEntry, newZipPath, newResolvedPath;
             return __generator(this, function (_a) {
@@ -235,10 +282,10 @@ switch (_a.label) {
                     case 1:
-                        files = _a.sent();
-                        _i = 0, files_1 = files;
+                        dirEntries = _a.sent();
+                        _i = 0, dirEntries_1 = dirEntries;
                         _a.label = 2;
                     case 2:
-                        if (!(_i < files_1.length)) return [3 /*break*/, 5];
-                        file = files_1[_i];
-                        newZipPath = entry.zipPath + '/' + file;
-                        newResolvedPath = path.join(entry.resolvedPath, file);
+                        if (!(_i < dirEntries_1.length)) return [3 /*break*/, 5];
+                        dirEntry = dirEntries_1[_i];
+                        newZipPath = entry.zipPath + "/" + dirEntry;
+                        newResolvedPath = path.join(entry.resolvedPath, dirEntry);
                         return [4 /*yield*/, this.checkEntry({
@@ -245,0 +292,0 @@ resolvedPath: newResolvedPath,

dist/BuildService.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"BuildService.js","sourceRoot":"","sources":["../src/BuildService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BuildService.js","sourceRoot":"","sources":["../src/BuildService.ts"],"names":[],"mappings":"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"}

dist/cli.js

@@ -24,3 +24,4 @@ #!/usr/bin/env node
     .option('-i, --ignore <entry>', 'ignore a file or directory')
-    .option('-f, --force', 'force overwriting files (default: false)')
+    .option('-f, --force', 'force overwriting files and directories (default: false)')
+    .option('-d, --dereference', 'dereference links (default: false)')
     .option('-l, --level <number>', 'set the compression level', 5)
@@ -36,6 +37,7 @@ .option('-V, --verbose', 'enable verbose logging (default: false)')
     .alias('a')
-    .description('add files to a new ZIP archive')
+    .description('add files and directories to a new ZIP archive')
     .option('-o, --output <dir>', 'set the output directory (default: stdout)')
     .option('-i, --ignore <entry>', 'ignore a file or directory')
-    .option('-f, --force', 'force overwriting files (default: false)')
+    .option('-f, --force', 'force overwriting files and directories (default: false)')
+    .option('-d, --dereference', 'dereference links (default: false)')
     .option('-l, --level <number>', 'set the compression level', 5)
@@ -47,3 +49,3 @@ .option('-V, --verbose', 'enable verbose logging (default: false)')
     var parent = _a.parent;
-    new _1.JSZipCLI(__assign({}, (parent.force && { force: parent.force }), (parent.ignore && { ignoreEntries: [parent.ignore] }), (parent.level && { compressionLevel: parent.level }), (parent.output && { outputEntry: parent.output }), (parent.quiet && { quiet: parent.quiet }), (parent.verbose && { verbose: parent.verbose })))
+    new _1.JSZipCLI(__assign({}, (parent.level && { compressionLevel: parent.level }), (parent.dereference && { dereferenceLinks: parent.dereference }), (parent.force && { force: parent.force }), (parent.ignore && { ignoreEntries: [parent.ignore] }), (parent.output && { outputEntry: parent.output }), (parent.quiet && { quiet: parent.quiet }), (parent.verbose && { verbose: parent.verbose })))
         .add(entries)
@@ -53,5 +55,5 @@ .save()
         var outputFile = _a.outputFile, compressedFilesCount = _a.compressedFilesCount;
-        return parent.output &&
-            !parent.quiet &&
-            console.log("Done compressing " + compressedFilesCount + " files to " + outputFile + ".");
+        if (parent.output && !parent.quiet) {
+            console.log("Done compressing " + compressedFilesCount + " files to \"" + outputFile + "\".");
+        }
     })
@@ -66,6 +68,6 @@ .catch(function (error) {
     .alias('e')
-    .description('extract files from ZIP archive(s)')
+    .description('extract files and directories from ZIP archive(s)')
     .option('-o, --output <dir>', 'set the output directory (default: stdout)')
     .option('-i, --ignore <entry>', 'ignore a file or directory')
-    .option('-f, --force', 'force overwriting files (default: false)')
+    .option('-f, --force', 'force overwriting files and directories (default: false)')
     .option('-V, --verbose', 'enable verbose logging (default: false)')
@@ -80,3 +82,5 @@ .option('-q, --quiet', "Don't log anything (default: false)")
         var outputDir = _a.outputDir, extractedFilesCount = _a.extractedFilesCount;
-        return parent.output && !parent.quiet && console.log("Done extracting " + extractedFilesCount + " files to " + outputDir + ".");
+        if (parent.output && !parent.quiet) {
+            console.log("Done extracting " + extractedFilesCount + " files to \"" + outputDir + "\".");
+        }
     })
@@ -83,0 +87,0 @@ .catch(function (error) {

dist/cli.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAEA,mCAAqC;AACrC,uBAA4B;AAEtB,IAAA,+BAA+G,EAA9G,cAAI,EAAE,oBAAO,EAAE,4BAAW,CAAqF;AAEtH,OAAO;KACJ,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;KACnC,OAAO,CAAC,OAAO,EAAE,eAAe,CAAC;KACjC,WAAW,CAAC,WAAW,CAAC;KACxB,MAAM,CAAC,oBAAoB,EAAE,4CAA4C,CAAC;KAC1E,MAAM,CAAC,sBAAsB,EAAE,4BAA4B,CAAC;KAC5D,MAAM,CAAC,aAAa,EAAE,0DAA0D,CAAC;KACjF,MAAM,CAAC,mBAAmB,EAAE,oCAAoC,CAAC;KACjE,MAAM,CAAC,sBAAsB,EAAE,2BAA2B,EAAE,CAAC,CAAC;KAC9D,MAAM,CAAC,eAAe,EAAE,yCAAyC,CAAC;KAClE,MAAM,CAAC,aAAa,EAAE,qCAAqC,CAAC;KAC5D,EAAE,CAAC,WAAW,EAAE,UAAA,IAAI;IACnB,OAAO,CAAC,KAAK,CAAC,iCAAgC,IAAI,CAAC,CAAC,CAAC,QAAK,CAAC,CAAC;IAC5D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC;AAEL,OAAO;KACJ,OAAO,CAAC,KAAK,CAAC;KACd,KAAK,CAAC,GAAG,CAAC;KACV,WAAW,CAAC,gDAAgD,CAAC;KAC7D,MAAM,CAAC,oBAAoB,EAAE,4CAA4C,CAAC;KAC1E,MAAM,CAAC,sBAAsB,EAAE,4BAA4B,CAAC;KAC5D,MAAM,CAAC,aAAa,EAAE,0DAA0D,CAAC;KACjF,MAAM,CAAC,mBAAmB,EAAE,oCAAoC,CAAC;KACjE,MAAM,CAAC,sBAAsB,EAAE,2BAA2B,EAAE,CAAC,CAAC;KAC9D,MAAM,CAAC,eAAe,EAAE,yCAAyC,CAAC;KAClE,MAAM,CAAC,aAAa,EAAE,qCAAqC,CAAC;KAC5D,SAAS,CAAC,cAAc,CAAC;KACzB,MAAM,CAAC,UAAC,OAAiB,EAAE,EAAyB;QAAxB,kBAAM;IACjC,IAAI,WAAQ,cACP,CAAC,MAAM,CAAC,KAAK,IAAI,EAAC,gBAAgB,EAAE,MAAM,CAAC,KAAK,EAAC,CAAC,EAClD,CAAC,MAAM,CAAC,WAAW,IAAI,EAAC,gBAAgB,EAAE,MAAM,CAAC,WAAW,EAAC,CAAC,EAC9D,CAAC,MAAM,CAAC,KAAK,IAAI,EAAC,KAAK,EAAE,MAAM,CAAC,KAAK,EAAC,CAAC,EACvC,CAAC,MAAM,CAAC,MAAM,IAAI,EAAC,aAAa,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,EAAC,CAAC,EACnD,CAAC,MAAM,CAAC,MAAM,IAAI,EAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAC,CAAC,EAC/C,CAAC,MAAM,CAAC,KAAK,IAAI,EAAC,KAAK,EAAE,MAAM,CAAC,KAAK,EAAC,CAAC,EACvC,CAAC,MAAM,CAAC,OAAO,IAAI,EAAC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAC,CAAC,EAChD;SACC,GAAG,CAAC,OAAO,CAAC;SACZ,IAAI,EAAE;SACN,IAAI,CAAC,UAAC,EAAkC;YAAjC,0BAAU,EAAE,8CAAoB;QACtC,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;YAClC,OAAO,CAAC,GAAG,CAAC,sBAAoB,oBAAoB,oBAAc,UAAU,QAAI,CAAC,CAAC;SACnF;IACH,CAAC,CAAC;SACD,KAAK,CAAC,UAAA,KAAK;QACV,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QACvC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC;AAEL,OAAO;KACJ,OAAO,CAAC,SAAS,CAAC;KAClB,KAAK,CAAC,GAAG,CAAC;KACV,WAAW,CAAC,mDAAmD,CAAC;KAChE,MAAM,CAAC,oBAAoB,EAAE,4CAA4C,CAAC;KAC1E,MAAM,CAAC,sBAAsB,EAAE,4BAA4B,CAAC;KAC5D,MAAM,CAAC,aAAa,EAAE,0DAA0D,CAAC;KACjF,MAAM,CAAC,eAAe,EAAE,yCAAyC,CAAC;KAClE,MAAM,CAAC,aAAa,EAAE,qCAAqC,CAAC;KAC5D,SAAS,CAAC,eAAe,CAAC;KAC1B,MAAM,CAAC,UAAC,QAAkB,EAAE,EAAyB;QAAxB,kBAAM;IAClC,IAAI,WAAQ,cACP,CAAC,MAAM,CAAC,KAAK,IAAI,EAAC,KAAK,EAAE,MAAM,CAAC,KAAK,EAAC,CAAC,EACvC,CAAC,MAAM,CAAC,MAAM,IAAI,EAAC,aAAa,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,EAAC,CAAC,EACnD,CAAC,MAAM,CAAC,MAAM,IAAI,EAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAC,CAAC,EAC/C,CAAC,MAAM,CAAC,KAAK,IAAI,EAAC,KAAK,EAAE,MAAM,CAAC,KAAK,EAAC,CAAC,EACvC,CAAC,MAAM,CAAC,OAAO,IAAI,EAAC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAC,CAAC,EAChD;SACC,OAAO,CAAC,QAAQ,CAAC;SACjB,IAAI,CAAC,UAAC,EAAgC;YAA/B,wBAAS,EAAE,4CAAmB;QACpC,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;YAClC,OAAO,CAAC,GAAG,CAAC,qBAAmB,mBAAmB,oBAAc,SAAS,QAAI,CAAC,CAAC;SAChF;IACH,CAAC,CAAC;SACD,KAAK,CAAC,UAAA,KAAK;QACV,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QACvC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC;AAEL,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAE5B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE;IACxB,OAAO,CAAC,IAAI,EAAE,CAAC;CAChB"}

dist/ExtractService.js

@@ -41,2 +41,3 @@ "use strict";
 var path = require("path");
+var os = require("os");
 var progress = require("progress");
@@ -64,3 +65,3 @@ var FileService_1 = require("./FileService");
         return __awaiter(this, void 0, void 0, function () {
-            var _loop_1, this_1, _i, rawEntries_1, entry, state_1;
+            var isWin32, _loop_1, this_1, _i, rawEntries_1, entry, state_1;
             var _this = this;
@@ -70,2 +71,3 @@ return __generator(this, function (_a) {
                     case 0:
+                        isWin32 = os.platform() === 'win32';
                         _loop_1 = function (entry) {
@@ -84,3 +86,3 @@ var jszip, resolvedPath, data, entries, lastPercent;
                                         resolvedPath = path.resolve(entry);
-                                        return [4 /*yield*/, FileService_1.fsPromise.readFile(resolvedPath)];
+                                        return [4 /*yield*/, this_1.fileService.readFile(resolvedPath)];
                                     case 3:
@@ -101,5 +103,5 @@ data = _a.sent();
                                                 return __awaiter(_this, void 0, void 0, function () {
-                                                    var resolvedFilePath, data_1, diff;
-                                                    return __generator(this, function (_b) {
-                                                        switch (_b.label) {
+                                                    var resolvedFilePath, data_1, diff, _b, _c;
+                                                    return __generator(this, function (_d) {
+                                                        switch (_d.label) {
                                                             case 0:
@@ -110,7 +112,7 @@ resolvedFilePath = path.join(this.outputDir, filePath);
                                                             case 1:
-                                                                _b.sent();
-                                                                return [3 /*break*/, 7];
+                                                                _d.sent();
+                                                                return [3 /*break*/, 5];
                                                             case 2: return [4 /*yield*/, entry.async('nodebuffer')];
                                                             case 3:
-                                                                data_1 = _b.sent();
+                                                                data_1 = _d.sent();
                                                                 return [4 /*yield*/, FileService_1.fsPromise.writeFile(resolvedFilePath, data_1, {
@@ -120,9 +122,3 @@ encoding: 'utf-8',
                                                             case 4:
-                                                                _b.sent();
-                                                                if (!entry.unixPermissions) return [3 /*break*/, 6];
-                                                                return [4 /*yield*/, FileService_1.fsPromise.chmod(resolvedFilePath, entry.unixPermissions)];
-                                                            case 5:
-                                                                _b.sent();
-                                                                _b.label = 6;
-                                                            case 6:
+                                                                _d.sent();
                                                                 this.extractedFilesCount++;
@@ -134,4 +130,25 @@ diff = Math.floor(index / entries.length) - Math.floor(lastPercent);
                                                                 }
-                                                                _b.label = 7;
-                                                            case 7: return [2 /*return*/];
+                                                                _d.label = 5;
+                                                            case 5:
+                                                                if (!isWin32) return [3 /*break*/, 8];
+                                                                _b = entry.dosPermissions;
+                                                                if (!_b) return [3 /*break*/, 7];
+                                                                return [4 /*yield*/, FileService_1.fsPromise.chmod(resolvedFilePath, entry.dosPermissions)];
+                                                            case 6:
+                                                                _b = (_d.sent());
+                                                                _d.label = 7;
+                                                            case 7:
+                                                                _b;
+                                                                return [3 /*break*/, 11];
+                                                            case 8:
+                                                                _c = entry.unixPermissions;
+                                                                if (!_c) return [3 /*break*/, 10];
+                                                                return [4 /*yield*/, FileService_1.fsPromise.chmod(resolvedFilePath, entry.unixPermissions)];
+                                                            case 9:
+                                                                _c = (_d.sent());
+                                                                _d.label = 10;
+                                                            case 10:
+                                                                _c;
+                                                                _d.label = 11;
+                                                            case 11: return [2 /*return*/];
                                                         }
@@ -138,0 +155,0 @@ });

dist/ExtractService.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"ExtractService.js","sourceRoot":"","sources":["../src/ExtractService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ExtractService.js","sourceRoot":"","sources":["../src/ExtractService.ts"],"names":[],"mappings":"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"}

dist/FileService.d.ts

@@ -12,2 +12,3 @@ /// <reference types="node" />
     readLink: typeof fs.readlink.__promisify__;
+    realPath: typeof fs.realpath.__promisify__;
     writeFile: typeof fs.writeFile.__promisify__;
@@ -24,4 +25,6 @@ };
     readFile(filePath: string): Promise<Buffer>;
+    readLink(linkPath: string): Promise<Buffer>;
+    getRealPath(linkPath: string): Promise<string>;
     writeFile(data: Buffer, filePath: string): Promise<FileService>;
 }
 export { fsPromise, FileService };

dist/FileService.js

@@ -50,2 +50,3 @@ "use strict";
     readLink: util_1.promisify(fs.readlink),
+    realPath: util_1.promisify(fs.realpath),
     writeFile: util_1.promisify(fs.writeFile),
@@ -125,7 +126,3 @@ };
     FileService.prototype.fileStat = function (filePath) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                return [2 /*return*/, fsPromise.lstat(filePath)];
-            });
-        });
+        return fsPromise.lstat(filePath);
     };
@@ -158,20 +155,10 @@ FileService.prototype.fileIsWritable = function (filePath) {
     FileService.prototype.readFile = function (filePath) {
-        return __awaiter(this, void 0, void 0, function () {
-            var fileStat;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.fileStat(filePath)];
-                    case 1:
-                        fileStat = _a.sent();
-                        if (fileStat.isSymbolicLink()) {
-                            return [2 /*return*/, fsPromise.readLink(filePath, { encoding: 'buffer' })];
-                        }
-                        else {
-                            return [2 /*return*/, fsPromise.readFile(filePath)];
-                        }
-                        return [2 /*return*/];
-                }
-            });
-        });
+        return fsPromise.readFile(filePath);
     };
+    FileService.prototype.readLink = function (linkPath) {
+        return fsPromise.readLink(linkPath, { encoding: 'buffer' });
+    };
+    FileService.prototype.getRealPath = function (linkPath) {
+        return fsPromise.realPath(linkPath);
+    };
     FileService.prototype.writeFile = function (data, filePath) {
@@ -178,0 +165,0 @@ return __awaiter(this, void 0, void 0, function () {

dist/FileService.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"FileService.js","sourceRoot":"","sources":["../src/FileService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"FileService.js","sourceRoot":"","sources":["../src/FileService.ts"],"names":[],"mappings":"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"}

dist/index.js

@@ -17,2 +17,3 @@ "use strict";
 var defaultOptions = {
+    dereferenceLinks: false,
     force: false,
@@ -19,0 +20,0 @@ ignoreEntries: [],

dist/index.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AACA,+CAA4C;AAC5C,mDAAgD;AAEhD,IAAM,cAAc,GAAyB;IAC3C,KAAK,EAAE,KAAK;IACZ,aAAa,EAAE,EAAE;IACjB,gBAAgB,EAAE,CAAC;IACnB,WAAW,EAAE,IAAI;IACjB,KAAK,EAAE,KAAK;IACZ,OAAO,EAAE,KAAK;CACf,CAAC;AAEF;IAKE,kBAAY,OAAoC;QAApC,wBAAA,EAAA,wBAAoC;QAC9C,IAAI,CAAC,OAAO,gBAAO,cAAc,EAAK,OAAO,CAAC,CAAC;QAC/C,IAAI,CAAC,YAAY,GAAG,IAAI,2BAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACnD,IAAI,CAAC,cAAc,GAAG,IAAI,+BAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACzD,CAAC;IAEM,sBAAG,GAAV,UAAW,UAAoB;QAC7B,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC3C,CAAC;IAEM,0BAAO,GAAd,UAAe,UAAoB;QACjC,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACjD,CAAC;IAEM,uBAAI,GAAX;QACE,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;IAClC,CAAC;IACH,eAAC;AAAD,CAAC,AAtBD,IAsBC;AAtBY,4BAAQ"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AACA,+CAA4C;AAC5C,mDAAgD;AAEhD,IAAM,cAAc,GAAyB;IAC3C,gBAAgB,EAAE,KAAK;IACvB,KAAK,EAAE,KAAK;IACZ,aAAa,EAAE,EAAE;IACjB,gBAAgB,EAAE,CAAC;IACnB,WAAW,EAAE,IAAI;IACjB,KAAK,EAAE,KAAK;IACZ,OAAO,EAAE,KAAK;CACf,CAAC;AAEF;IAKE,kBAAY,OAAoC;QAApC,wBAAA,EAAA,wBAAoC;QAC9C,IAAI,CAAC,OAAO,gBAAO,cAAc,EAAK,OAAO,CAAC,CAAC;QAC/C,IAAI,CAAC,YAAY,GAAG,IAAI,2BAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACnD,IAAI,CAAC,cAAc,GAAG,IAAI,+BAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACzD,CAAC;IAEM,sBAAG,GAAV,UAAW,UAAoB;QAC7B,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC3C,CAAC;IAEM,0BAAO,GAAd,UAAe,UAAoB;QACjC,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACjD,CAAC;IAEM,uBAAI,GAAX;QACE,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;IAClC,CAAC;IACH,eAAC;AAAD,CAAC,AAtBD,IAsBC;AAtBY,4BAAQ"}

dist/Interfaces.d.ts

 interface CLIOptions {
+    compressionLevel?: number;
+    dereferenceLinks?: boolean;
     force?: boolean;
     ignoreEntries?: string[];
-    compressionLevel?: number;
     outputEntry?: string | null;
@@ -6,0 +7,0 @@ quiet?: boolean;

package.json

@@ -38,3 +38,3 @@ {
   "types": "dist/index.d.ts",
-  "version": "1.3.0"
+  "version": "1.4.0"
 }

README.md

@@ -21,3 +21,4 @@ # jszip-cli [![Build Status](https://api.travis-ci.org/ffflorian/jszip-cli.svg?branch=master)](https://travis-ci.org/ffflorian/jszip-cli/) [![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=ffflorian/jszip-cli)](https://dependabot.com)
   -i, --ignore <entry>               ignore a file or directory
-  -f, --force                        force overwriting files (default: false)
+  -f, --force                        force overwriting files and directories (default: false)
+  -d, --dereference                  dereference links (default: false)
   -l, --level <number>               set the compression level (default: 5)
@@ -30,4 +31,4 @@ -V, --verbose                      enable verbose logging (default: false)
 
-  add|a [options] <entries...>       add files to a new ZIP archive
-  extract|e [options] [archives...]  extract files from ZIP archive(s)
+  add|a [options] <entries...>       add files and directories to a new ZIP archive
+  extract|e [options] [archives...]  extract files and directories from ZIP archive(s)
 ```
@@ -38,6 +39,7 @@
 ```
-jszip-cli add -i *.map -o deploy.zip dist/ package.json
-jszip-cli extract deploy.zip -o deployment_files/
+jszip-cli add --ignore *.map --output deploy.zip dist/ package.json
 
-jszip-cli add -i *.map dist/ package.json > deploy.zip
+jszip-cli add --ignore *.map dist/ package.json > deploy.zip
+
+jszip-cli extract --output deployment_files/ deploy.zip
 ```

New alerts

Filesystem access

Supply chain risk

Accesses the file system, and could potentially read sensitive data.

Found 1 instance in 1 package

Long strings

Supply chain risk

Contains long string literals, which may be a sign of obfuscated or packed code.

Found 1 instance in 1 package

Fixed alerts

Filesystem access

Supply chain risk

Accesses the file system, and could potentially read sensitive data.

Found 1 instance in 1 package

Long strings

Supply chain risk

Contains long string literals, which may be a sign of obfuscated or packed code.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

65645

9.03%

Lines of code

894

7.32%

Number of lines in readme file

43

4.88%

Worsened metrics

Number of low supply chain risk alerts

5

25%

No dependency changes