ignore errors while walking; allow stopping walk.sync

lib/hunt.js

@@ -77,6 +77,7 @@ module.exports.sync = function huntSync (directory, matcher, stopOnFirstMatch) {
 			if (isMatch) {
 				matches.push(resource);
 				finished = stopOnFirstMatch;
+				if (finished) return true;
 			}
 		}
 	});

lib/walk.js

@@ -31,16 +31,10 @@ module.exports = function walk (dir, visitor, fn) {
 			files.forEach(function (file) {
 				file = path.join(dir, file);
 				fs.stat(file, function (err, stat) {
-					if (err) {
-						// Skip if not found, otherwise exit
-						if (err.code === 'ENOENT') {
-							return (!--outstanding) ? next(finished) : null;
-						}	else {
-							return fn(err);
-						}
-					}
-
 					if (!finished) {
+						// Skip on error
+						if (err) return (!--outstanding) ? next(finished) : null;
+
 						visitor(file, stat, function (stop) {
 							if (stop === true) finished = true;
 
@@ -61,41 +55,42 @@ module.exports = function walk (dir, visitor, fn) {
 
 /**
  * Synchronously walk directory tree from 'directory', passing all resources to 'visitor'.
- * Stops walking when root directory reached.
+ * Stops walking when root directory reached or `true` is returned from 'visitor'.
  * @param {String} dir
  * @param {Function} visitor(resource)
  */
 module.exports.sync = function walkSync (directory, visitor) {
 	directory = path.resolve(directory);
 
 	function visit (dir) {
-		var files = fs.readdirSync(dir)
-			, outstanding = files.length
-			, next = function () {
-					var parent = path.resolve(dir, '..');
+		function next () {
+			var parent = path.resolve(dir, '..');
 
-					// Stop if we can no longer go up a level
-					if (parent.toLowerCase() === dir.toLowerCase()) return;
+			// Stop if we can no longer go up a level
+			if (parent.toLowerCase() === dir.toLowerCase()) return;
 
-					// Up one level
-					visit(parent);
-				};
+			// Up one level
+			visit(parent);
+		}
+
+		var files = fs.readdirSync(dir)
+			, outstanding = files.length
+			, finished = false;
 
 		files.forEach(function (file) {
 			file = path.join(dir, file);
 			try {
 				var stat = fs.statSync(file);
 			} catch (err) {
-				// Skip if file not found, otherwise throw
-				if (err.code === 'ENOENT') {
-					return (!--outstanding) ? next() : null;
-				} else {
-					throw err;
-				}
+				// Skip if error
+				return (!--outstanding) ? next() : null;
 			}
 
-			visitor(file, stat);
-			if (!--outstanding) return next();
+			if (!finished) {
+				var stop = visitor(file, stat);
+				if (stop === true) finished = true;
+				if (!--outstanding && !finished) return next();
+			}
 		});
 	}
 

test/fs-test.js

@@ -410,6 +410,14 @@ describe('recur-fs', function () {
 				});
 				visits.should.equal(4);
 			});
+			it('should allow for early termination', function () {
+				var visits = 0;
+				walk.sync(path.resolve('readdir-nested/src/package'), function (resource, stat) {
+					if (~resource.indexOf('.js')) visits++;
+					return true;
+				});
+				visits.should.equal(1);
+			});
 		});
 	});