From e977316668df1ac3984a463dedbe92cb7a9dd869 Mon Sep 17 00:00:00 2001 From: Itay Maman Date: Fri, 8 Feb 2019 00:37:01 +0200 Subject: [PATCH 1/5] prmomisify --- lib/rmdir.js | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/rmdir.js b/lib/rmdir.js index e263ecf..f46e535 100644 --- a/lib/rmdir.js +++ b/lib/rmdir.js @@ -61,27 +61,27 @@ function rmdir(dir, options, callback) { if (!--pending) { if (!_dirs.length) return callback(); - _dirs.forEach(function (dir) { - flow.parallel(function (ready) { + var promises = _dirs.map(function (dir) { + return new Promise(function (resolve, reject) { xfs.exists(dir, function (exists) { - if (!exists) return ready(); + if (!exists) return resolve(); xfs.rmdir(dir, function (err) { - if (err) return ready(err); + if (err) return reject(err); - ready(); + resolve(); }); }); }); }); - flow.join(). - error(function (err) { - if (err) callback(err, _dirs, _files); - }). - end(function () { - callback(null, _dirs, _files); - }); + Promise.all(promises) + .then(function () { + callback(null, _dirs, _files); + }) + .catch(function (err) { + if (err) callback(err, _dirs, _files); + }); } } From 19a5d0110ebde3ad9a179ec632c815504504605f Mon Sep 17 00:00:00 2001 From: Itay Maman Date: Fri, 8 Feb 2019 00:42:00 +0200 Subject: [PATCH 2/5] npm i --package-lock-only --- package-lock.json | 35 +++++++++++++++++++++++++++ package.json | 60 +++++++++++++++++++++++++++++------------------ 2 files changed, 72 insertions(+), 23 deletions(-) create mode 100644 package-lock.json diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..fd7ced9 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,35 @@ +{ + "name": "rmdir", + "version": "1.2.0", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "is": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/is/-/is-0.2.7.tgz", + "integrity": "sha1-OzSixI81mXLzUEKEkZOucmS2NWI=" + }, + "node.extend": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/node.extend/-/node.extend-1.0.8.tgz", + "integrity": "sha1-urBDefc4P0WHmQyd8Htqf2Xbdys=", + "requires": { + "is": "~0.2.6", + "object-keys": "~0.4.0" + } + }, + "node.flow": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/node.flow/-/node.flow-1.2.3.tgz", + "integrity": "sha1-4cRKgq7KjXi0WKd/s9xkLy66Jkk=", + "requires": { + "node.extend": "1.0.8" + } + }, + "object-keys": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz", + "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=" + } + } +} diff --git a/package.json b/package.json index 4f28bfd..7a92dda 100644 --- a/package.json +++ b/package.json @@ -1,40 +1,54 @@ { - "name" : "rmdir", - "version" : "1.2.0", + "name": "rmdir", + "version": "1.2.0", "description": "Remove all files in the given path recursively", - "keywords" : [ - "remove", "remove files", "remove all files", "remove path", - "remove dir", "rm -r", "rmdir", "remove files recursively" + "keywords": [ + "remove", + "remove files", + "remove all files", + "remove path", + "remove dir", + "rm -r", + "rmdir", + "remove files recursively" ], - "author" : "dreamerslab ", + "author": "dreamerslab ", "contributors": [ - { "name": "Aaron Larner" }, - { "name": "Glen R. Goodwin" }, { - "name" : "David Pate", + "name": "Aaron Larner" + }, + { + "name": "Glen R. Goodwin" + }, + { + "name": "David Pate", "email": "davidtpate@gmail.com", - "url" : "http://davidtpate.com" + "url": "http://davidtpate.com" }, { - "name" : "Radare", + "name": "Radare", "email": "pancake@nopcode.org", - "url" : "http://www.radare.org/" + "url": "http://www.radare.org/" } ], "dependencies": { - "node.flow" : "1.2.3" + "node.flow": "1.2.3" }, - "repository" : { + "repository": { "type": "git", - "url" : "https://github.com/dreamerslab/node.rmdir.git" + "url": "https://github.com/dreamerslab/node.rmdir.git" }, - "main" : "index", - "engines" : [ "node >= 0.8.0" ], - "licenses": [{ - "type": "MIT", - "url" : "http://en.wikipedia.org/wiki/MIT_License" - }], - "scripts" : { - "test" : "node test/run.js" + "main": "index", + "engines": [ + "node >= 0.8.0" + ], + "licenses": [ + { + "type": "MIT", + "url": "http://en.wikipedia.org/wiki/MIT_License" + } + ], + "scripts": { + "test": "node test/run.js" } } From f42ab242d419889a2ecd960971204b53bb74cb0a Mon Sep 17 00:00:00 2001 From: Itay Maman Date: Fri, 8 Feb 2019 10:47:48 +0200 Subject: [PATCH 3/5] remove unused var --- lib/rmdir.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/rmdir.js b/lib/rmdir.js index f46e535..4c7b04f 100644 --- a/lib/rmdir.js +++ b/lib/rmdir.js @@ -7,7 +7,6 @@ * Remove all files in the given path recursively. */ var fs = require('fs'); -var Flow = require('node.flow'); function rmdir(dir, options, callback) { if (typeof options === 'undefined') { @@ -56,8 +55,6 @@ function rmdir(dir, options, callback) { xfs.lstat(file, function (err, stat) { function rm_all_dirs(callback) { - var flow = new Flow(); - if (!--pending) { if (!_dirs.length) return callback(); From 9fffad6207887ec53cc7cd0f993985d0ca252269 Mon Sep 17 00:00:00 2001 From: Itay Maman Date: Fri, 8 Feb 2019 10:48:10 +0200 Subject: [PATCH 4/5] undepend --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 7a92dda..1aed9d0 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,6 @@ } ], "dependencies": { - "node.flow": "1.2.3" }, "repository": { "type": "git", From 71acb35381139bfc5613f28d326c5dbfb963bbe2 Mon Sep 17 00:00:00 2001 From: Itay Maman Date: Fri, 8 Feb 2019 10:49:14 +0200 Subject: [PATCH 5/5] remove package-lock --- package-lock.json | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 package-lock.json diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index fd7ced9..0000000 --- a/package-lock.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "name": "rmdir", - "version": "1.2.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "is": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/is/-/is-0.2.7.tgz", - "integrity": "sha1-OzSixI81mXLzUEKEkZOucmS2NWI=" - }, - "node.extend": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/node.extend/-/node.extend-1.0.8.tgz", - "integrity": "sha1-urBDefc4P0WHmQyd8Htqf2Xbdys=", - "requires": { - "is": "~0.2.6", - "object-keys": "~0.4.0" - } - }, - "node.flow": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/node.flow/-/node.flow-1.2.3.tgz", - "integrity": "sha1-4cRKgq7KjXi0WKd/s9xkLy66Jkk=", - "requires": { - "node.extend": "1.0.8" - } - }, - "object-keys": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz", - "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=" - } - } -}