Adds ability to combine messages

crates/core/Cargo.toml

@@ -13,4 +13,5 @@ cgmath = "0.18"
 serde = { version = "1.0", features = ["derive"] }
 epaint = { version = "0.22.0", features = ["bytemuck", "serde"] }
 pollster = "0.3"
-futures-intrusive = "0.5"
+futures-intrusive = "0.5"
+macro_magic = "0.5.0"

crates/core/src/interactions/interaction_manager.rs

@@ -1,7 +1,9 @@
 use crate::{BoundingBoxInteraction, RadiantNode, ScreenDescriptor};
 use epaint::ClippedPrimitive;
 use serde::{Deserialize, Serialize};
+use macro_magic::export_tokens;
 
+#[export_tokens]
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub enum InteractionMessage {
     TransformNode {

crates/core/src/tools/rectangle_tool.rs

@@ -1,7 +1,8 @@
 use serde::{Deserialize, Serialize};
-
 use crate::RadiantTool;
+use macro_magic::export_tokens;
 
+#[export_tokens]
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub enum RectangleToolMessage {
     AddNode {

crates/core/src/tools/selection_tool.rs

@@ -1,9 +1,13 @@
 use crate::RadiantTool;
 use serde::{Deserialize, Serialize};
+use macro_magic::export_tokens;
 
+#[export_tokens]
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub enum SelectionToolMessage {
-    SelectNode(u64),
+    SelectNode { 
+        id: u64,
+    },
     TransformNode {
         id: u64,
         position: [f32; 2],
@@ -29,7 +33,7 @@ impl<M: From<SelectionToolMessage>> RadiantTool<M> for SelectionTool {
     fn on_mouse_down(&mut self, node_id: u64, _position: [f32; 2]) -> Option<M> {
         if node_id > 0 {
             self.active_node_id = Some(node_id - 1);
-            let message = SelectionToolMessage::SelectNode(node_id - 1);
+            let message = SelectionToolMessage::SelectNode { id: node_id - 1 };
             Some(message.into())
         } else {
             None

crates/image/Cargo.toml

@@ -15,3 +15,4 @@ epaint = { version = "0.22.0", features = ["bytemuck", "serde"] }
 pollster = "0.3"
 futures-intrusive = "0.5"
 radiant-core = { path = "../core" }
+macro_magic = "0.5.0"

crates/image/src/image_message.rs

@@ -1,5 +1,7 @@
 use serde::{Deserialize, Serialize};
+use macro_magic::export_tokens;
 
+#[export_tokens]
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub enum RadiantImageMessage {
     AddImage {

crates/image/src/lib.rs

@@ -1,3 +1,5 @@
 pub mod image_node;
+pub mod image_message;
 
 pub use image_node::*;
+pub use image_message::*;

crates/macros/Cargo.toml

@@ -11,3 +11,5 @@ proc-macro = true
 proc-macro2 = "1.0.69"
 quote = "1.0.33"
 syn = "2.0.38"
+macro_magic = { version = "0.5.0", features = ["proc_support"] }
+proc-utils = "0"

crates/macros/src/lib.rs

@@ -1,6 +1,7 @@
 use proc_macro::TokenStream;
 use proc_macro2::TokenStream as TokenStream2;
 use quote::quote;
+use macro_magic::import_tokens_attr;
 
 fn derive_tessellatable_internal(item: TokenStream2) -> syn::Result<TokenStream2> {
     let item = syn::parse2::<syn::ItemEnum>(item)?;
@@ -121,6 +122,60 @@ fn derive_component_provider_internal(item: TokenStream2) -> syn::Result<TokenSt
     Ok(res)
 }
 
+fn combine_enum_internal(attr: TokenStream2, item: TokenStream2, foreign_path: syn::Path) -> syn::Result<TokenStream2> {
+    let mut local_enum = syn::parse2::<syn::ItemEnum>(item.clone())?;
+    let local_name = local_enum.ident.clone();
+
+    let foreign_enum = syn::parse2::<syn::ItemEnum>(attr)?;
+    let foreign_variants = foreign_enum.variants.iter().map(|variant| {
+        variant.ident.clone()
+    }).collect::<Vec<_>>();
+    let foreign_args = foreign_enum.variants.iter().map(|variant| {
+        variant.fields.iter().map(|field| {
+            field.ident.clone()
+        }).collect::<Vec<_>>()
+    }).collect::<Vec<_>>();
+
+    foreign_enum.variants.iter().for_each(|variant| {
+        if local_enum.variants.iter().any(|local_variant| local_variant.ident == variant.ident) {
+            return;
+        }
+        local_enum.variants.push(variant.clone());
+    });
+
+    let res = quote! {
+        #local_enum
+
+        impl From<#foreign_path> for #local_name {
+            fn from(foreign: #foreign_path) -> Self {
+                match foreign {
+                    #(
+                        #foreign_path::#foreign_variants { #(#foreign_args,)* } => Self::#foreign_variants { #(#foreign_args,)* },
+                    )*
+                }
+            }
+        }
+
+        impl TryInto<#foreign_path> for #local_name {
+            type Error = ();
+
+            fn try_into(self) -> Result<#foreign_path, Self::Error> {
+                match self {
+                    #(
+                        Self::#foreign_variants { #(#foreign_args,)* } => Ok(#foreign_path::#foreign_variants { #(#foreign_args,)* }),
+                    )*
+                    _ => Err(()),
+                }
+            }
+        }
+    };
+
+    // use proc_utils::*;
+    // res.pretty_print();
+
+    Ok(res)
+}
+
 #[proc_macro_derive(RadiantTessellatable)]
 pub fn derive_tessellatable(item: TokenStream) -> TokenStream {
     let res = match derive_tessellatable_internal(item.into()) {
@@ -146,4 +201,15 @@ pub fn derive_component_provider(item: TokenStream) -> TokenStream {
         Err(err) => err.to_compile_error(),
     };
     res.into()
+}
+
+#[import_tokens_attr]
+#[proc_macro_attribute]
+pub fn combine_enum(attr: TokenStream, item: TokenStream) -> TokenStream {
+    let foreign_path = syn::parse::<syn::Path>(__source_path).unwrap();
+    let res = match combine_enum_internal(attr.into(), item.into(), foreign_path) {
+        Ok(res) => res,
+        Err(err) => err.to_compile_error(),
+    };
+    res.into()
 }

crates/path/Cargo.toml

@@ -15,3 +15,4 @@ epaint = { version = "0.22.0", features = ["bytemuck", "serde"] }
 pollster = "0.3"
 futures-intrusive = "0.5"
 radiant-core  = { path = "../core" }
+macro_magic = "0.5.0"