module: use validateString in modules/cjs
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:
parent
a1a5c0419e
commit
4dc10ac7d7
@ -1,6 +1,6 @@
|
||||
'use strict';
|
||||
|
||||
const { ERR_INVALID_ARG_TYPE } = require('internal/errors').codes;
|
||||
const { validateString } = require('internal/validators');
|
||||
|
||||
const {
|
||||
CHAR_LINE_FEED,
|
||||
@ -26,18 +26,14 @@ function makeRequireFunction(mod) {
|
||||
}
|
||||
|
||||
function resolve(request, options) {
|
||||
if (typeof request !== 'string') {
|
||||
throw new ERR_INVALID_ARG_TYPE('request', 'string', request);
|
||||
}
|
||||
validateString(request, 'request');
|
||||
return Module._resolveFilename(request, mod, false, options);
|
||||
}
|
||||
|
||||
require.resolve = resolve;
|
||||
|
||||
function paths(request) {
|
||||
if (typeof request !== 'string') {
|
||||
throw new ERR_INVALID_ARG_TYPE('request', 'string', request);
|
||||
}
|
||||
validateString(request, 'request');
|
||||
return Module._resolveLookupPaths(request, mod, true);
|
||||
}
|
||||
|
||||
|
@ -47,10 +47,10 @@ const preserveSymlinksMain = getOptionValue('--preserve-symlinks-main');
|
||||
const experimentalModules = getOptionValue('--experimental-modules');
|
||||
|
||||
const {
|
||||
ERR_INVALID_ARG_TYPE,
|
||||
ERR_INVALID_ARG_VALUE,
|
||||
ERR_REQUIRE_ESM
|
||||
} = require('internal/errors').codes;
|
||||
const { validateString } = require('internal/validators');
|
||||
|
||||
module.exports = Module;
|
||||
|
||||
@ -649,9 +649,7 @@ Module.prototype.load = function(filename) {
|
||||
// Loads a module at the given file path. Returns that module's
|
||||
// `exports` property.
|
||||
Module.prototype.require = function(id) {
|
||||
if (typeof id !== 'string') {
|
||||
throw new ERR_INVALID_ARG_TYPE('id', 'string', id);
|
||||
}
|
||||
validateString(id, 'id');
|
||||
if (id === '') {
|
||||
throw new ERR_INVALID_ARG_VALUE('id', id,
|
||||
'must be a non-empty string');
|
||||
|
Loading…
x
Reference in New Issue
Block a user