Skip to content

refactor: Replace builtins.rs with nodejs-built-in-modules crate #940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Boshen merged 1 commit into from
Dec 24, 2025
Merged

refactor: Replace builtins.rs with nodejs-built-in-modules crate #940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ cfg-if = "1"
fast-glob = "1"
indexmap = { version = "2", features = ["serde"] }
json-strip-comments = "3.1"
nodejs-built-in-modules = "0.0.1"
once_cell = "1" # Use `std::sync::OnceLock::get_or_try_init` when it is stable.
papaya = "0.2"
parking_lot = "0.12"
Expand Down
79 changes: 0 additions & 79 deletions src/builtins.rs
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
#![doc = include_str!("../examples/dir.rs")]
//! ```

mod builtins;
mod cache;
mod context;
mod error;
Expand All @@ -65,7 +64,6 @@ mod windows;
mod tests;

pub use crate::{
builtins::NODEJS_BUILTINS,
cache::{Cache, CachedPath},
error::{JSONError, ResolveError, SpecifierError},
file_system::{FileMetadata, FileSystem, FileSystemOs},
Expand Down Expand Up @@ -447,7 +445,9 @@ impl<Fs: FileSystem> ResolverGeneric<Fs> {
fn require_core(&self, specifier: &str) -> Result<(), ResolveError> {
if self.options.builtin_modules {
let is_runtime_module = specifier.starts_with("node:");
if is_runtime_module || NODEJS_BUILTINS.binary_search(&specifier).is_ok() {
if is_runtime_module
|| nodejs_built_in_modules::BUILTINS.binary_search(&specifier).is_ok()
{
let resolved = if is_runtime_module {
specifier.to_string()
} else {
Expand Down
82 changes: 12 additions & 70 deletions src/tests/builtins.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,86 +16,28 @@ fn builtins() {

let resolver = Resolver::new(ResolveOptions::default().with_builtin_modules(true));

let pass = [
"_http_agent",
"_http_client",
"_http_common",
"_http_incoming",
"_http_outgoing",
"_http_server",
"_stream_duplex",
"_stream_passthrough",
"_stream_readable",
"_stream_transform",
"_stream_wrap",
"_stream_writable",
"_tls_common",
"_tls_wrap",
"assert",
"assert/strict",
"async_hooks",
"buffer",
"child_process",
"cluster",
"console",
"constants",
"crypto",
"dgram",
"diagnostics_channel",
"dns",
"dns/promises",
"domain",
"events",
"fs",
"fs/promises",
"http",
"http2",
"https",
"inspector",
"module",
"net",
"os",
"path",
"path/posix",
"path/win32",
"perf_hooks",
"process",
"punycode",
"querystring",
"readline",
"repl",
"stream",
"stream/consumers",
"stream/promises",
"stream/web",
"string_decoder",
"sys",
"timers",
"timers/promises",
"tls",
"trace_events",
"tty",
"url",
"util",
"util/types",
"v8",
"vm",
"worker_threads",
"zlib",
];

for request in pass {
for request in nodejs_built_in_modules::BUILTINS {
let prefixed_request = format!("node:{request}");
for request in [prefixed_request.clone(), request.to_string()] {
let starts_with_node = request.starts_with("node:");
let resolved_path = resolver.resolve(f, &request).map(|r| r.full_path());
let resolved_path = resolver.resolve(f, &request);
let err = ResolveError::Builtin {
resolved: prefixed_request.clone(),
is_runtime_module: starts_with_node,
};
assert_eq!(resolved_path, Err(err), "{request}");
}
}

for request in nodejs_built_in_modules::BUILTINS_WITH_MANDATORY_NODE_PREFIX {
let resolved_path = resolver.resolve(f, request);
assert_eq!(resolved_path, Err(ResolveError::NotFound(request.to_string())), "{request}");

let prefixed_request = format!("node:{request}");
let resolved_path = resolver.resolve(f, &prefixed_request);
let err = ResolveError::Builtin { resolved: prefixed_request, is_runtime_module: true };
assert_eq!(resolved_path, Err(err), "{request}");
}
}

#[test]
Expand Down
Loading