Throw on the main export and be silent when using resolveFrom.silent()

index.js

@@ -2,7 +2,15 @@
 const path = require('path');
 const Module = require('module');
 
-module.exports = (fromDir, moduleId) => {
+const _resolveFileName = (fromDir, fromFile, moduleId) => {
+	return Module._resolveFilename(moduleId, {
+		id: fromFile,
+		filename: fromFile,
+		paths: Module._nodeModulePaths(fromDir)
+	});
+};
+
+const _resolveFrom = (fromDir, moduleId, silent) => {
 	if (typeof fromDir !== 'string' || typeof moduleId !== 'string') {
 		throw new TypeError('Expected `fromDir` and `moduleId` to be strings');
 	}
@@ -11,13 +19,17 @@ module.exports = (fromDir, moduleId) => {
 
 	const fromFile = path.join(fromDir, 'noop.js');
 
-	try {
-		return Module._resolveFilename(moduleId, {
-			id: fromFile,
-			filename: fromFile,
-			paths: Module._nodeModulePaths(fromDir)
-		});
-	} catch (err) {
-		return null;
+	if (silent) {
+		try {
+			_resolveFileName(fromDir, fromFile, moduleId);
+		} catch (err) {
+			return null;
+		}
 	}
+
+	return _resolveFileName(fromDir, fromFile, moduleId);
 };
+
+module.exports = _resolveFrom;
+
+module.exports.silent = (fromDir, moduleId) => _resolveFrom(fromDir, moduleId, true);

readme.md

@@ -2,8 +2,6 @@
 
 > Resolve the path of a module like [`require.resolve()`](http://nodejs.org/api/globals.html#globals_require_resolve) but from a given path
 
-Unlike `require.resolve()` it returns `null` instead of throwing when the module can't be found.
-
 
 ## Install
 
@@ -28,6 +26,12 @@ resolveFrom('foo', './bar');
 
 ### resolveFrom(fromDir, moduleId)
 
+Like `require()`, throws when the module can't be found.
+
+### resolveFrom.silent(fromDir, moduleId)
+
+Returns `null` instead of throwing when the module can't be found.
+
 #### fromDir
 
 Type: `string`

test.js

@@ -3,5 +3,15 @@ import m from './';
 
 test(t => {
 	t.regex(m('fixture', './fixture'), /fixture\/fixture\.js$/);
-	t.is(m('fixture', './fixture2'), null);
+	const moduleNotFoundError = t.throws(() => {
+		m('fixture', './nonexistent');
+	}, Error);
+	t.is(moduleNotFoundError.code, 'MODULE_NOT_FOUND');
+	t.is(moduleNotFoundError.message, 'Cannot find module \'./nonexistent\'');
+	t.regex(m.silent('fixture', './fixture'), /fixture\/fixture\.js$/);
+	t.is(m.silent('fixture', './nonexistent'), null);
+	const resolveFromfixture = m.bind(null, 'fixture');
+	t.regex(resolveFromfixture('./fixture'), /fixture\/fixture\.js$/);
+	const silentResolveFromfixture = m.silent.bind(null, 'fixture');
+	t.regex(silentResolveFromfixture('./fixture'), /fixture\/fixture\.js$/);
 });