re-implemented pathfilter feature nearly passes the test

Author: James Halliday

lib/async.js

@@ -3,7 +3,7 @@ var fs = require('fs');
 var path = require('path');
 var caller = require('./caller.js');
 var nodeModulesPaths = require('./node-modules-paths.js');
-var packagePathAndRemainder = require('./package-path-and-remainder.js');
+var splitRe = process.platform === 'win32' ? /[\/\\]/ : /\//;
 
 module.exports = function resolve (x, opts, cb) {
     if (typeof opts === 'function') {
@@ -34,7 +34,7 @@ module.exports = function resolve (x, opts, cb) {
     if (/^(?:\.\.?(?:\/|$)|\/|([A-Za-z]:)?[\\\/])/.test(x)) {
         var res = path.resolve(y, x);
         if (x === '..') res += '/';
-        loadAsFile(res, function (err, m, pkg) {
+        loadAsFile(res, opts.package, function (err, m, pkg) {
             if (err) cb(err)
             else if (m) cb(null, m, pkg)
             else loadAsDirectory(path.resolve(y, x), function (err, d, pkg) {
@@ -52,62 +52,71 @@ module.exports = function resolve (x, opts, cb) {
     });
 
     function loadAsFile (x, pkg, cb) {
-        
         if (typeof pkg === 'function') {
             cb = pkg;
-            pkg = opts.package;
+            pkg = undefined;
         }
 
-        var pathAndRemainder = packagePathAndRemainder(x);
         var exts = [''].concat(extensions);
 
-        if (pathAndRemainder) {
-            var pkgfile = path.join(pathAndRemainder.path, 'package.json');
-            var remainder = pathAndRemainder.remainder;
-            
-            isFile(pkgfile, function (err, ex) {
-                if (!ex) return load(exts, x);
-                
-                readFile(pkgfile, function (err, body) {
-                    if (err) return load(exts, x);
-                    try {
-                        pkg = JSON.parse(body);
-                    }
-                    catch (err) {}
-                    
-                    if (opts.packageFilter) {
-                        pkg = opts.packageFilter(pkg, pkgfile);
-                    }
-                    if (opts.pathFilter && remainder) {
-                        var newRemainder = opts.pathFilter(pkg, x, remainder);
-                        if (newRemainder) {
-                            return load(exts, path.resolve(
-                                pathAndRemainder.path, newRemainder)
-                            );
-                        }
-                    }
-                    return load(exts, x);
-                });
-            });
-        }
-        else if (x === y) {
+        if (x === y) {
             return loadAsDirectory(y, pkg, cb);
         }
         else {
-            return load(exts, x);
+            return load(exts, x, pkg);
         }
 
-		function load (exts, x) {
+		function load (exts, x, pkg) {
             if (exts.length === 0) return cb(null, undefined, pkg);
             var file = x + exts[0];
 
             isFile(file, function (err, ex) {
-                if (err) cb(err)
-                else if (ex) cb(null, file, pkg)
-                else load(exts.slice(1), x)
+                if (err) return cb(err)
+                if (!ex) return load(exts.slice(1), x, pkg)
+                if (pkg) return cb(null, file, pkg)
+                
+                loadpkg(path.dirname(file), function (err, pkg, dir) {
+                    if (err) return cb(err)
+                    if (pkg && opts.pathFilter) {
+                        var rel = path.relative(dir, file);
+                        var r = opts.pathFilter(pkg, x, rel);
+                        if (r) return load(
+                            extensions.slice(),
+                            path.resolve(dir, r),
+                            pkg
+                        );
+                    }
+                    cb(null, file, pkg)
+                });
             });
         }
-		
+    }
+    
+    function loadpkg (dir, cb) {
+        if (dir === '' || dir === '/') return cb(null);
+        if (process.platform === 'win32' && /^\w:[\\\/]*$/.test(dir)) {
+            return cb(null);
+        }
+        if (/[\\\/]node_modules[\\\/]*$/.test(dir)) return cb(null);
+        
+        var pkgfile = path.join(dir, 'package.json');
+        isFile(pkgfile, function (err, ex) {
+            if (err) return cb(err);
+            if (!ex) return loadpkg(
+                dir.replace(/[\\\/]*[^\\\/]+[\\\/]*/, ''), cb
+            );
+            
+            readFile(pkgfile, function (err, body) {
+                if (err) cb(err);
+                try { var pkg = JSON.parse(body) }
+                catch (err) {}
+                
+                if (pkg && opts.packageFilter) {
+                    pkg = opts.packageFilter(pkg, pkgfile);
+                }
+                cb(null, pkg, dir);
+            });
+        });
     }
 
     function loadAsDirectory (x, fpkg, cb) {