Add serde support for Value

pbjson-types/build.rs

@@ -28,7 +28,11 @@ fn main() -> Result<()> {
     let descriptor_set = std::fs::read(descriptor_path)?;
     pbjson_build::Builder::new()
         .register_descriptors(&descriptor_set)?
-        .exclude([".google.protobuf.Duration", ".google.protobuf.Timestamp"])
+        .exclude([
+            ".google.protobuf.Duration",
+            ".google.protobuf.Timestamp",
+            ".google.protobuf.Value",
+        ])
         .build(&[".google"])?;
 
     Ok(())

pbjson-types/src/lib.rs

@@ -24,6 +24,7 @@
     clippy::redundant_closure,
     clippy::redundant_field_names,
     clippy::clone_on_ref_ptr,
+    clippy::enum_variant_names,
     clippy::use_self
 )]
 mod pb {
@@ -36,6 +37,9 @@ mod pb {
 }
 
 mod duration;
+mod list_value;
+mod r#struct;
 mod timestamp;
+mod value;
 
 pub use pb::google::protobuf::*;

pbjson-types/src/list_value.rs

@@ -0,0 +1,27 @@
+impl From<Vec<crate::Value>> for crate::ListValue {
+    fn from(values: Vec<crate::Value>) -> Self {
+        Self { values }
+    }
+}
+
+impl FromIterator<crate::value::Kind> for crate::ListValue {
+    fn from_iter<T>(iter: T) -> Self
+    where
+        T: IntoIterator<Item = crate::value::Kind>,
+    {
+        Self {
+            values: iter.into_iter().map(Into::into).collect(),
+        }
+    }
+}
+
+impl FromIterator<crate::Value> for crate::ListValue {
+    fn from_iter<T>(iter: T) -> Self
+    where
+        T: IntoIterator<Item = crate::Value>,
+    {
+        Self {
+            values: iter.into_iter().collect(),
+        }
+    }
+}

pbjson-types/src/struct.rs

@@ -0,0 +1,48 @@
+impl From<std::collections::HashMap<String, crate::Value>> for crate::Struct {
+    fn from(fields: std::collections::HashMap<String, crate::Value>) -> Self {
+        Self { fields }
+    }
+}
+
+impl FromIterator<(String, crate::Value)> for crate::Struct {
+    fn from_iter<T>(iter: T) -> Self
+    where
+        T: IntoIterator<Item = (String, crate::Value)>,
+    {
+        Self {
+            fields: iter.into_iter().collect(),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn it_works() {
+        let map = std::collections::HashMap::from([
+            (String::from("bool"), true.into()),
+            (String::from("unit"), crate::value::Kind::NullValue(0)),
+            (String::from("number"), 5.0.into()),
+            (String::from("string"), "string".into()),
+            (String::from("list"), vec![1.0.into(), 2.0.into()].into()),
+            (
+                String::from("map"),
+                std::collections::HashMap::from([(String::from("key"), "value".into())]).into(),
+            ),
+        ]);
+
+        assert_eq!(
+            serde_json::to_value(map).unwrap(),
+            serde_json::json!({
+                "bool": true,
+                "unit": null,
+                "number": 5.0,
+                "string": "string",
+                "list": [1.0, 2.0],
+                "map": {
+                    "key": "value",
+                }
+            })
+        );
+    }
+}