refactor: remove unnecessary filesystem trait (#8525)

Author: hardfist

Cargo.lock

@@ -13,7 +13,7 @@ use napi::bindgen_prelude::*;
 use rspack_binding_options::BuiltinPlugin;
 use rspack_core::{Compilation, PluginExt};
 use rspack_error::Diagnostic;
-use rspack_fs_node::{AsyncNodeWritableFileSystem, ThreadsafeNodeFS};
+use rspack_fs_node::{NodeFileSystem, ThreadsafeNodeFS};
 
 mod compiler;
 mod diagnostic;
@@ -70,10 +70,9 @@ impl Rspack {
       compiler_options,
       plugins,
       rspack_binding_options::buildtime_plugins::buildtime_plugins(),
-      Some(Box::new(
-        AsyncNodeWritableFileSystem::new(output_filesystem)
-          .map_err(|e| Error::from_reason(format!("Failed to create writable filesystem: {e}",)))?,
-      )),
+      Some(Box::new(NodeFileSystem::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/lib.rs

@@ -103,14 +103,14 @@ impl Snapshot {
 mod tests {
   use std::sync::Arc;
 
-  use rspack_fs::{MemoryFileSystem, SyncWritableFileSystem};
+  use rspack_fs::{MemoryFileSystem, WritableFileSystem};
   use rspack_paths::Utf8PathBuf;
 
   use super::super::MemoryStorage;
   use super::{PathMatcher, Snapshot, SnapshotOptions};
 
-  #[test]
-  fn should_snapshot_work() {
+  #[tokio::test]
+  async fn should_snapshot_work() {
     let fs = Arc::new(MemoryFileSystem::default());
     let storage = Arc::new(MemoryStorage::default());
     let options = SnapshotOptions::new(
@@ -119,23 +119,31 @@ mod tests {
       vec![PathMatcher::String("node_modules".into())],
     );
 
-    fs.create_dir_all("/node_modules/project".into()).unwrap();
-    fs.create_dir_all("/node_modules/lib".into()).unwrap();
-    fs.write("/file1".into(), "abc".as_bytes()).unwrap();
-    fs.write("/constant".into(), "abc".as_bytes()).unwrap();
+    fs.create_dir_all("/node_modules/project".into())
+      .await
+      .unwrap();
+    fs.create_dir_all("/node_modules/lib".into()).await.unwrap();
+    fs.write("/file1".into(), "abc".as_bytes()).await.unwrap();
+    fs.write("/constant".into(), "abc".as_bytes())
+      .await
+      .unwrap();
     fs.write(
       "/node_modules/project/package.json".into(),
       r#"{"version":"1.0.0"}"#.as_bytes(),
     )
+    .await
     .unwrap();
     fs.write("/node_modules/project/file1".into(), "abc".as_bytes())
+      .await
       .unwrap();
     fs.write(
       "/node_modules/lib/package.json".into(),
       r#"{"version":"1.1.0"}"#.as_bytes(),
     )
+    .await
     .unwrap();
     fs.write("/node_modules/lib/file1".into(), "abc".as_bytes())
+      .await
       .unwrap();
 
     let snapshot = Snapshot::new(options, fs.clone(), storage);
@@ -149,11 +157,15 @@ mod tests {
       .iter(),
     );
     std::thread::sleep(std::time::Duration::from_millis(100));
-    fs.write("/file1".into(), "abcd".as_bytes()).unwrap();
-    fs.write("/constant".into(), "abcd".as_bytes()).unwrap();
+    fs.write("/file1".into(), "abcd".as_bytes()).await.unwrap();
+    fs.write("/constant".into(), "abcd".as_bytes())
+      .await
+      .unwrap();
     fs.write("/node_modules/project/file1".into(), "abcd".as_bytes())
+      .await
       .unwrap();
     fs.write("/node_modules/lib/file1".into(), "abcd".as_bytes())
+      .await
       .unwrap();
 
     let (modified_paths, deleted_paths) = snapshot.calc_modified_paths();
@@ -167,6 +179,7 @@ mod tests {
       "/node_modules/lib/package.json".into(),
       r#"{"version":"1.3.0"}"#.as_bytes(),
     )
+    .await
     .unwrap();
     snapshot.add(["/file1".into()].iter());
     let (modified_paths, deleted_paths) = snapshot.calc_modified_paths();

crates/rspack_core/src/cache/persistent/snapshot/mod.rs

@@ -132,26 +132,28 @@ impl StrategyHelper {
 mod tests {
   use std::sync::Arc;
 
-  use rspack_fs::{MemoryFileSystem, SyncReadableFileSystem, SyncWritableFileSystem};
+  use rspack_fs::{MemoryFileSystem, ReadableFileSystem, WritableFileSystem};
 
   use super::{Strategy, StrategyHelper, ValidateResult};
 
-  #[test]
-  fn should_strategy_works() {
+  #[tokio::test]
+  async fn should_strategy_works() {
     let fs = Arc::new(MemoryFileSystem::default());
-    fs.create_dir_all("/packages/p1".into()).unwrap();
-    fs.create_dir_all("/packages/p2".into()).unwrap();
+    fs.create_dir_all("/packages/p1".into()).await.unwrap();
+    fs.create_dir_all("/packages/p2".into()).await.unwrap();
     fs.write(
       "/packages/p1/package.json".into(),
       r#"{"version": "1.0.0"}"#.as_bytes(),
     )
+    .await
     .unwrap();
     fs.write(
       "/packages/p2/package.json".into(),
       r#"{"version": "1.1.0"}"#.as_bytes(),
     )
+    .await
     .unwrap();
-    fs.write("/file1".into(), "abc".as_bytes()).unwrap();
+    fs.write("/file1".into(), "abc".as_bytes()).await.unwrap();
 
     // compile_time
     let Strategy::CompileTime(time1) = StrategyHelper::compile_time() else {
@@ -222,7 +224,7 @@ mod tests {
       ValidateResult::NoChanged
     ));
     std::thread::sleep(std::time::Duration::from_millis(100));
-    fs.write("/file1".into(), "abcd".as_bytes()).unwrap();
+    fs.write("/file1".into(), "abcd".as_bytes()).await.unwrap();
     assert!(matches!(
       helper.validate(&"/file1".into(), &now),
       ValidateResult::Modified

crates/rspack_core/src/cache/persistent/snapshot/strategy.rs

@@ -5,7 +5,7 @@ mod module_executor;
 use std::sync::Arc;
 
 use rspack_error::Result;
-use rspack_fs::{AsyncWritableFileSystem, FileSystem, NativeFileSystem};
+use rspack_fs::{FileSystem, NativeFileSystem, WritableFileSystem};
 use rspack_futures::FuturesResults;
 use rspack_hook::define_hook;
 use rspack_paths::{Utf8Path, Utf8PathBuf};
@@ -53,7 +53,7 @@ pub struct CompilerHooks {
 #[derive(Debug)]
 pub struct Compiler {
   pub options: Arc<CompilerOptions>,
-  pub output_filesystem: Box<dyn AsyncWritableFileSystem + Send + Sync>,
+  pub output_filesystem: Box<dyn WritableFileSystem>,
   pub input_filesystem: Arc<dyn FileSystem>,
   pub compilation: Compilation,
   pub plugin_driver: SharedPluginDriver,
@@ -73,7 +73,7 @@ impl Compiler {
     options: CompilerOptions,
     plugins: Vec<BoxPlugin>,
     buildtime_plugins: Vec<BoxPlugin>,
-    output_filesystem: Option<Box<dyn AsyncWritableFileSystem + Send + Sync>>,
+    output_filesystem: Option<Box<dyn WritableFileSystem + Send + Sync>>,
     // only supports passing input_filesystem in rust api, no support for js api
     input_filesystem: Option<Arc<dyn FileSystem + Send + Sync>>,
     // no need to pass resolve_factory in rust api

crates/rspack_core/src/compiler/mod.rs

@@ -7,6 +7,7 @@ repository  = "https://github.com/web-infra-dev/rspack"
 version     = "0.1.0"
 
 [dependencies]
+async-trait  = { workspace = true }
 dunce        = { version = "1.0.5" }
 futures      = { workspace = true }
 rspack_error = { path = "../rspack_error", version = "0.1.0" }

crates/rspack_fs/Cargo.toml

@@ -1,10 +1,5 @@
-use crate::{
-  AsyncFileSystem, AsyncReadableFileSystem, AsyncWritableFileSystem, SyncFileSystem,
-  SyncReadableFileSystem, SyncWritableFileSystem,
-};
+use std::fmt::Debug;
 
-pub trait FileSystem: AsyncFileSystem + SyncFileSystem {}
+use crate::{ReadableFileSystem, WritableFileSystem};
 
-pub trait ReadableFileSystem: AsyncReadableFileSystem + SyncReadableFileSystem {}
-
-pub trait WritableFileSystem: AsyncWritableFileSystem + SyncWritableFileSystem {}
+pub trait FileSystem: ReadableFileSystem + WritableFileSystem + Debug + Sync + Send {}

crates/rspack_fs/src/fs.rs

@@ -1,10 +1,10 @@
 mod fs;
-pub use fs::{FileSystem, ReadableFileSystem, WritableFileSystem};
-mod r#async;
-pub use r#async::{AsyncFileSystem, AsyncReadableFileSystem, AsyncWritableFileSystem};
+pub use fs::FileSystem;
+mod read;
+pub use read::ReadableFileSystem;
 
-mod sync;
-pub use sync::{SyncFileSystem, SyncReadableFileSystem, SyncWritableFileSystem};
+mod write;
+pub use write::WritableFileSystem;
 
 mod file_metadata;
 pub use file_metadata::FileMetadata;