use value_or_array serialization for domain type

Signed-off-by: Ryan Tate <ryan.tate@spruceid.com>

crates/claims/crates/data-integrity/core/src/lib.rs

@@ -16,6 +16,7 @@ pub mod suite;
 pub use decode::*;
 use educe::Educe;
 pub use options::ProofOptions;
+pub use proof::value_or_array;
 pub use proof::*;
 use serde::Serialize;
 use ssi_claims_core::{

crates/claims/crates/data-integrity/core/src/options.rs

@@ -40,7 +40,12 @@ pub struct ProofOptions<M, T> {
     /// Example domain values include: `domain.example`` (DNS domain),
     /// `https://domain.example:8443` (Web origin), `mycorp-intranet` (bespoke
     /// text string), and `b31d37d4-dd59-47d3-9dd8-c973da43b63a` (UUID).
-    #[serde(default, skip_serializing_if = "Vec::is_empty", rename = "domain")]
+    #[serde(
+        default,
+        with = "crate::value_or_array",
+        skip_serializing_if = "Vec::is_empty",
+        rename = "domain"
+    )]
     pub domains: Vec<String>,
 
     /// Used to mitigate replay attacks.

crates/claims/crates/data-integrity/core/src/proof/configuration/mod.rs

@@ -57,7 +57,11 @@ pub struct ProofConfiguration<S: CryptographicSuite> {
     /// Example domain values include: `domain.example`` (DNS domain),
     /// `https://domain.example:8443` (Web origin), `mycorp-intranet` (bespoke
     /// text string), and `b31d37d4-dd59-47d3-9dd8-c973da43b63a` (UUID).
-    #[serde(skip_serializing_if = "Vec::is_empty", rename = "domain")]
+    #[serde(
+        with = "crate::value_or_array",
+        skip_serializing_if = "Vec::is_empty",
+        rename = "domain"
+    )]
     pub domains: Vec<String>,
 
     /// Used to mitigate replay attacks.

crates/claims/crates/data-integrity/core/src/proof/mod.rs

@@ -81,7 +81,11 @@ pub struct Proof<S: CryptographicSuite> {
     /// Example domain values include: `domain.example`` (DNS domain),
     /// `https://domain.example:8443` (Web origin), `mycorp-intranet` (bespoke
     /// text string), and `b31d37d4-dd59-47d3-9dd8-c973da43b63a` (UUID).
-    #[serde(skip_serializing_if = "Vec::is_empty", rename = "domain")]
+    #[serde(
+        with = "crate::value_or_array",
+        skip_serializing_if = "Vec::is_empty",
+        rename = "domain"
+    )]
     pub domains: Vec<String>,
 
     /// Used to mitigate replay attacks.
@@ -441,3 +445,25 @@ impl<'de, S: DeserializeCryptographicSuite<'de>> Deserialize<'de> for Proofs<S>
         }
     }
 }
+
+pub mod value_or_array {
+    use serde::{Deserialize, Serialize};
+    use ssi_core::OneOrMany;
+
+    pub fn serialize<T: Serialize, S>(value: &[T], serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        match value.split_first() {
+            Some((first, [])) => first.serialize(serializer),
+            _ => value.serialize(serializer),
+        }
+    }
+
+    pub fn deserialize<'de, T: Deserialize<'de>, D>(deserializer: D) -> Result<Vec<T>, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        Ok(OneOrMany::deserialize(deserializer)?.into_vec())
+    }
+}

crates/claims/crates/vc/src/syntax/mod.rs

@@ -102,7 +102,7 @@ pub struct TypedObject {
     pub extra_properties: BTreeMap<String, json_syntax::Value>,
 }
 
-pub(crate) mod value_or_array {
+pub mod value_or_array {
     use serde::{Deserialize, Serialize};
     use ssi_core::OneOrMany;