Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 3 additions & 63 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "codegen-sdk-core"
version = "0.1.0"
edition = "2021"
edition = "2024"

[dependencies]
clap = { version = "4.5.28", features = ["derive"] }
Expand All @@ -28,7 +28,6 @@ members = [
rayon = "1.10.0"
env_logger = "0.11.6"
log = "0.4.25"
ouroboros = "0.18.5"
tree-sitter = "0.25.1"
tree-sitter-python = "0.23.6"
tree-sitter-typescript = "0.23.2"
Expand Down
2 changes: 1 addition & 1 deletion codegen-sdk-analyzer/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "codegen-sdk-analyzer"
version = "0.1.0"
edition = "2021"
edition = "2024"

[dependencies]
salsa = "0.16.1"
Expand Down
2 changes: 1 addition & 1 deletion codegen-sdk-ast/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "codegen-sdk-ast"
version = "0.1.0"
edition = "2021"
edition = "2024"

[dependencies]
codegen-sdk-cst = { path = "../codegen-sdk-cst" }
Expand Down
3 changes: 1 addition & 2 deletions codegen-sdk-common/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
[package]
name = "codegen-sdk-common"
version = "0.1.0"
edition = "2021"
edition = "2024"

[dependencies]
bytes = { workspace = true }
tree-sitter = { workspace = true }
ouroboros = { workspace = true }
tree-sitter-python = { workspace = true, optional = true }
tree-sitter-typescript = { workspace = true, optional = true }
tree-sitter-javascript = { workspace = true, optional = true }
Expand Down
8 changes: 5 additions & 3 deletions codegen-sdk-cst-generator/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
[package]
name = "codegen-sdk-cst-generator"
version = "0.1.0"
edition = "2021"
edition = "2024"

[dependencies]
convert_case = { workspace = true }
prettyplease = "0.2.29"
syn = "2.0.98"
syn = { version = "2.0.98", features = ["proc-macro"] }
tree-sitter = { workspace = true }
log = { workspace = true }
codegen-sdk-common = { path = "../codegen-sdk-common" }
anyhow = { workspace = true }

quote = "1.0.38"
proc-macro2 = "1.0.93"
tempfile = "3.8.1"
[dev-dependencies]
codegen-sdk-common = { path = "../codegen-sdk-common" , features = ["python"] }
43 changes: 28 additions & 15 deletions codegen-sdk-cst-generator/src/generator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,23 @@ mod enum_generator;
mod format;
mod state;
mod struct_generator;
const IMPORTS: &str = "
use std::sync::Arc;
use tree_sitter;
use derive_more::Debug;
use codegen_sdk_common::*;
use std::backtrace::Backtrace;
use bytes::Bytes;
use rkyv::{Archive, Deserialize, Serialize, Portable};
";
use std::io::Write;

use proc_macro2::TokenStream;
use quote::quote;
fn get_imports() -> TokenStream {
quote! {

use std::sync::Arc;
use tree_sitter;
use derive_more::Debug;
use codegen_sdk_common::*;
use std::backtrace::Backtrace;
use bytes::Bytes;
use rkyv::{Archive, Deserialize, Serialize, Portable};

}
}
pub(crate) fn generate_cst(node_types: &Vec<Node>) -> anyhow::Result<String> {
let mut state = State::default();
let mut nodes = HashSet::new();
Expand Down Expand Up @@ -47,15 +54,21 @@ pub(crate) fn generate_cst(node_types: &Vec<Node>) -> anyhow::Result<String> {
generate_struct(node, &mut state, &name);
}
}
let mut result = IMPORTS.to_string();
result.push_str(&state.enums);
result.push_str(&state.structs);
let formatted = format::format_cst(&result);
let mut result = get_imports();
result.extend_one(state.enums);
result.extend_one(state.structs);
let formatted = format::format_cst(&result.to_string());
match formatted {
Ok(formatted) => return Ok(formatted),
Err(e) => {
log::error!("Failed to format CST: {}", e);
return Ok(result.to_string());
let mut out_file = tempfile::NamedTempFile::with_suffix(".rs")?;
log::error!(
"Failed to format CST, writing to temp file at {}",
out_file.path().display()
);
out_file.write_all(result.to_string().as_bytes())?;
out_file.keep()?;
return Err(e);
}
}
}
Expand Down
Loading
Loading