extract-base-iterator 0.2.3 → 0.2.6

package/lib/DirectoryEntry.js

@@ -1,7 +1,7 @@
 var path = require('path');
 var mkpath = require('mkpath');
 var Queue = require('queue-cb');
-var assign = require('object-assign');
+var assign = require('just-extend');
 
 var chmod = require('./fs/chmod');
 var chown = require('./fs/chown');
@@ -31,12 +31,9 @@ DirectoryEntry.prototype.create = function create(dest, options, callback) {
       var normalizedPath = path.normalize(self.path);
       var fullPath = path.join(dest, stripPath(normalizedPath, options));
 
+      // do not check for the existence of the directory but allow out-of-order calling
       var queue = new Queue(1);
-      queue.defer(function (callback) {
-        mkpath(fullPath, function (err) {
-          err && err.code !== 'EEXIST' ? callback(err) : callback();
-        });
-      });
+      queue.defer(mkpath.bind(null, fullPath));
       queue.defer(chmod.bind(null, fullPath, self, options));
       queue.defer(chown.bind(null, fullPath, self, options));
       queue.defer(utimes.bind(null, fullPath, self, options));

package/lib/FileEntry.js

@@ -1,7 +1,7 @@
 var path = require('path');
 var mkpath = require('mkpath');
 var Queue = require('queue-cb');
-var assign = require('object-assign');
+var assign = require('just-extend');
 
 var chmod = require('./fs/chmod');
 var chown = require('./fs/chown');
@@ -34,16 +34,14 @@ FileEntry.prototype.create = function create(dest, options, callback) {
       var fullPath = path.join(dest, stripPath(normalizedPath, options));
 
       var queue = new Queue(1);
-      queue.defer(function (callback) {
-        mkpath(path.dirname(fullPath), function (err) {
-          err && err.code !== 'EEXIST' ? callback(err) : callback();
+      if (options.force) {
+        queue.defer(function (callback) {
+          rimraf(fullPath, function (err) {
+            err && err.code !== 'ENOENT' ? callback(err) : callback();
+          });
         });
-      });
-      queue.defer(function (callback) {
-        rimraf(fullPath, function (err) {
-          err && err.code !== 'ENOENT' ? callback(err) : callback();
-        });
-      });
+      }
+      queue.defer(mkpath.bind(null, path.dirname(fullPath)));
       queue.defer(this._writeFile.bind(this, fullPath, options));
       queue.defer(chmod.bind(null, fullPath, self, options));
       queue.defer(chown.bind(null, fullPath, self, options));

package/lib/LinkEntry.js

@@ -1,5 +1,5 @@
 var path = require('path');
-var assign = require('object-assign');
+var assign = require('just-extend');
 var fs = require('graceful-fs');
 var mkpath = require('mkpath');
 var rimraf = require('rimraf');
@@ -36,16 +36,14 @@ LinkEntry.prototype.create = function create(dest, options, callback) {
       var linkFullPath = path.join(dest, stripPath(normalizedLinkpath, options));
 
       var queue = new Queue(1);
-      queue.defer(function (callback) {
-        rimraf(fullPath, function (err) {
-          err && err.code !== 'ENOENT' ? callback(err) : callback();
+      if (options.force) {
+        queue.defer(function (callback) {
+          rimraf(fullPath, function (err) {
+            err && err.code !== 'ENOENT' ? callback(err) : callback();
+          });
         });
-      });
-      queue.defer(function (callback) {
-        mkpath(path.dirname(fullPath), function (err) {
-          err && err.code !== 'EEXIST' ? callback(err) : callback();
-        });
-      });
+      }
+      queue.defer(mkpath.bind(null, path.dirname(fullPath)));
       queue.defer(fs.link.bind(fs, linkFullPath, fullPath));
       queue.defer(chmod.bind(null, fullPath, self, options));
       queue.defer(chown.bind(null, fullPath, self, options));

package/lib/SymbolicLinkEntry.js

@@ -1,5 +1,5 @@
 var path = require('path');
-var assign = require('object-assign');
+var assign = require('just-extend');
 var fs = require('graceful-fs');
 var mkpath = require('mkpath');
 var rimraf = require('rimraf');
@@ -24,11 +24,11 @@ var isWindows = process.platform === 'win32';
 
 var MANDATORY_ATTRIBUTES = ['mode', 'mtime', 'path', 'linkpath'];
 
-function SymbolicLinkEntry(attributes, type) {
+function SymbolicLinkEntry(attributes) {
   validateAttributes(attributes, MANDATORY_ATTRIBUTES);
   assign(this, attributes);
   if (this.basename === undefined) this.basename = path.basename(this.path);
-  if (this.type === undefined) this.type = 'link';
+  if (this.type === undefined) this.type = 'symlink';
 }
 
 SymbolicLinkEntry.prototype.create = function create(dest, options, callback) {
@@ -52,17 +52,14 @@ SymbolicLinkEntry.prototype.create = function create(dest, options, callback) {
       }
 
       var queue = new Queue(1);
-      queue.defer(function (callback) {
-        rimraf(fullPath, function (err) {
-          err && err.code !== 'ENOENT' ? callback(err) : callback();
+      if (options.force) {
+        queue.defer(function (callback) {
+          rimraf(fullPath, function (err) {
+            err && err.code !== 'ENOENT' ? callback(err) : callback();
+          });
         });
-      });
-      queue.defer(function (callback) {
-        mkpath(path.dirname(fullPath), function (err) {
-          err && err.code !== 'EEXIST' ? callback(err) : callback();
-        });
-      });
-
+      }
+      queue.defer(mkpath.bind(null, path.dirname(fullPath)));
       if (isWindows) queue.defer(symlinkWin32.bind(null, linkFullPath, normalizedLinkpath, fullPath));
       else queue.defer(fs.symlink.bind(fs, normalizedLinkpath, fullPath));
       queue.defer(chmod.bind(null, fullPath, self, options));

package/lib/fs/chmod.js

@@ -2,15 +2,33 @@
 
 var fs = require('graceful-fs');
 
-var UMASK = process.umask ? process.umask() : 0;
-var DMODE = parseInt(333, 8);
-var FMODE = parseInt(222, 8);
+var UMASK = process.umask ? process.umask() : null;
+var DMODE = parseInt(755, 8);
+var FMODE = parseInt(644, 8);
+var SMODE = parseInt(755, 8);
+var LMODE = parseInt(644, 8);
 
 module.exports = function chmodFn(fullPath, entry, options, callback) {
-  // eslint-disable-next-line node/no-deprecated-api
+  // eslint-disable-next-line n/no-deprecated-api
   var chmod = entry.type === 'symlink' ? fs.lchmod : fs.chmod;
   if (!chmod || UMASK === null) return callback();
 
-  var mode = (entry.mode | (entry.type === 'directory' ? DMODE : FMODE)) & ~UMASK;
-  chmod(fullPath, mode, callback);
+  var mode = entry.mode;
+  if (!mode) {
+    switch (entry.type) {
+      case 'directory':
+        mode = DMODE;
+        break;
+      case 'file':
+        mode = FMODE;
+        break;
+      case 'symlink':
+        mode = SMODE;
+        break;
+      case 'link':
+        mode = LMODE;
+        break;
+    }
+  }
+  chmod(fullPath, mode & ~UMASK, callback);
 };

package/lib/index.js

@@ -0,0 +1,5 @@
+module.exports = require('stack-base-iterator');
+module.exports.DirectoryEntry = require('./DirectoryEntry');
+module.exports.FileEntry = require('./FileEntry');
+module.exports.LinkEntry = require('./LinkEntry');
+module.exports.SymbolicLinkEntry = require('./SymbolicLinkEntry');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "extract-base-iterator",
-  "version": "0.2.3",
+  "version": "0.2.6",
   "description": "Base iterator for extract iterators like tar-iterator and zip-iterator",
   "keywords": [
     "extract",
@@ -20,7 +20,10 @@
   },
   "license": "MIT",
   "author": "Kevin Malakoff <kmalakoff@gmail.com> (https://github.com/kmalakoff)",
-  "main": "index.js",
+  "main": "lib/index.js",
+  "files": [
+    "lib"
+  ],
   "scripts": {
     "format": "prettier --write .",
     "lint": "eslint .",
@@ -28,37 +31,33 @@
     "test": "mocha-compat test/spec/**/*.test.js --no-timeouts"
   },
   "dependencies": {
-    "fs-access-compat": "^1.0.1",
-    "graceful-fs": "^4.2.4",
+    "fs-access-compat": "^1.0.2",
+    "graceful-fs": "^4.2.10",
     "inherits": "^2.0.4",
     "is-absolute": "^1.0.0",
+    "just-extend": "^6.0.1",
     "lodash.compact": "^3.0.1",
     "mkpath": "^1.0.0",
-    "object-assign": "^4.1.1",
-    "queue-cb": "^1.1.5",
+    "queue-cb": "^1.1.6",
     "rimraf": "^2.7.1",
-    "stack-base-iterator": "^0.1.5"
+    "stack-base-iterator": "^0.1.7"
   },
   "devDependencies": {
-    "babel-eslint": "^10.1.0",
-    "big-int-stats": "^1.2.1",
+    "@typescript-eslint/parser": "^5.30.0",
     "cr": "^0.1.0",
-    "depcheck": "^0.9.2",
-    "dis-dat": "^0.1.3",
-    "eslint": "^6.8.0",
-    "eslint-config-prettier": "^6.11.0",
-    "eslint-config-standard": "^14.1.1",
-    "eslint-plugin-import": "^2.21.2",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-standard": "^4.0.1",
-    "fs-generate": "^1.8.4",
-    "fs-iterator": "^4.0.1",
+    "depcheck": "^1.4.3",
+    "dis-dat": "^0.1.6",
+    "eslint": "^8.18.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-config-standard": "^17.0.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-n": "^15.2.3",
+    "eslint-plugin-promise": "^6.0.0",
+    "fs-iterator": "^4.1.1",
     "fs-stats-spys": "^1.0.1",
     "lodash.find": "^4.6.0",
     "mocha-compat": "^3.5.5",
-    "normalize-stats": "^1.0.0",
-    "prettier": "^2.0.5"
+    "prettier": "^2.7.1"
   },
   "engines": {
     "node": ">=0.8"

package/index.js

@@ -1,5 +0,0 @@
-module.exports = require('stack-base-iterator');
-module.exports.DirectoryEntry = require('./lib/DirectoryEntry');
-module.exports.FileEntry = require('./lib/FileEntry');
-module.exports.LinkEntry = require('./lib/LinkEntry');
-module.exports.SymbolicLinkEntry = require('./lib/SymbolicLinkEntry');