refactor(core): Remove unused wrapper. Switch from yaml format to json

README.md

@@ -37,7 +37,7 @@ crates/
 ├── notes/
 ├── cache/
 ├── index/
-└── workspace.yml
+└── workspace.json
 ```
 
 Notes are stored separately from source files. FrilVault does not modify the source code it annotates.

crates/frilvault-core/Cargo.toml

@@ -15,4 +15,4 @@ serde = { workspace = true, features = ["derive"] }
 uuid = { workspace = true, features = ["v4", "serde"] }
 thiserror.workspace = true
 
-serde_yml = "0.0.13"
+serde_json= "1.0.150"

crates/frilvault-core/src/app/frilvault.rs

@@ -4,7 +4,7 @@ use crate::{
     FrilVaultResult,
     note::NoteService,
     runtime::VaultContext,
-    storage::YamlNoteRepository,
+    storage::NoteRepository,
     workspace::{PathResolver, WorkspaceIndexRepository, WorkspaceRepository, WorkspaceService},
 };
 
@@ -28,7 +28,7 @@ impl FrilVault {
         let index_repository = WorkspaceIndexRepository::new(resolver.clone());
         index_repository.create_if_missing()?;
 
-        let note_repository = YamlNoteRepository::new(resolver.clone());
+        let note_repository = NoteRepository::new(resolver.clone());
 
         let vault_context = VaultContext::new(note_repository, index_repository.clone());
 

crates/frilvault-core/src/constants.rs

@@ -1,7 +1,7 @@
 pub const VAULT_DIR_NAME: &str = ".vault";
-pub const NOTE_FILE_EXTENSION: &str = "yml";
+pub const NOTE_FILE_EXTENSION: &str = "json";
 // pub const SCHEMA_VERSION: u32 = 1;
 pub const NOTES_DIR_NAME: &str = "notes";
 pub const CACHE_DIR_NAME: &str = "cache";
 pub const INDEX_DIR_NAME: &str = "index";
-pub const WORKSPACE_FILE_NAME: &str = "workspace.yml";
+pub const WORKSPACE_FILE_NAME: &str = "workspace.json";

crates/frilvault-core/src/error/errors.rs

@@ -6,8 +6,8 @@ pub enum FrilVaultError {
     #[error("io error: {0}")]
     Io(#[from] std::io::Error),
 
-    #[error("yaml error: {0}")]
-    Yaml(#[from] serde_yml::Error),
+    #[error("json error: {0}")]
+    JSON(#[from] serde_json::Error),
 
     #[error("source path is outside workspace")]
     SourcePathOutsideWorkspace,

crates/frilvault-core/src/note/entity/anchor.rs

@@ -0,0 +1,34 @@
+use serde::{Deserialize, Serialize};
+
+// TODO: Regex parser
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(tag = "type")]
+pub enum NoteAnchor {
+    Line(LineAnchor),
+    Symbol(SymbolAnchor),
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+pub struct LineAnchor {
+    pub line: u32,
+    pub column: u32,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+pub struct SymbolAnchor {
+    pub name: String,
+    pub kind: SymbolKind,
+    pub signature: Option<String>,
+    pub line_hint: Option<u32>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+pub enum SymbolKind {
+    Function,
+    Struct,
+    Enum,
+    Trait,
+    Impl,
+    Method,
+    Unknown,
+}

crates/frilvault-core/src/note/entity/mod.rs

@@ -1,13 +1,7 @@
-mod line_anchor;
+mod anchor;
 mod note;
-mod note_anchor;
 mod note_file;
-mod symbol_anchor;
-mod symbol_kind;
 
-pub use line_anchor::*;
+pub use anchor::*;
 pub use note::*;
-pub use note_anchor::*;
 pub use note_file::*;
-pub use symbol_anchor::*;
-pub use symbol_kind::*;

crates/frilvault-core/src/note/entity/note_file.rs

@@ -1,7 +1,15 @@
+use std::path::PathBuf;
+
 use serde::{Deserialize, Serialize};
 
 use crate::note::Note;
 
+#[derive(Debug, Clone)]
+pub struct NoteFileRecord {
+    pub source_file: PathBuf,
+    pub note_file: NoteFile,
+}
+
 #[derive(Debug, Clone, Default, Serialize, Deserialize, PartialEq, Eq)]
 pub struct NoteFile {
     pub notes: Vec<Note>,

crates/frilvault-core/src/parser/json_parser.rs

@@ -0,0 +1,15 @@
+use crate::FrilVaultResult;
+use crate::note::NoteFile;
+
+#[derive(Debug, Default, Clone)]
+pub struct JsonParser;
+
+impl JsonParser {
+    pub fn serialize(&self, note_file: &NoteFile) -> FrilVaultResult<String> {
+        Ok(serde_json::to_string(note_file)?)
+    }
+
+    pub fn deserialize(&self, content: &str) -> FrilVaultResult<NoteFile> {
+        Ok(serde_json::from_str(content)?)
+    }
+}

crates/frilvault-core/src/parser/mod.rs

@@ -1,5 +1,3 @@
-mod note_parser;
-mod yaml_parser;
+mod json_parser;
 
-pub use note_parser::*;
-pub use yaml_parser::*;
+pub use json_parser::*;

crates/frilvault-core/src/runtime/vault_context.rs

@@ -2,9 +2,9 @@ use std::path::{Path, PathBuf};
 
 use crate::{
     FrilVaultResult,
-    note::NoteFile,
+    note::{NoteFile, NoteFileRecord},
     runtime::NoteCache,
-    storage::{NoteFileRecord, YamlNoteRepository},
+    storage::NoteRepository,
     workspace::{WorkspaceIndex, WorkspaceIndexRepository},
 };
 
@@ -20,14 +20,14 @@ use crate::{
 /// accessing repositories directly.
 #[derive(Clone)]
 pub struct VaultContext {
-    pub note_repository: YamlNoteRepository,
+    pub note_repository: NoteRepository,
     pub workspace_index_repository: WorkspaceIndexRepository,
     pub note_cache: NoteCache,
 }
 
 impl VaultContext {
     pub fn new(
-        note_repository: YamlNoteRepository,
+        note_repository: NoteRepository,
         workspace_index_repository: WorkspaceIndexRepository,
     ) -> Self {
         Self {

crates/frilvault-core/src/storage/mod.rs

@@ -1,5 +1,3 @@
-mod note_file_record;
-mod yaml_repository;
+mod repository;
 
-pub use note_file_record::*;
-pub use yaml_repository::*;
+pub use repository::*;

crates/frilvault-core/src/storage/yaml_repository.rs → crates/frilvault-core/src/storage/repository.rs

@@ -1,28 +1,27 @@
-//! YAML-backed note repository.
+//! JSON-backed note repository.
 //!
-//! Notes are persisted as YAML files
+//! Notes are persisted as JSON files
 //! inside the `.vault/notes` directory.
 
 use std::fs;
 use std::path::{Path, PathBuf};
 
-use crate::note::NoteFile;
-use crate::parser::{NoteParser, YamlParser};
-use crate::storage::NoteFileRecord;
+use crate::note::{NoteFile, NoteFileRecord};
+use crate::parser::JsonParser;
 use crate::workspace::PathResolver;
 use crate::{FrilVaultResult, Note};
 
 #[derive(Debug, Clone)]
-pub struct YamlNoteRepository {
+pub struct NoteRepository {
     path_resolver: PathResolver,
-    parser: YamlParser,
+    parser: JsonParser,
 }
 
-impl YamlNoteRepository {
+impl NoteRepository {
     pub fn new(path_resolver: PathResolver) -> Self {
         Self {
             path_resolver,
-            parser: YamlParser,
+            parser: JsonParser,
         }
     }
 
@@ -53,9 +52,9 @@ impl YamlNoteRepository {
             fs::create_dir_all(parent)?;
         }
 
-        let yaml = self.parser.serialize(note_file)?;
+        let json = self.parser.serialize(note_file)?;
 
-        fs::write(note_path, yaml)?;
+        fs::write(note_path, json)?;
 
         Ok(())
     }