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

module: use validateString in modules/cjs

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/24863
Refs: https://github.com/nodejs/node/pull/22101
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
This commit is contained in:
ZYSzys 2018-12-06 13:50:41 +08:00 committed by Rich Trott
parent a1a5c0419e
commit 4dc10ac7d7
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/internal/modules/cjs/helpers.js
View File

@ -1,6 +1,6 @@
'use strict'; 'use strict';
const { ERR_INVALID_ARG_TYPE } = require('internal/errors').codes; const { validateString } = require('internal/validators');
const { const {
CHAR_LINE_FEED, CHAR_LINE_FEED,
@ -26,18 +26,14 @@ function makeRequireFunction(mod) {
} }
function resolve(request, options) { function resolve(request, options) {
if (typeof request !== 'string') { validateString(request, 'request');
throw new ERR_INVALID_ARG_TYPE('request', 'string', request);
}
return Module._resolveFilename(request, mod, false, options); return Module._resolveFilename(request, mod, false, options);
} }
require.resolve = resolve; require.resolve = resolve;
function paths(request) { function paths(request) {
if (typeof request !== 'string') { validateString(request, 'request');
throw new ERR_INVALID_ARG_TYPE('request', 'string', request);
}
return Module._resolveLookupPaths(request, mod, true); return Module._resolveLookupPaths(request, mod, true);
} }

6
lib/internal/modules/cjs/loader.js
View File

@ -47,10 +47,10 @@ const preserveSymlinksMain = getOptionValue('--preserve-symlinks-main');
const experimentalModules = getOptionValue('--experimental-modules'); const experimentalModules = getOptionValue('--experimental-modules');
const { const {
ERR_INVALID_ARG_TYPE,
ERR_INVALID_ARG_VALUE, ERR_INVALID_ARG_VALUE,
ERR_REQUIRE_ESM ERR_REQUIRE_ESM
} = require('internal/errors').codes; } = require('internal/errors').codes;
const { validateString } = require('internal/validators');
module.exports = Module; module.exports = Module;
@ -649,9 +649,7 @@ 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(id) { Module.prototype.require = function(id) {
if (typeof id !== 'string') { validateString(id, 'id');
throw new ERR_INVALID_ARG_TYPE('id', 'string', id);
}
if (id === '') { if (id === '') {
throw new ERR_INVALID_ARG_VALUE('id', id, throw new ERR_INVALID_ARG_VALUE('id', id,
'must be a non-empty string'); 'must be a non-empty string');