add linting (and some initial fixes)

1 files changed, 33 insertions, 25 deletions

diff --git a/node_modules/resolve/lib/sync.js b/node_modules/resolve/lib/sync.js
index ef91eddbb..510ca256c 100644
--- a/node_modules/resolve/lib/sync.js
+++ b/node_modules/resolve/lib/sync.js
@@ -4,39 +4,48 @@ var path = require('path');
 var caller = require('./caller.js');
 var nodeModulesPaths = require('./node-modules-paths.js');
 
-module.exports = function (x, opts) {
-    if (!opts) opts = {};
+module.exports = function (x, options) {
+    if (typeof x !== 'string') {
+        throw new TypeError('Path must be a string.');
+    }
+    var opts = options || {};
     var isFile = opts.isFile || function (file) {
-        try { var stat = fs.statSync(file) }
-        catch (err) { if (err && err.code === 'ENOENT') return false }
+        try {
+            var stat = fs.statSync(file);
+        } catch (e) {
+            if (e && (e.code === 'ENOENT' || e.code === 'ENOTDIR')) return false;
+            throw e;
+        }
         return stat.isFile() || stat.isFIFO();
     };
     var readFileSync = opts.readFileSync || fs.readFileSync;
-    
-    var extensions = opts.extensions || [ '.js' ];
+
+    var extensions = opts.extensions || ['.js'];
     var y = opts.basedir || path.dirname(caller());
 
     opts.paths = opts.paths || [];
 
-    if (/^(?:\.\.?(?:\/|$)|\/|([A-Za-z]:)?[\\\/])/.test(x)) {
+    if (/^(?:\.\.?(?:\/|$)|\/|([A-Za-z]:)?[/\\])/.test(x)) {
         var res = path.resolve(y, x);
-        if (x === '..') res += '/';
+        if (x === '..' || x.slice(-1) === '/') res += '/';
         var m = loadAsFileSync(res) || loadAsDirectorySync(res);
         if (m) return m;
     } else {
         var n = loadNodeModulesSync(x, y);
         if (n) return n;
     }
-    
+
     if (core[x]) return x;
-    
-    throw new Error("Cannot find module '" + x + "' from '" + y + "'");
-    
-    function loadAsFileSync (x) {
+
+    var err = new Error("Cannot find module '" + x + "' from '" + y + "'");
+    err.code = 'MODULE_NOT_FOUND';
+    throw err;
+
+    function loadAsFileSync(x) {
         if (isFile(x)) {
             return x;
         }
-        
+
         for (var i = 0; i < extensions.length; i++) {
             var file = x + extensions[i];
             if (isFile(file)) {
@@ -44,8 +53,8 @@ module.exports = function (x, opts) {
             }
         }
     }
-    
-    function loadAsDirectorySync (x) {
+
+    function loadAsDirectorySync(x) {
         var pkgfile = path.join(x, '/package.json');
         if (isFile(pkgfile)) {
             var body = readFileSync(pkgfile, 'utf8');
@@ -54,27 +63,26 @@ module.exports = function (x, opts) {
                 if (opts.packageFilter) {
                     pkg = opts.packageFilter(pkg, x);
                 }
-                
+
                 if (pkg.main) {
                     var m = loadAsFileSync(path.resolve(x, pkg.main));
                     if (m) return m;
                     var n = loadAsDirectorySync(path.resolve(x, pkg.main));
                     if (n) return n;
                 }
-            }
-            catch (err) {}
+            } catch (e) {}
         }
-        
-        return loadAsFileSync(path.join( x, '/index'));
+
+        return loadAsFileSync(path.join(x, '/index'));
     }
-    
-    function loadNodeModulesSync (x, start) {
+
+    function loadNodeModulesSync(x, start) {
         var dirs = nodeModulesPaths(start, opts);
         for (var i = 0; i < dirs.length; i++) {
             var dir = dirs[i];
-            var m = loadAsFileSync(path.join( dir, '/', x));
+            var m = loadAsFileSync(path.join(dir, '/', x));
             if (m) return m;
-            var n = loadAsDirectorySync(path.join( dir, '/', x ));
+            var n = loadAsDirectorySync(path.join(dir, '/', x));
             if (n) return n;
         }
     }