refactor: replace dotenvy with deno_dotenv (#32263)

Author: Tango992

Cargo.lock

@@ -184,7 +184,6 @@ comrak = "0.29.0"
 dashmap = "5.5.3"
 data-encoding = "2.3.3"
 data-url = "=0.3.1"
-dotenvy = "0.15.7"
 dyn-clone = "1"
 encoding_rs = "=0.8.35"
 error_reporter = "1"

Cargo.toml

@@ -108,9 +108,9 @@ comrak.workspace = true
 console_static_text.workspace = true
 crossterm.workspace = true
 dashmap.workspace = true
+deno_dotenv.workspace = true
 dhat = { workspace = true, optional = true }
 dissimilar.workspace = true
-dotenvy.workspace = true
 dprint-core.workspace = true
 dprint-plugin-json.workspace = true
 dprint-plugin-jupyter.workspace = true

cli/Cargo.toml

@@ -1257,9 +1257,9 @@ fn get_dev_binary_path() -> Option<OsString> {
 /// in the passed environment file.
 fn get_file_env_vars(
   filename: String,
-) -> Result<IndexMap<String, String>, dotenvy::Error> {
+) -> Result<IndexMap<String, String>, deno_dotenv::Error> {
   let mut file_env_vars = IndexMap::new();
-  for item in dotenvy::from_filename_iter(filename)? {
+  for item in deno_dotenv::from_path_sanitized_iter(filename)? {
     let Ok((key, val)) = item else {
       continue; // this failure will be warned about on load
     };

cli/standalone/binary.rs

@@ -52,36 +52,34 @@ impl WatchEnvTracker {
   }
 
   // Consolidated error handling function
-  fn handle_dotenvy_error(
-    error: dotenvy::Error,
+  fn handle_dotenv_error(
+    error: deno_dotenv::Error,
     file_path: &Path,
     log_level: Option<log::Level>,
   ) {
     #[allow(clippy::print_stderr)]
     if log_level.map(|l| l >= log::Level::Info).unwrap_or(true) {
       match error {
-        dotenvy::Error::LineParse(line, index) => eprintln!(
+        deno_dotenv::Error::LineParse(line, index) => eprintln!(
           "{} Parsing failed within the specified environment file: {} at index: {} of the value: {}",
           colors::yellow("Warning"),
           file_path.display(),
           index,
           line
         ),
-        dotenvy::Error::Io(_) => eprintln!(
-          "{} The `--env-file` flag was used, but the environment file specified '{}' was not found.",
-          colors::yellow("Warning"),
-          file_path.display()
-        ),
-        dotenvy::Error::EnvVar(_) => eprintln!(
-          "{} One or more of the environment variables isn't present or not unicode within the specified environment file: {}",
-          colors::yellow("Warning"),
-          file_path.display()
-        ),
-        _ => eprintln!(
-          "{} Unknown failure occurred with the specified environment file: {}",
-          colors::yellow("Warning"),
-          file_path.display()
-        ),
+        deno_dotenv::Error::Io(e) => match e.kind() {
+          std::io::ErrorKind::NotFound => eprintln!(
+            "{} The `--env-file` flag was used, but the environment file specified '{}' was not found.",
+            colors::yellow("Warning"),
+            file_path.display(),
+          ),
+          _ => eprintln!(
+            "{} Error reading from environment file '{}': {}.",
+            colors::yellow("Warning"),
+            file_path.display(),
+            e,
+          ),
+        },
       }
     }
   }
@@ -107,7 +105,7 @@ impl WatchEnvTracker {
       return;
     }
 
-    match dotenvy::from_path_iter(&file_path) {
+    match deno_dotenv::from_path_sanitized_iter(&file_path) {
       Ok(iter) => {
         for item in iter {
           match item {
@@ -148,7 +146,7 @@ impl WatchEnvTracker {
               inner.unused_variables.remove(&key_os);
             }
             Err(e) => {
-              Self::handle_dotenvy_error(e, &file_path, log_level);
+              Self::handle_dotenv_error(e, &file_path, log_level);
             }
           }
         }
@@ -244,10 +242,10 @@ pub fn load_env_variables_from_env_files(
   };
 
   for env_file_name in env_file_names.iter().rev() {
-    match dotenvy::from_filename(env_file_name) {
+    match deno_dotenv::from_path(env_file_name) {
       Ok(_) => (),
       Err(error) => {
-        WatchEnvTracker::handle_dotenvy_error(
+        WatchEnvTracker::handle_dotenv_error(
           error,
           env_file_name,
           flags_log_level,

cli/util/watch_env_tracker.rs

@@ -1,6 +1,7 @@
 // Copyright 2018-2026 the Deno authors. MIT license.
 
 use std::borrow::Cow;
+use std::path::Path;
 
 const CHAR_NL: u8 = b'\n';
 const CHAR_CR: u8 = b'\r';
@@ -14,6 +15,38 @@ const CHAR_BQUOTE: u8 = b'`';
 const CHAR_BSLASH: u8 = b'\\';
 const CHAR_N: u8 = b'n';
 
+#[derive(Debug)]
+pub enum Error {
+  LineParse(String, usize),
+  Io(std::io::Error),
+}
+
+impl std::fmt::Display for Error {
+  fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+    match self {
+      Error::LineParse(line, index) => {
+        write!(f, "Error parsing line at index {}: {}", index, line)
+      }
+      Error::Io(err) => write!(f, "{}", err),
+    }
+  }
+}
+
+impl std::error::Error for Error {
+  fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
+    match self {
+      Error::Io(err) => Some(err),
+      _ => None,
+    }
+  }
+}
+
+impl From<std::io::Error> for Error {
+  fn from(err: std::io::Error) -> Self {
+    Error::Io(err)
+  }
+}
+
 /// Ported from:
 /// https://github.com/nodejs/node/blob/9cc7fcc26dece769d9ffa06c453f0171311b01f8/src/node_dotenv.cc#L138-L315
 pub fn parse_env_content_hook(content: &str, mut cb: impl FnMut(&str, &str)) {
@@ -244,6 +277,37 @@ pub fn parse_env_content_hook(content: &str, mut cb: impl FnMut(&str, &str)) {
   }
 }
 
+type IterElement = Result<(String, String), Error>;
+
+pub fn from_path_sanitized_iter(
+  path: impl AsRef<Path>,
+) -> Result<std::vec::IntoIter<IterElement>, Error> {
+  let content = std::fs::read_to_string(path.as_ref()).map_err(Error::Io)?;
+  let mut pairs = Vec::new();
+  parse_env_content_hook(&content, |k, v| {
+    if let Some(index) = k
+      .find('\0')
+      .or_else(|| v.find('\0').map(|i| k.len() + i + 1))
+    {
+      pairs.push(Err(Error::LineParse(format!("{}={}", k, v), index)));
+    } else {
+      pairs.push(Ok((k.to_string(), v.to_string())));
+    }
+  });
+  Ok(pairs.into_iter())
+}
+
+pub fn from_path(filename: impl AsRef<Path>) -> Result<(), Error> {
+  for item in from_path_sanitized_iter(filename)? {
+    let (key, val) = item?;
+    #[allow(clippy::undocumented_unsafe_blocks)]
+    unsafe {
+      std::env::set_var(&key, &val);
+    }
+  }
+  Ok(())
+}
+
 fn trim_spaces_slice(input: &[u8]) -> &[u8] {
   if input.is_empty() {
     return input;

libs/dotenv/lib.rs

@@ -1,4 +1,4 @@
-Warning Parsing failed within the specified environment file: environment.env at index: 3 of the value: c:\path
+Warning Parsing failed within the specified environment file: environment.env at index: 14 of the value: ANOTHER_FOO=c:ath
 Check [WILDCARD]main.ts
 Compile [WILDCARD]main.ts to out[WILDCARD]
 Warning Environment variables from the file "environment.env" were embedded in the generated executable file

tests/specs/compile/env_vars_support/compile.out

@@ -1 +1 @@
-ANOTHER_BAR
+ANOTHER_${FOO}

tests/specs/compile/env_vars_support/environment.env

@@ -0,0 +1,4 @@
+{
+  "args": "eval --env-file=invalid_utf8_env console.log(Deno.env.get(\"BAR\"))",
+  "output": "main.out"
+}