fixup: switch back to regular value arg to error

nodejs · Jun 24, 2022 · 1f380d1 · 1f380d1
1 parent c516dcd
commit 1f380d1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/lib/internal/modules/esm/loader.js b/lib/internal/modules/esm/loader.js
@@ -94,8 +94,6 @@ const { getOptionValue } = require('internal/options');
 
 let emittedSpecifierResolutionWarning = false;
 
-const nullTypeForErr = { constructor: { name: 'null' } };
-
 /**
  * A utility function to iterate through a hook chain, track advancement in the
  * chain, and generate and supply the `next<HookName>` argument to the custom
@@ -608,7 +606,7 @@ class ESMLoader {
         throw new ERR_INVALID_RETURN_VALUE(
           'an object',
           hookErrIdentifier,
-          output === null ? nullTypeForErr : output,
+          output,
         );
       }
     };
@@ -844,7 +842,7 @@ class ESMLoader {
         throw new ERR_INVALID_RETURN_VALUE(
           'an object',
           hookErrIdentifier,
-          output === null ? nullTypeForErr : output,
+          output,
         );
       }
     };

diff --git a/test/es-module/test-esm-loader-chaining.mjs b/test/es-module/test-esm-loader-chaining.mjs
@@ -332,7 +332,7 @@ const commonArgs = [
   assert.match(stderr, /loader-resolve-null-return\.mjs/);
   assert.match(stderr, /'resolve' hook's nextResolve\(\)/);
   assert.match(stderr, /an object/);
-  assert.match(stderr, /instance of null/);
+  assert.match(stderr, /got null/);
 }
 
 { // Verify error thrown when invalid `context` argument passed to `nextResolve`
@@ -372,7 +372,7 @@ const commonArgs = [
   assert.match(stderr, /loader-load-null-return\.mjs/);
   assert.match(stderr, /'load' hook's nextLoad\(\)/);
   assert.match(stderr, /an object/);
-  assert.match(stderr, /instance of null/);
+  assert.match(stderr, /got null/);
 }
 
 { // Verify error thrown when invalid `url` argument passed to `nextLoad`