Merge pull request #81 from pmowrer/bug/wrong-__dirname

Fix __dirname sometimes pointing to wrong package

Author: zertosh

index.js

@@ -146,11 +146,12 @@ Deps.prototype.resolve = function (id, parent, cb) {
         });
     }
 
-    var pkgdir;
     parent.packageFilter = function (p, x) {
-        pkgdir = path.dirname(x);
-        if (opts.packageFilter) return opts.packageFilter(p, x);
-        else return p;
+        var pkgdir = path.dirname(x);
+        if (opts.packageFilter) p = opts.packageFilter(p, x);
+        p.__dirname = pkgdir;
+
+        return p;
     };
 
     if (opts.extensions) parent.extensions = opts.extensions;
@@ -163,7 +164,6 @@ Deps.prototype.resolve = function (id, parent, cb) {
             + parent.filename
         ));
 
-        if (pkg && pkgdir) pkg.__dirname = pkgdir;
         if (!pkg || !pkg.__dirname) {
             self.lookupPackage(file, function (err, p) {
                 if (err) return cb(err);

test/pkg.js

@@ -1,15 +1,18 @@
 var mdeps = require('../');
 var test = require('tape');
 var path = require('path');
+var fs = require('fs');
 
-var pkg = require('./pkg/package.json');
-pkg.__dirname = path.join(__dirname, '/pkg');
+var dirname = path.join(__dirname, '/pkg');
 
 test('pkg', function (t) {
-    t.plan(1);
+    t.plan(4);
 
     var d = mdeps();
     d.on('package', function (pkg_) {
+        var pkg = JSON.parse(fs.readFileSync(dirname + pkg_.dir + '/package.json'));
+        pkg.__dirname = dirname + pkg_.dir;
+
         t.deepEqual(pkg_, pkg);
     });
     d.end(path.join(__dirname, '/pkg/main.js'));

test/pkg/main.js

@@ -1 +1,2 @@
-console.log(555)
+require('pkga');
+require('pkgb');

test/pkg/node_modules/pkga/main.js

@@ -1 +1,4 @@
-{ "beep": "boop" }
+{
+  "dir": "",
+  "main": "index.js"
+}