feat(core): integrate rspack_resolver with input_filesystem (web-infr…

…a-dev#7858)

Cargo.toml

@@ -48,6 +48,7 @@ proc-macro2        = { version = "1.0.79" }
 quote              = { version = "1.0.35" }
 rayon              = { version = "1.10.0" }
 regex              = { version = "1.10.4" }
+rspack_resolver    = { version = "0.3.3", features = ["package_json_raw_json_api"] }
 ropey              = "1.6.1"
 rspack_sources     = { version = "=0.3.2" }
 rustc-hash         = { version = "1.1.0" }

crates/node_binding/Cargo.toml

@@ -21,6 +21,7 @@ rspack_binding_values    = { version = "0.1.0", path = "../rspack_binding_values
 rspack_collections       = { version = "0.1.0", path = "../rspack_collections" }
 rspack_core              = { version = "0.1.0", path = "../rspack_core" }
 rspack_error             = { version = "0.1.0", path = "../rspack_error" }
+rspack_fs                = { version = "0.1.0", path = "../rspack_fs" }
 rspack_fs_node           = { version = "0.1.0", path = "../rspack_fs_node" }
 rspack_hash              = { version = "0.1.0", path = "../rspack_hash" }
 rspack_hook              = { version = "0.1.0", path = "../rspack_hook" }

crates/node_binding/src/lib.rs

@@ -69,10 +69,11 @@ impl Rspack {
     let rspack = rspack_core::Compiler::new(
       compiler_options,
       plugins,
-      Box::new(
+      Some(Box::new(
         AsyncNodeWritableFileSystem::new(output_filesystem)
           .map_err(|e| Error::from_reason(format!("Failed to create writable filesystem: {e}",)))?,
-      ),
+      )),
+      None,
       Some(resolver_factory),
       Some(loader_resolver_factory),
     );

crates/node_binding/src/resolver_factory.rs

@@ -2,6 +2,7 @@ use std::sync::Arc;
 
 use napi_derive::napi;
 use rspack_core::{Resolve, ResolverFactory};
+use rspack_fs::{NativeFileSystem, ReadableFileSystem};
 
 use crate::{
   raw_resolve::{
@@ -14,23 +15,30 @@ use crate::{
 pub struct JsResolverFactory {
   pub(crate) resolver_factory: Option<Arc<ResolverFactory>>,
   pub(crate) loader_resolver_factory: Option<Arc<ResolverFactory>>,
+  pub(crate) input_filesystem: Arc<dyn ReadableFileSystem>,
 }
 
 #[napi]
 impl JsResolverFactory {
   #[napi(constructor)]
   pub fn new() -> napi::Result<Self> {
+    let input_filesystem = Arc::new(NativeFileSystem {});
     Ok(Self {
       resolver_factory: None,
       loader_resolver_factory: None,
+      input_filesystem,
     })
   }
 
   pub fn get_resolver_factory(&mut self, resolve_options: Resolve) -> Arc<ResolverFactory> {
     match &self.resolver_factory {
       Some(resolver_factory) => resolver_factory.clone(),
+
       None => {
-        let resolver_factory = Arc::new(ResolverFactory::new(resolve_options));
+        let resolver_factory = Arc::new(ResolverFactory::new(
+          resolve_options,
+          self.input_filesystem.clone(),
+        ));
         self.resolver_factory = Some(resolver_factory.clone());
         resolver_factory
       }
@@ -41,7 +49,10 @@ impl JsResolverFactory {
     match &self.loader_resolver_factory {
       Some(resolver_factory) => resolver_factory.clone(),
       None => {
-        let resolver_factory = Arc::new(ResolverFactory::new(resolve_options));
+        let resolver_factory = Arc::new(ResolverFactory::new(
+          resolve_options,
+          self.input_filesystem.clone(),
+        ));
         self.loader_resolver_factory = Some(resolver_factory.clone());
         resolver_factory
       }

crates/rspack_core/Cargo.toml

@@ -31,15 +31,15 @@ regex = { workspace = true }
 rspack_ast = { version = "0.1.0", path = "../rspack_ast" }
 rspack_collections = { version = "0.1.0", path = "../rspack_collections" }
 rspack_error = { version = "0.1.0", path = "../rspack_error" }
-rspack_fs = { version = "0.1.0", path = "../rspack_fs", features = ["async", "rspack-error"] }
+rspack_fs = { version = "0.1.0", path = "../rspack_fs" }
 rspack_futures = { version = "0.1.0", path = "../rspack_futures" }
 rspack_hash = { version = "0.1.0", path = "../rspack_hash" }
 rspack_hook = { version = "0.1.0", path = "../rspack_hook" }
 rspack_loader_runner = { version = "0.1.0", path = "../rspack_loader_runner" }
 rspack_macros = { version = "0.1.0", path = "../rspack_macros" }
 rspack_paths = { version = "0.1.0", path = "../rspack_paths" }
 rspack_regex = { version = "0.1.0", path = "../rspack_regex" }
-rspack_resolver = { version = "0.3.1", features = ["package_json_raw_json_api"] }
+rspack_resolver = { workspace = true }
 rspack_sources = { workspace = true }
 rspack_util = { version = "0.1.0", path = "../rspack_util" }
 rustc-hash = { workspace = true }

crates/rspack_core/src/compiler/compilation.rs

@@ -7,13 +7,15 @@ use std::{
 };
 
 use dashmap::DashSet;
+use derivative::Derivative;
 use indexmap::{IndexMap, IndexSet};
 use itertools::Itertools;
 use rayon::prelude::*;
 use rspack_collections::{
   Identifiable, Identifier, IdentifierDashMap, IdentifierMap, IdentifierSet, UkeySet,
 };
 use rspack_error::{error, Diagnostic, Result, Severity};
+use rspack_fs::ReadableFileSystem;
 use rspack_futures::FuturesResults;
 use rspack_hash::{RspackHash, RspackHashDigest};
 use rspack_hook::define_hook;
@@ -129,8 +131,8 @@ impl Default for CompilationId {
 type ValueCacheVersions = HashMap<String, String>;
 
 static COMPILATION_ID: AtomicU32 = AtomicU32::new(0);
-
-#[derive(Debug)]
+#[derive(Derivative)]
+#[derivative(Debug)]
 pub struct Compilation {
   /// get_compilation_hooks(compilation.id)
   id: CompilationId,
@@ -193,6 +195,8 @@ pub struct Compilation {
   pub modified_files: HashSet<PathBuf>,
   pub removed_files: HashSet<PathBuf>,
   make_artifact: MakeArtifact,
+  #[derivative(Debug = "ignore")]
+  pub input_filesystem: Arc<dyn ReadableFileSystem>,
 }
 
 impl Compilation {
@@ -228,6 +232,7 @@ impl Compilation {
     module_executor: Option<ModuleExecutor>,
     modified_files: HashSet<PathBuf>,
     removed_files: HashSet<PathBuf>,
+    input_filesystem: Arc<dyn ReadableFileSystem>,
   ) -> Self {
     let mutations = options.new_incremental_enabled().then(Mutations::default);
     Self {
@@ -285,6 +290,7 @@ impl Compilation {
       make_artifact: Default::default(),
       modified_files,
       removed_files,
+      input_filesystem,
     }
   }
 

crates/rspack_core/src/compiler/hmr.rs

@@ -73,6 +73,7 @@ impl Compiler {
         Some(ModuleExecutor::default()),
         modified_files,
         removed_files,
+        self.input_filesystem.clone(),
       );
 
       if let Some(state) = self.options.get_incremental_rebuild_make_state() {

crates/rspack_core/src/compiler/make/repair/add.rs

@@ -77,6 +77,7 @@ impl Task<MakeTaskContext> for AddTask {
       resolver_factory: context.resolver_factory.clone(),
       compiler_options: context.compiler_options.clone(),
       plugin_driver: context.plugin_driver.clone(),
+      fs: context.fs.clone(),
     })])
   }
 }

crates/rspack_core/src/compiler/make/repair/build.rs

@@ -1,6 +1,8 @@
 use std::{collections::VecDeque, sync::Arc};
 
+use derivative::Derivative;
 use rspack_error::{Diagnostic, IntoTWithDiagnosticArray};
+use rspack_fs::ReadableFileSystem;
 
 use super::{process_dependencies::ProcessDependenciesTask, MakeTaskContext};
 use crate::{
@@ -10,13 +12,17 @@ use crate::{
   SharedPluginDriver,
 };
 
-#[derive(Debug)]
+#[derive(Derivative)]
+#[derivative(Debug)]
+
 pub struct BuildTask {
   pub module: Box<dyn Module>,
   pub current_profile: Option<Box<ModuleProfile>>,
   pub resolver_factory: Arc<ResolverFactory>,
   pub compiler_options: Arc<CompilerOptions>,
   pub plugin_driver: SharedPluginDriver,
+  #[derivative(Debug = "ignore")]
+  pub fs: Arc<dyn ReadableFileSystem>,
 }
 
 #[async_trait::async_trait]
@@ -31,6 +37,7 @@ impl Task<MakeTaskContext> for BuildTask {
       plugin_driver,
       current_profile,
       mut module,
+      fs,
     } = *self;
     if let Some(current_profile) = &current_profile {
       current_profile.mark_building_start();
@@ -53,6 +60,7 @@ impl Task<MakeTaskContext> for BuildTask {
           },
           plugin_driver: plugin_driver.clone(),
           compiler_options: &compiler_options,
+          fs: fs.clone(),
         },
         None,
       )

crates/rspack_core/src/compiler/make/repair/mod.rs

@@ -6,6 +6,7 @@ pub mod process_dependencies;
 use std::sync::Arc;
 
 use rspack_error::Result;
+use rspack_fs::ReadableFileSystem;
 use rustc_hash::{FxHashMap as HashMap, FxHashSet as HashSet};
 
 use super::MakeArtifact;
@@ -21,6 +22,7 @@ use crate::{
 pub struct MakeTaskContext {
   // compilation info
   pub plugin_driver: SharedPluginDriver,
+  pub fs: Arc<dyn ReadableFileSystem>,
   pub compiler_options: Arc<CompilerOptions>,
   pub resolver_factory: Arc<ResolverFactory>,
   pub loader_resolver_factory: Arc<ResolverFactory>,
@@ -41,6 +43,7 @@ impl MakeTaskContext {
       old_cache: compilation.old_cache.clone(),
       unaffected_modules_cache: compilation.unaffected_modules_cache.clone(),
       dependency_factories: compilation.dependency_factories.clone(),
+      fs: compilation.input_filesystem.clone(),
       artifact,
     }
   }
@@ -68,6 +71,7 @@ impl MakeTaskContext {
       None,
       Default::default(),
       Default::default(),
+      self.fs.clone(),
     );
     compilation.dependency_factories = self.dependency_factories.clone();
     compilation.swap_make_artifact(&mut self.artifact);

crates/rspack_core/src/compiler/mod.rs

@@ -6,7 +6,9 @@ use std::sync::Arc;
 
 use derivative::Derivative;
 use rspack_error::Result;
-use rspack_fs::AsyncWritableFileSystem;
+use rspack_fs::{
+  AsyncNativeFileSystem, AsyncWritableFileSystem, NativeFileSystem, ReadableFileSystem,
+};
 use rspack_futures::FuturesResults;
 use rspack_hook::define_hook;
 use rspack_paths::{Utf8Path, Utf8PathBuf};
@@ -55,6 +57,8 @@ pub struct Compiler {
   pub options: Arc<CompilerOptions>,
   #[derivative(Debug = "ignore")]
   pub output_filesystem: Box<dyn AsyncWritableFileSystem + Send + Sync>,
+  #[derivative(Debug = "ignore")]
+  pub input_filesystem: Arc<dyn ReadableFileSystem>,
   pub compilation: Compilation,
   pub plugin_driver: SharedPluginDriver,
   pub resolver_factory: Arc<ResolverFactory>,
@@ -71,7 +75,9 @@ impl Compiler {
   pub fn new(
     options: CompilerOptions,
     plugins: Vec<BoxPlugin>,
-    output_filesystem: Box<dyn AsyncWritableFileSystem + Send + Sync>,
+    output_filesystem: Option<Box<dyn AsyncWritableFileSystem + Send + Sync>>,
+    // only supports passing input_filesystem in rust api, no support for js api
+    input_filesystem: Option<Arc<dyn ReadableFileSystem + Send + Sync>>,
     // no need to pass resolve_factory in rust api
     resolver_factory: Option<Arc<ResolverFactory>>,
     loader_resolver_factory: Option<Arc<ResolverFactory>>,
@@ -82,14 +88,26 @@ impl Compiler {
         debug_info.with_context(options.context.to_string());
       }
     }
-    let resolver_factory =
-      resolver_factory.unwrap_or_else(|| Arc::new(ResolverFactory::new(options.resolve.clone())));
-    let loader_resolver_factory = loader_resolver_factory
-      .unwrap_or_else(|| Arc::new(ResolverFactory::new(options.resolve_loader.clone())));
+    let input_filesystem = input_filesystem.unwrap_or_else(|| Arc::new(NativeFileSystem {}));
+
+    let resolver_factory = resolver_factory.unwrap_or_else(|| {
+      Arc::new(ResolverFactory::new(
+        options.resolve.clone(),
+        input_filesystem.clone(),
+      ))
+    });
+    let loader_resolver_factory = loader_resolver_factory.unwrap_or_else(|| {
+      Arc::new(ResolverFactory::new(
+        options.resolve_loader.clone(),
+        input_filesystem.clone(),
+      ))
+    });
     let (plugin_driver, options) = PluginDriver::new(options, plugins, resolver_factory.clone());
     let old_cache = Arc::new(OldCache::new(options.clone()));
     let unaffected_modules_cache = Arc::new(UnaffectedModulesCache::default());
     let module_executor = ModuleExecutor::default();
+    let output_filesystem = output_filesystem.unwrap_or_else(|| Box::new(AsyncNativeFileSystem {}));
+
     Self {
       options: options.clone(),
       compilation: Compilation::new(
@@ -103,6 +121,7 @@ impl Compiler {
         Some(module_executor),
         Default::default(),
         Default::default(),
+        input_filesystem.clone(),
       ),
       output_filesystem,
       plugin_driver,
@@ -111,6 +130,7 @@ impl Compiler {
       old_cache,
       emitted_asset_versions: Default::default(),
       unaffected_modules_cache,
+      input_filesystem,
     }
   }
 
@@ -140,6 +160,7 @@ impl Compiler {
         Some(module_executor),
         Default::default(),
         Default::default(),
+        self.input_filesystem.clone(),
       ),
     );
 

crates/rspack_core/src/external_module.rs

@@ -1,5 +1,4 @@
-use std::borrow::Cow;
-use std::iter;
+use std::{borrow::Cow, iter};
 
 use rspack_collections::{Identifiable, Identifier};
 use rspack_error::{error, impl_empty_diagnosable_trait, Diagnostic, Result};