r: Use wit_bindgen_rust in build.rs

Author: tomasol

Cargo.lock

@@ -34,6 +34,8 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 sha2 = "0.10.9"
 wit-bindgen = "0.50.0"
+wit-bindgen-rust = "0.50.0"
+wit-parser = "0.243.0"
 wstd = "0.6.3"
 
 [profile.release]

Cargo.toml

@@ -22,3 +22,8 @@ wstd.workspace = true
 
 [dev-dependencies]
 rand.workspace = true
+
+[build-dependencies]
+anyhow.workspace = true
+wit-bindgen-rust.workspace = true
+wit-parser.workspace = true

activity/db/turso/Cargo.toml

@@ -0,0 +1,14 @@
+use anyhow::Result;
+use wit_bindgen_rust::Opts;
+
+fn main() -> Result<()> {
+    println!("cargo:rerun-if-changed=wit/");
+    Opts {
+        generate_all: true,
+        additional_derive_attributes: vec!["PartialEq".to_string()],
+        ..Default::default()
+    }
+    .build()
+    .generate_to_out_dir(None)?;
+    Ok(())
+}

activity/db/turso/build.rs

@@ -1,22 +1,26 @@
 mod turso;
 
-use crate::exports::stargazers::db::llm::Guest as LlmGuest;
-use crate::exports::stargazers::db::user::Guest as UserGuest;
-use exports::stargazers::db::user::{Ordering, Stargazer};
+use generated::export;
+use generated::exports::stargazers::db::llm::Guest as LlmGuest;
+use generated::exports::stargazers::db::user::Guest as UserGuest;
+use generated::exports::stargazers::db::user::{Ordering, Stargazer};
 use humantime::format_rfc3339_millis;
 use std::time::SystemTime;
 use turso::request::{NamedArg, PipelineAction, PipelineRequest, Stmt};
 use turso::response::{QueryResult, Response, extract_first_value_from_nth_response};
 use turso::{TursoClient, TursoValue};
-use wit_bindgen::generate;
 use wstd::runtime::block_on;
 
 pub const ENV_TURSO_TOKEN: &str = "TURSO_TOKEN";
 pub const ENV_TURSO_LOCATION: &str = "TURSO_LOCATION";
 
-generate!({ generate_all, additional_derives: [PartialEq] });
-pub(crate) struct Component;
-export!(Component);
+mod generated {
+    #![allow(clippy::empty_line_after_outer_attr)]
+    include!(concat!(env!("OUT_DIR"), "/any.rs"));
+}
+
+struct Component;
+export!(Component with_types_in generated);
 
 impl LlmGuest for Component {
     fn get_settings_json() -> Result<String, String> {
@@ -410,7 +414,7 @@ fn process_resp_list_stargazers(
 #[cfg(test)]
 mod tests {
     use crate::{
-        exports::stargazers::db::user::Stargazer,
+        generated::exports::stargazers::db::user::Stargazer,
         process_resp_list_stargazers,
         turso::{
             TursoValue,
@@ -687,10 +691,8 @@ mod tests {
 
         use crate::{
             Component, ENV_TURSO_LOCATION, ENV_TURSO_TOKEN,
-            exports::stargazers::db::{
-                llm::Guest as _,
-                user::{Guest as _, Ordering, Stargazer},
-            },
+            generated::exports::stargazers::db::llm::Guest as _,
+            generated::exports::stargazers::db::user::{Guest as _, Ordering, Stargazer},
             turso::{
                 TursoClient, TursoValue,
                 request::{NamedArg, PipelineAction, PipelineRequest, Stmt},

activity/db/turso/src/lib.rs

@@ -21,3 +21,6 @@ wstd.workspace = true
 
 [build-dependencies]
 cynic-codegen.workspace = true
+anyhow.workspace = true
+wit-bindgen-rust.workspace = true
+wit-parser.workspace = true

activity/github/impl/Cargo.toml

@@ -1,7 +1,17 @@
-fn main() {
+use anyhow::Result;
+use wit_bindgen_rust::Opts;
+
+fn main() -> Result<()> {
+    println!("cargo:rerun-if-changed=wit/");
+    Opts {
+        generate_all: true,
+        ..Default::default()
+    }
+    .build()
+    .generate_to_out_dir(None)?;
+
     cynic_codegen::register_schema("github")
-        .from_sdl_file("graphql/github.graphql")
-        .unwrap()
-        .as_default()
-        .unwrap();
+        .from_sdl_file("graphql/github.graphql")?
+        .as_default()?;
+    Ok(())
 }

activity/github/impl/build.rs

@@ -1,12 +1,12 @@
-use crate::exports::stargazers::github::account::Guest;
 use cynic::GraphQlResponse;
-use exports::stargazers::github::account::Stargazers;
+use generated::export;
+use generated::exports::stargazers::github::account::Guest;
+use generated::exports::stargazers::github::account::Stargazers;
 use serde::Serialize;
 use stargazers::{
     QueryStargazers, QueryStargazersVariables, Repository, StargazerConnection, StargazerEdge,
     UniformResourceLocatable,
 };
-use wit_bindgen::generate;
 use wstd::{
     http::{Body, Client, Method, Request, StatusCode},
     runtime::block_on,
@@ -15,9 +15,13 @@ mod stargazers;
 
 const ENV_GITHUB_TOKEN: &str = "GITHUB_TOKEN";
 
-generate!({ generate_all });
-pub(crate) struct Component;
-export!(Component);
+mod generated {
+    #![allow(clippy::empty_line_after_outer_attr)]
+    include!(concat!(env!("OUT_DIR"), "/any.rs"));
+}
+
+struct Component;
+export!(Component with_types_in generated);
 
 #[derive(Debug, serde::Serialize)]
 #[serde(rename_all = "camelCase")]
@@ -161,7 +165,7 @@ pub struct UserArguments {
 #[cfg(test)]
 mod tests {
     use crate::Component;
-    use crate::exports::stargazers::github::account::Guest;
+    use crate::generated::exports::stargazers::github::account::Guest;
     use crate::{ENV_GITHUB_TOKEN, extract_stargazers, stargazers::QueryStargazers};
     use cynic::GraphQlResponse;
 

activity/github/impl/src/lib.rs

@@ -17,3 +17,8 @@ serde.workspace = true
 serde_json.workspace = true
 wit-bindgen.workspace = true
 wstd.workspace = true
+
+[build-dependencies]
+anyhow.workspace = true
+wit-bindgen-rust.workspace = true
+wit-parser.workspace = true

activity/llm/openai/Cargo.toml

@@ -0,0 +1,13 @@
+use anyhow::Result;
+use wit_bindgen_rust::Opts;
+
+fn main() -> Result<()> {
+    println!("cargo:rerun-if-changed=wit/");
+    Opts {
+        generate_all: true,
+        ..Default::default()
+    }
+    .build()
+    .generate_to_out_dir(None)?;
+    Ok(())
+}