Merge branch 'main' into kurt-web-app-oauth

* add test

* fix

* Update snapshots

* Update snapshots

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

jest-component-unit-tests/jest.config.ts

@@ -11,6 +11,12 @@ const jestConfig: Config = {
     "^.+\.tsx?$": ["ts-jest",{ babelConfig: true }],
   },
   testEnvironment: "jest-fixed-jsdom",
+  // Include both standard test patterns and our custom .jesttest. pattern
+  testMatch: [
+    "**/__tests__/**/*.[jt]s?(x)",
+    "**/?(*.)+(spec|test).[tj]s?(x)",
+    "**/?(*.)+(jesttest).[tj]s?(x)"
+  ],
   // TAG: paths, path, baseUrl, alias
   // This is necessary to use tsconfig path aliases.
   moduleNameMapper: pathsToModuleNameMapper(compilerOptions.paths, { prefix: '<rootDir>/../' }),

rust/Cargo.lock

@@ -2049,9 +2049,9 @@ dependencies = [
 
 [[package]]
 name = "kittycad-modeling-cmds"
-version = "0.2.122"
+version = "0.2.121"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "643f41fa4bc9c98104d6f0da937024dbb5fce37ffe63c0635b348db74bd78c4f"
+checksum = "94ba95c22493d79ec8a1faab963d8903f6de0e373efedf2bc3bb76a0ddbab036"
 dependencies = [
  "anyhow",
  "chrono",

rust/Cargo.toml

@@ -36,7 +36,7 @@ dashmap = { version = "6.1.0" }
 http = "1"
 indexmap = "2.9.0"
 kittycad = { version = "0.3.37", default-features = false, features = ["js", "requests"] }
-kittycad-modeling-cmds = { version = "0.2.122", features = ["ts-rs", "websocket"] }
+kittycad-modeling-cmds = { version = "0.2.120", features = ["ts-rs", "websocket"] }
 lazy_static = "1.5.0"
 miette = "7.5.0"
 pyo3 = { version = "0.24.1" }

rust/kcl-lib/src/engine/mod.rs

@@ -369,15 +369,13 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
         settings: &crate::ExecutorSettings,
         source_range: SourceRange,
         id_generator: &mut IdGenerator,
-        grid_scale_unit: Option<kcmc::units::UnitLength>,
     ) -> Result<(), crate::errors::KclError> {
         // Set the edge visibility.
         self.set_edge_visibility(settings.highlight_edges, source_range, id_generator)
             .await?;
 
         // Send the command to show the grid.
-
-        self.modify_grid(!settings.show_grid, grid_scale_unit, source_range, id_generator)
+        self.modify_grid(!settings.show_grid, source_range, id_generator)
             .await?;
 
         // We do not have commands for changing ssao on the fly.
@@ -831,7 +829,6 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
     async fn modify_grid(
         &self,
         hidden: bool,
-        base_unit: Option<kcmc::units::UnitLength>,
         source_range: SourceRange,
         id_generator: &mut IdGenerator,
     ) -> Result<(), KclError> {
@@ -846,17 +843,6 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
         )
         .await?;
 
-        let grid_scale = if let Some(units) = base_unit {
-            // The grid is 10x10, so setting the value to 10 means that
-            // users whose unit is cm will see each cell as 1cm by 1cm,
-            // which is useful for sketching.
-            ModelingCmd::from(mcmd::SetGridScale { value: 10.0, units })
-        } else {
-            ModelingCmd::from(mcmd::SetGridAutoScale {})
-        };
-        self.batch_modeling_cmd(id_generator.next_uuid(), source_range, &grid_scale)
-            .await?;
-
         // Hide/show the grid scale text.
         self.batch_modeling_cmd(
             id_generator.next_uuid(),

rust/kcl-lib/src/execution/mod.rs

@@ -585,12 +585,6 @@ impl ExecutorContext {
 
     pub async fn run_with_caching(&self, program: crate::Program) -> Result<ExecOutcome, KclErrorWithOutputs> {
         assert!(!self.is_mock());
-        let grid_scale = program
-            .meta_settings()
-            .ok()
-            .flatten()
-            .map(|s| s.default_length_units)
-            .map(kcmc::units::UnitLength::from);
 
         let (program, exec_state, result) = match cache::read_old_ast().await {
             Some(mut cached_state) => {
@@ -617,7 +611,6 @@ impl ExecutorContext {
                                     &self.settings,
                                     Default::default(),
                                     &mut cached_state.main.exec_state.id_generator,
-                                    grid_scale,
                                 )
                                 .await
                                 .is_err()
@@ -645,7 +638,6 @@ impl ExecutorContext {
                                     &self.settings,
                                     Default::default(),
                                     &mut cached_state.main.exec_state.id_generator,
-                                    grid_scale,
                                 )
                                 .await
                                 .is_err()
@@ -690,7 +682,6 @@ impl ExecutorContext {
                                 &self.settings,
                                 Default::default(),
                                 &mut cached_state.main.exec_state.id_generator,
-                                grid_scale,
                             )
                             .await
                             .is_ok()
@@ -1072,21 +1063,10 @@ impl ExecutorContext {
         preserve_mem: bool,
     ) -> Result<(EnvironmentRef, Option<ModelingSessionData>), KclErrorWithOutputs> {
         let _stats = crate::log::LogPerfStats::new("Interpretation");
-        let grid_scale = program
-            .meta_settings()
-            .ok()
-            .flatten()
-            .map(|s| s.default_length_units)
-            .map(kcmc::units::UnitLength::from);
 
         // Re-apply the settings, in case the cache was busted.
         self.engine
-            .reapply_settings(
-                &self.settings,
-                Default::default(),
-                exec_state.id_generator(),
-                grid_scale,
-            )
+            .reapply_settings(&self.settings, Default::default(), exec_state.id_generator())
             .await
             .map_err(KclErrorWithOutputs::no_outputs)?;
 

rust/kcl-lib/tests/add_lots/artifact_commands.snap

@@ -28,12 +28,5 @@ description: Artifact commands add_lots.kcl
       "object_id": "[uuid]",
       "hidden": true
     }
-  },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
   }
 ]

rust/kcl-lib/tests/angled_line/artifact_commands.snap

@@ -29,13 +29,6 @@ description: Artifact commands angled_line.kcl
       "hidden": true
     }
   },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
-  },
   {
     "cmdId": "[uuid]",
     "range": [],

rust/kcl-lib/tests/any_type/artifact_commands.snap

@@ -28,12 +28,5 @@ description: Artifact commands any_type.kcl
       "object_id": "[uuid]",
       "hidden": true
     }
-  },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
   }
 ]

rust/kcl-lib/tests/argument_error/artifact_commands.snap

@@ -28,12 +28,5 @@ description: Artifact commands argument_error.kcl
       "object_id": "[uuid]",
       "hidden": true
     }
-  },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
   }
 ]

rust/kcl-lib/tests/array_elem_pop/artifact_commands.snap

@@ -28,12 +28,5 @@ description: Artifact commands array_elem_pop.kcl
       "object_id": "[uuid]",
       "hidden": true
     }
-  },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
   }
 ]

rust/kcl-lib/tests/array_elem_pop_empty_fail/artifact_commands.snap

@@ -28,12 +28,5 @@ description: Artifact commands array_elem_pop_empty_fail.kcl
       "object_id": "[uuid]",
       "hidden": true
     }
-  },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
   }
 ]

rust/kcl-lib/tests/array_elem_pop_fail/artifact_commands.snap

@@ -28,12 +28,5 @@ description: Artifact commands array_elem_pop_fail.kcl
       "object_id": "[uuid]",
       "hidden": true
     }
-  },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
   }
 ]

rust/kcl-lib/tests/array_elem_push/artifact_commands.snap

@@ -28,12 +28,5 @@ description: Artifact commands array_elem_push.kcl
       "object_id": "[uuid]",
       "hidden": true
     }
-  },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
   }
 ]

rust/kcl-lib/tests/array_elem_push_fail/artifact_commands.snap

@@ -28,12 +28,5 @@ description: Artifact commands array_elem_push_fail.kcl
       "object_id": "[uuid]",
       "hidden": true
     }
-  },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
   }
 ]

rust/kcl-lib/tests/array_index_oob/artifact_commands.snap

@@ -28,12 +28,5 @@ description: Artifact commands array_index_oob.kcl
       "object_id": "[uuid]",
       "hidden": true
     }
-  },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
   }
 ]

rust/kcl-lib/tests/array_push_item_wrong_type/artifact_commands.snap

@@ -28,12 +28,5 @@ description: Artifact commands array_push_item_wrong_type.kcl
       "object_id": "[uuid]",
       "hidden": true
     }
-  },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
   }
 ]

rust/kcl-lib/tests/array_range_expr/artifact_commands.snap

@@ -28,12 +28,5 @@ description: Artifact commands array_range_expr.kcl
       "object_id": "[uuid]",
       "hidden": true
     }
-  },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
   }
 ]

rust/kcl-lib/tests/array_range_mismatch_units/artifact_commands.snap

@@ -28,12 +28,5 @@ description: Artifact commands array_range_mismatch_units.kcl
       "object_id": "[uuid]",
       "hidden": true
     }
-  },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
   }
 ]

rust/kcl-lib/tests/array_range_negative_expr/artifact_commands.snap

@@ -28,12 +28,5 @@ description: Artifact commands array_range_negative_expr.kcl
       "object_id": "[uuid]",
       "hidden": true
     }
-  },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
   }
 ]

rust/kcl-lib/tests/array_range_with_units/artifact_commands.snap

@@ -28,12 +28,5 @@ description: Artifact commands array_range_with_units.kcl
       "object_id": "[uuid]",
       "hidden": true
     }
-  },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
   }
 ]

rust/kcl-lib/tests/artifact_graph_example_code1/artifact_commands.snap

@@ -29,13 +29,6 @@ description: Artifact commands artifact_graph_example_code1.kcl
       "hidden": true
     }
   },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
-  },
   {
     "cmdId": "[uuid]",
     "range": [],

rust/kcl-lib/tests/artifact_graph_example_code_no_3d/artifact_commands.snap

@@ -29,13 +29,6 @@ description: Artifact commands artifact_graph_example_code_no_3d.kcl
       "hidden": true
     }
   },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
-  },
   {
     "cmdId": "[uuid]",
     "range": [],

rust/kcl-lib/tests/artifact_graph_example_code_offset_planes/artifact_commands.snap

@@ -29,13 +29,6 @@ description: Artifact commands artifact_graph_example_code_offset_planes.kcl
       "hidden": true
     }
   },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
-  },
   {
     "cmdId": "[uuid]",
     "range": [],

rust/kcl-lib/tests/artifact_graph_sketch_on_face_etc/artifact_commands.snap

@@ -29,13 +29,6 @@ description: Artifact commands artifact_graph_sketch_on_face_etc.kcl
       "hidden": true
     }
   },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
-  },
   {
     "cmdId": "[uuid]",
     "range": [],

rust/kcl-lib/tests/ascription_unknown_type/artifact_commands.snap

@@ -28,12 +28,5 @@ description: Artifact commands ascription_unknown_type.kcl
       "object_id": "[uuid]",
       "hidden": true
     }
-  },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
   }
 ]

rust/kcl-lib/tests/assembly_mixed_units_cubes/artifact_commands.snap

@@ -29,15 +29,6 @@ description: Artifact commands assembly_mixed_units_cubes.kcl
       "hidden": true
     }
   },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_scale",
-      "value": 10.0,
-      "units": "in"
-    }
-  },
   {
     "cmdId": "[uuid]",
     "range": [],

rust/kcl-lib/tests/assembly_non_default_units/artifact_commands.snap

@@ -29,15 +29,6 @@ description: Artifact commands assembly_non_default_units.kcl
       "hidden": true
     }
   },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_scale",
-      "value": 10.0,
-      "units": "in"
-    }
-  },
   {
     "cmdId": "[uuid]",
     "range": [],

rust/kcl-lib/tests/bad_units_in_annotation/artifact_commands.snap

@@ -28,12 +28,5 @@ description: Artifact commands bad_units_in_annotation.kcl
       "object_id": "[uuid]",
       "hidden": true
     }
-  },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
   }
 ]

rust/kcl-lib/tests/basic_fillet_cube_close_opposite/artifact_commands.snap

@@ -29,13 +29,6 @@ description: Artifact commands basic_fillet_cube_close_opposite.kcl
       "hidden": true
     }
   },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
-  },
   {
     "cmdId": "[uuid]",
     "range": [],

rust/kcl-lib/tests/basic_fillet_cube_end/artifact_commands.snap

@@ -29,13 +29,6 @@ description: Artifact commands basic_fillet_cube_end.kcl
       "hidden": true
     }
   },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
-  },
   {
     "cmdId": "[uuid]",
     "range": [],

rust/kcl-lib/tests/basic_fillet_cube_next_adjacent/artifact_commands.snap

@@ -29,13 +29,6 @@ description: Artifact commands basic_fillet_cube_next_adjacent.kcl
       "hidden": true
     }
   },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
-  },
   {
     "cmdId": "[uuid]",
     "range": [],

rust/kcl-lib/tests/basic_fillet_cube_previous_adjacent/artifact_commands.snap

@@ -29,13 +29,6 @@ description: Artifact commands basic_fillet_cube_previous_adjacent.kcl
       "hidden": true
     }
   },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
-  },
   {
     "cmdId": "[uuid]",
     "range": [],

rust/kcl-lib/tests/basic_fillet_cube_start/artifact_commands.snap

@@ -29,13 +29,6 @@ description: Artifact commands basic_fillet_cube_start.kcl
       "hidden": true
     }
   },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
-  },
   {
     "cmdId": "[uuid]",
     "range": [],

rust/kcl-lib/tests/basic_revolve_circle/artifact_commands.snap

@@ -29,13 +29,6 @@ description: Artifact commands basic_revolve_circle.kcl
       "hidden": true
     }
   },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
-  },
   {
     "cmdId": "[uuid]",
     "range": [],

rust/kcl-lib/tests/boolean_logical_and/artifact_commands.snap

@@ -28,12 +28,5 @@ description: Artifact commands boolean_logical_and.kcl
       "object_id": "[uuid]",
       "hidden": true
     }
-  },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
   }
 ]

rust/kcl-lib/tests/boolean_logical_multiple/artifact_commands.snap

@@ -28,12 +28,5 @@ description: Artifact commands boolean_logical_multiple.kcl
       "object_id": "[uuid]",
       "hidden": true
     }
-  },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
   }
 ]

rust/kcl-lib/tests/boolean_logical_or/artifact_commands.snap

@@ -28,12 +28,5 @@ description: Artifact commands boolean_logical_or.kcl
       "object_id": "[uuid]",
       "hidden": true
     }
-  },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
   }
 ]

rust/kcl-lib/tests/circle_three_point/artifact_commands.snap

@@ -29,13 +29,6 @@ description: Artifact commands circle_three_point.kcl
       "hidden": true
     }
   },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
-  },
   {
     "cmdId": "[uuid]",
     "range": [],

rust/kcl-lib/tests/circular_pattern3d_a_pattern/artifact_commands.snap

@@ -29,13 +29,6 @@ description: Artifact commands circular_pattern3d_a_pattern.kcl
       "hidden": true
     }
   },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
-  },
   {
     "cmdId": "[uuid]",
     "range": [],

rust/kcl-lib/tests/comparisons/artifact_commands.snap

@@ -28,12 +28,5 @@ description: Artifact commands comparisons.kcl
       "object_id": "[uuid]",
       "hidden": true
     }
-  },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
   }
 ]

rust/kcl-lib/tests/comparisons_multiple/artifact_commands.snap

@@ -28,12 +28,5 @@ description: Artifact commands comparisons_multiple.kcl
       "object_id": "[uuid]",
       "hidden": true
     }
-  },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
   }
 ]

rust/kcl-lib/tests/computed_var/artifact_commands.snap

@@ -28,12 +28,5 @@ description: Artifact commands computed_var.kcl
       "object_id": "[uuid]",
       "hidden": true
     }
-  },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
   }
 ]

rust/kcl-lib/tests/crazy_multi_profile/artifact_commands.snap

@@ -29,13 +29,6 @@ description: Artifact commands crazy_multi_profile.kcl
       "hidden": true
     }
   },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
-  },
   {
     "cmdId": "[uuid]",
     "range": [],

rust/kcl-lib/tests/cube/artifact_commands.snap

@@ -29,13 +29,6 @@ description: Artifact commands cube.kcl
       "hidden": true
     }
   },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
-  },
   {
     "cmdId": "[uuid]",
     "range": [],

rust/kcl-lib/tests/cube_with_error/artifact_commands.snap

@@ -29,13 +29,6 @@ description: Artifact commands cube_with_error.kcl
       "hidden": true
     }
   },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
-  },
   {
     "cmdId": "[uuid]",
     "range": [],

rust/kcl-lib/tests/double_map_fn/artifact_commands.snap

@@ -28,12 +28,5 @@ description: Artifact commands double_map_fn.kcl
       "object_id": "[uuid]",
       "hidden": true
     }
-  },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
   }
 ]

rust/kcl-lib/tests/error_inside_fn_also_has_source_range_of_call_site_recursive/artifact_commands.snap

@@ -28,12 +28,5 @@ description: Artifact commands error_inside_fn_also_has_source_range_of_call_sit
       "object_id": "[uuid]",
       "hidden": true
     }
-  },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
   }
 ]

rust/kcl-lib/tests/error_revolve_on_edge_get_edge/artifact_commands.snap

@@ -29,13 +29,6 @@ description: Artifact commands error_revolve_on_edge_get_edge.kcl
       "hidden": true
     }
   },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
-  },
   {
     "cmdId": "[uuid]",
     "range": [],

rust/kcl-lib/tests/error_with_point_shows_numeric_units/artifact_commands.snap

@@ -29,13 +29,6 @@ description: Artifact commands error_with_point_shows_numeric_units.kcl
       "hidden": true
     }
   },
-  {
-    "cmdId": "[uuid]",
-    "range": [],
-    "command": {
-      "type": "set_grid_auto_scale"
-    }
-  },
   {
     "cmdId": "[uuid]",
     "range": [],