compressing 1.10.0 → 1.10.2

package/lib/utils.js

@@ -168,6 +168,13 @@ function safePipe(streams) {
 
 exports.safePipe = safePipe;
 
+function normalizePath(fileName) {
+  fileName = path.normalize(fileName);
+  // https://nodejs.org/api/path.html#path_path_normalize_path
+  if (process.platform === 'win32') fileName = fileName.replace(/\\+/g, '/');
+  return fileName;
+}
+
 exports.stripFileName = (strip, fileName, type) => {
   // before
   // node/package.json
@@ -189,15 +196,18 @@ exports.stripFileName = (strip, fileName, type) => {
   // /foo => foo
   if (fileName[0] === '/') fileName = fileName.replace(/^\/+/, '');
 
+  // fix case
+  // ./foo/bar => foo/bar
+  if (fileName) {
+    fileName = normalizePath(fileName);
+  }
+
   let s = fileName.split('/');
 
   // fix relative path
   // foo/../bar/../../asdf/
   //  => asdf/
   if (s.indexOf('..') !== -1) {
-    fileName = path.normalize(fileName);
-    // https://npm.taobao.org/mirrors/node/latest/docs/api/path.html#path_path_normalize_path
-    if (process.platform === 'win32') fileName = fileName.replace(/\\+/g, '/');
     // replace '../' on ../../foo/bar
     fileName = fileName.replace(/(\.\.\/)+/, '');
     if (type === 'directory' && fileName && fileName[fileName.length - 1] !== '/') {

package/lib/zip/uncompress_stream.js

@@ -98,8 +98,8 @@ class ZipUncompressStream extends UncompressBaseStream {
             entry.fileName = iconv.decode(entry.fileName, this._zipFileNameEncoding);
           }
         }
-        // directory file names end with '/'
-        const type = /\/$/.test(entry.fileName) ? 'directory' : 'file';
+        // 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 header = { name, type, yauzl: entry, mode };

package/package.json

@@ -1,16 +1,17 @@
 {
   "name": "compressing",
-  "version": "1.10.0",
+  "version": "1.10.2",
   "description": "Everything you need for compressing and uncompressing",
   "main": "index.js",
   "scripts": {
     "contributor": "git-contributor",
-    "ts-test": "tsc -p ./test/fixtures/types/tsconfig.json",
-    "test": "egg-bin test --ts false && npm run ts-test",
+    "test:ts": "tsc -p ./test/fixtures/types/tsconfig.json",
+    "test:js": "egg-bin test --ts false",
+    "test": "npm run test:js && npm run test:ts",
     "cov": "egg-bin cov --ts false",
     "lint-fix": "eslint . --fix",
     "lint": "eslint .",
-    "ci": "npm run lint && npm run ts-test && npm run cov"
+    "ci": "npm run lint && npm run test:ts && npm run cov"
   },
   "repository": {
     "type": "git",