Fix WorldPivotData not being written in studio

generate_reflection/src/property_patches.rs

@@ -26,6 +26,7 @@ pub struct PropertyPatches {
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "PascalCase", deny_unknown_fields)]
 pub struct PropertyChange {
+    pub data_type: Option<DataType<'static>>,
     pub alias_for: Option<String>,
     pub serialization: Option<PropertySerialization>,
     pub scriptability: Option<Scriptability>,
@@ -150,6 +151,10 @@ impl PropertyPatches {
                 if let Some(scriptability) = &property_change.scriptability {
                     existing_property.scriptability = *scriptability;
                 }
+
+                if let Some(data_type) = &property_change.data_type {
+                    existing_property.data_type = data_type.clone();
+                }
             }
         }
 

patches/model-pivot.yml

@@ -0,0 +1,14 @@
+Change:
+  Model:
+    WorldPivot:
+      DataType:
+        Value: CFrame
+      Serialization:
+        Type: SerializesAs
+        As: WorldPivotData
+  Model:
+    WorldPivotData:
+      AliasFor: WorldPivot
+      DataType:
+        Value: OptionalCFrame
+      Scriptability: None

rbx_binary/src/deserializer/mod.rs

@@ -1,5 +1,5 @@
 mod error;
-mod header;
+pub mod header;
 mod state;
 
 use std::{io::Read, str};
@@ -9,8 +9,6 @@ use rbx_reflection::ReflectionDatabase;
 
 use self::state::DeserializerState;
 
-pub(crate) use self::header::FileHeader;
-
 pub use self::error::Error;
 
 /// A configurable deserializer for Roblox binary models and places.

rbx_binary/src/deserializer/state.rs

@@ -1236,7 +1236,8 @@ impl<'db, R: Read> DeserializerState<'db, R> {
                 }
             },
             Type::OptionalCFrame => match canonical_type {
-                VariantType::OptionalCFrame => {
+                // Model.WorldPivotData may be serialized as a CFrame. The easiest fix is to treat it like an OptionalCFrame
+                VariantType::OptionalCFrame | VariantType::CFrame => {
                     let referents = &type_info.referents;
                     let mut rotations = Vec::with_capacity(referents.len());
 

rbx_binary/src/text_deserializer.rs

@@ -14,7 +14,7 @@ use rbx_dom_weak::types::{
 };
 use serde::{ser::SerializeSeq, Serialize, Serializer};
 
-use crate::{chunk::Chunk, core::RbxReadExt, deserializer::FileHeader, types::Type};
+use crate::{chunk::Chunk, core::RbxReadExt, deserializer::header::FileHeader, types::Type};
 
 #[derive(Debug, Serialize)]
 pub struct DecodedModel {
@@ -695,9 +695,10 @@ impl DecodedValues {
                             Some(CFrame::new(Vector3::new(x, y, z), rotation))
                         }
                     })
+                    .flatten()
                     .collect();
 
-                Some(DecodedValues::OptionalCFrame(values))
+                Some(DecodedValues::CFrame(values))
             }
             Type::UniqueId => {
                 let mut values = Vec::with_capacity(prop_count);

rbx_dom_lua/src/EncodedValue.lua

@@ -493,6 +493,8 @@ types = {
 	},
 }
 
+types.OptionalCFrame = types.CFrame
+
 function EncodedValue.decode(encodedValue)
 	local ty, value = next(encodedValue)