refactor: move typst parsing to a new crate

Automattic · Jan 4, 2025 · 1672de3 · 1672de3
1 parent 6dcf841
commit 1672de3
Show file tree

Hide file tree

Showing 18 changed files with 815 additions and 755 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace]
-members = [ "harper-cli", "harper-core", "harper-ls", "harper-comments", "harper-wasm", "harper-tree-sitter", "harper-html"]
+members = [ "harper-cli", "harper-core", "harper-ls", "harper-comments", "harper-wasm", "harper-tree-sitter", "harper-html", "harper-typst"]
 resolver = "2"
 
 [profile.release]

diff --git a/harper-cli/Cargo.toml b/harper-cli/Cargo.toml
@@ -12,8 +12,9 @@ ariadne = "0.4.1"
 clap = { version = "4.5.23", features = ["derive"] }
 harper-core = { path = "../harper-core", version = "0.14.0" }
 harper-comments = { path = "../harper-comments", version = "0.14.0" }
+harper-typst = { path = "../harper-typst", version = "0.14.0", optional = true }
 serde_json = "1.0.133"
 
 [features]
 default = ["typst"]
-typst = ["harper-core/typst"]
+typst = ["dep:harper-typst"]
diff --git a/harper-cli/src/main.rs b/harper-cli/src/main.rs
@@ -172,7 +172,7 @@ fn load_file(file: &Path) -> anyhow::Result<(Document, String)> {
         match file.extension().map(|v| v.to_str().unwrap()) {
             Some("md") => Box::new(Markdown),
             #[cfg(feature = "typst")]
-            Some("typ") => Box::new(harper_core::parsers::Typst),
+            Some("typ") => Box::new(harper_typst::Typst),
             _ => Box::new(
                 CommentParser::new_from_filename(file)
                     .map(Box::new)

diff --git a/harper-comments/Cargo.toml b/harper-comments/Cargo.toml
@@ -32,6 +32,3 @@ tree-sitter-haskell = "0.15.0"
 
 [dev-dependencies]
 paste = "1.0.15"
-
-[features]
-typst = ["harper-core/typst"]
diff --git a/harper-core/Cargo.toml b/harper-core/Cargo.toml
@@ -24,7 +24,6 @@ thiserror = "2.0.9"
 unicode-blocks = "0.1.9"
 unicode-width = "0.2.0"
 levenshtein_automata = { version = "0.2.1", features = ["fst_automaton"] }
-typst-syntax = { version = "0.12.0", optional = true }
 
 [dev-dependencies]
 criterion = { version = "0.5.1", default-features = false }
@@ -35,5 +34,5 @@ name = "parse_demo"
 harness = false
 
 [features]
-typst = ["dep:typst-syntax"]
+default = []
 concurrent = []
diff --git a/harper-core/src/parsers/mod.rs b/harper-core/src/parsers/mod.rs
@@ -4,11 +4,6 @@ mod markdown;
 mod mask;
 mod plain_english;
 
-#[cfg(feature = "typst")]
-mod typst;
-#[cfg(feature = "typst")]
-pub use typst::Typst;
-
 use blanket::blanket;
 pub use collapse_identifiers::CollapseIdentifiers;
 pub use isolate_english::IsolateEnglish;