diff --git a/Cargo.lock b/Cargo.lock index 49739201d1f9a5..5df5b7354aa9ee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1343,8 +1343,9 @@ dependencies = [ [[package]] name = "deno_core" -version = "0.299.0" -source = "git+https://github.com/denoland/deno_core.git?rev=4fe63c9#4fe63c9dd2b4a3ed8e232fb3044eef4e65e9a59e" +version = "0.300.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb79d0494b8c15f97761645f4afca5d52a414d4dc8f8aef8ca3b3ca82240ab55" dependencies = [ "anyhow", "bincode", @@ -1824,8 +1825,9 @@ dependencies = [ [[package]] name = "deno_ops" -version = "0.175.0" -source = "git+https://github.com/denoland/deno_core.git?rev=4fe63c9#4fe63c9dd2b4a3ed8e232fb3044eef4e65e9a59e" +version = "0.176.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb75c43c9441f413f0595f694746f90d8ffd292337287da309dbd93773928c" dependencies = [ "proc-macro-rules", "proc-macro2", @@ -5971,8 +5973,9 @@ dependencies = [ [[package]] name = "serde_v8" -version = "0.208.0" -source = "git+https://github.com/denoland/deno_core.git?rev=4fe63c9#4fe63c9dd2b4a3ed8e232fb3044eef4e65e9a59e" +version = "0.209.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15d9095a8a725125fff1706f940af182e2a8ca01da8b0cd019aa47da93b28b94" dependencies = [ "num-bigint", "serde", diff --git a/Cargo.toml b/Cargo.toml index ed8eafd2bc354a..1c5020855ae317 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -45,7 +45,7 @@ repository = "https://github.com/denoland/deno" [workspace.dependencies] deno_ast = { version = "=0.40.0", features = ["transpiling"] } -deno_core = { git = "https://github.com/denoland/deno_core.git", rev = "4fe63c9" } +deno_core = { version = "0.300.0" } deno_bench_util = { version = "0.157.0", path = "./bench_util" } deno_lockfile = "0.20.0" diff --git a/cli/module_loader.rs b/cli/module_loader.rs index bda4e58d864854..2c833616292e46 100644 --- a/cli/module_loader.rs +++ b/cli/module_loader.rs @@ -35,7 +35,6 @@ use crate::util::text_encoding::code_without_source_map; use crate::util::text_encoding::source_map_from_code; use crate::worker::ModuleLoaderAndSourceMapGetter; use crate::worker::ModuleLoaderFactory; - use deno_ast::MediaType; use deno_core::anyhow::anyhow; use deno_core::anyhow::bail; @@ -64,6 +63,7 @@ use deno_graph::Module; use deno_graph::ModuleGraph; use deno_graph::Resolution; use deno_runtime::code_cache; +use deno_runtime::deno_node::get_host_defined_options; use deno_runtime::deno_permissions::PermissionsContainer; use deno_semver::npm::NpmPackageReqReference; use node_resolver::NodeResolutionMode; @@ -724,6 +724,19 @@ impl ModuleLoader Ok(specifier) } + fn get_host_defined_options<'s>( + &self, + scope: &mut deno_core::v8::HandleScope<'s>, + name: &str, + ) -> Option> { + let name = deno_core::ModuleSpecifier::parse(name).ok()?; + if self.0.shared.node_resolver.in_npm_package(&name) { + Some(get_host_defined_options(scope)) + } else { + None + } + } + fn load( &self, specifier: &ModuleSpecifier, diff --git a/cli/standalone/mod.rs b/cli/standalone/mod.rs index 1538807f1e88bd..80144d844ebb94 100644 --- a/cli/standalone/mod.rs +++ b/cli/standalone/mod.rs @@ -25,6 +25,7 @@ use deno_core::ResolutionKind; use deno_npm::npm_rc::ResolvedNpmRc; use deno_package_json::PackageJsonDepValue; use deno_runtime::deno_fs; +use deno_runtime::deno_node::get_host_defined_options; use deno_runtime::deno_node::NodeResolver; use deno_runtime::deno_permissions::Permissions; use deno_runtime::deno_permissions::PermissionsContainer; @@ -267,6 +268,19 @@ impl ModuleLoader for EmbeddedModuleLoader { } } + fn get_host_defined_options<'s>( + &self, + scope: &mut deno_core::v8::HandleScope<'s>, + name: &str, + ) -> Option> { + let name = deno_core::ModuleSpecifier::parse(name).ok()?; + if self.shared.node_resolver.in_npm_package(&name) { + Some(get_host_defined_options(scope)) + } else { + None + } + } + fn load( &self, original_specifier: &ModuleSpecifier, diff --git a/ext/node/global.rs b/ext/node/global.rs index 8a5494ad05be4f..2434a64fd42714 100644 --- a/ext/node/global.rs +++ b/ext/node/global.rs @@ -1,13 +1,9 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. -use std::mem::MaybeUninit; - use deno_core::v8; use deno_core::v8::GetPropertyNamesArgs; use deno_core::v8::MapFnTo; -use crate::NodeResolverRc; - // NOTE(bartlomieju): somehow calling `.map_fn_to()` multiple times on a function // returns two different pointers. That shouldn't be the case as `.map_fn_to()` // creates a thin wrapper that is a pure function. @piscisaureus suggests it @@ -239,19 +235,19 @@ fn is_managed_key( } fn current_mode(scope: &mut v8::HandleScope) -> Mode { - let Some(v8_string) = - v8::StackTrace::current_script_name_or_source_url(scope) + let Some(host_defined_options) = scope.get_current_host_defined_options() else { return Mode::Deno; }; - let op_state = deno_core::JsRuntime::op_state_from(scope); - let op_state = op_state.borrow(); - let Some(node_resolver) = op_state.try_borrow::() else { - return Mode::Deno; + // SAFETY: host defined options must always be a PrimitiveArray in current V8. + let host_defined_options = unsafe { + v8::Local::::cast_unchecked(host_defined_options) }; - let mut buffer = [MaybeUninit::uninit(); 2048]; - let str = v8_string.to_rust_cow_lossy(scope, &mut buffer); - if str.starts_with("node:") || node_resolver.in_npm_package_with_cache(str) { + if host_defined_options.length() < 1 { + return Mode::Deno; + } + let is_node = host_defined_options.get(scope, 0).is_true(); + if is_node { Mode::Node } else { Mode::Deno diff --git a/ext/node/lib.rs b/ext/node/lib.rs index 9a554c33f58daf..c6449de1708a5e 100644 --- a/ext/node/lib.rs +++ b/ext/node/lib.rs @@ -836,3 +836,12 @@ impl<'a> deno_package_json::fs::DenoPkgJsonFs for DenoPkgJsonFsAdapter<'a> { .map_err(|err| err.into_io_error()) } } + +pub fn get_host_defined_options<'s>( + scope: &mut v8::HandleScope<'s>, +) -> v8::Local<'s, v8::Data> { + let host_defined_options = v8::PrimitiveArray::new(scope, 1); + let value = v8::Boolean::new(scope, true); + host_defined_options.set(scope, 0, value.into()); + host_defined_options.into() +} diff --git a/ext/node/ops/vm_internal.rs b/ext/node/ops/vm_internal.rs index ca4abea51f6f84..389b1c7dc4e76e 100644 --- a/ext/node/ops/vm_internal.rs +++ b/ext/node/ops/vm_internal.rs @@ -1,5 +1,6 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. +use crate::get_host_defined_options; use deno_core::error::type_error; use deno_core::error::AnyError; use deno_core::v8; @@ -19,7 +20,22 @@ impl ContextifyScript { scope: &mut v8::HandleScope, source_str: v8::Local, ) -> Result { - let source = v8::script_compiler::Source::new(source_str, None); + let resource_name = v8::undefined(scope); + let host_defined_options = get_host_defined_options(scope); + let origin = v8::ScriptOrigin::new( + scope, + resource_name.into(), + 0, + 0, + false, + 0, + None, + false, + false, + false, + Some(host_defined_options), + ); + let source = v8::script_compiler::Source::new(source_str, Some(&origin)); let unbound_script = v8::script_compiler::compile_unbound_script( scope, diff --git a/ext/node/polyfills/01_require.js b/ext/node/polyfills/01_require.js index bbcc7555d9feb4..28f0aeb9f0d95a 100644 --- a/ext/node/polyfills/01_require.js +++ b/ext/node/polyfills/01_require.js @@ -976,9 +976,14 @@ function wrapSafe( filename, content, cjsModuleInstance, + format, ) { const wrapper = Module.wrap(content); - const [f, err] = core.evalContext(wrapper, `file://${filename}`); + const [f, err] = core.evalContext( + wrapper, + url.pathToFileURL(filename).toString(), + [format !== "module"], + ); if (err) { if (process.mainModule === cjsModuleInstance) { enrichCJSError(err.thrown); @@ -995,8 +1000,16 @@ function wrapSafe( return f; } -Module.prototype._compile = function (content, filename) { - const compiledWrapper = wrapSafe(filename, content, this); +Module.prototype._compile = function (content, filename, format) { + const compiledWrapper = wrapSafe(filename, content, this, format); + + if (format === "module") { + // TODO: implement require esm + throw createRequireEsmError( + filename, + moduleParentCache.get(module)?.filename, + ); + } const dirname = pathDirname(filename); const require = makeRequireFunction(this); @@ -1053,17 +1066,24 @@ Module.prototype._compile = function (content, filename) { Module._extensions[".js"] = function (module, filename) { const content = op_require_read_file(filename); + let format; if (StringPrototypeEndsWith(filename, ".js")) { const pkg = op_require_read_closest_package_json(filename); - if (pkg && pkg.typ === "module") { + if (pkg?.typ === "module") { + // TODO: implement require esm + format = "module"; throw createRequireEsmError( filename, moduleParentCache.get(module)?.filename, ); + } else if (pkg?.type === "commonjs") { + format = "commonjs"; } + } else if (StringPrototypeEndsWith(filename, ".cjs")) { + format = "commonjs"; } - module._compile(content, filename); + module._compile(content, filename, format); }; function createRequireEsmError(filename, parent) { diff --git a/ext/node_resolver/resolution.rs b/ext/node_resolver/resolution.rs index f4b2e8056f8fdc..e7e99aa3c93d7b 100644 --- a/ext/node_resolver/resolution.rs +++ b/ext/node_resolver/resolution.rs @@ -1,7 +1,6 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. use std::borrow::Cow; -use std::collections::HashMap; use std::path::Path; use std::path::PathBuf; @@ -138,38 +137,17 @@ pub type NodeResolverRc = crate::sync::MaybeArc>; pub struct NodeResolver { env: TEnv, npm_resolver: NpmResolverRc, - in_npm_package_cache: crate::sync::MaybeArcMutex>, } impl NodeResolver { pub fn new(env: TEnv, npm_resolver: NpmResolverRc) -> Self { - Self { - env, - npm_resolver, - in_npm_package_cache: crate::sync::MaybeArcMutex::new(HashMap::new()), - } + Self { env, npm_resolver } } pub fn in_npm_package(&self, specifier: &Url) -> bool { self.npm_resolver.in_npm_package(specifier) } - pub fn in_npm_package_with_cache(&self, specifier: Cow) -> bool { - let mut cache = self.in_npm_package_cache.lock(); - - if let Some(result) = cache.get(specifier.as_ref()) { - return *result; - } - - let result = if let Ok(specifier) = Url::parse(&specifier) { - self.npm_resolver.in_npm_package(&specifier) - } else { - false - }; - cache.insert(specifier.into_owned(), result); - result - } - /// This function is an implementation of `defaultResolve` in /// `lib/internal/modules/esm/resolve.js` from Node. pub fn resolve( diff --git a/ext/node_resolver/sync.rs b/ext/node_resolver/sync.rs index f6689a56abdf37..e4b00c3c2466d7 100644 --- a/ext/node_resolver/sync.rs +++ b/ext/node_resolver/sync.rs @@ -6,81 +6,13 @@ pub use inner::*; mod inner { #![allow(clippy::disallowed_types)] - use std::ops::Deref; - use std::ops::DerefMut; pub use std::sync::Arc as MaybeArc; - pub struct MaybeArcMutexGuard<'lock, T>(std::sync::MutexGuard<'lock, T>); - - impl<'lock, T> Deref for MaybeArcMutexGuard<'lock, T> { - type Target = std::sync::MutexGuard<'lock, T>; - fn deref(&self) -> &std::sync::MutexGuard<'lock, T> { - &self.0 - } - } - - impl<'lock, T> DerefMut for MaybeArcMutexGuard<'lock, T> { - fn deref_mut(&mut self) -> &mut std::sync::MutexGuard<'lock, T> { - &mut self.0 - } - } - - #[derive(Debug)] - pub struct MaybeArcMutex(std::sync::Arc>); - impl MaybeArcMutex { - pub fn new(val: T) -> Self { - Self(std::sync::Arc::new(std::sync::Mutex::new(val))) - } - } - - impl<'lock, T> MaybeArcMutex { - pub fn lock(&'lock self) -> MaybeArcMutexGuard<'lock, T> { - MaybeArcMutexGuard(self.0.lock().unwrap()) - } - } - pub use core::marker::Send as MaybeSend; pub use core::marker::Sync as MaybeSync; } #[cfg(not(feature = "sync"))] mod inner { - use std::ops::Deref; - use std::ops::DerefMut; - pub use std::rc::Rc as MaybeArc; - - pub struct MaybeArcMutexGuard<'lock, T>(std::cell::RefMut<'lock, T>); - - impl<'lock, T> Deref for MaybeArcMutexGuard<'lock, T> { - type Target = std::cell::RefMut<'lock, T>; - fn deref(&self) -> &std::cell::RefMut<'lock, T> { - &self.0 - } - } - - impl<'lock, T> DerefMut for MaybeArcMutexGuard<'lock, T> { - fn deref_mut(&mut self) -> &mut std::cell::RefMut<'lock, T> { - &mut self.0 - } - } - - #[derive(Debug)] - pub struct MaybeArcMutex(std::rc::Rc>); - impl MaybeArcMutex { - pub fn new(val: T) -> Self { - Self(std::rc::Rc::new(std::cell::RefCell::new(val))) - } - } - - impl<'lock, T> MaybeArcMutex { - pub fn lock(&'lock self) -> MaybeArcMutexGuard<'lock, T> { - MaybeArcMutexGuard(self.0.borrow_mut()) - } - } - - pub trait MaybeSync {} - impl MaybeSync for T where T: ?Sized {} - pub trait MaybeSend {} - impl MaybeSend for T where T: ?Sized {} } diff --git a/tests/node_compat/test/common/index.js b/tests/node_compat/test/common/index.js index bc1ea05e454f7f..ebac56ac5526f6 100644 --- a/tests/node_compat/test/common/index.js +++ b/tests/node_compat/test/common/index.js @@ -59,7 +59,6 @@ let knownGlobals = [ queueMicrotask, removeEventListener, reportError, - self, sessionStorage, setImmediate, ];