Skip to content

Commit 1260d9d

Browse files
Alexander Wenzowskiljharb
authored andcommitted
[New] add searched extensions to error messages
1 parent caffe35 commit 1260d9d

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed

lib/async.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ var fs = require('fs');
33
var path = require('path');
44
var caller = require('./caller.js');
55
var nodeModulesPaths = require('./node-modules-paths.js');
6+
var format = require('util').format;
67

78
module.exports = function resolve(x, options, callback) {
89
var cb = callback;
@@ -43,7 +44,7 @@ module.exports = function resolve(x, options, callback) {
4344
else if (n) cb(null, n, pkg);
4445
else if (core[x]) return cb(null, x);
4546
else {
46-
var moduleError = new Error("Cannot find module '" + x + "' from '" + y + "'");
47+
var moduleError = new Error(format("Cannot find module '%s' from '%s' with extension in %j", x, y, extensions));
4748
moduleError.code = 'MODULE_NOT_FOUND';
4849
cb(moduleError);
4950
}
@@ -56,7 +57,7 @@ module.exports = function resolve(x, options, callback) {
5657
if (err) cb(err);
5758
else if (d) cb(null, d, pkg);
5859
else {
59-
var moduleError = new Error("Cannot find module '" + x + "' from '" + y + "'");
60+
var moduleError = new Error(format("Cannot find module '%s' from '%s' with extension in %j", x, y, extensions));
6061
moduleError.code = 'MODULE_NOT_FOUND';
6162
cb(moduleError);
6263
}

lib/sync.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ var fs = require('fs');
33
var path = require('path');
44
var caller = require('./caller.js');
55
var nodeModulesPaths = require('./node-modules-paths.js');
6+
var format = require('util').format;
67

78
module.exports = function (x, options) {
89
var opts = options || {};
@@ -34,7 +35,7 @@ module.exports = function (x, options) {
3435

3536
if (core[x]) return x;
3637

37-
var err = new Error("Cannot find module '" + x + "' from '" + y + "'");
38+
var err = new Error(format("Cannot find module '%s' from '%s' with extension in %j", x, y, extensions));
3839
err.code = 'MODULE_NOT_FOUND';
3940
throw err;
4041

test/mock.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ test('mock', function (t) {
3333
});
3434

3535
resolve('baz', opts('/foo/bar'), function (err, res) {
36-
t.equal(err.message, "Cannot find module 'baz' from '" + path.resolve('/foo/bar') + "'");
36+
t.equal(err.message, "Cannot find module 'baz' from '" + path.resolve('/foo/bar') + "' with extension in [\".js\"]");
3737
t.equal(err.code, 'MODULE_NOT_FOUND');
3838
});
3939

4040
resolve('../baz', opts('/foo/bar'), function (err, res) {
41-
t.equal(err.message, "Cannot find module '../baz' from '" + path.resolve('/foo/bar') + "'");
41+
t.equal(err.message, "Cannot find module '../baz' from '" + path.resolve('/foo/bar') + "' with extension in [\".js\"]");
4242
t.equal(err.code, 'MODULE_NOT_FOUND');
4343
});
4444
});
@@ -75,12 +75,12 @@ test('mock from package', function (t) {
7575
});
7676

7777
resolve('baz', opts('/foo/bar'), function (err, res) {
78-
t.equal(err.message, "Cannot find module 'baz' from '" + path.resolve('/foo/bar') + "'");
78+
t.equal(err.message, "Cannot find module 'baz' from '" + path.resolve('/foo/bar') + "' with extension in [\".js\"]");
7979
t.equal(err.code, 'MODULE_NOT_FOUND');
8080
});
8181

8282
resolve('../baz', opts('/foo/bar'), function (err, res) {
83-
t.equal(err.message, "Cannot find module '../baz' from '" + path.resolve('/foo/bar') + "'");
83+
t.equal(err.message, "Cannot find module '../baz' from '" + path.resolve('/foo/bar') + "' with extension in [\".js\"]");
8484
t.equal(err.code, 'MODULE_NOT_FOUND');
8585
});
8686
});

test/resolver.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ test('async foo', function (t) {
3131
});
3232

3333
resolve('foo', { basedir: dir }, function (err) {
34-
t.equal(err.message, "Cannot find module 'foo' from '" + path.resolve(dir) + "'");
34+
t.equal(err.message, "Cannot find module 'foo' from '" + path.resolve(dir) + "' with extension in [\".js\"]");
3535
t.equal(err.code, 'MODULE_NOT_FOUND');
3636
});
3737
});
@@ -190,7 +190,7 @@ test('cup', function (t) {
190190
});
191191

192192
resolve('./cup', { basedir: dir, extensions: ['.js'] }, function (err, res) {
193-
t.equal(err.message, "Cannot find module './cup' from '" + path.resolve(dir) + "'");
193+
t.equal(err.message, "Cannot find module './cup' from '" + path.resolve(dir) + "' with extension in [\".js\"]");
194194
t.equal(err.code, 'MODULE_NOT_FOUND');
195195
});
196196
});
@@ -231,12 +231,12 @@ test('other path', function (t) {
231231
});
232232

233233
resolve('root', { basedir: dir }, function (err, res) {
234-
t.equal(err.message, "Cannot find module 'root' from '" + path.resolve(dir) + "'");
234+
t.equal(err.message, "Cannot find module 'root' from '" + path.resolve(dir) + "' with extension in [\".js\"]");
235235
t.equal(err.code, 'MODULE_NOT_FOUND');
236236
});
237237

238238
resolve('zzz', { basedir: dir, paths: [otherDir] }, function (err, res) {
239-
t.equal(err.message, "Cannot find module 'zzz' from '" + path.resolve(dir) + "'");
239+
t.equal(err.message, "Cannot find module 'zzz' from '" + path.resolve(dir) + "' with extension in [\".js\"]");
240240
t.equal(err.code, 'MODULE_NOT_FOUND');
241241
});
242242
});

0 commit comments

Comments
 (0)