Fix JSON round trip of properties with nested structs with native serialization

Author: trumank

uesave/src/lib.rs

@@ -687,21 +687,23 @@ impl PropertyTagDataPartial {
             Self::Other(t) => PropertyTagDataFull::Other(t),
         }
     }
-}
-
-impl PropertyTagDataFull {
-    fn basic_type(&self) -> PropertyType {
+    pub(crate) fn has_raw_struct(&self) -> bool {
         match self {
-            Self::Array(_) => PropertyType::ArrayProperty,
-            Self::Struct { .. } => PropertyType::StructProperty,
-            Self::Set { .. } => PropertyType::SetProperty,
-            Self::Map { .. } => PropertyType::MapProperty,
-            Self::Byte(_) => PropertyType::ByteProperty,
-            Self::Enum(_, _) => PropertyType::EnumProperty,
-            Self::Bool(_) => PropertyType::BoolProperty,
-            Self::Other(property_type) => *property_type,
+            Self::Array(inner) => inner.has_raw_struct(),
+            Self::Struct { struct_type, .. } => struct_type.raw(),
+            Self::Set { key_type } => key_type.has_raw_struct(),
+            Self::Map {
+                key_type,
+                value_type,
+            } => key_type.has_raw_struct() || value_type.has_raw_struct(),
+            Self::Byte(_) => false,
+            Self::Enum(_, _) => false,
+            Self::Other(_) => false,
         }
     }
+}
+
+impl PropertyTagDataFull {
     fn has_raw_struct(&self) -> bool {
         match self {
             Self::Array(inner) => inner.has_raw_struct(),
@@ -717,6 +719,18 @@ impl PropertyTagDataFull {
             Self::Other(_) => false,
         }
     }
+    fn basic_type(&self) -> PropertyType {
+        match self {
+            Self::Array(_) => PropertyType::ArrayProperty,
+            Self::Struct { .. } => PropertyType::StructProperty,
+            Self::Set { .. } => PropertyType::SetProperty,
+            Self::Map { .. } => PropertyType::MapProperty,
+            Self::Byte(_) => PropertyType::ByteProperty,
+            Self::Enum(_, _) => PropertyType::EnumProperty,
+            Self::Bool(_) => PropertyType::BoolProperty,
+            Self::Other(property_type) => *property_type,
+        }
+    }
     fn from_type(inner_type: PropertyType, struct_type: Option<StructType>) -> Self {
         match inner_type {
             PropertyType::BoolProperty => Self::Bool(false),
@@ -4467,6 +4481,13 @@ impl<T: ArchiveType> Property<T> {
         tag: PropertyTagFull,
     ) -> Result<(Property<T>, Option<PropertyTagDataFull>)> {
         if tag.data.has_raw_struct() {
+            if ar.log() {
+                eprintln!(
+                    "Warning: Storing property '{}' as raw bytes; tag contains native-serialized struct with no parser: {:?}",
+                    ar.path(),
+                    tag.data,
+                );
+            }
             let mut raw = vec![0; tag.size as usize];
             ar.read_exact(&mut raw)?;
             return Ok((Property::Raw(raw), None));

uesave/src/serialization.rs

@@ -146,6 +146,9 @@ impl<'de, 'a> DeserializeSeed<'de> for PropertySeed<'a> {
         D: Deserializer<'de>,
     {
         use crate::PropertyType;
+        if self.tag.has_raw_struct() {
+            return Ok(Property::Raw(Vec::<u8>::deserialize(deserializer)?));
+        }
         match &self.tag {
             PropertyTagDataPartial::Other(pt) => match pt {
                 PropertyType::BoolProperty => Ok(Property::Bool(bool::deserialize(deserializer)?)),