zip-lib 1.1.0 → 1.1.2

package/{fs.js → lib/fs.js}

@@ -168,54 +168,6 @@ async function mkdir(folder) {
             throw error; // rethrow original error
         }
     }
-    // // Any other error: check if folder exists and
-    // // return normally in that case if its a folder
-    // try {
-    //     if (folder.includes("dirlink")) {
-    //         console.log("tttttt11111", folder);
-    //     }
-    //     const fileStat = await fs.lstat(folder);
-    //     if (folder.includes("dirlink")) {
-    //         console.log("tttttt22222", fileStat);
-    //     }
-    //     if (fileStat.isSymbolicLink()) {
-    //         console.log("kkkkkkkkk", fileStat);
-    //         const realFilePath = await realpath(folder);
-    //         const realFileStat = await fs.lstat(realFilePath);
-    //         if (!realFileStat.isDirectory()) {
-    //             return Promise.reject(new Error(`"${folder}" exists and is not a directory.`));
-    //         }
-    //         return {
-    //             isDirectory: false,
-    //             isSymbolicLink: true,
-    //             realpath: realFilePath,
-    //         }
-    //     } else {
-    //         if (!fileStat.isDirectory()) {
-    //             return Promise.reject(new Error(`"${folder}" exists and is not a directory.`));
-    //         }
-    //         return {
-    //             isDirectory: true,
-    //             isSymbolicLink: false,
-    //         }
-    //     }
-    // } catch (statError) {
-    //     if (folder.includes("dirlink")) {
-    //         console.log("yyyyy", statError);
-    //     }
-    //     // ignore
-    // }
-    // if (folder.includes("dirlink")) {
-    //     console.log("kkkkkkkkk22222", folder);
-    // }
-    // await fs.mkdir(folder, { recursive: true, mode: 0o777 });
-    // if (folder.includes("dirlink")) {
-    //     console.log("kkkkkkkkk3333333", folder);
-    // }
-    // return {
-    //     isDirectory: true,
-    //     isSymbolicLink: false,
-    // };
 }
 // "A"
 const charA = 65;

package/{unzip.js → lib/unzip.js}

@@ -41,6 +41,7 @@ class EntryContext {
         this.symlinkAsFileOnWindows = symlinkAsFileOnWindows;
         this._symlinkFileNames = [];
         this._symlinkFolders = [];
+        this._ensuredFolders = [];
     }
     get decodeEntryFileName() {
         return this._decodeEntryFileName;
@@ -57,29 +58,42 @@ class EntryContext {
     get symlinkFileNames() {
         return this._symlinkFileNames;
     }
-    get symlinkFolders() {
-        return this._symlinkFolders;
+    addSymlinkFolder(folder, realpath) {
+        const find = this._symlinkFolders.find((item) => item.folder === folder);
+        if (!find) {
+            this._symlinkFolders.push({ folder, realpath });
+        }
     }
     getFilePath() {
         return path.join(this.targetFolder, this.decodeEntryFileName);
     }
+    async ensureFolder(folder) {
+        if (this._ensuredFolders.includes(folder)) {
+            return;
+        }
+        const folderStat = await exfs.ensureFolder(folder);
+        if (folderStat.isSymbolicLink) {
+            this.addSymlinkFolder(folder, folderStat.realpath);
+        }
+        this._ensuredFolders.push(folder);
+    }
     async isOutsideTargetFolder(tpath) {
-        if (this.symlinkFileNames.length === 0 &&
-            this.symlinkFolders.length === 0) {
+        if (this._symlinkFileNames.length === 0 &&
+            this._symlinkFolders.length === 0) {
             return false;
         }
         if (process.platform === "win32" &&
             this.symlinkAsFileOnWindows) {
             return false;
         }
-        for (const { folder, realpath } of this.symlinkFolders) {
+        for (const { folder, realpath } of this._symlinkFolders) {
             if (tpath.includes(folder)) {
                 if (realpath.indexOf(this.realTargetFolder) !== 0) {
                     return true;
                 }
             }
         }
-        for (const fileName of this.symlinkFileNames) {
+        for (const fileName of this._symlinkFileNames) {
             if (tpath.includes(fileName)) {
                 const realFilePath = await exfs.realpath(tpath);
                 if (realFilePath.indexOf(this.realTargetFolder) !== 0) {
@@ -252,13 +266,7 @@ class Unzip extends cancelable_1.Cancelable {
     async extractEntry(zfile, entry, entryContext, token) {
         const filePath = entryContext.getFilePath();
         const fileDir = path.dirname(filePath);
-        const folderStat = await exfs.ensureFolder(fileDir);
-        if (folderStat.isSymbolicLink) {
-            entryContext.symlinkFolders.push({
-                folder: fileDir,
-                realpath: folderStat.realpath,
-            });
-        }
+        await entryContext.ensureFolder(fileDir);
         const outside = await entryContext.isOutsideTargetFolder(fileDir);
         if (outside) {
             const error = new Error(`Refuse to write file outside "${entryContext.targetFolder}", file: "${filePath}"`);

package/package.json

@@ -1,11 +1,13 @@
 {
     "name": "zip-lib",
-    "version": "1.1.0",
+    "version": "1.1.2",
     "description": "zip and unzip library for node",
     "main": "lib/index.js",
+    "types": "./lib/index.d.ts",
     "scripts": {
         "compile": "rimraf ./dist && tsc -p ./src/tsconfig.json",
-        "release": "rimraf ./lib && tsc -p ./src/tsconfig.release.json && node ./build.mjs",
+        "release": "rimraf ./pkg && npm run tsc-cjs && node ./build.mjs",
+        "tsc-cjs": "tsc -p ./src/tsconfig.production.cjs.json",
         "compile-test": "rimraf ./test/out && tsc -p ./test/src/tsconfig.json",
         "test": "npm run compile && npm run compile-test && node ./test/src/before.js && mocha ./test/out --timeout 10000"
     },