Flatten StructPropertyValue.value field

localcc · Apr 5, 2024 · b807f7e · b807f7e
1 parent 35ea0d5
commit b807f7e
Show file tree

Hide file tree

Showing 4 changed files with 152 additions and 189 deletions.
diff --git a/src/properties/struct_property.rs b/src/properties/struct_property.rs
@@ -43,6 +43,7 @@ pub struct StructProperty {
     #[cfg_attr(feature = "serde", serde(default))]
     pub guid: Guid,
     /// The value of the property.
+    #[cfg_attr(feature = "serde", serde(flatten))]
     pub value: StructPropertyValue,
 }
 

diff --git a/tests/common/regression.rs b/tests/common/regression.rs
@@ -62,9 +62,7 @@ pub const REGRESSION_01_JSON: &str = r#"{
   "properties": {
     "Thing": {
       "type": "StructProperty",
-      "value": {
-        "Guid": "D49982B3-DF3D-D549-B4AE-57C71D5838E4"
-      }
+      "Guid": "D49982B3-DF3D-D549-B4AE-57C71D5838E4"
     }
   }
 }"#;
diff --git a/tests/common/vector2d.rs b/tests/common/vector2d.rs
@@ -1214,112 +1214,106 @@ pub const VECTOR2D_JSON: &str = r#"{
     },
     "AudioSettings": {
       "type": "StructProperty",
-      "value": {
-        "CustomStruct": [
-          "GameAudioSettings",
+      "CustomStruct": [
+        "GameAudioSettings",
+        [
           [
-            [
-              "MasterLevel",
-              {
-                "type": "FloatProperty",
-                "value": 0.20348908
-              }
-            ],
-            [
-              "MusicLevel",
-              {
-                "type": "FloatProperty",
-                "value": 0.1511635
-              }
-            ],
-            [
-              "SFXLevel",
-              {
-                "type": "FloatProperty",
-                "value": 0.5436054
-              }
-            ]
+            "MasterLevel",
+            {
+              "type": "FloatProperty",
+              "value": 0.20348908
+            }
+          ],
+          [
+            "MusicLevel",
+            {
+              "type": "FloatProperty",
+              "value": 0.1511635
+            }
+          ],
+          [
+            "SFXLevel",
+            {
+              "type": "FloatProperty",
+              "value": 0.5436054
+            }
           ]
         ]
-      }
+      ]
     },
     "GameSettings": {
       "type": "StructProperty",
-      "value": {
-        "CustomStruct": [
-          "GameSettings",
+      "CustomStruct": [
+        "GameSettings",
+        [
           [
-            [
-              "CurrentSaveSlot",
-              {
-                "type": "StrProperty",
-                "value": "SAVE2"
-              }
-            ],
-            [
-              "LoadTutorial",
-              {
-                "type": "BoolProperty",
-                "value": false
-              }
-            ],
-            [
-              "DisplayNewOrders",
-              {
-                "type": "BoolProperty",
-                "value": false
-              }
-            ],
-            [
-              "EscapeExitsTool",
-              {
-                "type": "BoolProperty",
-                "value": false
-              }
-            ],
-            [
-              "UseDarkMode",
-              {
-                "type": "BoolProperty",
-                "value": true
-              }
-            ],
-            [
-              "AnimateDayCycle",
-              {
-                "type": "BoolProperty",
-                "value": false
-              }
-            ],
-            [
-              "EnableTractorCollision",
-              {
-                "type": "BoolProperty",
-                "value": false
-              }
-            ],
-            [
-              "ShowInventory",
-              {
-                "type": "BoolProperty",
-                "value": true
-              }
-            ],
-            [
-              "CameraAngle",
-              {
-                "type": "StructProperty",
-                "value": {
-                  "Vector2D": {
-                    "x": 30.574748247861862,
-                    "y": 60.42525175213814
-                  }
-                }
+            "CurrentSaveSlot",
+            {
+              "type": "StrProperty",
+              "value": "SAVE2"
+            }
+          ],
+          [
+            "LoadTutorial",
+            {
+              "type": "BoolProperty",
+              "value": false
+            }
+          ],
+          [
+            "DisplayNewOrders",
+            {
+              "type": "BoolProperty",
+              "value": false
+            }
+          ],
+          [
+            "EscapeExitsTool",
+            {
+              "type": "BoolProperty",
+              "value": false
+            }
+          ],
+          [
+            "UseDarkMode",
+            {
+              "type": "BoolProperty",
+              "value": true
+            }
+          ],
+          [
+            "AnimateDayCycle",
+            {
+              "type": "BoolProperty",
+              "value": false
+            }
+          ],
+          [
+            "EnableTractorCollision",
+            {
+              "type": "BoolProperty",
+              "value": false
+            }
+          ],
+          [
+            "ShowInventory",
+            {
+              "type": "BoolProperty",
+              "value": true
+            }
+          ],
+          [
+            "CameraAngle",
+            {
+              "type": "StructProperty",
+              "Vector2D": {
+                "x": 30.574748247861862,
+                "y": 60.42525175213814
               }
-            ]
+            }
           ]
         ]
-      }
+      ]
     },
     "HighScore": {
       "type": "IntProperty",