.gitignore

@@ -1,2 +0,0 @@
-node_modules
-walk-test

.jshintrc

@@ -1,14 +0,0 @@
-{ "node": true
-, "browser": true
-, "jquery": true
-
-, "onevar": true
-, "laxcomma": true
-, "laxbreak": true
-
-, "eqeqeq": true
-, "immed": true
-, "undef": true
-, "unused": true
-, "latedef": true
-}

LICENSE

@@ -1,41 +0,0 @@
-Copyright 2011 AJ ONeal
-
-This is open source software; you can redistribute it and/or modify it under the
-terms of either:
-
-   a) the "MIT License"
-   b) the "Apache-2.0 License"
-
-MIT License
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in all
-   copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-   SOFTWARE.
-
-Apache-2.0 License Summary
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

README.md

@@ -1,272 +1,110 @@
-# 2021 Update
+node-walk
+====
 
-Consider using [`@root/walk`](https://npmjs.org/package/@root/walk) instead.
+A port python's `os.walk`, but using Node.JS conventions.
 
-I created `walk` quite literally a decade ago, in the Node v0.x days.
+  * EventEmitter
-Back then using an EventEmitter seemed like the thing to do. Nowadays,
+  * Asynchronous
-it seems a bit overkill for the simple task of walking over directories.
+  * Chronological (optionally)
-
+  * Built-in flow-control
-There's nothing wrong with `walk` - it's about the same as it was 10 years ago -
-however, at only 50 lines of code long, `@root/walk` is much simpler and much faster.
-
-# node-walk
-
-| a [Root](https://rootprojects.org) project
-
-nodejs walk implementation.
-
-This is somewhat of a port python's `os.walk`, but using Node.JS conventions.
-
-- EventEmitter
-- Asynchronous
-- Chronological (optionally)
-- Built-in flow-control
-- includes Synchronous version (same API as Asynchronous)
 
 As few file descriptors are opened at a time as possible.
 This is particularly well suited for single hard disks which are not flash or solid state.
 
-## Installation
+Memory usage is high (120mb for 60,000 dirs), but reduction is being investigated.
+Patches welcome.
 
-```bash
+Installation
-npm install --save walk
+----
-```
 
-# Getting Started
+    npm install walk
 
-```javascript
+Usage
-'use strict';
+====
 
-var walk = require('walk');
+    var walk = require('walk').walk,
-var fs = require('fs');
+      options,
-var walker;
+      walker;
-var options = {};
 
-walker = walk.walk('/tmp', options);
+    options = {
+        followLinks: false,
+    };
 
-walker.on('file', function (root, fileStats, next) {
+    walker = walk("path/to/dir", options);
-  fs.readFile(fileStats.name, function () {
-    // doStuff
-    next();
-  });
-});
 
-walker.on('errors', function (root, nodeStatsArray, next) {
+    walker.on("directories", function (root, dirStatsArray, next) {
-  next();
+      // dirStatsArray is an array of `stat` objects with the additional attributes
-});
+      // * type
-
+      // * error
-walker.on('end', function () {
+      // * name
-  console.log('all done');
+      
-});
+      next();
-```
+    });
-
-## Common Events
-
-All single event callbacks are in the form of `function (root, stat, next) {}`.
-
-All multiple event callbacks callbacks are in the form of `function (root, stats, next) {}`, except **names** which is an array of strings.
-
-All **error** event callbacks are in the form `function (root, stat/stats, next) {}`.
-**`stat.error`** contains the error.
-
-- `names`
-- `directory`
-- `directories`
-- `file`
-- `files`
-- `end`
-- `nodeError` (`stat` failed)
-- `directoryError` (`stat` succedded, but `readdir` failed)
-- `errors` (a collection of any errors encountered)
-
-A typical `stat` event looks like this:
-
-```javascript
-{ dev: 16777223,
-  mode: 33188,
-  nlink: 1,
-  uid: 501,
-  gid: 20,
-  rdev: 0,
-  blksize: 4096,
-  ino: 49868100,
-  size: 5617,
-  blocks: 16,
-  atime: Mon Jan 05 2015 18:18:10 GMT-0700 (MST),
-  mtime: Thu Sep 25 2014 21:21:28 GMT-0600 (MDT),
-  ctime: Thu Sep 25 2014 21:21:28 GMT-0600 (MDT),
-  birthtime: Thu Sep 25 2014 21:21:28 GMT-0600 (MDT),
-  name: 'README.md',
-  type: 'file' }
-```
-
-# Advanced Example
-
-Both Asynchronous and Synchronous versions are provided.
-
-```javascript
-'use strict';
-
-var walk = require('walk');
-var fs = require('fs');
-var options;
-var walker;
-
-options = {
-  followLinks: false,
-  // directories with these keys will be skipped
-  filters: ['Temp', '_Temp'],
-};
-
-walker = walk.walk('/tmp', options);
-
-// OR
-// walker = walk.walkSync("/tmp", options);
-
-walker.on('names', function (root, nodeNamesArray) {
-  nodeNamesArray.sort(function (a, b) {
-    if (a > b) return 1;
-    if (a < b) return -1;
-    return 0;
-  });
-});
-
-walker.on('directories', function (root, dirStatsArray, next) {
-  // dirStatsArray is an array of `stat` objects with the additional attributes
-  // * type
-  // * error
-  // * name
-
-  next();
-});
-
-walker.on('file', function (root, fileStats, next) {
-  fs.readFile(fileStats.name, function () {
-    // doStuff
-    next();
-  });
-});
-
-walker.on('errors', function (root, nodeStatsArray, next) {
-  next();
-});
-
-walker.on('end', function () {
-  console.log('all done');
-});
-```
-
-### Sync
-
-Note: You **can't use EventEmitter** if you want truly synchronous walker
-(although it's synchronous under the hood, it appears not to be due to the use of `process.nextTick()`).
-
-Instead **you must use `options.listeners`** for truly synchronous walker.
-
-Although the sync version uses all of the `fs.readSync`, `fs.readdirSync`, and other sync methods,
-I don't think I can prevent the `process.nextTick()` that `EventEmitter` calls.
-
-```javascript
-(function () {
-  'use strict';
-
-  var walk = require('walk');
-  var fs = require('fs');
-  var options;
-  var walker;
-
-  // To be truly synchronous in the emitter and maintain a compatible api,
-  // the listeners must be listed before the object is created
-  options = {
-    listeners: {
-      names: function (root, nodeNamesArray) {
-        nodeNamesArray.sort(function (a, b) {
-          if (a > b) return 1;
-          if (a < b) return -1;
-          return 0;
-        });
-      },
-      directories: function (root, dirStatsArray, next) {
-        // dirStatsArray is an array of `stat` objects with the additional attributes
-        // * type
-        // * error
-        // * name
 
+    walker.on("file", function (root, fileStats, next) {
+      fs.readFile(file, function () {
+        // doStuff
         next();
-      },
+      });
-      file: function (root, fileStats, next) {
+    });
-        fs.readFile(fileStats.name, function () {
-          // doStuff
-          next();
-        });
-      },
-      errors: function (root, nodeStatsArray, next) {
-        next();
-      },
-    },
-  };
 
-  walker = walk.walkSync('/tmp', options);
+    walker.on("errors", function (root, nodeStatsArray, next) {
+      next();
+    });
 
-  console.log('all done');
+    walker.on("end", function () {
-})();
+      console.log("all done");
-```
+    });
 
-# API
+API
+====
 
 Emitted Values
 
-- `on('XYZ', function(root, stats, next) {})`
+  * `root` - the containing the files to be inspected
-
+  * *stats[Array]* - a single `stats` object or an array with some added attributes
-- `root` - the containing the files to be inspected
+    * type - 'file', 'directory', etc
-- _stats[Array]_ - a single `stats` object or an array with some added attributes
+    * error
-  - type - 'file', 'directory', etc
+    * name - the name of the file, dir, etc 
-  - error
+  * next - no more files will be read until this is called
-  - name - the name of the file, dir, etc
-- next - no more files will be read until this is called
 
 Single Events - fired immediately
 
-- `end` - No files, dirs, etc left to inspect
+  * `end` - No files, dirs, etc left to inspect
 
-- `directoryError` - Error when `fstat` succeeded, but reading path failed (Probably due to permissions).
+  * `directoryError` - Error when `fstat` succeeded, but reading path failed (Probably due to permissions).
-- `nodeError` - Error `fstat` did not succeeded.
+  * `node` - a `stats` object for a node of any type
-- `node` - a `stats` object for a node of any type
+  * `file` - includes links when `followLinks` is `true`
-- `file` - includes links when `followLinks` is `true`
+  * `directory`
-- `directory` - **NOTE** you could get a recursive loop if `followLinks` and a directory links to its parent
+  * `blockDevice`
-- `symbolicLink` - always empty when `followLinks` is `true`
+  * `characterDevice`
-- `blockDevice`
+  * `symbolicLink` - always empty when `followLinks` is `true`
-- `characterDevice`
+  * `FIFO`
-- `FIFO`
+  * `socket`
-- `socket`
 
-Events with Array Arguments - fired after all files in the dir have been `stat`ed
+Array Arguments
 
-- `names` - before any `stat` takes place. Useful for sorting and filtering.
+  * `errors` - errors encountered by `fs.stat` when reading ndes in a directory
+  * `nodes` - an array of `stats` of any type
+  * `files`
+  * `directories` - modification of this array - sorting, removing, etc - affects traversal
+  * `blockDevices`
+  * `characterDevices`
+  * `symbolicLinks`
+  * `FIFOs`
+  * `sockets`
 
-  - Note: the array is an array of `string`s, not `stat` objects
+**Warning** when following links, an infinite loop is possible
-  - Note: the `next` argument is a `noop`
 
-- `errors` - errors encountered by `fs.stat` when reading ndes in a directory
+Comparisons
-- `nodes` - an array of `stats` of any type
+====
-- `files`
-- `directories` - modification of this array - sorting, removing, etc - affects traversal
-- `symbolicLinks`
-- `blockDevices`
-- `characterDevices`
-- `FIFOs`
-- `sockets`
-
-**Warning** beware of infinite loops when `followLinks` is true (using `walk-recurse` varient).
-
-# Comparisons
 
 Tested on my `/System` containing 59,490 (+ self) directories (and lots of files).
 The size of the text output was 6mb.
 
 `find`:
-time bash -c "find /System -type d | wc"
+    time bash -c "find /System -type d | wc"
-59491 97935 6262916
+    59491   97935 6262916
 
     real  2m27.114s
     user  0m1.193s
@@ -278,12 +116,12 @@ Note that `find.js` omits the start directory
 
     time bash -c "node examples/find.js /System -type d | wc"
     59490   97934 6262908
-
+   
-    # Test 1
+    # Test 1 
     real  2m52.273s
     user  0m20.374s
     sys 0m27.800s
-
+    
     # Test 2
     real  2m23.725s
     user  0m18.019s
@@ -294,13 +132,3 @@ Note that `find.js` omits the start directory
     user  0m17.661s
     sys 0m24.008s
 
-In conclusion node.js asynchronous walk is much slower than regular "find".
-
-# LICENSE
-
-`node-walk` is available under the following licenses:
-
-- MIT
-- Apache 2
-
-Copyright 2011 - Present AJ ONeal

examples/walk-test.js

@@ -1,131 +0,0 @@
-#!/usr/bin/env node
-(function () {
-  "use strict";
-
-  var walk = require('walk')
-    , count = 0
-    , emitter
-    , saneCount = 0
-    ;
-
-  function sort(a,b) {
-    a= a.toLowerCase();
-    b= b.toLowerCase();
-    if (a > b) return -1;
-    if (a < b) return  1;
-    return  0;
-  }
-
-  process.argv.forEach(function(startpath, index) {
-    if (index > 1) {
-      emitter = walk.walk(startpath);
-
-  // Non-`stat`ed Nodes
-      emitter.on('name', function (path, file, stat) {
-        saneCount += 1;
-        //console.log( ["[", count, "] ", path, '/', file].join('') )
-        //console.log( [path, '/', file].join('') )
-      });
-      emitter.on('names', function (path, files, stats) {
-        files.sort(sort);
-        //console.log('sort: ' + files.join(' ; '));
-      });
-
-
-
-  // Single `stat`ed Nodes
-      emitter.on('error', function (path, err, next) {
-        next()
-        // ignore
-      });
-      emitter.on('directoryError', function (path, stats, next) {
-        next();
-      });
-      emitter.on('nodeError', function (path, stats, next) {
-        next();
-      });
-      /*
-      emitter.on('node', function (path, stat, next) {
-        count += 1;
-        console.log( [path, '/', stat.name].join('') )
-        //console.log( ["[", count, "] ", path, '/', stat.name].join('') )
-        next();
-      });
-      */
-      emitter.on('file', function (path, stat, next) {
-        count += 1;
-        console.log( [path, '/', stat.name].join('') )
-        //console.log( ["[", count, "] ", path, '/', stat.name].join('') )
-        next();
-      });
-      emitter.on('directory', function (path, stat, next) {
-        count += 1;
-        console.log( [path, '/', stat.name].join('') )
-        next();
-      });
-      emitter.on('symbolicLink', function (path, stat, next) {
-        count += 1;
-        console.log( [path, '/', stat.name].join('') )
-        next();
-      });
-      /*
-      emitter.on('blockDevice', function (path, stat, next) {
-        next();
-      });
-      emitter.on('characterDevice', function (path, stat, next) {
-        next();
-      });
-      emitter.on('FIFO', function (path, stat, next) {
-        next();
-      });
-      emitter.on('socket', function (path, stat, next) {
-        next();
-      });
-      */
-
-
-
-    // Grouped `stat`ed Nodes
-      emitter.on('errors', function (path, stats, next) {
-        next();
-      });
-      /*
-      emitter.on('nodes', function (path, stats, next) {
-        next();
-      });
-      */
-      emitter.on('files', function (path, stats, next) {
-        next();
-      });
-      emitter.on('directories', function (path, stats, next) {
-        //delete stats[1];
-        next();
-      });
-      emitter.on('symbolicLinks', function (path, stats, next) {
-        next();
-      });
-      /*
-      emitter.on('blockDevices', function (path, stats, next) {
-        next();
-      });
-      emitter.on('characterDevices', function (path, stats, next) {
-        next();
-      });
-      emitter.on('FIFOs', function (path, stats, next) {
-        next();
-      });
-      emitter.on('sockets', function (path, stats, next) {
-        next();
-      });
-      */
-
-
-
-    // The end of all things
-      emitter.on('end', function () {
-        console.log("The eagle has landed. [" + count + " == " + saneCount + "]");
-      });
-    }
-  });
-
-}());

lib/node-type-emitter.js

@@ -1,92 +0,0 @@
-/*jshint strict:true node:true es5:true onevar:true laxcomma:true laxbreak:true*/
-(function () {
-  "use strict";
-
-  // "FIFO" isn't easy to convert to camelCase and back reliably
-  var isFnodeTypes = [
-      "isFile", "isDirectory",  "isSymbolicLink", "isBlockDevice",  "isCharacterDevice", "isFIFO", "isSocket"
-    ],
-    fnodeTypes = [
-      "file",   "directory",    "symbolicLink",   "blockDevice",    "characterDevice",    "FIFO",   "socket"
-    ],
-    fnodeTypesPlural = [
-      "files",  "directories",  "symbolicLinks",  "blockDevices",   "characterDevices",   "FIFOs",  "sockets"
-    ];
-
-
-  // 
-  function createNodeGroups() {
-    var nodeGroups = {};
-    fnodeTypesPlural.concat("nodes", "errors").forEach(function (fnodeTypePlural) {
-      nodeGroups[fnodeTypePlural] = [];
-    });
-    return nodeGroups;
-  }
-
-
-  // Determine each file node's type
-  // 
-  function sortFnodesByType(stat, fnodes) {
-    var i, isType;
-
-    for (i = 0; i < isFnodeTypes.length; i += 1) {
-      isType = isFnodeTypes[i];
-      if (stat[isType]()) {
-        stat.type = fnodeTypes[i];
-        fnodes[fnodeTypesPlural[i]].push(stat);
-        return;
-      }
-    }
-  }
-
-
-  // Get the current number of listeners (which may change)
-  // Emit events to each listener
-  // Wait for all listeners to `next()` before continueing
-  // (in theory this may avoid disk thrashing)
-  function emitSingleEvents(emitter, path, stats, next, self) {
-    var num = 1 + emitter.listeners(stats.type).length + emitter.listeners("node").length;
-
-    function nextWhenReady(flag) {
-      if (flag) {
-        stats.flag = flag;
-      }
-      num -= 1;
-      if (0 === num) { next.call(self); }
-    }
-
-    emitter.emit(stats.type, path, stats, nextWhenReady);
-    emitter.emit("node", path, stats, nextWhenReady);
-    nextWhenReady();
-  }
-
-
-  // Since the risk for disk thrashing among anything
-  // other than files is relatively low, all types are
-  // emitted at once, but all must complete before advancing
-  function emitPluralEvents(emitter, path, nodes, next, self) {
-    var num = 1;
-
-    function nextWhenReady() {
-      num -= 1;
-      if (0 === num) { next.call(self); }
-    }
-
-    fnodeTypesPlural.concat(["nodes", "errors"]).forEach(function (fnodeType) {
-      if (0 === nodes[fnodeType].length) { return; }
-      num += emitter.listeners(fnodeType).length;
-      emitter.emit(fnodeType, path, nodes[fnodeType], nextWhenReady);
-    });
-    nextWhenReady();
-  }
-
-  module.exports = {
-    emitNodeType: emitSingleEvents,
-    emitNodeTypeGroups: emitPluralEvents,
-    isFnodeTypes: isFnodeTypes,
-    fnodeTypes: fnodeTypes,
-    fnodeTypesPlural: fnodeTypesPlural,
-    sortFnodesByType: sortFnodesByType,
-    createNodeGroups: createNodeGroups
-  };
-}());

lib/walk-alternate-implementation.js

@@ -30,8 +30,7 @@ function walk (file, cb) {
   
   function getDirectory (cb) {
     fs.readdir(file, function(err, files) {
-      // XXX bug was here. `next()` added by coolaj86
+      if (!files) return;
-      if (!files) return next();
       //if (err) throw Error(err);
       files.sort(sort);
       files.forEach(fullPath);

lib/walk-async-only.js

@@ -1,93 +0,0 @@
-(function () {
-  "use strict"
-
-  // Array.prototype.forEachAsync(next, item, i, collection)
-  require('futures/forEachAsync');
-
-  function noop() {}
-
-  var fs = require('fs'),
-    path = require('path'),
-    EventEmitter = require('events').EventEmitter,
-    TypeEmitter = require('./node-type-emitter');
-
-  // 2010-11-25 jorge@jorgechamorro.com
-  function create(pathname, cb) {
-    var emitter = new EventEmitter(),
-      q = [],
-      queue = [q],
-      curpath;
-
-    function walk() { 
-      fs.readdir(curpath, function(err, files) {
-        if (err) {
-          emitter.emit('directoryError', curpath, { error: err }, noop);
-          //emitter.emit('error', curpath, { error: err });
-        }
-        // XXX bug was here. next() was omitted
-        if (!files || 0 == files.length) {
-          return next();
-        }
-
-        var fnodeGroups = TypeEmitter.createNodeGroups();
-
-        // TODO could allow user to selectively stat
-        // and don't stat if there are no stat listeners
-        emitter.emit('names', curpath, files, noop);
-        files.forEachAsync(function (cont, file) {
-          emitter.emit('name', curpath, file, noop);
-          fs.lstat(curpath + path.sep + file, function (err, stat) {
-            stat = stat || {};
-            stat.name = file;
-            if (err) {
-              stat.error = err;
-              //emitter.emit('error', curpath, stat);
-              emitter.emit('nodeError', curpath, stat, noop);
-              fnodeGroups.errors.push(stat);
-              cont();
-            } else {
-              TypeEmitter.sortFnodesByType(stat, fnodeGroups);
-              TypeEmitter.emitNodeType(emitter, curpath, stat, cont);
-            }
-          });
-        }).then(function () {
-          if (fnodeGroups.errors.length) {
-            emitter.emit('errors', curpath, fnodeGroups.errors, noop);
-          }
-          TypeEmitter.emitNodeTypeGroups(emitter, curpath, fnodeGroups, function () {
-            var dirs = [];
-            fnodeGroups.directories.forEach(function (stat) {
-              dirs.push(stat.name);
-            });
-            dirs.forEach(fullPath);
-            queue.push(q = dirs);
-            next();
-          });
-        });
-      });
-    }
-    
-    function next() {
-      if (q.length) {
-        curpath = q.pop();
-        return walk();
-      }
-      if (queue.length -= 1) {
-        q = queue[queue.length-1];
-        return next();
-      }
-      emitter.emit('end');
-    }
-    
-    function fullPath(v,i,o) {
-      o[i]= [curpath, path.sep, v].join('');
-    }
-    
-    curpath = pathname;
-    walk();
-    
-    return emitter;
-  }
-
-  module.exports = create;
-}());

lib/walk.js

@@ -1,302 +1,165 @@
-// Adapted from work by jorge@jorgechamorro.com on 2010-11-25
+// TODO
-(function () {
+//  * add types by listener dynamically
-  "use strict";
+//  * unroll loops for better readability?
+//  * should emitted errors wait for `next()`?
+(function (undefined) {
+  var fs = require('fs'),
+    upath = require('path'),
+    util = require('util'),
+    Futures = require('futures'),
+    events = require('events'),
+    noop = function () {},
+    // "FIFO" isn't easy to convert to camelCame and back reliably
+    isFnodeTypes = [
+      "isFile", "isDirectory",  "isBlockDevice",  "isCharacterDevice",  "isSymbolicLink", "isFIFO", "isSocket"
+    ],
+    fnodeTypes = [
+      "file",   "directory",    "blockDevice",    "characterDevice",    "symbolicLink",   "FIFO",   "socket"
+    ],
+    fnodeTypesPlural = [
+      "files",  "directories",  "blockDevices",   "characterDevices",   "symbolicLinks",  "FIFOs",  "sockets"
+    ];
 
-  function noop() {}
+  function newVersion() {
-
+    throw new Error("New Version. Please see API on github.com/coolaj86/node-walk");
-  var fs = require('fs')
-    , forEachAsync = require('foreachasync').forEachAsync
-    , EventEmitter = require('events').EventEmitter
-    , TypeEmitter = require('./node-type-emitter')
-    , util = require('util')
-    , path = require('path')
-    ;
-
-  function appendToDirs(stat) {
-    /*jshint validthis:true*/
-    if(stat.flag && stat.flag === NO_DESCEND) { return; }
-    this.push(stat.name);
   }
 
-  function wFilesHandlerWrapper(items) {
+  // Create a new walk instance
-    /*jshint validthis:true*/
+  function create(path, options, cb) {
-    this._wFilesHandler(noop, items);
+    if (cb) {
-  }
+      newVersion();
-
-  function Walker(pathname, options, sync) {
-    EventEmitter.call(this);
-
-    var me = this
-      ;
-
-    options = options || {};
-    me._wStat = options.followLinks && 'stat' || 'lstat';
-    me._wStatSync = me._wStat + 'Sync';
-    me._wsync = sync;
-    me._wq = [];
-    me._wqueue = [me._wq];
-    me._wcurpath = undefined;
-    me._wfilters = options.filters || [];
-    me._wfirstrun = true;
-    me._wcurpath = pathname;
-
-    if (me._wsync) {
-      //console.log('_walkSync');
-      me._wWalk = me._wWalkSync;
-    } else {
-      //console.log('_walkASync');
-      me._wWalk = me._wWalkAsync;
     }
+    
+    var emitter = new events.EventEmitter(),
+      fstat = (options||{}).followLinks ? fs.stat : fs.lstat;
 
-    options.listeners = options.listeners || {};
-    Object.keys(options.listeners).forEach(function (event) {
-      var callbacks = options.listeners[event]
-        ;
 
-      if ('function' === typeof callbacks) {
+    // Get the current number of listeners (which may change)
-        callbacks = [callbacks];
+    // Emit events to each listener
+    // Wait for all listeners to `next()` before continueing
+    // (in theory this may avoid disk thrashing)
+    function emitSingleEvents(path, stats, next) {
+      var num = 1 + emitter.listeners(stats.type).length + emitter.listeners("node").length;
+
+      function nextWhenReady() {
+        num -= 1;
+        if (0 === num) { next(); }
       }
 
-      callbacks.forEach(function (callback) {
+      emitter.emit(stats.type, path, stats, nextWhenReady);
-        me.on(event, callback);
+      emitter.emit("node", path, stats, nextWhenReady);
+      nextWhenReady();
+    }
+
+
+    // Since the risk for disk thrashing among anything
+    // other than files is relatively low, all types are
+    // emitted at once, but all must complete before advancing
+    function emitPluralEvents(path, nodes, next) {
+      var num = 1;
+
+      function nextWhenReady() {
+        num -= 1;
+        if (0 === num) { next(); }
+      }
+
+      fnodeTypesPlural.concat(["nodes", "errors"]).forEach(function (fnodeType) {
+        if (0 === nodes[fnodeType].length) { return; }
+        num += emitter.listeners(fnodeType).length;
+        emitter.emit(fnodeType, path, nodes[fnodeType], nextWhenReady);
       });
-    });
+      nextWhenReady();
-
-    me._wWalk();
-  }
-
-  // Inherits must come before prototype additions
-  util.inherits(Walker, EventEmitter);
-
-  Walker.prototype._wLstatHandler = function (err, stat) {
-    var me = this
-      ;
-
-    stat = stat || {};
-    stat.name = me._wcurfile;
-
-    if (err) {
-      stat.error = err;
-      //me.emit('error', curpath, stat);
-      // TODO v3.0 (don't noop the next if there are listeners)
-      me.emit('nodeError', me._wcurpath, stat, noop);
-      me._wfnodegroups.errors.push(stat);
-      me._wCurFileCallback();
-    } else {
-      TypeEmitter.sortFnodesByType(stat, me._wfnodegroups);
-      // NOTE: wCurFileCallback doesn't need thisness, so this is okay
-      TypeEmitter.emitNodeType(me, me._wcurpath, stat, me._wCurFileCallback, me);
     }
-  };
-  Walker.prototype._wFilesHandler = function (cont, file) {
-    var statPath
-      , me = this
-      ;
 
 
-    me._wcurfile = file;
+    // Determine each file node's type
-    me._wCurFileCallback = cont;
+    // 
-    me.emit('name', me._wcurpath, file, noop);
+    function sortFnodesByType(path, stats, fnodes, nextFile) {
-
+      isFnodeTypes.forEach(function (isType, i) {
-    statPath = me._wcurpath + path.sep + file;
+        if (stats[isType]()) {
-
+          if (stats.type) { throw new Error("is_" + type + " and " + isType); }
-    if (!me._wsync) {
+          stats.type = fnodeTypes[i];
-      // TODO how to remove this anony?
+          fnodes[fnodeTypesPlural[i]].push(stats);
-      fs[me._wStat](statPath, function (err, stat) {
+          // TODO throw to break;
-        me._wLstatHandler(err, stat);
+        }
       });
-      return;
+      if (!stats.type) { throw new Error(upath.join(path, stats.name) + ' isAnUndefinedType'); }
+      emitSingleEvents(path, stats, nextFile);
     }
 
-    try {
-      me._wLstatHandler(null, fs[me._wStatSync](statPath));
-    } catch(e) {
-      me._wLstatHandler(e);
-    }
-  };
-  Walker.prototype._wOnEmitDone = function () {
-    var me = this
-      , dirs = []
-      ;
 
-    me._wfnodegroups.directories.forEach(appendToDirs, dirs);
+    // Asynchronously get the stats 
-    dirs.forEach(me._wJoinPath, me);
+    //
-    me._wqueue.push(me._wq = dirs);
+    function getStats(path, files, walkDirs) {
-    me._wNext();
+      var nodeGroups = {};
-  };
-  Walker.prototype._wPostFilesHandler = function () {
-    var me = this
-      ;
 
-    if (me._wfnodegroups.errors.length) {
+      fnodeTypesPlural.concat("nodes", "errors").forEach(function (fnodeTypePlural) {
-      // TODO v3.0 (don't noop the next)
+        nodeGroups[fnodeTypePlural] = [];
-      // .errors is an array of stats with { name: name, error: error }
+      });
-      me.emit('errors', me._wcurpath, me._wfnodegroups.errors, noop);
-    }
-    // XXX emitNodeTypes still needs refactor
-    TypeEmitter.emitNodeTypeGroups(me, me._wcurpath, me._wfnodegroups, me._wOnEmitDone, me);
-  };
-  Walker.prototype._wReadFiles = function () {
-    var me = this
-      ;
 
-    if (!me._wcurfiles || 0 === me._wcurfiles.length) {
+      function nextFile() {
-      return me._wNext();
+        var file = files.pop(), dirs = [], fnames = [];
-    }
 
-    // TODO could allow user to selectively stat
+        if (undefined === file) {
-    // and don't stat if there are no stat listeners
+          emitPluralEvents(path, nodeGroups, function () {
-    me.emit('names', me._wcurpath, me._wcurfiles, noop);
+            nodeGroups.directories.forEach(function (dir) {
+              dirs.push(dir.name);
+            });
+            walkDirs(dirs);
+          });
+          return;
+        }
 
-    if (me._wsync) {
+        fstat(upath.join(path, file), function (err, stats) {
-      me._wcurfiles.forEach(wFilesHandlerWrapper, me);
+          stats = stats || {};
-      me._wPostFilesHandler();
+          stats.name = file;
-    } else {
+          nodeGroups.nodes.push(stats);
-      forEachAsync(me._wcurfiles, me._wFilesHandler, me).then(me._wPostFilesHandler);
+          if (err) {
-    }
+            stats.error = err;
-  };
+            stats.type = 'error';
-  Walker.prototype._wReaddirHandler = function (err, files) {
+            nodeGroups.errors.push(stats);
-    var fnodeGroups = TypeEmitter.createNodeGroups()
+            //emitter.emit('fileError', path, stats, noop);
-      , me = this
+            return nextFile();
-      , parent
+          }
-      , child
+          sortFnodesByType(path, stats, nodeGroups, nextFile);
-      ;
+        });
-
-    me._wfnodegroups = fnodeGroups;
-    me._wcurfiles = files;
-
-    // no error, great
-    if (!err) {
-      me._wReadFiles();
-      return;
-    }
-
-    // TODO path.sep
-    me._wcurpath = me._wcurpath.replace(/\/$/, '');
-
-    // error? not first run? => directory error
-    if (!me._wfirstrun) {
-      // TODO v3.0 (don't noop the next if there are listeners)
-      me.emit('directoryError', me._wcurpath, { error: err }, noop);
-      // TODO v3.0
-      //me.emit('directoryError', me._wcurpath.replace(/^(.*)\/.*$/, '$1'), { name: me._wcurpath.replace(/^.*\/(.*)/, '$1'), error: err }, noop);
-      me._wReadFiles();
-      return;
-    }
-
-    // error? first run? => maybe a file, maybe a true error
-    me._wfirstrun = false;
-
-    // readdir failed (might be a file), try a stat on the parent
-    parent = me._wcurpath.replace(/^(.*)\/.*$/, '$1');
-    fs[me._wStat](parent, function (e, stat) {
-
-      if (stat) {
-        // success
-        // now try stat on this as a child of the parent directory
-        child = me._wcurpath.replace(/^.*\/(.*)$/, '$1');
-        me._wcurfiles = [child];
-        me._wcurpath = parent;
-      } else {
-        // TODO v3.0
-        //me.emit('directoryError', me._wcurpath.replace(/^(.*)\/.*$/, '$1'), { name: me._wcurpath.replace(/^.*\/(.*)/, '$1'), error: err }, noop);
-        // TODO v3.0 (don't noop the next)
-        // the original readdir error, not the parent stat error
-        me.emit('nodeError', me._wcurpath, { error: err }, noop);
       }
+      nextFile();
+    }
 
-      me._wReadFiles();
+    function walk(path, next) {
+      fs.readdir(path, function (err, nodes) {
+        if (err) { 
+          emitter.emit('directoryError', path, { error: err, name: path }, noop);
+          return next(); /*TODO*/ throw err;
+        }
+        getStats(path, nodes, function (dirs) {
+          walkDirs(path, dirs, next);
+        });
+      });
+    }
+
+    function walkDirs(path, dirs, cb) {
+      function nextDir() {
+        var dir = dirs.pop();
+        if (undefined === dir) {
+          delete dirs;
+          return cb();
+        }
+        walk(upath.join(path, dir), nextDir);
+      }
+      nextDir();
+    }
+
+    walk(upath.normalize(path), function () {
+      emitter.emit('end');
     });
-  };
+    emitter.walk = newVersion;
-  Walker.prototype._wFilter = function () {
+    emitter.whenever = newVersion;
-    var me = this
+    return emitter;
-      , exclude
+  }
-      ;
+  module.exports = create;
-
+  module.exports.isFnodeTypes = isFnodeTypes;
-    // Stop directories that contain filter keywords
+  module.exports.fnodeTypes = fnodeTypes;
-    // from continuing through the walk process
+  module.exports.fnodeTypesPlural = fnodeTypesPlural;
-    exclude = me._wfilters.some(function (filter) {
-      if (me._wcurpath.match(filter)) {
-        return true;
-      }
-    });
-
-    return exclude;
-  };
-  Walker.prototype._wWalkSync = function () {
-    //console.log('walkSync');
-    var err
-      , files
-      , me = this
-      ;
-
-    try {
-      files = fs.readdirSync(me._wcurpath);
-    } catch(e) {
-      err = e;
-    }
-
-    me._wReaddirHandler(err, files);
-  };
-  Walker.prototype._wWalkAsync = function () {
-    //console.log('walkAsync');
-    var me = this
-      ;
-
-    // TODO how to remove this anony?
-    fs.readdir(me._wcurpath, function (err, files) {
-      me._wReaddirHandler(err, files);
-    });
-  };
-  Walker.prototype._wNext = function () {
-    var me = this
-      ;
-
-    if (me._paused) {
-      return;
-    }
-    if (me._wq.length) {
-      me._wcurpath = me._wq.pop();
-      while (me._wq.length && me._wFilter()) {
-        me._wcurpath = me._wq.pop();
-      }
-      if (me._wcurpath && !me._wFilter()) {
-        me._wWalk();
-      } else {
-        me._wNext();
-      }
-      return;
-    }
-    me._wqueue.length -= 1;
-    if (me._wqueue.length) {
-      me._wq = me._wqueue[me._wqueue.length - 1];
-      return me._wNext();
-    }
-
-    // To not break compatibility
-    //process.nextTick(function () {
-      me.emit('end');
-    //});
-  };
-  Walker.prototype._wJoinPath = function (v, i, o) {
-    var me = this
-      ;
-
-    o[i] = [me._wcurpath, path.sep, v].join('');
-  };
-  Walker.prototype.pause = function () {
-    this._paused = true;
-  };
-  Walker.prototype.resume = function () {
-    this._paused = false;
-    this._wNext();
-  };
-
-  exports.walk = function (path, opts) {
-    return new Walker(path, opts, false);
-  };
-
-  exports.walkSync = function (path, opts) {
-    return new Walker(path, opts, true);
-  };
 }());

old/examples/walk-jqueue-2-test.js

@@ -1,42 +0,0 @@
-#!/usr/bin/env node
-(function () {
-  "use strict";
-
-  var walk = require('../lib/walk-jqueue-2'),
-    count = 0;
-
-  function sort(a,b) {
-    a= a.toLowerCase();
-    b= b.toLowerCase();
-    if (a > b) return -1;
-    if (a < b) return  1;
-    else       return  0;
-  }
-
-  process.argv.forEach(function(val, index, array) {
-    if (index > 1) {
-      emitter = walk(val);
-      emitter.on('name', function (path, file, stat) {
-        count += 1;
-        console.log( ["[", count, "] ", path, '/', file].join('') )
-      });
-      emitter.on('names', function (path, files, stats) {
-        files.sort(sort);
-        //console.log('sort: ' + files.join(' ; '));
-      });
-      emitter.on('error', function () {
-        // ignore
-      });
-      emitter.on('stat', function (path, file, stat) {
-        //console.log('stat: ' + file);
-      });
-      emitter.on('stats', function (path, files, stats) {
-        //console.log('stats: ' + files.join(' ; '));
-      });
-      emitter.on('end', function () {
-        console.log("The eagle has landed.");
-      });
-    }
-  });
-
-}());

old/examples/walk-jqueue-3-test.js

@@ -1,123 +0,0 @@
-#!/usr/bin/env node
-(function () {
-  "use strict";
-
-  var walk = require('../lib/walk-jqueue-3'),
-    count = 0;
-
-  function sort(a,b) {
-    a= a.toLowerCase();
-    b= b.toLowerCase();
-    if (a > b) return -1;
-    if (a < b) return  1;
-    else       return  0;
-  }
-
-  process.argv.forEach(function(startpath, index) {
-    if (index > 1) {
-      emitter = walk(startpath);
-
-  // Non-`stat`ed Nodes
-      /*
-      emitter.on('name', function (path, file, stat) {
-        count += 1;
-        //console.log( ["[", count, "] ", path, '/', file].join('') )
-        console.log( [path, '/', file].join('') )
-      });
-      emitter.on('names', function (path, files, stats) {
-        files.sort(sort);
-        //console.log('sort: ' + files.join(' ; '));
-      });
-      */
-
-
-  // Single `stat`ed Nodes
-      emitter.on('error', function (path, err, next) {
-        // ignore
-      });
-      emitter.on('directoryError', function (path, stats, next) {
-        next();
-      });
-      /*
-      emitter.on('node', function (path, stat, next) {
-        count += 1;
-        console.log( [path, '/', stat.name].join('') )
-        //console.log( ["[", count, "] ", path, '/', stat.name].join('') )
-        next();
-      });
-      */
-      emitter.on('file', function (path, stat, next) {
-        count += 1;
-        console.log( [path, '/', stat.name].join('') )
-        //console.log( ["[", count, "] ", path, '/', stat.name].join('') )
-        next();
-      });
-      emitter.on('directory', function (path, stat, next) {
-        count += 1;
-        console.log( [path, '/', stat.name].join('') )
-        next();
-      });
-      emitter.on('symbolicLink', function (path, stat, next) {
-        count += 1;
-        console.log( [path, '/', stat.name].join('') )
-        next();
-      });
-      /*
-      */
-      /*
-      emitter.on('blockDevice', function (path, stat, next) {
-        next();
-      });
-      emitter.on('characterDevice', function (path, stat, next) {
-        next();
-      });
-      emitter.on('FIFO', function (path, stat, next) {
-        next();
-      });
-      emitter.on('socket', function (path, stat, next) {
-        next();
-      });
-      */
-
-    // Grouped `stat`ed Nodes
-      emitter.on('errors', function (path, stats, next) {
-        next();
-      });
-      /*
-      emitter.on('nodes', function (path, stats, next) {
-        next();
-      });
-      */
-      emitter.on('files', function (path, stats, next) {
-        next();
-      });
-      emitter.on('directories', function (path, stats, next) {
-        //delete stats[1];
-        next();
-      });
-      emitter.on('symbolicLinks', function (path, stats, next) {
-        next();
-      });
-      /*
-      emitter.on('blockDevices', function (path, stats, next) {
-        next();
-      });
-      emitter.on('characterDevices', function (path, stats, next) {
-        next();
-      });
-      emitter.on('FIFOs', function (path, stats, next) {
-        next();
-      });
-      emitter.on('sockets', function (path, stats, next) {
-        next();
-      });
-      */
-
-    // The end of all things
-      emitter.on('end', function () {
-        console.log("The eagle has landed.");
-      });
-    }
-  });
-
-}());

old/examples/walkq-test.js

@@ -1,33 +0,0 @@
-#!/usr/bin/env node
-(function () {
-  var walk = require('../lib/walk-queue'),
-    emitter = walk(process.argv[2] || '.'),
-    _ = require('underscore'),
-    count = 0;
-
-  emitter.on('error', function (err, path, files) {
-    console.log(err);
-  });
-  emitter.on('nodes', function (path, files, next) {
-    //next();
-    var filenames = _.map(files, function (file) {
-      return path + '/' + file;
-    })
-    filenames.forEach(function (name) {
-      count += 1;
-      console.log('[' + count  + '] ' + name)
-    });
-    //filenames.forEach(console.log);
-    //console.log(_.pluck(files, 'name'));
-  });
-  emitter.on('directories', function (path, files, next) {
-    next();
-  });
-  emitter.on('directory', function (path, stat, next) {
-    //console.log(stat.name);
-    next();
-  });
-  emitter.on('end', function () {
-    console.log("The eagle has landed");
-  });
-}());

old/lib/walk-jqueue-0.js

@@ -1 +0,0 @@
-walk-jorge.js

old/lib/walk-jqueue-1.js

@@ -1,75 +0,0 @@
-(function () {
-  "use strict"
-
-  var fs = require('fs'),
-    EventEmitter = require('events').EventEmitter;
-
-  // 2010-11-25 jorge@jorgechamorro.com
-  function create (pathname, cb) {
-    var emitter = new EventEmitter(),
-      q = [],
-      queue = [q],
-      curpath;
-
-    function walk() { 
-      //cb(curpath);
-      fs.lstat(curpath, function (err, stat) {
-        if (err) {
-          emitter.emit('error', curpath, err);
-        }
-        if (!stat) {
-          return next();
-        }
-        emitter.emit('node', curpath, stat);
-        if (!stat.isDirectory()) {
-          return next();
-        }
-        fs.readdir(curpath, function(err, files) {
-          if (err) {
-            emitter.emit('error', curpath, err);
-          }
-          // XXX bug was here. next() was omitted
-          if (!files || 0 == files.length) {
-            return next();
-          }
-          files.sort(sort);
-          emitter.emit('nodes', curpath, files);
-          files.forEach(fullPath);
-          queue.push(q = files);
-          next();
-        });
-      });
-    }
-    
-    function next () {
-      if (q.length) {
-        curpath = q.pop();
-        return walk();
-      }
-      if (queue.length -= 1) {
-        q = queue[queue.length-1];
-        return next();
-      }
-      emitter.emit('end');
-    }
-    
-    function fullPath(v,i,o) {
-      o[i]= [curpath, '/', v].join('');
-    }
-    
-    function sort(a,b) {
-      a= a.toLowerCase();
-      b= b.toLowerCase();
-      if (a > b) return -1;
-      if (a < b) return  1;
-      else       return  0;
-    }
-
-    curpath = pathname;
-    walk();
-    
-    return emitter;
-  }
-
-  module.exports = create;
-}());

old/lib/walk-jqueue-2.js

@@ -1,79 +0,0 @@
-(function () {
-  "use strict"
-
-  // Array.prototype.forEachAsync(next, item, i, collection)
-  require('futures/forEachAsync');
-
-  var fs = require('fs'),
-    EventEmitter = require('events').EventEmitter;
-
-  // 2010-11-25 jorge@jorgechamorro.com
-  function create(pathname, cb) {
-    var emitter = new EventEmitter(),
-      q = [],
-      queue = [q],
-      curpath;
-
-    function walk() { 
-      fs.readdir(curpath, function(err, files) {
-        if (err) {
-          emitter.emit('error', curpath, err);
-        }
-        // XXX bug was here. next() was omitted
-        if (!files || 0 == files.length) {
-          return next();
-        }
-        var stats = [];
-        emitter.emit('names', curpath, files, stats);
-        files.forEachAsync(function (cont, file) {
-          emitter.emit('name', curpath, file);
-          fs.lstat(curpath + '/' + file, function (err, stat) {
-            if (err) {
-              emitter.emit('error', curpath, err);
-            }
-            if (stat) {
-              stat.name = file;
-              stats.push(stat);
-              emitter.emit('stat', curpath, file, stat);
-            }
-            cont();
-          });
-        }).then(function () {
-          var dirs = []
-          emitter.emit('stats', curpath, files, stats);
-          stats.forEach(function (stat) {
-            if (stat.isDirectory()) {
-              dirs.push(stat.name);
-            }
-          });
-          dirs.forEach(fullPath);
-          queue.push(q = dirs);
-          next();
-        });
-      });
-    }
-    
-    function next() {
-      if (q.length) {
-        curpath = q.pop();
-        return walk();
-      }
-      if (queue.length -= 1) {
-        q = queue[queue.length-1];
-        return next();
-      }
-      emitter.emit('end');
-    }
-    
-    function fullPath(v,i,o) {
-      o[i]= [curpath, '/', v].join('');
-    }
-    
-    curpath = pathname;
-    walk();
-    
-    return emitter;
-  }
-
-  module.exports = create;
-}());

old/lib/walk-jqueue-3.js

@@ -1,86 +0,0 @@
-(function () {
-  "use strict"
-
-  // Array.prototype.forEachAsync(next, item, i, collection)
-  require('futures/forEachAsync');
-
-  var fs = require('fs'),
-    EventEmitter = require('events').EventEmitter,
-    TypeEmitter = require('./node-type-emitter');
-
-  // 2010-11-25 jorge@jorgechamorro.com
-  function create(pathname, cb) {
-    var emitter = new EventEmitter(),
-      q = [],
-      queue = [q],
-      curpath;
-
-    function walk() { 
-      fs.readdir(curpath, function(err, files) {
-        if (err) {
-          emitter.emit('error', curpath, err);
-        }
-        // XXX bug was here. next() was omitted
-        if (!files || 0 == files.length) {
-          return next();
-        }
-        var stats = [],
-          fnodeGroups = TypeEmitter.createNodeGroups();
-
-        // TODO could allow user to selectively stat
-        // and don't stat if there are no stat listeners
-        emitter.emit('names', curpath, files);
-        files.forEachAsync(function (cont, file) {
-          emitter.emit('name', curpath, file);
-          fs.lstat(curpath + '/' + file, function (err, stat) {
-            if (err) {
-              emitter.emit('error', curpath, err);
-            }
-            if (!stat) {
-              cont();
-            }
-            stat.name = file;
-            stats.push(stat);
-            //emitter.emit('stat', curpath, file, stat);
-            TypeEmitter.sortFnodesByType(stat, fnodeGroups);
-            TypeEmitter.emitNodeType(emitter, curpath, stat, cont);
-          });
-        }).then(function () {
-          var dirs = []
-          //emitter.emit('stats', curpath, files, stats);
-          TypeEmitter.emitNodeTypeGroups(emitter, curpath, fnodeGroups, function () {
-            fnodeGroups.directories.forEach(function (stat) {
-              dirs.push(stat.name);
-            });
-            dirs.forEach(fullPath);
-            queue.push(q = dirs);
-            next();
-          });
-        });
-      });
-    }
-    
-    function next() {
-      if (q.length) {
-        curpath = q.pop();
-        return walk();
-      }
-      if (queue.length -= 1) {
-        q = queue[queue.length-1];
-        return next();
-      }
-      emitter.emit('end');
-    }
-    
-    function fullPath(v,i,o) {
-      o[i]= [curpath, '/', v].join('');
-    }
-    
-    curpath = pathname;
-    walk();
-    
-    return emitter;
-  }
-
-  module.exports = create;
-}());

old/lib/walk-queue.js

@@ -1,165 +0,0 @@
-(function () {
-  "use strict";
-
-  var fs = require('fs'),
-    fstat = fs.lstat,
-    Futures = require('futures'),
-    EventEmitter = require('events').EventEmitter,
-    upath = require('path'),
-    // "FIFO" isn't easy to convert to camelCase and back reliably
-    isFnodeTypes = [
-      "isFile", "isDirectory",  "isBlockDevice",  "isCharacterDevice",  "isSymbolicLink", "isFIFO", "isSocket"
-    ],
-    fnodeTypes = [
-      "file",   "directory",    "blockDevice",    "characterDevice",    "symbolicLink",   "FIFO",   "socket"
-    ],
-    fnodeTypesPlural = [
-      "files",  "directories",  "blockDevices",   "characterDevices",   "symbolicLinks",  "FIFOs",  "sockets"
-    ];
-
-  // Get the current number of listeners (which may change)
-  // Emit events to each listener
-  // Wait for all listeners to `next()` before continueing
-  // (in theory this may avoid disk thrashing)
-  function emitSingleEvents(emitter, path, stats, next) {
-    var num = 1 + emitter.listeners(stats.type).length + emitter.listeners("node").length;
-
-    function nextWhenReady() {
-      num -= 1;
-      if (0 === num) { next(); }
-    }
-
-    emitter.emit(stats.type, path, stats, nextWhenReady);
-    emitter.emit("node", path, stats, nextWhenReady);
-    nextWhenReady();
-  }
-
-
-  // Since the risk for disk thrashing among anything
-  // other than files is relatively low, all types are
-  // emitted at once, but all must complete before advancing
-  function emitPluralEvents(emitter, path, nodes, next) {
-    var num = 1;
-
-    function nextWhenReady() {
-      num -= 1;
-      if (0 === num) { next(); }
-    }
-
-    fnodeTypesPlural.concat(["nodes", "errors"]).forEach(function (fnodeType) {
-      if (0 === nodes[fnodeType].length) { return; }
-      num += emitter.listeners(fnodeType).length;
-      emitter.emit(fnodeType, path, nodes[fnodeType], nextWhenReady);
-    });
-    nextWhenReady();
-  }
-
-
-  // Determine each file node's type
-  // 
-  function sortFnodesByType(stats, fnodes) {
-    isFnodeTypes.forEach(function (isType, i) {
-      if (stats[isType]()) {
-        if (stats.type) { throw new Error("is_" + type + " and " + isType); }
-        stats.type = fnodeTypes[i];
-        fnodes[fnodeTypesPlural[i]].push(stats);
-        //console.log(isType, fnodeTypesPlural[i], stats.name);
-        // TODO throw to break;
-      }
-    });
-    /*
-    // Won't really ever happen
-    if (!stats.type) {
-      stats.error = new Error(upath.join(path, stats.name) + ' isAnUndefinedType');
-    }
-    */
-  }
-
-  function create(path) {
-    var emitter = new EventEmitter(),
-      paths = [],
-      path;
-
-    function next() {
-      // path could be local if dirHandler were anonymous
-      //console.log('LEN: '+ paths.length);
-      if (0 == paths.length) {
-        emitter.emit('end');
-        return;
-      }
-      path = paths.pop();
-      //console.log("POP: " + path);
-      fs.readdir(path, dirHandler);
-    }
-
-    function nodesHandler(nodes, args) {
-      //console.log('USE: ' + path);
-      var statses = [];
-
-      var nodeGroups = {};
-      fnodeTypesPlural.concat("nodes", "errors").forEach(function (fnodeTypePlural) {
-        nodeGroups[fnodeTypePlural] = [];
-      });
-
-      args.forEach(function (arg, i) {
-        var file = nodes[i],
-          err = arg[0],
-          stats = arg[1];
-
-        if (err) {
-          stats = { error: err, name: file };
-          emitter.emit('error', err, path, stats);
-        }
-        if (stats) {
-          stats.name = file;
-          sortFnodesByType(stats, nodeGroups);
-          emitter.emit('stat', path, stats);
-        }
-      });
-      emitter.emit('stats', path, statses);
-      nodeGroups['directories'].forEach(function (stat) {
-        paths.push(path + '/' + stat.name);
-        //console.log('PUSH: ' + path + '/' + stat.name);
-      });
-      /*
-      //console.log('USE: ' + path);
-      next();
-      */
-      emitPluralEvents(emitter, path, nodeGroups, next);
-    }
-
-    function dirHandler(err, nodes) {
-      //console.log("HANDLE: " + path);
-      var join = Futures.join(),
-        i;
-
-      if (err) {
-        emitter.emit('error', err, path);
-      }
-      if (!nodes || 0 == nodes.length) {
-        //console.log('EMPTY: ' + path);
-        return next();
-      }
-      // TODO don't duplicate efforts
-      emitter.emit('nodes', path, nodes);
-
-      for (i = 0; i < nodes.length; i += 1) {
-        fstat(path + '/' + nodes[i], join.deliverer());
-      }
-
-      join.when(function () {
-        var args = Array.prototype.slice.call(arguments);
-        nodesHandler(nodes, args);
-      });
-    }
-
-    //paths.push([path]);
-    paths.push(path);
-
-
-    next();
-    return emitter;
-  }
-
-  module.exports = create;
-}());

old/lib/walk-recurse.js

@@ -1,165 +0,0 @@
-// TODO
-//  * add types by listener dynamically
-//  * unroll loops for better readability?
-//  * should emitted errors wait for `next()`?
-(function (undefined) {
-  var fs = require('fs'),
-    upath = require('path'),
-    util = require('util'),
-    Futures = require('futures'),
-    events = require('events'),
-    noop = function () {},
-    // "FIFO" isn't easy to convert to camelCame and back reliably
-    isFnodeTypes = [
-      "isFile", "isDirectory",  "isBlockDevice",  "isCharacterDevice",  "isSymbolicLink", "isFIFO", "isSocket"
-    ],
-    fnodeTypes = [
-      "file",   "directory",    "blockDevice",    "characterDevice",    "symbolicLink",   "FIFO",   "socket"
-    ],
-    fnodeTypesPlural = [
-      "files",  "directories",  "blockDevices",   "characterDevices",   "symbolicLinks",  "FIFOs",  "sockets"
-    ];
-
-  function newVersion() {
-    throw new Error("New Version. Please see API on github.com/coolaj86/node-walk");
-  }
-
-  // Create a new walk instance
-  function create(path, options, cb) {
-    if (cb) {
-      newVersion();
-    }
-    
-    var emitter = new events.EventEmitter(),
-      fstat = (options||{}).followLinks ? fs.stat : fs.lstat;
-
-
-    // Get the current number of listeners (which may change)
-    // Emit events to each listener
-    // Wait for all listeners to `next()` before continueing
-    // (in theory this may avoid disk thrashing)
-    function emitSingleEvents(path, stats, next) {
-      var num = 1 + emitter.listeners(stats.type).length + emitter.listeners("node").length;
-
-      function nextWhenReady() {
-        num -= 1;
-        if (0 === num) { next(); }
-      }
-
-      emitter.emit(stats.type, path, stats, nextWhenReady);
-      emitter.emit("node", path, stats, nextWhenReady);
-      nextWhenReady();
-    }
-
-
-    // Since the risk for disk thrashing among anything
-    // other than files is relatively low, all types are
-    // emitted at once, but all must complete before advancing
-    function emitPluralEvents(path, nodes, next) {
-      var num = 1;
-
-      function nextWhenReady() {
-        num -= 1;
-        if (0 === num) { next(); }
-      }
-
-      fnodeTypesPlural.concat(["nodes", "errors"]).forEach(function (fnodeType) {
-        if (0 === nodes[fnodeType].length) { return; }
-        num += emitter.listeners(fnodeType).length;
-        emitter.emit(fnodeType, path, nodes[fnodeType], nextWhenReady);
-      });
-      nextWhenReady();
-    }
-
-
-    // Determine each file node's type
-    // 
-    function sortFnodesByType(path, stats, fnodes, nextFile) {
-      isFnodeTypes.forEach(function (isType, i) {
-        if (stats[isType]()) {
-          if (stats.type) { throw new Error("is_" + type + " and " + isType); }
-          stats.type = fnodeTypes[i];
-          fnodes[fnodeTypesPlural[i]].push(stats);
-          // TODO throw to break;
-        }
-      });
-      if (!stats.type) { throw new Error(upath.join(path, stats.name) + ' isAnUndefinedType'); }
-      emitSingleEvents(path, stats, nextFile);
-    }
-
-
-    // Asynchronously get the stats 
-    //
-    function getStats(path, files, walkDirs) {
-      var nodeGroups = {};
-
-      fnodeTypesPlural.concat("nodes", "errors").forEach(function (fnodeTypePlural) {
-        nodeGroups[fnodeTypePlural] = [];
-      });
-
-      function nextFile() {
-        var file = files.pop(), dirs = [], fnames = [];
-
-        if (undefined === file) {
-          emitPluralEvents(path, nodeGroups, function () {
-            nodeGroups.directories.forEach(function (dir) {
-              dirs.push(dir.name);
-            });
-            walkDirs(dirs);
-          });
-          return;
-        }
-
-        fstat(upath.join(path, file), function (err, stats) {
-          stats = stats || {};
-          stats.name = file;
-          nodeGroups.nodes.push(stats);
-          if (err) {
-            stats.error = err;
-            stats.type = 'error';
-            nodeGroups.errors.push(stats);
-            //emitter.emit('fileError', path, stats, noop);
-            return nextFile();
-          }
-          sortFnodesByType(path, stats, nodeGroups, nextFile);
-        });
-      }
-      nextFile();
-    }
-
-    function walk(path, next) {
-      fs.readdir(path, function (err, nodes) {
-        if (err) { 
-          emitter.emit('directoryError', path, { error: err, name: path }, noop);
-          return next(); /*TODO*/ throw err;
-        }
-        getStats(path, nodes, function (dirs) {
-          walkDirs(path, dirs, next);
-        });
-      });
-    }
-
-    function walkDirs(path, dirs, cb) {
-      function nextDir() {
-        var dir = dirs.pop();
-        if (undefined === dir) {
-          delete dirs;
-          return cb();
-        }
-        walk(upath.join(path, dir), nextDir);
-      }
-      nextDir();
-    }
-
-    walk(upath.normalize(path), function () {
-      emitter.emit('end');
-    });
-    emitter.walk = newVersion;
-    emitter.whenever = newVersion;
-    return emitter;
-  }
-  module.exports = create;
-  module.exports.isFnodeTypes = isFnodeTypes;
-  module.exports.fnodeTypes = fnodeTypes;
-  module.exports.fnodeTypesPlural = fnodeTypesPlural;
-}());

package.json

@@ -1,40 +1,12 @@
 {
-  "name": "walk",
+  "name"          : "walk",
-  "description": "A node port of python's os.walk",
+  "description"   : "A node port of python's os.walk",
-  "url": "http://git.coolaj86.com/coolaj86/fs-walk.js",
+  "url"           : "github.com/coolaj86/node-walk",
-  "keywords": [
+  "keywords"      : ["util", "os", "sys", "fs", "walk", "walkSync"],
-    "util",
+  "author"        : "AJ ONeal <coolaj86@gmail.com>",
-    "os",
+  "contributors"  : [],
-    "sys",
+  "dependencies"  : [],
-    "fs",
+  "lib"           : "lib",
-    "walk",
+  "main"          : "./lib/walk.js",
-    "walkSync"
+  "version"       : "1.0.0"
-  ],
-  "author": "AJ ONeal <coolaj86@gmail.com>",
-  "contributors": [],
-  "dependencies": {
-    "foreachasync": "^3.0.0"
-  },
-  "lib": ".",
-  "main": "./lib/walk.js",
-  "version": "2.3.15",
-  "files": [
-    "lib"
-  ],
-  "repository": {
-    "url": "https://git.coolaj86.com/coolaj86/fs-walk.js.git"
-  },
-  "license": "(MIT OR Apache-2.0)",
-  "bugs": {
-    "url": "https://git.coolaj86.com/coolaj86/fs-walk.js/issues"
-  },
-  "homepage": "https://git.coolaj86.com/coolaj86/fs-walk.js",
-  "directories": {
-    "example": "examples",
-    "test": "test"
-  },
-  "devDependencies": {},
-  "scripts": {
-    "test": "./test/walk-test.sh"
-  }
 }

profile/walk-test.js

@@ -1,129 +0,0 @@
-#!/usr/bin/env node
-(function () {
-  "use strict";
-
-  var walk = require('../lib/walk'),
-    count = 0,
-    saneCount = 0;
-
-  function sort(a,b) {
-    a= a.toLowerCase();
-    b= b.toLowerCase();
-    if (a > b) return -1;
-    if (a < b) return  1;
-    return  0;
-  }
-
-  process.argv.forEach(function(startpath, index) {
-    if (index > 1) {
-      emitter = walk(startpath);
-
-  // Non-`stat`ed Nodes
-      emitter.on('name', function (path, file, stat) {
-        saneCount += 1;
-        //console.log( ["[", count, "] ", path, '/', file].join('') )
-        //console.log( [path, '/', file].join('') )
-      });
-      emitter.on('names', function (path, files, stats) {
-        files.sort(sort);
-        //console.log('sort: ' + files.join(' ; '));
-      });
-
-
-
-  // Single `stat`ed Nodes
-      emitter.on('error', function (path, err, next) {
-        next()
-        // ignore
-      });
-      emitter.on('directoryError', function (path, stats, next) {
-        next();
-      });
-      emitter.on('nodeError', function (path, stats, next) {
-        next();
-      });
-      /*
-      emitter.on('node', function (path, stat, next) {
-        count += 1;
-        console.log( [path, '/', stat.name].join('') )
-        //console.log( ["[", count, "] ", path, '/', stat.name].join('') )
-        next();
-      });
-      */
-      emitter.on('file', function (path, stat, next) {
-        count += 1;
-        console.log( [path, '/', stat.name].join('') )
-        //console.log( ["[", count, "] ", path, '/', stat.name].join('') )
-        next();
-      });
-      emitter.on('directory', function (path, stat, next) {
-        count += 1;
-        console.log( [path, '/', stat.name].join('') )
-        next();
-      });
-      emitter.on('symbolicLink', function (path, stat, next) {
-        count += 1;
-        console.log( [path, '/', stat.name].join('') )
-        next();
-      });
-      /*
-      emitter.on('blockDevice', function (path, stat, next) {
-        next();
-      });
-      emitter.on('characterDevice', function (path, stat, next) {
-        next();
-      });
-      emitter.on('FIFO', function (path, stat, next) {
-        next();
-      });
-      emitter.on('socket', function (path, stat, next) {
-        next();
-      });
-      */
-
-
-
-    // Grouped `stat`ed Nodes
-      emitter.on('errors', function (path, stats, next) {
-        next();
-      });
-      /*
-      emitter.on('nodes', function (path, stats, next) {
-        next();
-      });
-      */
-      emitter.on('files', function (path, stats, next) {
-        next();
-      });
-      emitter.on('directories', function (path, stats, next) {
-        //delete stats[1];
-        next();
-      });
-      emitter.on('symbolicLinks', function (path, stats, next) {
-        next();
-      });
-      /*
-      emitter.on('blockDevices', function (path, stats, next) {
-        next();
-      });
-      emitter.on('characterDevices', function (path, stats, next) {
-        next();
-      });
-      emitter.on('FIFOs', function (path, stats, next) {
-        next();
-      });
-      emitter.on('sockets', function (path, stats, next) {
-        next();
-      });
-      */
-
-
-
-    // The end of all things
-      emitter.on('end', function () {
-        console.log("The eagle has landed. [" + count + " == " + saneCount + "]");
-      });
-    }
-  });
-
-}());

test/test-walk.js

@@ -1,34 +0,0 @@
-(function () {
-  "use strict";
-
-  var walk = require('../lib/walk').walk
-    , path = require('path')
-    , dirname = process.argv[2] || './'
-    , walker
-    ;
-
-  walker = walk(dirname);
-
-  walker.on('directories', function (root, stats, next) {
-    stats.forEach(function (stat) {
-      console.log('[ds]', path.join(root, stat.name));
-    });
-    next();
-  });
-
-  /*
-  walker.on('directory', function (root, stat, next) {
-    console.log('[d]', path.join(root, stat.name));
-    next();
-  });
-  */
-
-  walker.on('file', function (root, stat, next) {
-    console.log('[f]', path.join(root, stat.name));
-    next();
-  });
-
-  walker.on('end', function () {
-    console.log('All Done!');
-  });
-}());

test/testSync.js

@@ -1,43 +0,0 @@
-(function () {
-  "use strict";
-
-  var walk = require('../lib/walk')
-    , fs = require('fs')
-    , options
-    , walker
-    ;
-
-  options = {
-      listeners: {
-          names: function (root, nodeNamesArray) {
-            nodeNamesArray.sort(function (a, b) {
-              if (a > b) return 1;
-              if (a < b) return -1;
-              return 0;
-            });
-          }
-        , directories: function (root, dirStatsArray, next) {
-            // dirStatsArray is an array of `stat` objects with the additional attributes
-            // * type
-            // * error
-            // * name
-            
-            next();
-          }
-        , file: function (root, fileStats, next) {
-            fs.readFile(fileStats.name, function () {
-              // doStuff
-              console.log(root, fileStats.name);
-              next();
-            });
-          }
-        , errors: function (root, nodeStatsArray, next) {
-            next();
-          }
-      }
-  };
-
-  walker = walk.walkSync("/tmp", options);
-
-  console.log("all done");
-}());

test/walk-test.sh

@@ -1,6 +0,0 @@
-mkdir -p walk-test/dir1
-touch walk-test/file-0
-touch walk-test/file-1
-touch walk-test/dir1/file-2
-touch walk-test/dir1/file-3
-echo "4 files and 2 directories (including '.')"

walk-test.sh

@@ -0,0 +1,5 @@
+mkdir -p walk-test/dir1
+touch walk-test/file-1
+touch walk-test/file-2
+touch walk-test/dir1/file-1
+touch walk-test/dir1/file-2