Skip to content

Commit 0f29c93

Browse files
committed
[Docs] fix default “isFile” implementations
- also, name isFile functions for debugging
1 parent 876b0b0 commit 0f29c93

File tree

3 files changed

+16
-9
lines changed

3 files changed

+16
-9
lines changed

lib/async.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ module.exports = function resolve(x, options, callback) {
1818
});
1919
}
2020

21-
var isFile = opts.isFile || function (file, cb) {
21+
var isFile = opts.isFile || function isFile(file, cb) {
2222
fs.stat(file, function (err, stat) {
2323
if (!err) {
2424
return cb(null, stat.isFile() || stat.isFIFO());

lib/sync.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module.exports = function (x, options) {
99
throw new TypeError('Path must be a string.');
1010
}
1111
var opts = options || {};
12-
var isFile = opts.isFile || function (file) {
12+
var isFile = opts.isFile || function isFile(file) {
1313
try {
1414
var stat = fs.statSync(file);
1515
} catch (e) {

readme.markdown

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,13 @@ default `opts` values:
8686
basedir: __dirname,
8787
extensions: [ '.js' ],
8888
readFile: fs.readFile,
89-
isFile: function (file, cb) {
89+
isFile: function isFile(file, cb) {
9090
fs.stat(file, function (err, stat) {
91-
if (err && err.code === 'ENOENT') cb(null, false)
92-
else if (err) cb(err)
93-
else cb(null, stat.isFile())
91+
if (!err) {
92+
return cb(null, stat.isFile() || stat.isFIFO());
93+
}
94+
if (err.code === 'ENOENT' || err.code === 'ENOTDIR') return cb(null, false);
95+
return cb(err);
9496
});
9597
},
9698
moduleDirectory: 'node_modules',
@@ -134,9 +136,14 @@ default `opts` values:
134136
basedir: __dirname,
135137
extensions: [ '.js' ],
136138
readFileSync: fs.readFileSync,
137-
isFile: function (file) {
138-
try { return fs.statSync(file).isFile() }
139-
catch (e) { return false }
139+
isFile: function isFile(file) {
140+
try {
141+
var stat = fs.statSync(file);
142+
} catch (e) {
143+
if (e && (e.code === 'ENOENT' || e.code === 'ENOTDIR')) return false;
144+
throw e;
145+
}
146+
return stat.isFile() || stat.isFIFO();
140147
},
141148
moduleDirectory: 'node_modules',
142149
preserveSymlinks: true

0 commit comments

Comments
 (0)