module: refactor to use normalizeRequirableId in the CJS module loader

`BuiltinModule.normalizeRequirableId()` was introduced in nodejs#47779 to fix a bug in the require function of SEAs and Snapshots, so that built-in modules with the `node:` scheme could be required correctly. This change makes more use of this API instead of `BuiltinModule.canBeRequiredByUsers()` and `BuiltinModule.canBeRequiredWithoutScheme()` to reduce chances of such bugs. Signed-off-by: Darshan Sen <[email protected]>
RaisinTen · May 6, 2023 · 1b0d145 · 1b0d145
1 parent 2de10f5
commit 1b0d145
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 22 deletions.
diff --git a/lib/internal/bootstrap/realm.js b/lib/internal/bootstrap/realm.js
@@ -286,17 +286,16 @@ class BuiltinModule {
   }
 
   static normalizeRequirableId(id) {
-    let normalizedId = id;
     if (StringPrototypeStartsWith(id, 'node:')) {
-      normalizedId = StringPrototypeSlice(id, 5);
-    }
-
-    if (!BuiltinModule.canBeRequiredByUsers(normalizedId) ||
-        (id === normalizedId && !BuiltinModule.canBeRequiredWithoutScheme(normalizedId))) {
-      return undefined;
+      const normalizedId = StringPrototypeSlice(id, 5);
+      if (BuiltinModule.canBeRequiredByUsers(normalizedId)) {
+        return normalizedId;
+      }
+    } else if (BuiltinModule.canBeRequiredWithoutScheme(id)) {
+      return id;
     }
 
-    return normalizedId;
+    return undefined;
   }
 
   static isBuiltin(id) {

diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
@@ -792,12 +792,7 @@ if (isWindows) {
 }
 
 Module._resolveLookupPaths = function(request, parent) {
-  if ((
-    StringPrototypeStartsWith(request, 'node:') &&
-    BuiltinModule.canBeRequiredByUsers(StringPrototypeSlice(request, 5))
-  ) || (
-    BuiltinModule.canBeRequiredWithoutScheme(request)
-  )) {
+  if (BuiltinModule.normalizeRequirableId(request)) {
     debug('looking for %j in []', request);
     return null;
   }
@@ -989,14 +984,7 @@ Module._load = function(request, parent, isMain) {
 };
 
 Module._resolveFilename = function(request, parent, isMain, options) {
-  if (
-    (
-      StringPrototypeStartsWith(request, 'node:') &&
-      BuiltinModule.canBeRequiredByUsers(StringPrototypeSlice(request, 5))
-    ) || (
-      BuiltinModule.canBeRequiredWithoutScheme(request)
-    )
-  ) {
+  if (BuiltinModule.normalizeRequirableId(request)) {
     return request;
   }