Merge branch 'bindgen-v2'

Cargo.toml

@@ -28,6 +28,7 @@ async-trait = "0.1.67"
 btdht = { git = "https://github.com/equalitie/btdht.git", rev = "4b8dc478e3e5f011a45b8f50c424519019f7b70d" }
 bytes = "1.4.0"
 camino = "1.0.9"
+clap = { version = "4.1.8", features = ["derive"] }
 futures-util = { version = "0.3.27", default-features = false }
 num_enum = { version = "0.5.11", default-features = false }
 once_cell = "1.12.0"

bindgen/Cargo.toml

@@ -1,5 +1,6 @@
 [package]
 name = "ouisync-bindgen"
+description = "Bindings generator for the ouisync library"
 publish = false
 authors.workspace = true
 edition.workspace = true
@@ -13,5 +14,7 @@ name = "bindgen"
 path = "src/main.rs"
 
 [dependencies]
-cbindgen = "0.20.0"
-env_logger = { version = "0.10.0", optional = true }
+clap = { workspace = true }
+heck = "0.4.1"
+syn = { version = "2.0.33", default-features = false, features = ["parsing", "full", "extra-traits"] }
+thiserror = { workspace = true }

bindgen/src/dart.rs

@@ -0,0 +1,67 @@
+use crate::parse::{Enum, Source};
+use heck::AsLowerCamelCase;
+use std::io::{self, Write};
+
+pub(crate) fn generate(source: &Source, out: &mut dyn Write) -> io::Result<()> {
+    for (name, value) in &source.enums {
+        generate_enum(name, value, out)?;
+    }
+
+    Ok(())
+}
+
+fn generate_enum(name: &str, value: &Enum, out: &mut dyn Write) -> io::Result<()> {
+    writeln!(out, "enum {name} {{")?;
+
+    for variant in &value.variants {
+        writeln!(out, "  {},", AsLowerCamelCase(&variant.name))?;
+    }
+
+    writeln!(out, "  ;")?;
+    writeln!(out)?;
+
+    // decode
+    writeln!(out, "  static {} decode(int n) {{", name)?;
+    writeln!(out, "    switch (n) {{")?;
+
+    for variant in &value.variants {
+        writeln!(
+            out,
+            "      case {}: return {}.{};",
+            variant.value,
+            name,
+            AsLowerCamelCase(&variant.name)
+        )?;
+    }
+
+    writeln!(
+        out,
+        "      default: throw ArgumentError('invalid value: $n');"
+    )?;
+    writeln!(out, "    }}")?;
+    writeln!(out, "  }}")?;
+    writeln!(out)?;
+
+    // encode
+    writeln!(out, "  int encode() {{")?;
+    writeln!(out, "    switch (this) {{")?;
+
+    for variant in &value.variants {
+        writeln!(
+            out,
+            "      case {}.{}: return {};",
+            name,
+            AsLowerCamelCase(&variant.name),
+            variant.value
+        )?;
+    }
+
+    writeln!(out, "    }}")?;
+    writeln!(out, "  }}")?;
+    writeln!(out)?;
+
+    writeln!(out, "}}")?;
+    writeln!(out)?;
+
+    Ok(())
+}

bindgen/src/main.rs

@@ -1,27 +1,43 @@
-use cbindgen::{Builder, EnumConfig, Language, RenameRule};
-use std::path::Path;
+mod dart;
+mod parse;
+
+use clap::{Parser, ValueEnum};
+use parse::{parse_file, Source};
+use std::io;
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    // Generate the C bindings header
-
-    #[cfg(feature = "env_logger")]
-    env_logger::init();
-
-    let output_path = Path::new("target").join("bindings.h");
-
-    Builder::new()
-        .with_config(cbindgen::Config {
-            language: Language::C,
-            enumeration: EnumConfig {
-                rename_variants: RenameRule::CamelCase,
-                ..Default::default()
-            },
-            ..Default::default()
-        })
-        .with_src(Path::new("ffi").join("src").join("lib.rs"))
-        .with_src(Path::new("bridge").join("src").join("constants.rs"))
-        .generate()?
-        .write_to_file(output_path);
+    let options = Options::parse();
+
+    let source_files = [
+        "bridge/src/protocol/mod.rs",
+        "ffi/src/lib.rs",
+        "lib/src/access_control/access_mode.rs",
+        "lib/src/directory/entry_type.rs",
+    ];
+    let mut source = Source::new();
+
+    for source_file in source_files {
+        parse_file(source_file, &mut source)?;
+    }
+
+    match options.language {
+        Language::Dart => dart::generate(&source, &mut io::stdout())?,
+        Language::Kotlin => todo!(),
+    }
 
     Ok(())
 }
+
+#[derive(Parser, Debug)]
+#[command(about)]
+struct Options {
+    /// Language to generate the bindings for
+    #[arg(short, long)]
+    language: Language,
+}
+
+#[derive(Clone, Copy, Debug, ValueEnum)]
+enum Language {
+    Dart,
+    Kotlin,
+}