1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

module: use internal/errors.js in module.require

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/18359
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
This commit is contained in:
Joyee Cheung 2018-01-25 04:26:52 +08:00
parent 6ef17303a7
commit b21715403b
No known key found for this signature in database
GPG Key ID: F586868AAD831D0C
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/module.js
View File

@ -603,10 +603,15 @@ Module.prototype.load = function(filename) {
// Loads a module at the given file path. Returns that module's // Loads a module at the given file path. Returns that module's
// `exports` property. // `exports` property.
Module.prototype.require = function(path) { Module.prototype.require = function(id) {
assert(path, 'missing path'); if (typeof id !== 'string') {
assert(typeof path === 'string', 'path must be a string'); throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'id', 'string', id);
return Module._load(path, this, /* isMain */ false); }
if (id === '') {
throw new errors.Error('ERR_INVALID_ARG_VALUE',
'id', id, 'must be a non-empty string');
}
return Module._load(id, this, /* isMain */ false);
}; };

18
test/parallel/test-module-loading-error.js
View File

@ -59,16 +59,22 @@ assert.throws(
} }
); );
const re = /^The "id" argument must be of type string\. Received type \w+$/;
[1, false, null, undefined, {}].forEach((value) => {
common.expectsError( common.expectsError(
require, () => { require(value); },
{ {
code: 'ERR_ASSERTION', type: TypeError,
message: /^missing path$/ code: 'ERR_INVALID_ARG_TYPE',
message: re
});
}); });
common.expectsError( common.expectsError(
() => { require({}); }, () => { require(''); },
{ {
code: 'ERR_ASSERTION', type: Error,
message: /^path must be a string$/ code: 'ERR_INVALID_ARG_VALUE',
message: 'The argument \'id\' must be a non-empty string. Received \'\''
}); });

11
test/sequential/test-module-loading.js
View File

@ -297,17 +297,6 @@ try {
} }
// require() must take string, and must be truthy
assert.throws(function() {
console.error('require non-string');
require({ foo: 'bar' });
}, /path must be a string/);
assert.throws(function() {
console.error('require empty string');
require('');
}, /missing path/);
process.on('exit', function() { process.on('exit', function() {
assert.ok(a.A instanceof Function); assert.ok(a.A instanceof Function);
assert.strictEqual(a.A(), 'A done'); assert.strictEqual(a.A(), 'A done');