diff --git a/lib/internal/modules/cjs/helpers.js b/lib/internal/modules/cjs/helpers.js index 4a878c7007fffd..ce0c2703434488 100644 --- a/lib/internal/modules/cjs/helpers.js +++ b/lib/internal/modules/cjs/helpers.js @@ -106,7 +106,8 @@ function makeRequireFunction(mod, redirects) { }; } else { require = function require(path) { - return mod[require_private_symbol](mod, path); + // When no policy manifest, the original prototype.require is sustained + return mod.require(path); }; } diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js index 73653fcdaa9437..42e5cc50105560 100644 --- a/lib/internal/modules/cjs/loader.js +++ b/lib/internal/modules/cjs/loader.js @@ -235,10 +235,9 @@ function Module(id = '', parent) { if (policy?.manifest) { const moduleURL = pathToFileURL(id); redirects = policy.manifest.getDependencyMapper(moduleURL); + // TODO(rafaelgss): remove the necessity of this branch + setOwnProperty(this, 'require', makeRequireFunction(this, redirects)); } - setOwnProperty(this, 'require', makeRequireFunction(this, redirects)); - // Loads a module at the given file path. Returns that module's - // `exports` property. this[require_private_symbol] = internalRequire; } @@ -1128,6 +1127,23 @@ Module.prototype.load = function(filename) { esmLoader.cjsCache.set(this, exports); }; +// Loads a module at the given file path. Returns that module's +// `exports` property. +// Note: when using the experimental policy mechanism this function is overridden +Module.prototype.require = function(id) { + validateString(id, 'id'); + if (id === '') { + throw new ERR_INVALID_ARG_VALUE('id', id, + 'must be a non-empty string'); + } + requireDepth++; + try { + return Module._load(id, this, /* isMain */ false); + } finally { + requireDepth--; + } +}; + // Resolved path to process.argv[1] will be lazily placed here // (needed for setting breakpoint when called with --inspect-brk) let resolvedArgv; @@ -1191,10 +1207,12 @@ function wrapSafe(filename, content, cjsModuleInstance) { // Returns exception, if any. Module.prototype._compile = function(content, filename) { let moduleURL; - if (policy?.manifest) { + let redirects; + const manifest = policy?.manifest; + if (manifest) { moduleURL = pathToFileURL(filename); - policy.manifest.getDependencyMapper(moduleURL); - policy.manifest.assertIntegrity(moduleURL, content); + redirects = manifest.getDependencyMapper(moduleURL); + manifest.assertIntegrity(moduleURL, content); } const compiledWrapper = wrapSafe(filename, content, this); @@ -1223,6 +1241,7 @@ Module.prototype._compile = function(content, filename) { } } const dirname = path.dirname(filename); + const require = makeRequireFunction(this, redirects); let result; const exports = this.exports; const thisValue = exports; @@ -1230,10 +1249,10 @@ Module.prototype._compile = function(content, filename) { if (requireDepth === 0) statCache = new SafeMap(); if (inspectorWrapper) { result = inspectorWrapper(compiledWrapper, thisValue, exports, - module.require, module, filename, dirname); + require, module, filename, dirname); } else { result = ReflectApply(compiledWrapper, thisValue, - [exports, module.require, module, filename, dirname]); + [exports, require, module, filename, dirname]); } hasLoadedAnyUserCJSModule = true; if (requireDepth === 0) statCache = null;