fix(byonm): Deno.readFile* fails to recognize paths correctly when called from a node package (#601)

Author: nyannyacha

crates/base/src/runtime/mod.rs

@@ -658,6 +658,10 @@ where
           base_url,
         } = rt_provider;
 
+        let node_modules = metadata
+          .node_modules()
+          .ok()
+          .flatten();
         let entrypoint = metadata.entrypoint.clone();
         let main_module_url = match entrypoint.as_ref() {
           Some(Entrypoint::Key(key)) => base_url.join(key)?,
@@ -717,6 +721,7 @@ where
 
         let (fs, s3_fs) = build_file_system_fn(if is_user_worker {
           Arc::new(StaticFs::new(
+            node_modules,
             static_files,
             if matches!(entrypoint, Some(Entrypoint::ModuleCode(_)) | None)
               && is_some_entry_point

crates/fs/impl/static_fs.rs

@@ -6,6 +6,7 @@ use std::path::PathBuf;
 use std::rc::Rc;
 use std::sync::Arc;
 
+use deno::standalone::binary::NodeModules;
 use deno_core::normalize_path;
 use deno_fs::AccessCheckCb;
 use deno_fs::FsDirEntry;
@@ -26,22 +27,34 @@ pub struct StaticFs {
   static_files: EszipStaticFiles,
   base_dir_path: PathBuf,
   vfs_path: PathBuf,
+  byonm_node_modules_path: Option<PathBuf>,
   snapshot: Option<ValidSerializedNpmResolutionSnapshot>,
   vfs: Arc<FileBackedVfs>,
 }
 
 impl StaticFs {
   pub fn new(
+    node_modules: Option<NodeModules>,
     static_files: EszipStaticFiles,
     base_dir_path: PathBuf,
     vfs_path: PathBuf,
     vfs: Arc<FileBackedVfs>,
     snapshot: Option<ValidSerializedNpmResolutionSnapshot>,
   ) -> Self {
+    let byonm_node_modules_path = if let Some(NodeModules::Byonm {
+      root_node_modules_dir: Some(path),
+    }) = node_modules
+    {
+      Some(vfs_path.join(path))
+    } else {
+      None
+    };
+
     Self {
       vfs,
       static_files,
       base_dir_path,
+      byonm_node_modules_path,
       vfs_path,
       snapshot,
     }
@@ -375,7 +388,13 @@ impl deno_fs::FileSystem for StaticFs {
     _access_check: Option<AccessCheckCb>,
   ) -> FsResult<Cow<'static, [u8]>> {
     let is_npm = self.is_valid_npm_package(path);
-    if is_npm {
+    let is_byonm_path = self
+      .byonm_node_modules_path
+      .as_ref()
+      .map(|it| path.starts_with(it))
+      .unwrap_or_default();
+
+    if is_npm || is_byonm_path {
       let options = OpenOptions::read();
       let file = self.open_sync(path, options, None)?;
       let buf = file.read_all_sync()?;

deno/standalone/binary.rs

@@ -9,7 +9,7 @@ use indexmap::IndexMap;
 use serde::Deserialize;
 use serde::Serialize;
 
-#[derive(Deserialize, Serialize)]
+#[derive(Debug, Clone, Deserialize, Serialize)]
 pub enum NodeModules {
   Managed {
     /// Relative path for the node_modules directory in the vfs.