Merge branch 'main' into f_cache_env_file

Author: marshallwalker

Cargo.lock

@@ -54,7 +54,7 @@ repository = "https://github.com/denoland/deno"
 
 [workspace.dependencies]
 deno_ast = { version = "=0.46.6", features = ["transpiling"] }
-deno_core = { version = "0.345.0" }
+deno_core = { version = "0.346.0" }
 
 deno_cache_dir = "=0.20.0"
 deno_config = { version = "=0.54.2", features = ["workspace"] }
@@ -296,8 +296,8 @@ env_logger = "=0.11.6"
 eszip = "=0.87.0"
 fancy-regex = "=0.14.0"
 libsui = "0.10.0"
-malva = "=0.11.2"
-markup_fmt = "=0.19.1"
+malva = "=0.12.0"
+markup_fmt = "=0.20.0"
 open = "5.0.1"
 pathdiff = "0.2.1"
 pretty_yaml = "=0.5.0"

Cargo.toml

@@ -5861,7 +5861,7 @@ mod tests {
       rx,
       Arc::new(AtomicBool::new(true)),
     );
-    let mut op_state = OpState::new(None, None);
+    let mut op_state = OpState::new(None);
     op_state.put(state);
     op_state
   }

cli/lsp/tsc.rs

@@ -410,6 +410,14 @@ fn setup_panic_hook() {
     orig_hook(panic_info);
     deno_runtime::exit(1);
   }));
+
+  fn error_handler(file: &str, line: i32, message: &str) {
+    // Override C++ abort with a rust panic, so we
+    // get our message above and a nice backtrace.
+    panic!("Fatal error in {file}:{line}: {message}");
+  }
+
+  deno_core::v8::V8::set_fatal_error_handler(error_handler);
 }
 
 fn exit_with_message(message: &str, code: i32) -> ! {

cli/main.rs

@@ -618,6 +618,8 @@ fn format_embedded_css(
       selector_override_comment_directive: "malva-selector-override".into(),
       ignore_comment_directive: "malva-ignore".into(),
       ignore_file_comment_directive: "malva-ignore-file".into(),
+      declaration_order_group_by:
+        config::DeclarationOrderGroupBy::NonDeclarationAndEmptyLine,
     },
   };
   // Wraps the text in a css block of `a { ... }`
@@ -711,6 +713,7 @@ fn format_embedded_html(
       script_formatter: None,
       ignore_comment_directive: "deno-fmt-ignore".into(),
       ignore_file_comment_directive: "deno-fmt-ignore-file".into(),
+      single_attr_same_line: true,
     },
   };
   let Ok(text) = markup_fmt::format_text(
@@ -1463,6 +1466,8 @@ fn get_resolved_malva_config(
     selector_override_comment_directive: "deno-fmt-selector-override".into(),
     ignore_comment_directive: "deno-fmt-ignore".into(),
     ignore_file_comment_directive: "deno-fmt-ignore-file".into(),
+    declaration_order_group_by:
+      DeclarationOrderGroupBy::NonDeclarationAndEmptyLine,
   };
 
   FormatOptions {
@@ -1523,6 +1528,7 @@ fn get_resolved_markup_fmt_config(
     astro_attr_shorthand: Some(true),
     ignore_comment_directive: "deno-fmt-ignore".into(),
     ignore_file_comment_directive: "deno-fmt-ignore-file".into(),
+    single_attr_same_line: true,
   };
 
   FormatOptions {

cli/tools/fmt.rs

@@ -1537,7 +1537,7 @@ mod tests {
         .context("Unable to get CWD")
         .unwrap(),
     );
-    let mut op_state = OpState::new(None, None);
+    let mut op_state = OpState::new(None);
     op_state.put(state);
     op_state
   }

cli/tsc/mod.rs

@@ -262,7 +262,11 @@ struct FunctionData {
   turbocall: Option<Turbocall>,
 }
 
-impl GarbageCollected for FunctionData {}
+impl GarbageCollected for FunctionData {
+  fn get_name(&self) -> &'static std::ffi::CStr {
+    c"FunctionData"
+  }
+}
 
 // Create a JavaScript function for synchronous FFI call to
 // the given symbol.

ext/ffi/dlfcn.rs

@@ -187,7 +187,7 @@ async function startTls(
     hostname,
     caCerts,
     alpnProtocols,
-  });
+  }, null);
   return new TlsConn(rid, remoteAddr, localAddr);
 }
 

ext/net/02_tls.js

@@ -399,7 +399,11 @@ pub struct NetPermToken {
   pub resolved_ips: Vec<String>,
 }
 
-impl deno_core::GarbageCollected for NetPermToken {}
+impl deno_core::GarbageCollected for NetPermToken {
+  fn get_name(&self) -> &'static std::ffi::CStr {
+    c"NetPermToken"
+  }
+}
 
 impl NetPermToken {
   /// Checks if the given address is included in the resolved IPs.

ext/net/ops.rs

@@ -196,7 +196,7 @@ pub fn op_tls_key_null() -> TlsKeysHolder {
   TlsKeysHolder::from(TlsKeys::Null)
 }
 
-#[op2]
+#[op2(reentrant)]
 #[cppgc]
 pub fn op_tls_key_static(
   #[string] cert: &str,
@@ -258,6 +258,7 @@ pub fn op_tls_cert_resolver_resolve_error(
 pub fn op_tls_start<NP>(
   state: Rc<RefCell<OpState>>,
   #[serde] args: StartTlsArgs,
+  #[cppgc] key_pair: Option<&TlsKeysHolder>,
 ) -> Result<(ResourceId, IpAddr, IpAddr), NetError>
 where
   NP: NetPermissions + 'static,
@@ -304,11 +305,13 @@ where
   let local_addr = tcp_stream.local_addr()?;
   let remote_addr = tcp_stream.peer_addr()?;
 
+  let tls_null = TlsKeysHolder::from(TlsKeys::Null);
+  let key_pair = key_pair.unwrap_or(&tls_null);
   let mut tls_config = create_client_config(
     root_cert_store,
     ca_certs,
     unsafely_ignore_certificate_errors,
-    TlsKeys::Null,
+    key_pair.take(),
     SocketUse::GeneralSsl,
   )?;
 

ext/net/ops_tls.rs

@@ -213,7 +213,11 @@ struct EndpointResource {
   session_store: Arc<dyn ClientSessionStore>,
 }
 
-impl GarbageCollected for EndpointResource {}
+impl GarbageCollected for EndpointResource {
+  fn get_name(&self) -> &'static std::ffi::CStr {
+    c"EndpointResource"
+  }
+}
 
 #[op2]
 #[cppgc]
@@ -294,7 +298,11 @@ impl Drop for ListenerResource {
   }
 }
 
-impl GarbageCollected for ListenerResource {}
+impl GarbageCollected for ListenerResource {
+  fn get_name(&self) -> &'static std::ffi::CStr {
+    c"ListenerResource"
+  }
+}
 
 #[op2]
 #[cppgc]
@@ -345,14 +353,22 @@ struct ConnectionResource(
   RefCell<Option<quinn::ZeroRttAccepted>>,
 );
 
-impl GarbageCollected for ConnectionResource {}
+impl GarbageCollected for ConnectionResource {
+  fn get_name(&self) -> &'static std::ffi::CStr {
+    c"ConnectionResource"
+  }
+}
 
 struct IncomingResource(
   RefCell<Option<quinn::Incoming>>,
   Arc<QuicServerConfig>,
 );
 
-impl GarbageCollected for IncomingResource {}
+impl GarbageCollected for IncomingResource {
+  fn get_name(&self) -> &'static std::ffi::CStr {
+    c"IncomingResource"
+  }
+}
 
 #[op2(async)]
 #[cppgc]
@@ -481,7 +497,11 @@ pub(crate) fn op_quic_incoming_ignore(
 
 struct ConnectingResource(RefCell<Option<quinn::Connecting>>);
 
-impl GarbageCollected for ConnectingResource {}
+impl GarbageCollected for ConnectingResource {
+  fn get_name(&self) -> &'static std::ffi::CStr {
+    c"ConnectingResource"
+  }
+}
 
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]

ext/net/quic.rs

@@ -1,5 +1,7 @@
 // Copyright 2018-2025 the Deno authors. MIT license.
 
+use std::rc::Rc;
+
 use deno_core::v8;
 use deno_core::v8::GetPropertyNamesArgs;
 use deno_core::v8::MapFnTo;
@@ -11,13 +13,13 @@ use deno_core::v8::MapFnTo;
 // these mapped functions per-thread. We should revisit it in the future and
 // ideally remove altogether.
 thread_local! {
-  pub static GETTER_MAP_FN: v8::NamedPropertyGetterCallback<'static> = getter.map_fn_to();
-  pub static SETTER_MAP_FN: v8::NamedPropertySetterCallback<'static> = setter.map_fn_to();
-  pub static QUERY_MAP_FN: v8::NamedPropertyQueryCallback<'static> = query.map_fn_to();
-  pub static DELETER_MAP_FN: v8::NamedPropertyDeleterCallback<'static> = deleter.map_fn_to();
-  pub static ENUMERATOR_MAP_FN: v8::NamedPropertyEnumeratorCallback<'static> = enumerator.map_fn_to();
-  pub static DEFINER_MAP_FN: v8::NamedPropertyDefinerCallback<'static> = definer.map_fn_to();
-  pub static DESCRIPTOR_MAP_FN: v8::NamedPropertyGetterCallback<'static> = descriptor.map_fn_to();
+  pub static GETTER_MAP_FN: v8::NamedPropertyGetterCallback = getter.map_fn_to();
+  pub static SETTER_MAP_FN: v8::NamedPropertySetterCallback = setter.map_fn_to();
+  pub static QUERY_MAP_FN: v8::NamedPropertyQueryCallback = query.map_fn_to();
+  pub static DELETER_MAP_FN: v8::NamedPropertyDeleterCallback = deleter.map_fn_to();
+  pub static ENUMERATOR_MAP_FN: v8::NamedPropertyEnumeratorCallback = enumerator.map_fn_to();
+  pub static DEFINER_MAP_FN: v8::NamedPropertyDefinerCallback = definer.map_fn_to();
+  pub static DESCRIPTOR_MAP_FN: v8::NamedPropertyGetterCallback = descriptor.map_fn_to();
 }
 
 /// Convert an ASCII string to a UTF-16 byte encoding of the string.
@@ -224,7 +226,7 @@ pub fn global_object_middleware<'s>(
     deno_globals,
     node_globals,
   };
-  scope.get_current_context().set_slot(storage);
+  scope.get_current_context().set_slot(Rc::new(storage));
 }
 
 fn is_managed_key(

ext/node/global.rs

@@ -18,7 +18,11 @@ pub struct BlockListResource {
   blocklist: RefCell<BlockList>,
 }
 
-impl deno_core::GarbageCollected for BlockListResource {}
+impl deno_core::GarbageCollected for BlockListResource {
+  fn get_name(&self) -> &'static std::ffi::CStr {
+    c"BlockListResource"
+  }
+}
 
 #[derive(Serialize)]
 struct SocketAddressSerialization(String, String);

ext/node/ops/blocklist.rs

@@ -14,7 +14,11 @@ pub struct Hasher {
   pub hash: Rc<RefCell<Option<Hash>>>,
 }
 
-impl GarbageCollected for Hasher {}
+impl GarbageCollected for Hasher {
+  fn get_name(&self) -> &'static std::ffi::CStr {
+    c"Hasher"
+  }
+}
 
 impl Hasher {
   pub fn new(