fix(core): ser/de for FileKind

biomejs · Aug 28, 2024 · 6ddd405 · 6ddd405
1 parent f186ee2
commit 6ddd405
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 23 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -93,7 +93,7 @@ jobs:
         with:
           cache-base: main
       - name: Run tests on ${{ matrix.os }}
-        run: cargo test --workspace
+        run: cargo test --workspace --all-features
 
   coverage:
     name: Test262 Coverage

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -94,7 +94,7 @@ jobs:
         with:
           cache-base: main
       - name: Run tests
-        run: cargo test --workspace
+        run: cargo test --workspace --all-features
 
   test-node-api:
     name: Test node.js API

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/biome_fs/Cargo.toml b/crates/biome_fs/Cargo.toml
@@ -1,30 +1,34 @@
 [package]
-authors.workspace    = true
+authors.workspace = true
 categories.workspace = true
-description          = "A small wrapper around std::path::PathBuf contains additional information and convenient methods"
-edition.workspace    = true
-homepage.workspace   = true
-keywords.workspace   = true
-license.workspace    = true
-name                 = "biome_fs"
+description = "A small wrapper around std::path::PathBuf contains additional information and convenient methods"
+edition.workspace = true
+homepage.workspace = true
+keywords.workspace = true
+license.workspace = true
+name = "biome_fs"
 repository.workspace = true
-version              = "0.5.7"
+version = "0.5.7"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 biome_diagnostics = { workspace = true }
-crossbeam         = { workspace = true }
-directories       = "5.0.1"
-enumflags2        = { workspace = true, features = ["serde"] }
-indexmap          = { workspace = true }
-oxc_resolver      = { workspace = true }
-parking_lot       = { version = "0.12.3", features = ["arc_lock"] }
-rayon             = { workspace = true }
-rustc-hash        = { workspace = true }
-schemars          = { workspace = true, optional = true }
-serde             = { workspace = true }
-tracing           = { workspace = true }
+crossbeam = { workspace = true }
+directories = "5.0.1"
+enumflags2 = { workspace = true, features = ["serde"] }
+indexmap = { workspace = true }
+oxc_resolver = { workspace = true }
+parking_lot = { version = "0.12.3", features = ["arc_lock"] }
+rayon = { workspace = true }
+rustc-hash = { workspace = true }
+schemars = { workspace = true, optional = true }
+serde = { workspace = true }
+tracing = { workspace = true }
+
+[dev-dependencies]
+serde_json = { workspace = true }
+
 
 [features]
 serde = ["schemars", "biome_diagnostics/schema"]

diff --git a/crates/biome_fs/src/path.rs b/crates/biome_fs/src/path.rs
@@ -41,9 +41,30 @@ pub enum FileKind {
 }
 
 #[derive(Debug, Clone, Hash, Ord, PartialOrd, Eq, PartialEq, Default)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(
+    feature = "serde",
+    derive(serde::Serialize, serde::Deserialize),
+    serde(from = "Vec<FileKind>", into = "Vec<FileKind>")
+)]
 pub struct FileKinds(BitFlags<FileKind>);
 
+impl From<Vec<FileKind>> for FileKinds {
+    fn from(value: Vec<FileKind>) -> Self {
+        value
+            .into_iter()
+            .fold(FileKinds::default(), |mut acc, kind| {
+                acc.insert(kind);
+                acc
+            })
+    }
+}
+
+impl From<FileKinds> for Vec<FileKind> {
+    fn from(value: FileKinds) -> Self {
+        value.iter().collect()
+    }
+}
+
 impl Deref for FileKinds {
     type Target = BitFlags<FileKind>;
 
@@ -265,7 +286,7 @@ impl Aliases {
 
 #[cfg(test)]
 mod test {
-    use crate::path::FileKind;
+    use crate::path::{FileKind, FileKinds};
     use std::ffi::OsStr;
 
     #[test]
@@ -370,4 +391,22 @@ mod test {
         );
         assert_eq!(iter.next().unwrap().display().to_string(), "src/README.md");
     }
+
+    #[test]
+    #[cfg(feature = "serde")]
+    fn deserialize_file_kind_from_str() {
+        let result = serde_json::from_str::<FileKinds>("[\"Config\"]");
+        assert!(result.is_ok());
+        let file_kinds = result.unwrap();
+        assert_eq!(file_kinds.contains(FileKind::Config), true);
+    }
+
+    #[test]
+    #[cfg(feature = "serde")]
+    fn serialize_file_kind_into_vec() {
+        let file_kinds = FileKinds::from(FileKind::Config);
+        let result = serde_json::to_string(&file_kinds);
+        assert!(result.is_ok());
+        assert_eq!(result.unwrap(), "[\"Config\"]");
+    }
 }