src: use node:moduleName as builtin module filename

This change allows for easier recognition of builtin modules in stack traces. Refs: #11893 PR-URL: #35498 Reviewed-By: Joyee Cheung <[email protected]> Reviewed-By: Antoine du Hamel <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Zeyu Yang <[email protected]>
nodejs · Oct 7, 2020 · 2178227 · 2178227
1 parent 19f1451
commit 2178227
Show file tree

Hide file tree

Showing 47 changed files with 306 additions and 304 deletions.
diff --git a/lib/assert.js b/lib/assert.js
@@ -30,6 +30,8 @@ const {
   NumberIsNaN,
   RegExpPrototypeTest,
   String,
+  StringPrototypeSlice,
+  StringPrototypeStartsWith,
 } = primordials;
 
 const { Buffer } = require('buffer');
@@ -289,8 +291,8 @@ function getErrMessage(message, fn) {
     identifier = `${filename}${line}${column}`;
 
     // Skip Node.js modules!
-    if (filename.endsWith('.js') &&
-        NativeModule.exists(filename.slice(0, -3))) {
+    if (StringPrototypeStartsWith(filename, 'node:') &&
+        NativeModule.exists(StringPrototypeSlice(filename, 5))) {
       errorCache.set(identifier, undefined);
       return;
     }

diff --git a/lib/internal/util/inspect.js b/lib/internal/util/inspect.js
@@ -183,7 +183,7 @@ const strEscapeSequencesReplacerSingle = /[\x00-\x1f\x5c\x7f-\x9f]/g;
 const keyStrRegExp = /^[a-zA-Z_][a-zA-Z_0-9]*$/;
 const numberRegExp = /^(0|[1-9][0-9]*)$/;
 
-const coreModuleRegExp = /^    at (?:[^/\\(]+ \(|)((?<![/\\]).+)\.js:\d+:\d+\)?$/;
+const coreModuleRegExp = /^    at (?:[^/\\(]+ \(|)node:(.+):\d+:\d+\)?$/;
 const nodeModulesRegExp = /[/\\]node_modules[/\\](.+?)(?=[/\\])/g;
 
 const classRegExp = /^(\s+[^(]*?)\s*{/;

diff --git a/src/node_native_module.cc b/src/node_native_module.cc
@@ -260,7 +260,7 @@ MaybeLocal<Function> NativeModuleLoader::LookupAndCompile(
     return {};
   }
 
-  std::string filename_s = id + std::string(".js");
+  std::string filename_s = std::string("node:") + id;
   Local<String> filename =
       OneByteString(isolate, filename_s.c_str(), filename_s.size());
   Local<Integer> line_offset = Integer::New(isolate, 0);

diff --git a/test/message/assert_throws_stack.out b/test/message/assert_throws_stack.out
@@ -1,4 +1,4 @@
-assert.js:*
+node:assert:*
       throw err;
       ^
 
@@ -20,8 +20,8 @@ AssertionError [ERR_ASSERTION]: Expected values to be strictly deep-equal:
   code: 'ERR_ASSERTION',
   actual: Error: foo
       at assert.throws.bar (*assert_throws_stack.js:*)
-      at getActual (assert.js:*)
-      at Function.throws (assert.js:*)
+      at getActual (node:assert:*)
+      at Function.throws (node:assert:*)
       at Object.<anonymous> (*assert_throws_stack.js:*:*)
       at *
       at *

diff --git a/test/message/async_error_nexttick_main.out b/test/message/async_error_nexttick_main.out
@@ -1,7 +1,7 @@
 Error: test
     at one (*fixtures*async-error.js:4:9)
     at two (*fixtures*async-error.js:17:9)
-    at processTicksAndRejections (internal/process/task_queues.js:*:*)
+    at processTicksAndRejections (node:internal/process/task_queues:*:*)
     at async three (*fixtures*async-error.js:20:3)
     at async four (*fixtures*async-error.js:24:3)
     at async main (*message*async_error_nexttick_main.js:7:5)
diff --git a/test/message/core_line_numbers.out b/test/message/core_line_numbers.out
@@ -1,14 +1,14 @@
-punycode.js:42
+node:punycode:42
 	throw new RangeError(errors[type]);
 	^
 
 RangeError: Invalid input
-    at error (punycode.js:42:8)
-    at Object.decode (punycode.js:*:*)
+    at error (node:punycode:42:8)
+    at Object.decode (node:punycode:*:*)
     at Object.<anonymous> (*test*message*core_line_numbers.js:*:*)
-    at Module._compile (internal/modules/cjs/loader.js:*:*)
-    at Object.Module._extensions..js (internal/modules/cjs/loader.js:*:*)
-    at Module.load (internal/modules/cjs/loader.js:*:*)
-    at Function.Module._load (internal/modules/cjs/loader.js:*:*)
-    at Function.executeUserEntryPoint [as runMain] (internal/modules/run_main.js:*:*)
-    at internal/main/run_main_module.js:*:*
+    at Module._compile (node:internal/modules/cjs/loader:*:*)
+    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*:*)
+    at Module.load (node:internal/modules/cjs/loader:*:*)
+    at Function.Module._load (node:internal/modules/cjs/loader:*:*)
+    at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*:*)
+    at node:internal/main/run_main_module:*:*
diff --git a/test/message/error_exit.out b/test/message/error_exit.out
@@ -1,5 +1,5 @@
 Exiting with code=1
-assert.js:*
+node:assert:*
   throw new AssertionError(obj);
   ^
 
@@ -8,12 +8,12 @@ AssertionError [ERR_ASSERTION]: Expected values to be strictly equal:
 1 !== 2
 
     at Object.<anonymous> (*test*message*error_exit.js:*:*)
-    at Module._compile (internal/modules/cjs/loader.js:*:*)
-    at Object.Module._extensions..js (internal/modules/cjs/loader.js:*:*)
-    at Module.load (internal/modules/cjs/loader.js:*:*)
-    at Function.Module._load (internal/modules/cjs/loader.js:*:*)
-    at Function.executeUserEntryPoint [as runMain] (internal/modules/run_main.js:*:*)
-    at internal/main/run_main_module.js:*:* {
+    at Module._compile (node:internal/modules/cjs/loader:*:*)
+    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*:*)
+    at Module.load (node:internal/modules/cjs/loader:*:*)
+    at Function.Module._load (node:internal/modules/cjs/loader:*:*)
+    at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*:*)
+    at node:internal/main/run_main_module:*:* {
   generatedMessage: true,
   code: 'ERR_ASSERTION',
   actual: 1,

diff --git a/test/message/error_with_nul.out b/test/message/error_with_nul.out
diff --git a/test/message/esm_display_syntax_error.out b/test/message/esm_display_syntax_error.out
@@ -3,5 +3,5 @@ await async () => 0;
 ^^^^^
 
 SyntaxError: Unexpected reserved word
-    at Loader.moduleStrategy (internal/modules/esm/translators.js:*:*)
-    at async link (internal/modules/esm/module_job.js:*:*)
+    at Loader.moduleStrategy (node:internal/modules/esm/translators:*:*)
+    at async link (node:internal/modules/esm/module_job:*:*)
diff --git a/test/message/esm_display_syntax_error_import.out b/test/message/esm_display_syntax_error_import.out
@@ -2,7 +2,7 @@ file:///*/test/message/esm_display_syntax_error_import.mjs:5
   notfound
   ^^^^^^^^
 SyntaxError: The requested module '../fixtures/es-module-loaders/module-named-exports.mjs' does not provide an export named 'notfound'
-    at ModuleJob._instantiate (internal/modules/esm/module_job.js:*:*)
-    at async ModuleJob.run (internal/modules/esm/module_job.js:*:*)
-    at async Loader.import (internal/modules/esm/loader.js:*:*)
-    at async Object.loadESM (internal/process/esm_loader.js:*:*)
+    at ModuleJob._instantiate (node:internal/modules/esm/module_job:*:*)
+    at async ModuleJob.run (node:internal/modules/esm/module_job:*:*)
+    at async Loader.import (node:internal/modules/esm/loader:*:*)
+    at async Object.loadESM (node:internal/process/esm_loader:*:*)
diff --git a/test/message/esm_display_syntax_error_import_module.out b/test/message/esm_display_syntax_error_import_module.out
@@ -2,7 +2,7 @@ file:///*/test/fixtures/es-module-loaders/syntax-error-import.mjs:1
 import { foo, notfound } from './module-named-exports.mjs';
               ^^^^^^^^
 SyntaxError: The requested module './module-named-exports.mjs' does not provide an export named 'notfound'
-    at ModuleJob._instantiate (internal/modules/esm/module_job.js:*:*)
-    at async ModuleJob.run (internal/modules/esm/module_job.js:*:*)
-    at async Loader.import (internal/modules/esm/loader.js:*:*)
-    at async Object.loadESM (internal/process/esm_loader.js:*:*)
+    at ModuleJob._instantiate (node:internal/modules/esm/module_job:*:*)
+    at async ModuleJob.run (node:internal/modules/esm/module_job:*:*)
+    at async Loader.import (node:internal/modules/esm/loader:*:*)
+    at async Object.loadESM (node:internal/process/esm_loader:*:*)
diff --git a/test/message/esm_display_syntax_error_module.out b/test/message/esm_display_syntax_error_module.out
@@ -3,4 +3,4 @@ await async () => 0;
 ^^^^^^^^^^^^^
 
 SyntaxError: Malformed arrow function parameter list
-    at Loader.moduleStrategy (internal/modules/esm/translators.js:*:*)
+    at Loader.moduleStrategy (node:internal/modules/esm/translators:*:*)
diff --git a/test/message/esm_loader_not_found.out b/test/message/esm_loader_not_found.out
@@ -1,18 +1,18 @@
 (node:*) ExperimentalWarning: --experimental-loader is an experimental feature. This feature could change at any time
 (Use `* --trace-warnings ...` to show where the warning was created)
-internal/process/esm_loader.js:*
+node:internal/process/esm_loader:*
     internalBinding('errors').triggerUncaughtException(
                               ^
 Error [ERR_MODULE_NOT_FOUND]: Cannot find package 'i-dont-exist' imported from *
-    at new NodeError (internal/errors.js:*:*)
-    at packageResolve (internal/modules/esm/resolve.js:*:*)
-    at moduleResolve (internal/modules/esm/resolve.js:*:*)
-    at Loader.defaultResolve [as _resolve] (internal/modules/esm/resolve.js:*:*)
-    at Loader.resolve (internal/modules/esm/loader.js:*:*)
-    at Loader.getModuleJob (internal/modules/esm/loader.js:*:*)
-    at Loader.import (internal/modules/esm/loader.js:*:*)
-    at internal/process/esm_loader.js:*:*
-    at initializeLoader (internal/process/esm_loader.js:*:*)
-    at Object.loadESM (internal/process/esm_loader.js:*:*) {
+    at new NodeError (node:internal/errors:*:*)
+    at packageResolve (node:internal/modules/esm/resolve:*:*)
+    at moduleResolve (node:internal/modules/esm/resolve:*:*)
+    at Loader.defaultResolve [as _resolve] (node:internal/modules/esm/resolve:*:*)
+    at Loader.resolve (node:internal/modules/esm/loader:*:*)
+    at Loader.getModuleJob (node:internal/modules/esm/loader:*:*)
+    at Loader.import (node:internal/modules/esm/loader:*:*)
+    at node:internal/process/esm_loader:*:*
+    at initializeLoader (node:internal/process/esm_loader:*:*)
+    at Object.loadESM (node:internal/process/esm_loader:*:*) {
   code: 'ERR_MODULE_NOT_FOUND'
 }
diff --git a/test/message/esm_loader_not_found_cjs_hint_bare.out b/test/message/esm_loader_not_found_cjs_hint_bare.out
@@ -1,16 +1,16 @@
-internal/process/esm_loader.js:*
+node:internal/process/esm_loader:*
     internalBinding('errors').triggerUncaughtException(
                               ^
 
 Error [ERR_MODULE_NOT_FOUND]: Cannot find module '*test*fixtures*node_modules*some_module*obj' imported from *test*fixtures*esm_loader_not_found_cjs_hint_bare.mjs
 Did you mean to import some_module/obj.js?
-    at new NodeError (internal/errors.js:*:*)
-    at finalizeResolution (internal/modules/esm/resolve.js:*:*)
-    at moduleResolve (internal/modules/esm/resolve.js:*:*)
-    at Loader.defaultResolve [as _resolve] (internal/modules/esm/resolve.js:*:*)
-    at Loader.resolve (internal/modules/esm/loader.js:*:*)
-    at Loader.getModuleJob (internal/modules/esm/loader.js:*:*)
-    at ModuleWrap.<anonymous> (internal/modules/esm/module_job.js:*:*)
-    at link (internal/modules/esm/module_job.js:*:*) {
+    at new NodeError (node:internal/errors:*:*)
+    at finalizeResolution (node:internal/modules/esm/resolve:*:*)
+    at moduleResolve (node:internal/modules/esm/resolve:*:*)
+    at Loader.defaultResolve [as _resolve] (node:internal/modules/esm/resolve:*:*)
+    at Loader.resolve (node:internal/modules/esm/loader:*:*)
+    at Loader.getModuleJob (node:internal/modules/esm/loader:*:*)
+    at ModuleWrap.<anonymous> (node:internal/modules/esm/module_job:*:*)
+    at link (node:internal/modules/esm/module_job:*:*) {
   code: 'ERR_MODULE_NOT_FOUND'
 }
diff --git a/test/message/esm_loader_not_found_cjs_hint_relative.out b/test/message/esm_loader_not_found_cjs_hint_relative.out
@@ -1,20 +1,20 @@
 (node:*) ExperimentalWarning: --experimental-loader is an experimental feature. This feature could change at any time
 (Use `* --trace-warnings ...` to show where the warning was created)
-internal/process/esm_loader.js:*
+node:internal/process/esm_loader:*
     internalBinding('errors').triggerUncaughtException(
                               ^
 
 Error [ERR_MODULE_NOT_FOUND]: Cannot find module '*test*common*fixtures' imported from *
 Did you mean to import ./test/common/fixtures.js?
-    at new NodeError (internal/errors.js:*:*)
-    at finalizeResolution (internal/modules/esm/resolve.js:*:*)
-    at moduleResolve (internal/modules/esm/resolve.js:*:*)
-    at Loader.defaultResolve [as _resolve] (internal/modules/esm/resolve.js:*:*)
-    at Loader.resolve (internal/modules/esm/loader.js:*:*)
-    at Loader.getModuleJob (internal/modules/esm/loader.js:*:*)
-    at Loader.import (internal/modules/esm/loader.js:*:*)
-    at internal/process/esm_loader.js:*:*
-    at initializeLoader (internal/process/esm_loader.js:*:*)
-    at Object.loadESM (internal/process/esm_loader.js:*:*) {
+    at new NodeError (node:internal/errors:*:*)
+    at finalizeResolution (node:internal/modules/esm/resolve:*:*)
+    at moduleResolve (node:internal/modules/esm/resolve:*:*)
+    at Loader.defaultResolve [as _resolve] (node:internal/modules/esm/resolve:*:*)
+    at Loader.resolve (node:internal/modules/esm/loader:*:*)
+    at Loader.getModuleJob (node:internal/modules/esm/loader:*:*)
+    at Loader.import (node:internal/modules/esm/loader:*:*)
+    at node:internal/process/esm_loader:*:*
+    at initializeLoader (node:internal/process/esm_loader:*:*)
+    at Object.loadESM (node:internal/process/esm_loader:*:*) {
   code: 'ERR_MODULE_NOT_FOUND'
 }
diff --git a/test/message/esm_loader_syntax_error.out b/test/message/esm_loader_syntax_error.out
@@ -5,5 +5,5 @@ await async () => 0;
 ^^^^^^^^^^^^^
 
 SyntaxError: Malformed arrow function parameter list
-    at Loader.moduleStrategy (internal/modules/esm/translators.js:*:*)
-    at async link (internal/modules/esm/module_job.js:*:*)
+    at Loader.moduleStrategy (node:internal/modules/esm/translators:*:*)
+    at async link (node:internal/modules/esm/module_job:*:*)
diff --git a/test/message/eval_messages.out b/test/message/eval_messages.out
@@ -3,13 +3,13 @@
 with(this){__filename}
 ^^^^
 SyntaxError: Strict mode code may not include a with statement
-    at new Script (vm.js:*:*)
-    at createScript (vm.js:*:*)
-    at Object.runInThisContext (vm.js:*:*)
-    at internal/process/execution.js:*:*
+    at new Script (node:vm:*:*)
+    at createScript (node:vm:*:*)
+    at Object.runInThisContext (node:vm:*:*)
+    at node:internal/process/execution:*:*
     at [eval]-wrapper:*:*
-    at evalScript (internal/process/execution.js:*:*)
-    at internal/main/eval_string.js:*:*
+    at evalScript (node:internal/process/execution:*:*)
+    at node:internal/main/eval_string:*:*
 42
 42
 [eval]:1
@@ -18,38 +18,38 @@ throw new Error("hello")
 
 Error: hello
     at [eval]:1:7
-    at Script.runInThisContext (vm.js:*:*)
-    at Object.runInThisContext (vm.js:*:*)
-    at internal/process/execution.js:*:*
+    at Script.runInThisContext (node:vm:*:*)
+    at Object.runInThisContext (node:vm:*:*)
+    at node:internal/process/execution:*:*
     at [eval]-wrapper:*:*
-    at evalScript (internal/process/execution.js:*:*)
-    at internal/main/eval_string.js:*:*
+    at evalScript (node:internal/process/execution:*:*)
+    at node:internal/main/eval_string:*:*
 
 [eval]:1
 throw new Error("hello")
 ^
 
 Error: hello
     at [eval]:1:7
-    at Script.runInThisContext (vm.js:*:*)
-    at Object.runInThisContext (vm.js:*:*)
-    at internal/process/execution.js:*:*
+    at Script.runInThisContext (node:vm:*:*)
+    at Object.runInThisContext (node:vm:*:*)
+    at node:internal/process/execution:*:*
     at [eval]-wrapper:*:*
-    at evalScript (internal/process/execution.js:*:*)
-    at internal/main/eval_string.js:*:*
+    at evalScript (node:internal/process/execution:*:*)
+    at node:internal/main/eval_string:*:*
 100
 [eval]:1
 var x = 100; y = x;
                ^
 
 ReferenceError: y is not defined
     at [eval]:1:16
-    at Script.runInThisContext (vm.js:*:*)
-    at Object.runInThisContext (vm.js:*:*)
-    at internal/process/execution.js:*:*
+    at Script.runInThisContext (node:vm:*:*)
+    at Object.runInThisContext (node:vm:*:*)
+    at node:internal/process/execution:*:*
     at [eval]-wrapper:*:*
-    at evalScript (internal/process/execution.js:*:*)
-    at internal/main/eval_string.js:*:*
+    at evalScript (node:internal/process/execution:*:*)
+    at node:internal/main/eval_string:*:*
 
 [eval]:1
 var ______________________________________________; throw 10

diff --git a/test/message/events_unhandled_error_common_trace.out b/test/message/events_unhandled_error_common_trace.out
@@ -1,20 +1,20 @@
-events.js:*
+node:events:*
       throw er; // Unhandled 'error' event
       ^
 
 Error: foo:bar
     at bar (*events_unhandled_error_common_trace.js:*:*)
     at foo (*events_unhandled_error_common_trace.js:*:*)
     at Object.<anonymous> (*events_unhandled_error_common_trace.js:*:*)
-    at Module._compile (internal/modules/cjs/loader.js:*:*)
-    at Object.Module._extensions..js (internal/modules/cjs/loader.js:*:*)
-    at Module.load (internal/modules/cjs/loader.js:*:*)
-    at Function.Module._load (internal/modules/cjs/loader.js:*:*)
-    at Function.executeUserEntryPoint [as runMain] (internal/modules/run_main.js:*:*)
-    at internal/main/run_main_module.js:*:*
+    at Module._compile (node:internal/modules/cjs/loader:*:*)
+    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*:*)
+    at Module.load (node:internal/modules/cjs/loader:*:*)
+    at Function.Module._load (node:internal/modules/cjs/loader:*:*)
+    at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*:*)
+    at node:internal/main/run_main_module:*:*
 Emitted 'error' event at:
     at quux (*events_unhandled_error_common_trace.js:*:*)
     at Object.<anonymous> (*events_unhandled_error_common_trace.js:*:*)
-    at Module._compile (internal/modules/cjs/loader.js:*:*)
+    at Module._compile (node:internal/modules/cjs/loader:*:*)
     [... lines matching original stack trace ...]
-    at internal/main/run_main_module.js:*:*
+    at node:internal/main/run_main_module:*:*
diff --git a/test/message/events_unhandled_error_nexttick.out b/test/message/events_unhandled_error_nexttick.out
@@ -1,15 +1,15 @@
-events.js:*
+node:events:*
       throw er; // Unhandled 'error' event
       ^
 
 Error
     at Object.<anonymous> (*events_unhandled_error_nexttick.js:*:*)
-    at Module._compile (internal/modules/cjs/loader.js:*:*)
-    at Object.Module._extensions..js (internal/modules/cjs/loader.js:*:*)
-    at Module.load (internal/modules/cjs/loader.js:*:*)
-    at Function.Module._load (internal/modules/cjs/loader.js:*:*)
-    at Function.executeUserEntryPoint [as runMain] (internal/modules/run_main.js:*:*)
-    at internal/main/run_main_module.js:*:*
+    at Module._compile (node:internal/modules/cjs/loader:*:*)
+    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*:*)
+    at Module.load (node:internal/modules/cjs/loader:*:*)
+    at Function.Module._load (node:internal/modules/cjs/loader:*:*)
+    at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*:*)
+    at node:internal/main/run_main_module:*:*
 Emitted 'error' event at:
     at *events_unhandled_error_nexttick.js:*:*
-    at processTicksAndRejections (internal/process/task_queues.js:*:*)
+    at processTicksAndRejections (node:internal/process/task_queues:*:*)