Add derived fields

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bomboni"
-version = "0.1.14"
+version = "0.1.15"
 authors = ["Tin Rabzelj <tin@flinect.com>"]
 description = "Utility Library for Rust"
 repository = "https://github.com/tinrab/bomboni"
@@ -38,9 +38,9 @@ tokio = ["bomboni_common/tokio"]
 tonic = ["bomboni_proto/tonic", "bomboni_request/tonic"]
 
 [dependencies]
-bomboni_common = { path = "bomboni_common", version = "0.1.14" }
+bomboni_common = { path = "bomboni_common", version = "0.1.15" }
 
-bomboni_prost = { path = "bomboni_prost", version = "0.1.14", optional = true }
-bomboni_proto = { path = "bomboni_proto", version = "0.1.14", optional = true }
-bomboni_request = { path = "bomboni_request", version = "0.1.14", optional = true }
-bomboni_template = { path = "bomboni_template", version = "0.1.14", optional = true }
+bomboni_prost = { path = "bomboni_prost", version = "0.1.15", optional = true }
+bomboni_proto = { path = "bomboni_proto", version = "0.1.15", optional = true }
+bomboni_request = { path = "bomboni_request", version = "0.1.15", optional = true }
+bomboni_template = { path = "bomboni_template", version = "0.1.15", optional = true }

bomboni_common/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bomboni_common"
-version = "0.1.14"
+version = "0.1.15"
 authors = ["Tin Rabzelj <tin@flinect.com>"]
 description = "Common things for Bomboni library."
 repository = "https://github.com/tinrab/bomboni"

bomboni_prost/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bomboni_prost"
-version = "0.1.14"
+version = "0.1.15"
 authors = ["Tin Rabzelj <tin@flinect.com>"]
 description = "Utilities for working with prost. Part of Bomboni library."
 repository = "https://github.com/tinrab/bomboni"

bomboni_proto/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bomboni_proto"
-version = "0.1.14"
+version = "0.1.15"
 authors = ["Tin Rabzelj <tin@flinect.com>"]
 description = "Utilities for working with Protobuf/gRPC. Part of Bomboni library."
 repository = "https://github.com/tinrab/bomboni"
@@ -36,5 +36,5 @@ serde_json = { version = "1.0.108", optional = true }
 serde_json = "1.0.108"
 
 [build-dependencies]
-bomboni_prost = { path = "../bomboni_prost", version = "0.1.14" }
+bomboni_prost = { path = "../bomboni_prost", version = "0.1.15" }
 prost-build = "0.12.3"

bomboni_request/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bomboni_request"
-version = "0.1.14"
+version = "0.1.15"
 authors = ["Tin Rabzelj <tin@flinect.com>"]
 description = "Utilities for working with API requests. Part of Bomboni library."
 repository = "https://github.com/tinrab/bomboni"
@@ -19,8 +19,8 @@ testing = []
 tonic = ["bomboni_proto/tonic", "dep:tonic"]
 
 [dependencies]
-bomboni_common = { path = "../bomboni_common", version = "0.1.14" }
-bomboni_proto = { path = "../bomboni_proto", version = "0.1.14" }
+bomboni_common = { path = "../bomboni_common", version = "0.1.15" }
+bomboni_proto = { path = "../bomboni_proto", version = "0.1.15" }
 thiserror = "1.0.50"
 itertools = "0.12.0"
 time = { version = "0.3.30", features = ["formatting", "parsing"] }
@@ -35,4 +35,4 @@ rand = "0.8.5"
 regex = "1.10.2"
 
 tonic = { version = "0.10.2", optional = true }
-bomboni_request_derive = { path = "../bomboni_request_derive", version = "0.1.14", optional = true }
+bomboni_request_derive = { path = "../bomboni_request_derive", version = "0.1.15", optional = true }

bomboni_request/src/parse/mod.rs

@@ -49,6 +49,30 @@ mod tests {
 
     use super::*;
 
+    #[test]
+    fn derived_fields() {
+        #[derive(Debug, PartialEq, Default)]
+        struct Item {
+            x: i32,
+            y: i32,
+        }
+        #[derive(Parse, Debug, PartialEq)]
+        #[parse(source = Item, write)]
+        struct ParsedItem {
+            #[parse(derive = derive_value)]
+            z: i32,
+        }
+
+        #[allow(clippy::unnecessary_wraps)]
+        fn derive_value(item: &Item) -> RequestResult<i32> {
+            Ok(item.x + item.y)
+        }
+
+        assert_eq!(ParsedItem::parse(Item { x: 3, y: 5 }).unwrap().z, 8);
+
+        assert_eq!(Item::from(ParsedItem { z: 8 }), Item::default());
+    }
+
     #[test]
     fn it_works() {
         #[derive(Debug, PartialEq)]

bomboni_request_derive/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bomboni_request_derive"
-version = "0.1.14"
+version = "0.1.15"
 authors = ["Tin Rabzelj <tin@flinect.com>"]
 description = "Provides derive implementations for Bomboni library."
 repository = "https://github.com/tinrab/bomboni"

bomboni_request_derive/src/parse.rs

@@ -61,6 +61,10 @@ pub struct ParseField {
     /// The names of the functions must be `parse` and `write` respectively.
     #[darling(with = parse_expr::parse_str_literal, map = Some)]
     pub with: Option<Expr>,
+    /// Make this field derived.
+    /// The function must have the signature `fn(source: &Source) -> RequestResult<T>`.
+    #[darling(with = parse_expr::parse_str_literal, map = Some)]
+    pub derive: Option<Expr>,
 }
 
 #[derive(Debug, FromVariant)]

bomboni_request_derive/src/parse_message.rs

@@ -36,14 +36,11 @@ fn expand_parse(options: &ParseOptions, fields: &[ParseField]) -> syn::Result<To
             continue;
         }
 
-        let parse_field = if field.resource.is_some() {
-            expand_parse_resource_field(field)?
+        if field.resource.is_some() {
+            parse_fields.extend(expand_parse_resource_field(field)?);
         } else {
-            expand_parse_field(field)?
+            parse_fields.extend(expand_parse_field(field)?);
         };
-        parse_fields.extend(quote! {
-            #field_ident: { #parse_field },
-        });
     }
 
     Ok(quote! {
@@ -77,6 +74,13 @@ fn expand_parse_field(field: &ParseField) -> syn::Result<TokenStream> {
     } else {
         field.ident.clone().unwrap()
     };
+    let target_ident = field.ident.as_ref().unwrap();
+
+    if let Some(derive) = field.derive.as_ref() {
+        return Ok(quote! {
+            #target_ident: { #derive(&source)? },
+        });
+    }
 
     let (is_option, is_nested, is_string) = check_proto_type(&field.ty);
 
@@ -307,8 +311,10 @@ fn expand_parse_field(field: &ParseField) -> syn::Result<TokenStream> {
     }
 
     Ok(quote! {
-        #result
-        target
+        #target_ident: {
+            #result
+            target
+        },
     })
 }
 
@@ -320,6 +326,7 @@ fn expand_parse_resource_field(field: &ParseField) -> syn::Result<TokenStream> {
         ));
     }
 
+    let target_ident = field.ident.as_ref().unwrap();
     let options = field.resource.as_ref().unwrap();
 
     let mut result = quote! {
@@ -388,8 +395,10 @@ fn expand_parse_resource_field(field: &ParseField) -> syn::Result<TokenStream> {
     }
 
     Ok(quote! {
-        #result
-        result
+        #target_ident: {
+            #result
+            result
+        },
     })
 }
 
@@ -400,7 +409,7 @@ fn expand_write(options: &ParseOptions, fields: &[ParseField]) -> TokenStream {
     let mut write_fields = quote!();
 
     for field in fields {
-        if field.skip {
+        if field.skip || field.derive.is_some() {
             continue;
         }
 

bomboni_template/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bomboni_template"
-version = "0.1.14"
+version = "0.1.15"
 authors = ["Tin Rabzelj <tin@flinect.com>"]
 description = "Utilities for working Handlebars templates. Part of Bomboni library."
 repository = "https://github.com/tinrab/bomboni"
@@ -17,8 +17,8 @@ path = "src/lib.rs"
 testing = []
 
 [dependencies]
-bomboni_common = { path = "../bomboni_common", version = "0.1.14" }
-bomboni_proto = { version = "0.1.14", path = "../bomboni_proto", features = [
+bomboni_common = { path = "../bomboni_common", version = "0.1.15" }
+bomboni_proto = { version = "0.1.15", path = "../bomboni_proto", features = [
   "json",
 ] }
 thiserror = "1.0.50"