From 9593737871708e62329fba79d695f8f0f45482ae Mon Sep 17 00:00:00 2001
From: bbb651 <bar.ye651@gmail.com>
Date: Mon, 13 Jan 2025 01:07:07 +0200
Subject: [PATCH] build(generate): remove `tree-sitter` dependency

It was only used to share two constants, and balloons its dependencies.

This also makes `generate_parser_for_grammar` work in wasm.
(Tested in `wasm32-wasip2` in wasmtime with the json grammar,
`wasm32-unknown-unknown` running in the same setup exited successfully
so I'm pretty confident it works as well)

Co-authored-by: Amaan Qureshi <contact@amaanq.com>
---
 .cargo/config.toml              |   4 ++++
 Cargo.lock                      | Bin 73264 -> 73248 bytes
 crates/generate/Cargo.toml      |   2 --
 crates/generate/build.rs        |  11 +++++++++++
 crates/generate/src/generate.rs |   7 +++++--
 crates/generate/src/render.rs   |   3 ++-
 6 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 crates/generate/build.rs

diff --git a/.cargo/config.toml b/.cargo/config.toml
index 35049cbcb..549ae0224 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,2 +1,6 @@
 [alias]
 xtask = "run --package xtask --"
+
+[env]
+# See: https://github.com/rust-lang/cargo/issues/3946#issuecomment-973132993
+CARGO_WORKSPACE_DIR = { value = "", relative = true }
diff --git a/Cargo.lock b/Cargo.lock
index 0476d424d84c6534a0cc62b5e81191e4ff86857f..4458254d29d4046a038f00471a7d5659ff2f3487 100644
GIT binary patch
delta 14
Wcmdn6hh@PYmJLUaZN73WCL91eb_fdq

delta 18
YcmZ3mhh+m09XU2x?1;eTBgbOG0b0okcmMzZ

diff --git a/crates/generate/Cargo.toml b/crates/generate/Cargo.toml
index 1a296229d..23eba6d8b 100644
--- a/crates/generate/Cargo.toml
+++ b/crates/generate/Cargo.toml
@@ -47,8 +47,6 @@ smallbitvec.workspace = true
 thiserror.workspace = true
 topological-sort.workspace = true
 
-tree-sitter.workspace = true
-
 [target.'cfg(windows)'.dependencies]
 url = { workspace = true, optional = true }
 
diff --git a/crates/generate/build.rs b/crates/generate/build.rs
new file mode 100644
index 000000000..bbe8a4fa6
--- /dev/null
+++ b/crates/generate/build.rs
@@ -0,0 +1,11 @@
+use std::{env, fs, path::PathBuf};
+
+fn main() {
+    // This will always be ran in CI before publishing.
+    // We don't use a symlink for windows compatibility.
+    fs::copy(
+        concat!(env!("CARGO_WORKSPACE_DIR"), "lib/src/parser.h"),
+        PathBuf::from(env::var("OUT_DIR").expect("OUT_DIR should be set")).join("parser.h"),
+    )
+    .expect("failed to copy parser.h template");
+}
diff --git a/crates/generate/src/generate.rs b/crates/generate/src/generate.rs
index 800a0319e..6d8461989 100644
--- a/crates/generate/src/generate.rs
+++ b/crates/generate/src/generate.rs
@@ -65,8 +65,11 @@ struct GeneratedParser {
     node_types_json: String,
 }
 
+const LANGUAGE_VERSION: usize = 15;
+
 pub const ALLOC_HEADER: &str = include_str!("templates/alloc.h");
 pub const ARRAY_HEADER: &str = include_str!("templates/array.h");
+pub const PARSER_HEADER: &str = include_str!(concat!(env!("OUT_DIR"), "/parser.h"));
 
 pub type GenerateResult<T> = Result<T, GenerateError>;
 
@@ -271,7 +274,7 @@ where
     fs::create_dir_all(&header_path)?;
     write_file(&header_path.join("alloc.h"), ALLOC_HEADER)?;
     write_file(&header_path.join("array.h"), ARRAY_HEADER)?;
-    write_file(&header_path.join("parser.h"), tree_sitter::PARSER_HEADER)?;
+    write_file(&header_path.join("parser.h"), PARSER_HEADER)?;
 
     Ok(())
 }
@@ -284,7 +287,7 @@ pub fn generate_parser_for_grammar(
     let input_grammar = parse_grammar(&grammar_json)?;
     let parser = generate_parser_for_grammar_with_opts(
         &input_grammar,
-        tree_sitter::LANGUAGE_VERSION,
+        LANGUAGE_VERSION,
         semantic_version,
         None,
     )?;
diff --git a/crates/generate/src/render.rs b/crates/generate/src/render.rs
index d08ccc479..826d0919a 100644
--- a/crates/generate/src/render.rs
+++ b/crates/generate/src/render.rs
@@ -5,6 +5,7 @@ use std::{
     mem::swap,
 };
 
+use crate::LANGUAGE_VERSION;
 use indoc::indoc;
 
 use super::{
@@ -21,7 +22,7 @@ use super::{
 
 const SMALL_STATE_THRESHOLD: usize = 64;
 pub const ABI_VERSION_MIN: usize = 14;
-pub const ABI_VERSION_MAX: usize = tree_sitter::LANGUAGE_VERSION;
+pub const ABI_VERSION_MAX: usize = LANGUAGE_VERSION;
 const ABI_VERSION_WITH_RESERVED_WORDS: usize = 15;
 const BUILD_VERSION: &str = env!("CARGO_PKG_VERSION");