feat: support strip for all archive

Author: bytemain

lib/utils.js

@@ -88,6 +88,8 @@ exports.makeUncompressFn = StreamClass => {
       throw error;
     }
 
+    const strip = opts.strip ? Number(opts.strip) : 0;
+
     return new Promise((resolve, reject) => {
       fs.mkdir(destDir, { recursive: true }, err => {
         if (err) return reject(err);
@@ -108,8 +110,7 @@ exports.makeUncompressFn = StreamClass => {
           .on('error', reject)
           .on('entry', (header, stream, next) => {
             stream.on('end', next);
-            const destFilePath = path.join(destDir, header.name);
-
+            const destFilePath = path.join(destDir, stripFileName(strip, header.name, header.type));
             if (header.type === 'file') {
               const dir = path.dirname(destFilePath);
               fs.mkdir(dir, { recursive: true }, err => {

lib/zip/uncompress_stream.js

@@ -12,7 +12,6 @@ const utils = require('../utils');
 let iconv;
 
 const YAUZL_CALLBACK = Symbol('ZipUncompressStream#yauzlCallback');
-const STRIP_NAME = Symbol('ZipUncompressStream#stripName');
 
 // don't decodeStrings on yauzl, we should handle fileName by ourself
 // see validateFileName on https://github.com/thejoshwolfe/yauzl/blob/51010ce4e8c7e6345efe195e1b4150518f37b393/index.js#L607
@@ -34,7 +33,6 @@ class ZipUncompressStream extends UncompressBaseStream {
     super(opts);
 
     this._chunks = [];
-    this._strip = Number(opts.strip) || 0;
     this._zipFileNameEncoding = opts.zipFileNameEncoding || 'utf8';
     if (this._zipFileNameEncoding === 'utf-8') {
       this._zipFileNameEncoding = 'utf8';
@@ -108,7 +106,7 @@ class ZipUncompressStream extends UncompressBaseStream {
         }
         // directory file names end with '/' (for Linux and macOS) or '\' (for Windows)
         const type = /[\\\/]$/.test(entry.fileName) ? 'directory' : 'file';
-        const name = entry.fileName = this[STRIP_NAME](entry.fileName, type);
+        const name = entry.fileName;
 
         const header = { name, type, yauzl: entry, mode };
 
@@ -135,10 +133,6 @@ class ZipUncompressStream extends UncompressBaseStream {
       zipFile.readEntry();
     }
   }
-
-  [STRIP_NAME](fileName, type) {
-    return utils.stripFileName(this._strip, fileName, type);
-  }
 }
 
 module.exports = ZipUncompressStream;