Allow updating existing bodies too

Serena pointed out that if the extrude uses method=NEW, this will
update old bodies by adding new surfaces, instead of creating new bodies.

Let's be explicit about this.

Author: adamchalmers

modeling-cmds/openapi/api.json

@@ -2939,7 +2939,6 @@
                 "type": "string",
                 "format": "uuid"
               },
-<<<<<<< HEAD
               "edge_reference": {
                 "nullable": true,
                 "description": "Edge reference to use as the axis of revolution (new API). If both `edge_id` and `edge_reference` are provided, `edge_reference` takes precedence.",
@@ -2948,13 +2947,11 @@
                     "$ref": "#/components/schemas/EdgeSpecifier"
                   }
                 ]
-||||||| parent of 3cb4bff (Configurable seams)
-=======
+              },
               "keep_seams": {
                 "description": "When two collinear segments are extruded, what should happen? If true, creates a body with two surfaces. If false, creates a body with one surface, spanning both collinear segments.",
                 "default": false,
                 "type": "boolean"
->>>>>>> 3cb4bff (Configurable seams)
               },
               "opposite": {
                 "description": "Should the revolution also revolve in the opposite direction along the given axis? If so, this specifies its angle.",

modeling-cmds/src/ok_response.rs

@@ -24,7 +24,7 @@ define_ok_modeling_cmd_response_enum! {
             base64::Base64Data,
             id::ModelingCmdId,
             length_unit::LengthUnit,
-            shared::{CurveType, EntityType, ExportFile, ExtrusionFaceCapType, PathCommand, Point2d, Point3d, BodiesCreated},
+            shared::{CurveType, EntityType, ExportFile, ExtrusionFaceCapType, PathCommand, Point2d, Point3d, BodiesCreated, BodiesUpdated},
             units,
         };
 
@@ -59,39 +59,59 @@ define_ok_modeling_cmd_response_enum! {
         #[cfg_attr(not(feature = "unstable_exhaustive"), non_exhaustive)]
         pub struct Extrude {
             /// Any new bodies created by the request.
-            pub bodies: BodiesCreated,
+            #[serde(default, skip_serializing_if = "BodiesCreated::is_empty")]
+            pub bodies_created: BodiesCreated,
+            /// Any existing bodies updated by the request.
+            #[serde(default, skip_serializing_if = "BodiesUpdated::is_empty")]
+            pub bodies_updated: BodiesUpdated,
         }
 
         /// The response from the `ExtrudeToReference` endpoint.
         #[derive(Debug, Serialize, Deserialize, Clone, JsonSchema, ModelingCmdOutput)]
         #[cfg_attr(not(feature = "unstable_exhaustive"), non_exhaustive)]
         pub struct ExtrudeToReference {
             /// Any new bodies created by the request.
-            pub bodies: BodiesCreated,
+            #[serde(default, skip_serializing_if = "BodiesCreated::is_empty")]
+            pub bodies_created: BodiesCreated,
+            /// Any existing bodies updated by the request.
+            #[serde(default, skip_serializing_if = "BodiesUpdated::is_empty")]
+            pub bodies: BodiesUpdated,
         }
 
         /// The response from the `TwistExtrude` endpoint.
         #[derive(Debug, Serialize, Deserialize, Clone, JsonSchema, ModelingCmdOutput)]
         #[cfg_attr(not(feature = "unstable_exhaustive"), non_exhaustive)]
         pub struct TwistExtrude {
             /// Any new bodies created by the request.
-            pub bodies: BodiesCreated,
+            #[serde(default, skip_serializing_if = "BodiesCreated::is_empty")]
+            pub bodies_created: BodiesCreated,
+            /// Any existing bodies updated by the request.
+            #[serde(default, skip_serializing_if = "BodiesUpdated::is_empty")]
+            pub bodies: BodiesUpdated,
         }
 
         /// The response from the `Sweep` endpoint.
         #[derive(Debug, Serialize, Deserialize, Clone, JsonSchema, ModelingCmdOutput)]
         #[cfg_attr(not(feature = "unstable_exhaustive"), non_exhaustive)]
         pub struct Sweep {
             /// Any new bodies created by the request.
-            pub bodies: BodiesCreated,
+            #[serde(default, skip_serializing_if = "BodiesCreated::is_empty")]
+            pub bodies_created: BodiesCreated,
+            /// Any existing bodies updated by the request.
+            #[serde(default, skip_serializing_if = "BodiesUpdated::is_empty")]
+            pub bodies: BodiesUpdated,
         }
 
         /// The response from the `Revolve` endpoint.
         #[derive(Debug, Serialize, Deserialize, Clone, JsonSchema, ModelingCmdOutput)]
         #[cfg_attr(not(feature = "unstable_exhaustive"), non_exhaustive)]
         pub struct Revolve {
             /// Any new bodies created by the request.
-            pub bodies: BodiesCreated,
+            #[serde(default, skip_serializing_if = "BodiesCreated::is_empty")]
+            pub bodies_created: BodiesCreated,
+            /// Any existing bodies updated by the request.
+            #[serde(default, skip_serializing_if = "BodiesUpdated::is_empty")]
+            pub bodies: BodiesUpdated,
         }
 
         /// The response from the `Solid3dShellFace` endpoint.
@@ -146,7 +166,11 @@ define_ok_modeling_cmd_response_enum! {
         #[cfg_attr(not(feature = "unstable_exhaustive"), non_exhaustive)]
         pub struct RevolveAboutEdge {
             /// Any new bodies created by the request.
-            pub bodies: BodiesCreated,
+            #[serde(default, skip_serializing_if = "BodiesCreated::is_empty")]
+            pub bodies_created: BodiesCreated,
+            /// Any existing bodies updated by the request.
+            #[serde(default, skip_serializing_if = "BodiesUpdated::is_empty")]
+            pub bodies: BodiesUpdated,
         }
 
         /// The response from the `CameraDragStart` endpoint.

modeling-cmds/src/shared.rs

@@ -1911,7 +1911,7 @@ pub struct SurfaceEdgeReference {
 }
 
 /// List of bodies that were created by an operation.
-#[derive(Builder, Debug, Clone, PartialEq, Serialize, Deserialize, JsonSchema)]
+#[derive(Builder, Debug, Clone, PartialEq, Serialize, Deserialize, JsonSchema, Default)]
 #[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
 #[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))]
 #[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
@@ -1921,6 +1921,31 @@ pub struct BodiesCreated {
     pub bodies: Vec<BodyCreated>,
 }
 
+impl BodiesCreated {
+    /// Are there any bodies in this list?
+    pub fn is_empty(&self) -> bool {
+        self.bodies.is_empty()
+    }
+}
+
+/// List of bodies that were updated by an operation.
+#[derive(Builder, Debug, Clone, PartialEq, Serialize, Deserialize, JsonSchema, Default)]
+#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
+#[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))]
+#[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
+#[cfg_attr(not(feature = "unstable_exhaustive"), non_exhaustive)]
+pub struct BodiesUpdated {
+    /// All bodies created by this operation.
+    pub bodies: Vec<BodyUpdated>,
+}
+
+impl BodiesUpdated {
+    /// Are there any bodies in this list?
+    pub fn is_empty(&self) -> bool {
+        self.bodies.is_empty()
+    }
+}
+
 /// Details of a body that was created.
 #[derive(Builder, Debug, Clone, PartialEq, Serialize, Deserialize, JsonSchema)]
 #[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
@@ -1934,6 +1959,19 @@ pub struct BodyCreated {
     pub surfaces: Vec<SurfaceCreated>,
 }
 
+/// Details of a body that was updated.
+#[derive(Builder, Debug, Clone, PartialEq, Serialize, Deserialize, JsonSchema)]
+#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
+#[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))]
+#[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
+#[cfg_attr(not(feature = "unstable_exhaustive"), non_exhaustive)]
+pub struct BodyUpdated {
+    /// The body's ID.
+    pub id: Uuid,
+    /// Surfaces added to this body.
+    pub surfaces: Vec<SurfaceCreated>,
+}
+
 /// Details of a surface that was created under some body.
 #[derive(Builder, Debug, Clone, PartialEq, Serialize, Deserialize, JsonSchema)]
 #[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]