Merge pull request #146 from lbogdan/fix/resolve-sync

[Fix] Make loadAsFileSync() work the same as async loadAsFile()

Author: ljharb

lib/sync.js

@@ -44,6 +44,16 @@ module.exports = function (x, options) {
     throw err;
 
     function loadAsFileSync(x) {
+        var pkg = loadpkg(path.dirname(x));
+
+        if (pkg && pkg.dir && pkg.pkg && opts.pathFilter) {
+            var rfile = path.relative(pkg.dir, x);
+            var r = opts.pathFilter(pkg.pkg, x, rfile);
+            if (r) {
+                x = path.resolve(pkg.dir, r); // eslint-disable-line no-param-reassign
+            }
+        }
+
         if (isFile(x)) {
             return x;
         }
@@ -56,6 +66,32 @@ module.exports = function (x, options) {
         }
     }
 
+    function loadpkg(dir) {
+        if (dir === '' || dir === '/') return;
+        if (process.platform === 'win32' && (/^\w:[/\\]*$/).test(dir)) {
+            return;
+        }
+        if (/[/\\]node_modules[/\\]*$/.test(dir)) return;
+
+        var pkgfile = path.join(dir, 'package.json');
+
+        if (!isFile(pkgfile)) {
+            return loadpkg(path.dirname(dir));
+        }
+
+        var body = readFileSync(pkgfile);
+
+        try {
+            var pkg = JSON.parse(body);
+        } catch (jsonErr) {}
+
+        if (pkg && opts.packageFilter) {
+            pkg = opts.packageFilter(pkg, pkgfile);
+        }
+
+        return { pkg: pkg, dir: dir };
+    }
+
     function loadAsDirectorySync(x) {
         var pkgfile = path.join(x, '/package.json');
         if (isFile(pkgfile)) {

readme.markdown

@@ -115,6 +115,12 @@ options are:
 
 * `opts.packageFilter(pkg, pkgfile)` - transform the parsed package.json contents before looking at the "main" field
 
+* `opts.pathFilter(pkg, path, relativePath)` - transform a path within a package
+  * pkg - package data
+  * path - the path being resolved
+  * relativePath - the path relative from the package.json location
+  * returns - a relative path that will be joined from the package.json location
+
 * opts.paths - require.paths array to use if nothing is found on the normal `node_modules` recursive walk (probably don't use this)
 
 * opts.moduleDirectory - directory (or directories) in which to recursively look for modules. default: `"node_modules"`

test/pathfilter.js

@@ -50,16 +50,23 @@ test('#62: deep module references and the pathFilter', function (t) {
     });
 
     t.test('deep/ref alt', function (st) {
-        st.plan(4);
+        st.plan(8);
 
         var pathFilter = pathFilterFactory(st);
 
+        var res = resolve.sync(
+            'deep/ref',
+            { basedir: resolverDir, pathFilter: pathFilter }
+        );
+        st.equal(res, path.join(resolverDir, 'node_modules/deep/alt.js'));
+
         resolve(
             'deep/ref',
             { basedir: resolverDir, pathFilter: pathFilter },
             function (err, res, pkg) {
                 if (err) st.fail(err);
                 st.equal(res, path.join(resolverDir, 'node_modules/deep/alt.js'));
+                st.end();
             }
         );
     });