Fix attribute value in macro (#577)

* create into AttributeValue trait to allow arbitraty attribute values

* allow attributevalue in non-template macro

packages/core/src/arbitrary_value.rs

@@ -1,5 +1,6 @@
-use std::fmt::Formatter;
+use std::fmt::{Arguments, Formatter};
 
+use bumpalo::Bump;
 use dyn_clone::{clone_box, DynClone};
 
 /// Possible values for an attribute
@@ -30,6 +31,133 @@ pub enum AttributeValue<'a> {
     Any(ArbitraryAttributeValue<'a>),
 }
 
+/// A value that can be converted into an attribute value
+pub trait IntoAttributeValue<'a> {
+    /// Convert into an attribute value
+    fn into_value(self, bump: &'a Bump) -> AttributeValue<'a>;
+}
+
+impl<'a> IntoAttributeValue<'a> for u32 {
+    fn into_value(self, _: &'a Bump) -> AttributeValue<'a> {
+        AttributeValue::Uint32(self)
+    }
+}
+
+impl<'a> IntoAttributeValue<'a> for u64 {
+    fn into_value(self, _: &'a Bump) -> AttributeValue<'a> {
+        AttributeValue::Uint64(self)
+    }
+}
+
+impl<'a> IntoAttributeValue<'a> for i32 {
+    fn into_value(self, _: &'a Bump) -> AttributeValue<'a> {
+        AttributeValue::Int32(self)
+    }
+}
+
+impl<'a> IntoAttributeValue<'a> for i64 {
+    fn into_value(self, _: &'a Bump) -> AttributeValue<'a> {
+        AttributeValue::Int64(self)
+    }
+}
+
+impl<'a> IntoAttributeValue<'a> for f32 {
+    fn into_value(self, _: &'a Bump) -> AttributeValue<'a> {
+        AttributeValue::Float32(self)
+    }
+}
+
+impl<'a> IntoAttributeValue<'a> for f64 {
+    fn into_value(self, _: &'a Bump) -> AttributeValue<'a> {
+        AttributeValue::Float64(self)
+    }
+}
+
+impl<'a> IntoAttributeValue<'a> for bool {
+    fn into_value(self, _: &'a Bump) -> AttributeValue<'a> {
+        AttributeValue::Bool(self)
+    }
+}
+
+impl<'a> IntoAttributeValue<'a> for &'a str {
+    fn into_value(self, _: &'a Bump) -> AttributeValue<'a> {
+        AttributeValue::Text(self)
+    }
+}
+
+impl<'a> IntoAttributeValue<'a> for Arguments<'_> {
+    fn into_value(self, bump: &'a Bump) -> AttributeValue<'a> {
+        use bumpalo::core_alloc::fmt::Write;
+        let mut str_buf = bumpalo::collections::String::new_in(bump);
+        str_buf.write_fmt(self).unwrap();
+        AttributeValue::Text(str_buf.into_bump_str())
+    }
+}
+
+impl<'a> IntoAttributeValue<'a> for &'a [u8] {
+    fn into_value(self, _: &'a Bump) -> AttributeValue<'a> {
+        AttributeValue::Bytes(self)
+    }
+}
+
+impl<'a> IntoAttributeValue<'a> for (f32, f32, f32) {
+    fn into_value(self, _: &'a Bump) -> AttributeValue<'a> {
+        AttributeValue::Vec3Float(self.0, self.1, self.2)
+    }
+}
+
+impl<'a> IntoAttributeValue<'a> for (i32, i32, i32) {
+    fn into_value(self, _: &'a Bump) -> AttributeValue<'a> {
+        AttributeValue::Vec3Int(self.0, self.1, self.2)
+    }
+}
+
+impl<'a> IntoAttributeValue<'a> for (u32, u32, u32) {
+    fn into_value(self, _: &'a Bump) -> AttributeValue<'a> {
+        AttributeValue::Vec3Uint(self.0, self.1, self.2)
+    }
+}
+
+impl<'a> IntoAttributeValue<'a> for (f32, f32, f32, f32) {
+    fn into_value(self, _: &'a Bump) -> AttributeValue<'a> {
+        AttributeValue::Vec4Float(self.0, self.1, self.2, self.3)
+    }
+}
+
+impl<'a> IntoAttributeValue<'a> for (i32, i32, i32, i32) {
+    fn into_value(self, _: &'a Bump) -> AttributeValue<'a> {
+        AttributeValue::Vec4Int(self.0, self.1, self.2, self.3)
+    }
+}
+
+impl<'a> IntoAttributeValue<'a> for (u32, u32, u32, u32) {
+    fn into_value(self, _: &'a Bump) -> AttributeValue<'a> {
+        AttributeValue::Vec4Uint(self.0, self.1, self.2, self.3)
+    }
+}
+
+impl<'a, T> IntoAttributeValue<'a> for &'a T
+where
+    T: AnyClone + PartialEq,
+{
+    fn into_value(self, _: &'a Bump) -> AttributeValue<'a> {
+        AttributeValue::Any(ArbitraryAttributeValue {
+            value: self,
+            cmp: |a, b| {
+                if let Some(a) = a.as_any().downcast_ref::<T>() {
+                    if let Some(b) = b.as_any().downcast_ref::<T>() {
+                        a == b
+                    } else {
+                        false
+                    }
+                } else {
+                    false
+                }
+            },
+        })
+    }
+}
+
 // todo
 #[allow(missing_docs)]
 impl<'a> AttributeValue<'a> {