module: convert schema-only core module on convertCJSFilenameToURL

Co-authored-by: Joyee Cheung <joyeec9h3@gmail.com>
PR-URL: #58612Fixes: #58607
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>

Author: 2 people

lib/internal/modules/customization_hooks.js

@@ -6,6 +6,7 @@ const {
  ArrayPrototypeSplice,
  ObjectAssign,
  ObjectFreeze,
+ StringPrototypeSlice,
  StringPrototypeStartsWith,
  Symbol,
 }=primordials;
@@ -126,9 +127,12 @@ function registerHooks(hooks) {
  */
 functionconvertCJSFilenameToURL(filename){
 if(!filename){returnfilename;}
-constbuiltinId=BuiltinModule.normalizeRequirableId(filename);
-if(builtinId){
-return`node:${builtinId}`;
+letnormalizedId=filename;
+if(StringPrototypeStartsWith(filename,'node:')){
+normalizedId=StringPrototypeSlice(filename,5);
+}
+if(BuiltinModule.canBeRequiredByUsers(normalizedId)){
+return`node:${normalizedId}`;
 }
 // Handle the case where filename is neither a path, nor a built-in id,
 // which is possible via monkey-patching.

test/module-hooks/test-module-hooks-builtin-require.js

@@ -0,0 +1,48 @@
+'use strict';
+
+// This tests that when builtins that demand the `node:` prefix are
+// required, the URL returned by the default resolution step is still
+// prefixed and valid, and that gets passed to the load hook is still
+// the one with the `node:` prefix. The one with the prefix
+// stripped for internal lookups should not get passed into the hooks.
+
+constcommon=require('../common');
+constassert=require('assert');
+const{ registerHooks }=require('module');
+
+constschemelessBlockList=newSet([
+'sea',
+'sqlite',
+'test',
+'test/reporters',
+]);
+
+consttestModules=[];
+for(constmodofschemelessBlockList){
+testModules.push(`node:${mod}`);
+}
+
+consthook=registerHooks({
+resolve: common.mustCall((specifier,context,nextResolve)=>{
+constresult=nextResolve(specifier,context);
+assert.match(result.url,/^node:/);
+assert.strictEqual(schemelessBlockList.has(result.url.slice(5,result.url.length)),true);
+returnresult;
+},testModules.length),
+load: common.mustCall(functionload(url,context,nextLoad){
+assert.match(url,/^node:/);
+assert.strictEqual(schemelessBlockList.has(url.slice(5,url.length)),true);
+constresult=nextLoad(url,context);
+assert.strictEqual(result.source,null);
+return{
+source: 'throw new Error("I should not be thrown because the loader ignores user-supplied source for builtins")',
+format: 'builtin',
+};
+},testModules.length),
+});
+
+for(constmodoftestModules){
+require(mod);
+}
+
+hook.deregister();

test/module-hooks/test-module-hooks-load-builtin-require.js

@@ -11,8 +11,9 @@ const { registerHooks } = require('module');
 
 // Pick a builtin that's unlikely to be loaded already - like zlib.
 assert(!process.moduleLoadList.includes('NativeModule zlib'));
+lethook;
 
-consthook=registerHooks({
+hook=registerHooks({
 load: common.mustCall(functionload(url,context,nextLoad){
 assert.strictEqual(url,'node:zlib');
 constresult=nextLoad(url,context);
@@ -27,3 +28,39 @@ const hook = registerHooks({
 assert.strictEqual(typeofrequire('zlib').createGzip,'function');
 
 hook.deregister();
+
+// This tests that when builtins that demand the `node:` prefix are
+// required, the URL returned by the default resolution step is still
+// prefixed and valid, and that gets passed to the load hook is still
+// the one with the `node:` prefix. The one with the prefix
+// stripped for internal lookups should not get passed into the hooks.
+constschemelessBlockList=newSet([
+'sea',
+'sqlite',
+'test',
+'test/reporters',
+]);
+
+consttestModules=[];
+for(constmodofschemelessBlockList){
+testModules.push(`node:${mod}`);
+}
+
+hook=registerHooks({
+load: common.mustCall(functionload(url,context,nextLoad){
+assert.match(url,/^node:/);
+assert.strictEqual(schemelessBlockList.has(url.slice(5,url.length)),true);
+constresult=nextLoad(url,context);
+assert.strictEqual(result.source,null);
+return{
+source: 'throw new Error("I should not be thrown because the loader ignores user-supplied source for builtins")',
+format: 'builtin',
+};
+},testModules.length),
+});
+
+for(constmodoftestModules){
+require(mod);
+}
+
+hook.deregister();