feat(derive): Add derive macro for interface

This commit is contained in:
Kasper Juul Hermansen 2023-02-21 22:40:42 +01:00
parent 50e4d5a879
commit 0ca86560bf
Signed by: kjuulh
GPG Key ID: 57B6E1465221F912
9 changed files with 124 additions and 11 deletions

12
Cargo.lock generated
View File

@ -79,15 +79,27 @@ name = "char_plan"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"char_sdk", "char_sdk",
"char_sdk_derive",
"eyre",
"tokio",
] ]
[[package]] [[package]]
name = "char_sdk" name = "char_sdk"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"clap",
"eyre", "eyre",
] ]
[[package]]
name = "char_sdk_derive"
version = "0.1.0"
dependencies = [
"quote",
"syn",
]
[[package]] [[package]]
name = "clap" name = "clap"
version = "4.1.6" version = "4.1.6"

View File

@ -1,5 +1,10 @@
[workspace] [workspace]
members = ["examples/service/char_plan", "crates/char_cli", "crates/char_sdk"] members = [
"examples/service/char_plan",
"crates/char_cli",
"crates/char_sdk",
"crates/char_sdk_derive",
]
[workspace.dependencies] [workspace.dependencies]
eyre = "0.6.8" eyre = "0.6.8"

View File

@ -7,3 +7,4 @@ edition = "2021"
[dependencies] [dependencies]
eyre = { workspace = true } eyre = { workspace = true }
clap = "4.1.6"

View File

@ -1,20 +1,44 @@
pub mod std; pub mod std;
pub trait Action {} pub enum ActionArg<'a> {
Required { name: &'a str, description: &'a str },
Optional { name: &'a str, description: &'a str },
}
pub struct InputArg<'a> {
name: &'a str,
value: &'a str,
}
pub struct ActionArgs<'a> {
pub name: &'a str,
pub args: Vec<ActionArg<'a>>,
}
pub trait Action {
fn action<'a>(&self) -> ActionArgs<'a>;
fn execute(&self, args: &[&InputArg]) -> eyre::Result<()>;
}
pub trait Plugin {} pub trait Plugin {}
pub struct CharBuilder; pub struct CharBuilder {
actions: Vec<Box<dyn Action>>,
}
impl CharBuilder { impl CharBuilder {
pub fn new() -> Self { pub fn new() -> Self {
CharBuilder CharBuilder {
actions: Vec::new(),
}
} }
pub fn add_context<C>(mut self, context: C) -> Self { pub fn add_context<C>(mut self, context: C) -> Self {
self self
} }
pub fn add_action(mut self, action: impl Action) -> Self { pub fn add_action(mut self, action: impl Into<Box<dyn Action>>) -> Self {
self.actions.push(action.into());
self self
} }
@ -23,6 +47,7 @@ impl CharBuilder {
} }
pub fn execute(mut self) -> eyre::Result<()> { pub fn execute(mut self) -> eyre::Result<()> {
//clap::Command::new("").arg(a)
Ok(()) Ok(())
} }
} }

View File

@ -1,6 +1,8 @@
pub struct Context {} pub struct Plugin {}
impl Default for Context { impl crate::Plugin for Plugin {}
impl Default for Plugin {
fn default() -> Self { fn default() -> Self {
Self {} Self {}
} }

View File

@ -0,0 +1,12 @@
[package]
name = "char_sdk_derive"
version = "0.1.0"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
syn = "1.0.107"
quote = "1.0.23"
[lib]
proc-macro = true

View File

@ -0,0 +1,24 @@
extern crate proc_macro;
use proc_macro::TokenStream;
use quote::quote;
#[proc_macro_derive(CharAction)]
pub fn derive_char_action_into_box(input: TokenStream) -> TokenStream {
let ast = syn::parse(input).unwrap();
// Build the trait implementation
impl_hello_macro(&ast)
}
fn impl_hello_macro(ast: &syn::DeriveInput) -> TokenStream {
let name = &ast.ident;
let gen = quote! {
impl Into<Box<dyn char_sdk::Action>> for #name {
fn into(self) -> Box<dyn char_sdk::Action> {
Box::new(self)
}
}
};
gen.into()
}

View File

@ -7,3 +7,7 @@ edition = "2021"
[dependencies] [dependencies]
char_sdk = { path = "../../../crates/char_sdk" } char_sdk = { path = "../../../crates/char_sdk" }
char_sdk_derive = { path = "../../../crates/char_sdk_derive" }
eyre = { workspace = true }
tokio = { workspace = true }

View File

@ -1,14 +1,42 @@
struct Run; use char_sdk_derive::CharAction;
impl char_sdk::Action for Run {}
#[derive(CharAction)]
struct Run;
impl char_sdk::Action for Run {
fn action<'a>(&self) -> char_sdk::ActionArgs<'a> {
char_sdk::ActionArgs {
name: "run",
args: vec![char_sdk::ActionArg::Required {
name: "profile",
description: "which release profile to use, takes ['release', 'test']",
}],
}
}
fn execute(&self, args: &[&char_sdk::InputArg]) -> eyre::Result<()> {
todo!()
}
}
#[derive(CharAction)]
struct Build; struct Build;
impl char_sdk::Action for Build {}
impl char_sdk::Action for Build {
fn action<'a>(&self) -> char_sdk::ActionArgs<'a> {
todo!()
}
fn execute(&self, args: &[&char_sdk::InputArg]) -> eyre::Result<()> {
todo!()
}
}
fn main() { fn main() {
char_sdk::CharBuilder::new() char_sdk::CharBuilder::new()
.add_context(char_sdk::std::dagger::Context::default())
.add_action(Run {}) .add_action(Run {})
.add_action(Build {}) .add_action(Build {})
.add_plugin(char_sdk::std::dagger::Plugin::default())
.add_plugin(char_sdk::std::k8s::Plugin::default()) .add_plugin(char_sdk::std::k8s::Plugin::default())
.execute() .execute()
.unwrap(); .unwrap();