summaryrefslogtreecommitdiff
path: root/cli/node/mod.rs
diff options
context:
space:
mode:
authorBartek IwaƄczuk <biwanczuk@gmail.com>2022-08-29 20:19:54 +0200
committerGitHub <noreply@github.com>2022-08-29 20:19:54 +0200
commitb62ef4d37bc1207abb2daed5e2568eb581f07aa2 (patch)
tree0e2e188a199d1ef2b7fdced66154021eb7eca6e5 /cli/node/mod.rs
parenta938aaf36fde1ecf25fdbff323690c98c99a1ecc (diff)
refactor(cli): Remove cli/node dependency on cli/compat (#15654)
Diffstat (limited to 'cli/node/mod.rs')
-rw-r--r--cli/node/mod.rs225
1 files changed, 217 insertions, 8 deletions
diff --git a/cli/node/mod.rs b/cli/node/mod.rs
index c19179d0c..71046b4b7 100644
--- a/cli/node/mod.rs
+++ b/cli/node/mod.rs
@@ -4,6 +4,7 @@ use std::collections::HashSet;
use std::path::Path;
use std::path::PathBuf;
+use crate::deno_std::CURRENT_STD_URL;
use deno_ast::MediaType;
use deno_ast::ModuleSpecifier;
use deno_core::anyhow::bail;
@@ -27,7 +28,6 @@ use once_cell::sync::Lazy;
use path_clean::PathClean;
use regex::Regex;
-use crate::compat;
use crate::file_fetcher::FileFetcher;
use crate::npm::GlobalNpmPackageResolver;
use crate::npm::NpmPackageReference;
@@ -35,9 +35,218 @@ use crate::npm::NpmPackageReq;
use crate::npm::NpmPackageResolver;
mod analyze;
+pub mod errors;
pub use analyze::esm_code_with_node_globals;
+pub struct NodeModulePolyfill {
+ /// Name of the module like "assert" or "timers/promises"
+ pub name: &'static str,
+
+ /// Specifier relative to the root of `deno_std` repo, like "node/asser.ts"
+ pub specifier: &'static str,
+}
+
+pub(crate) static SUPPORTED_MODULES: &[NodeModulePolyfill] = &[
+ NodeModulePolyfill {
+ name: "assert",
+ specifier: "node/assert.ts",
+ },
+ NodeModulePolyfill {
+ name: "assert/strict",
+ specifier: "node/assert/strict.ts",
+ },
+ NodeModulePolyfill {
+ name: "async_hooks",
+ specifier: "node/async_hooks.ts",
+ },
+ NodeModulePolyfill {
+ name: "buffer",
+ specifier: "node/buffer.ts",
+ },
+ NodeModulePolyfill {
+ name: "child_process",
+ specifier: "node/child_process.ts",
+ },
+ NodeModulePolyfill {
+ name: "cluster",
+ specifier: "node/cluster.ts",
+ },
+ NodeModulePolyfill {
+ name: "console",
+ specifier: "node/console.ts",
+ },
+ NodeModulePolyfill {
+ name: "constants",
+ specifier: "node/constants.ts",
+ },
+ NodeModulePolyfill {
+ name: "crypto",
+ specifier: "node/crypto.ts",
+ },
+ NodeModulePolyfill {
+ name: "dgram",
+ specifier: "node/dgram.ts",
+ },
+ NodeModulePolyfill {
+ name: "dns",
+ specifier: "node/dns.ts",
+ },
+ NodeModulePolyfill {
+ name: "domain",
+ specifier: "node/domain.ts",
+ },
+ NodeModulePolyfill {
+ name: "events",
+ specifier: "node/events.ts",
+ },
+ NodeModulePolyfill {
+ name: "fs",
+ specifier: "node/fs.ts",
+ },
+ NodeModulePolyfill {
+ name: "fs/promises",
+ specifier: "node/fs/promises.ts",
+ },
+ NodeModulePolyfill {
+ name: "http",
+ specifier: "node/http.ts",
+ },
+ NodeModulePolyfill {
+ name: "https",
+ specifier: "node/https.ts",
+ },
+ NodeModulePolyfill {
+ name: "module",
+ specifier: "node/module.ts",
+ },
+ NodeModulePolyfill {
+ name: "net",
+ specifier: "node/net.ts",
+ },
+ NodeModulePolyfill {
+ name: "os",
+ specifier: "node/os.ts",
+ },
+ NodeModulePolyfill {
+ name: "path",
+ specifier: "node/path.ts",
+ },
+ NodeModulePolyfill {
+ name: "path/posix",
+ specifier: "node/path/posix.ts",
+ },
+ NodeModulePolyfill {
+ name: "path/win32",
+ specifier: "node/path/win32.ts",
+ },
+ NodeModulePolyfill {
+ name: "perf_hooks",
+ specifier: "node/perf_hooks.ts",
+ },
+ NodeModulePolyfill {
+ name: "process",
+ specifier: "node/process.ts",
+ },
+ NodeModulePolyfill {
+ name: "querystring",
+ specifier: "node/querystring.ts",
+ },
+ NodeModulePolyfill {
+ name: "readline",
+ specifier: "node/readline.ts",
+ },
+ NodeModulePolyfill {
+ name: "stream",
+ specifier: "node/stream.ts",
+ },
+ NodeModulePolyfill {
+ name: "stream/promises",
+ specifier: "node/stream/promises.mjs",
+ },
+ NodeModulePolyfill {
+ name: "stream/web",
+ specifier: "node/stream/web.ts",
+ },
+ NodeModulePolyfill {
+ name: "string_decoder",
+ specifier: "node/string_decoder.ts",
+ },
+ NodeModulePolyfill {
+ name: "sys",
+ specifier: "node/sys.ts",
+ },
+ NodeModulePolyfill {
+ name: "timers",
+ specifier: "node/timers.ts",
+ },
+ NodeModulePolyfill {
+ name: "timers/promises",
+ specifier: "node/timers/promises.ts",
+ },
+ NodeModulePolyfill {
+ name: "tls",
+ specifier: "node/tls.ts",
+ },
+ NodeModulePolyfill {
+ name: "tty",
+ specifier: "node/tty.ts",
+ },
+ NodeModulePolyfill {
+ name: "url",
+ specifier: "node/url.ts",
+ },
+ NodeModulePolyfill {
+ name: "util",
+ specifier: "node/util.ts",
+ },
+ NodeModulePolyfill {
+ name: "util/types",
+ specifier: "node/util/types.ts",
+ },
+ NodeModulePolyfill {
+ name: "v8",
+ specifier: "node/v8.ts",
+ },
+ NodeModulePolyfill {
+ name: "vm",
+ specifier: "node/vm.ts",
+ },
+ NodeModulePolyfill {
+ name: "worker_threads",
+ specifier: "node/worker_threads.ts",
+ },
+ NodeModulePolyfill {
+ name: "zlib",
+ specifier: "node/zlib.ts",
+ },
+];
+
+pub(crate) static NODE_COMPAT_URL: Lazy<Url> = Lazy::new(|| {
+ if let Ok(url_str) = std::env::var("DENO_NODE_COMPAT_URL") {
+ let url = Url::parse(&url_str).expect(
+ "Malformed DENO_NODE_COMPAT_URL value, make sure it's a file URL ending with a slash"
+ );
+ return url;
+ }
+
+ CURRENT_STD_URL.clone()
+});
+
+pub static MODULE_ALL_URL: Lazy<Url> =
+ Lazy::new(|| NODE_COMPAT_URL.join("node/module_all.ts").unwrap());
+
+pub fn try_resolve_builtin_module(specifier: &str) -> Option<Url> {
+ for module in SUPPORTED_MODULES {
+ if module.name == specifier {
+ let module_url = NODE_COMPAT_URL.join(module.specifier).unwrap();
+ return Some(module_url);
+ }
+ }
+
+ None
+}
+
static RESERVED_WORDS: Lazy<HashSet<&str>> = Lazy::new(|| {
HashSet::from([
"break",
@@ -96,7 +305,7 @@ pub async fn initialize_runtime(
const moduleAll = await import(moduleAllUrl);
Deno[Deno.internal].node.initialize(moduleAll.default);
}})('{}');"#,
- compat::MODULE_ALL_URL.as_str(),
+ MODULE_ALL_URL.as_str(),
);
let value =
@@ -142,7 +351,7 @@ pub fn node_resolve(
Url::parse("node:module").unwrap(),
)));
}
- if let Some(resolved) = compat::try_resolve_builtin_module(specifier) {
+ if let Some(resolved) = try_resolve_builtin_module(specifier) {
return Ok(Some(ResolveResponse::Esm(resolved)));
}
@@ -165,7 +374,7 @@ pub fn node_resolve(
)));
}
- if let Some(resolved) = compat::try_resolve_builtin_module(&specifier) {
+ if let Some(resolved) = try_resolve_builtin_module(&specifier) {
return Ok(Some(ResolveResponse::Esm(resolved)));
} else {
return Err(generic_error(format!("Unknown module {}", specifier)));
@@ -173,7 +382,7 @@ pub fn node_resolve(
}
if protocol != "file" && protocol != "data" {
- return Err(compat::errors::err_unsupported_esm_url_scheme(&url));
+ return Err(errors::err_unsupported_esm_url_scheme(&url));
}
// todo(THIS PR): I think this is handled upstream so can be removed?
@@ -410,7 +619,7 @@ fn finalize_resolution(
let encoded_sep_re = Regex::new(r"%2F|%2C").unwrap();
if encoded_sep_re.is_match(resolved.path()) {
- return Err(compat::errors::err_invalid_module_specifier(
+ return Err(errors::err_invalid_module_specifier(
resolved.path(),
"must not include encoded \"/\" or \"\\\\\" characters",
Some(to_file_path_string(base)),
@@ -437,12 +646,12 @@ fn finalize_resolution(
(false, false)
};
if is_dir {
- return Err(compat::errors::err_unsupported_dir_import(
+ return Err(errors::err_unsupported_dir_import(
resolved.as_str(),
base.as_str(),
));
} else if !is_file {
- return Err(compat::errors::err_module_not_found(
+ return Err(errors::err_module_not_found(
resolved.as_str(),
base.as_str(),
"module",