merge in main

Author: gserena

.github/dependabot.yml

@@ -8,60 +8,85 @@ updates:
   directory: /
   schedule:
     interval: weekly
-    day: monday
+    day: saturday
     time: '03:00'
     timezone: America/Los_Angeles
   open-pull-requests-limit: 5
   groups:
     security:
       applies-to: security-updates
+      exclude-patterns:
+      - kittycad*
       update-types:
-      - major
       - minor
       - patch
+    security-major:
+      applies-to: security-updates
+      exclude-patterns:
+      - kittycad*
+      update-types:
+      - major
     patch:
       applies-to: version-updates
+      exclude-patterns:
+      - kittycad*
       update-types:
       - patch
     major:
       applies-to: version-updates
+      exclude-patterns:
+      - kittycad*
       update-types:
       - major
     minor:
       applies-to: version-updates
+      exclude-patterns:
+      - kittycad*
       update-types:
       - minor
       - patch
 - package-ecosystem: cargo
   directory: /
   schedule:
     interval: weekly
-    day: monday
+    day: saturday
     time: '03:00'
     timezone: America/Los_Angeles
   ignore:
   - dependency-name: webrtc
   open-pull-requests-limit: 5
-  reviewers:
-  - adamchalmers
-  - jessfraz
   groups:
     security:
       applies-to: security-updates
+      exclude-patterns:
+      - kittycad*
       update-types:
-      - major
       - minor
       - patch
+    security-major:
+      applies-to: security-updates
+      exclude-patterns:
+      - kittycad*
+      update-types:
+      - major
     patch:
       applies-to: version-updates
+      exclude-patterns:
+      - kittycad*
       update-types:
       - patch
     major:
       applies-to: version-updates
+      exclude-patterns:
+      - kittycad*
       update-types:
       - major
     minor:
       applies-to: version-updates
+      exclude-patterns:
+      - kittycad*
       update-types:
       - minor
       - patch
+  cooldown:
+    default-days: 7

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
           uses: dtolnay/rust-toolchain@stable
         - uses: taiki-e/install-action@cargo-llvm-cov
         - uses: taiki-e/install-action@nextest
-        - uses: Swatinem/rust-cache@v2.8.1
+        - uses: Swatinem/rust-cache@v2.8.2
         - uses: taiki-e/install-action@just
 
         - name: cargo test
@@ -53,7 +53,7 @@ jobs:
           uses: actions/setup-node@v6
         - name: Install openapi-changes
           run: npm i -g @pb33f/openapi-changes
-        - uses: Swatinem/rust-cache@v2.8.1
+        - uses: Swatinem/rust-cache@v2.8.2
         - name: Run just breaking-api-changes
           run: just breaking-api-changes
 
@@ -67,7 +67,7 @@ jobs:
           uses: dtolnay/rust-toolchain@stable
           with:
             components: clippy
-        - uses: Swatinem/rust-cache@v2.8.1
+        - uses: Swatinem/rust-cache@v2.8.2
 
         - name: Check lints
           run: just lint
@@ -82,7 +82,7 @@ jobs:
           uses: dtolnay/rust-toolchain@stable
           with:
             targets: wasm32-unknown-unknown
-        - uses: Swatinem/rust-cache@v2.8.1
+        - uses: Swatinem/rust-cache@v2.8.2
 
         - name: Check lints
           run: just check-wasm
@@ -116,7 +116,7 @@ jobs:
         - name: Checkout
           uses: actions/checkout@v6
         - name: Run codespell
-          uses: crate-ci/typos@v1.39.2
+          uses: crate-ci/typos@v1.40.0
 
     cargo-toml-sorted:
       name: Check Cargo.toml is sorted

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "kittycad-modeling-cmds"
-version = "0.2.148"
+version = "0.2.149"
 edition = "2021"
 authors = ["KittyCAD, Inc."]
 description = "Commands in the KittyCAD Modeling API"

modeling-cmds/Cargo.toml

@@ -642,6 +642,25 @@
           "direction"
         ]
       },
+      "BodyType": {
+        "description": "Body type determining if the operation will create a solid or a surface.",
+        "oneOf": [
+          {
+            "description": "Create a body that has two caps, creating a solid object.",
+            "type": "string",
+            "enum": [
+              "solid"
+            ]
+          },
+          {
+            "description": "Create only the surface of the body without any caps.",
+            "type": "string",
+            "enum": [
+              "surface"
+            ]
+          }
+        ]
+      },
       "CameraDragInteractionType": {
         "description": "The type of camera drag interaction.",
         "oneOf": [
@@ -1829,6 +1848,15 @@
             "description": "Command for extruding a solid 2d.",
             "type": "object",
             "properties": {
+              "body_type": {
+                "description": "Should this extrude create a solid body or a surface?",
+                "default": "solid",
+                "allOf": [
+                  {
+                    "$ref": "#/components/schemas/BodyType"
+                  }
+                ]
+              },
               "distance": {
                 "description": "How far off the plane to extrude",
                 "allOf": [
@@ -1890,6 +1918,15 @@
             "description": "Command for extruding a solid 2d to a reference geometry.",
             "type": "object",
             "properties": {
+              "body_type": {
+                "description": "Should this extrude create a solid body or a surface?",
+                "default": "solid",
+                "allOf": [
+                  {
+                    "$ref": "#/components/schemas/BodyType"
+                  }
+                ]
+              },
               "extrude_method": {
                 "description": "Should the extrusion create a new object or be part of the existing object.",
                 "default": "merge",
@@ -1954,6 +1991,15 @@
                   }
                 ]
               },
+              "body_type": {
+                "description": "Should this extrude create a solid body or a surface?",
+                "default": "solid",
+                "allOf": [
+                  {
+                    "$ref": "#/components/schemas/BodyType"
+                  }
+                ]
+              },
               "center_2d": {
                 "description": "Center to twist about (relative to 2D sketch)",
                 "default": {

modeling-cmds/openapi/api.json

@@ -23,6 +23,7 @@ define_modeling_cmd_enum! {
             length_unit::LengthUnit,
             shared::{
                 Angle,
+                BodyType,
                 ComponentTransform,
                 RelativeTo,
                 CutType, CutTypeV2,
@@ -133,6 +134,9 @@ define_modeling_cmd_enum! {
             /// Otherwise, seams resulting from the extrusion will be removed where possible.
             #[serde(default)]
             pub show_seams: Option<bool>,
+            /// Should this extrude create a solid body or a surface?
+            #[serde(default)]
+            pub body_type: BodyType,
         }
 
         /// Command for extruding a solid 2d to a reference geometry.
@@ -155,6 +159,9 @@ define_modeling_cmd_enum! {
             /// Should the extrusion create a new object or be part of the existing object.
             #[serde(default)]
             pub extrude_method: ExtrudeMethod,
+            /// Should this extrude create a solid body or a surface?
+            #[serde(default)]
+            pub body_type: BodyType,
         }
 
         fn default_twist_extrude_section_interval() -> Angle {
@@ -187,6 +194,9 @@ define_modeling_cmd_enum! {
             pub angle_step_size: Angle,
             ///The twisted surface loft tolerance
             pub tolerance: LengthUnit,
+            /// Should this extrude create a solid body or a surface?
+            #[serde(default)]
+            pub body_type: BodyType,
         }
 
         /// Extrude the object along a path.

modeling-cmds/src/def_enum.rs

@@ -1041,6 +1041,19 @@ impl From<EngineErrorCode> for http::StatusCode {
     }
 }
 
+/// Body type determining if the operation will create a solid or a surface.
+#[derive(Default, Clone, Copy, Debug, Eq, PartialEq, Serialize, Deserialize, JsonSchema)]
+#[serde(rename_all = "snake_case")]
+#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
+#[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
+pub enum BodyType {
+    ///Create a body that has two caps, creating a solid object.
+    #[default]
+    Solid,
+    ///Create only the surface of the body without any caps.
+    Surface,
+}
+
 /// Extrusion method determining if the extrusion will be part of the existing object or an
 /// entirely new object.
 #[derive(Default, Clone, Copy, Debug, Eq, PartialEq, Serialize, Deserialize, JsonSchema)]
@@ -1342,6 +1355,7 @@ impl_extern_type! {
     // Scene
     SceneSelectionType = "Enums::_SceneSelectionType"
     SceneToolType = "Enums::_SceneToolType"
+    BodyType = "Enums::_BodyType"
     EntityType = "Enums::_EntityType"
     AnnotationType = "Enums::_AnnotationType"
     AnnotationTextAlignmentX = "Enums::_AnnotationTextAlignmentX"

modeling-cmds/src/shared.rs

@@ -114,6 +114,7 @@ async fn main() -> Result<()> {
                 opposite: Default::default(),
                 extrude_method: Default::default(),
                 show_seams: Default::default(),
+                body_type: Default::default(),
             }
             .into(),
         )

modeling-session/examples/cube_png.rs

@@ -105,6 +105,7 @@ async fn main() -> Result<()> {
             opposite: Default::default(),
             extrude_method: Default::default(),
             show_seams: Default::default(),
+            body_type: Default::default(),
         }),
         cmd_id: random_id(),
     });

modeling-session/examples/cube_png_batch.rs

@@ -144,6 +144,7 @@ async fn main() -> Result<()> {
             opposite: Default::default(),
             extrude_method: Default::default(),
             show_seams: Default::default(),
+            body_type: Default::default(),
         }),
         cmd_id: random_id(),
     });