zoo-kcl 0.3.115__tar.gz → 0.3.116__tar.gz

{zoo_kcl-0.3.115 → zoo_kcl-0.3.116}/Cargo.lock

@@ -28,6 +28,19 @@ dependencies = [
  "cpufeatures",
 ]
 
+[[package]]
+name = "ahash"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
+dependencies = [
+ "cfg-if",
+ "getrandom 0.3.1",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
 [[package]]
 name = "aho-corasick"
 version = "1.1.3"
@@ -980,16 +993,6 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "error-stack"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe413319145d1063f080f27556fd30b1d70b01e2ba10c2a6e40d4be982ffc5d1"
-dependencies = [
- "anyhow",
- "rustc_version",
-]
-
 [[package]]
 name = "euler"
 version = "0.4.1"
@@ -2113,20 +2116,9 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "kcl-api"
-version = "0.1.115"
-dependencies = [
- "indexmap 2.12.1",
- "kcl-error",
- "serde",
- "ts-rs",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "kcl-bumper"
-version = "0.1.115"
+version = "0.1.116"
 dependencies = [
  "anyhow",
  "clap",
@@ -2137,7 +2129,7 @@ dependencies = [
 
 [[package]]
 name = "kcl-derive-docs"
-version = "0.1.115"
+version = "0.1.116"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2146,7 +2138,7 @@ dependencies = [
 
 [[package]]
 name = "kcl-directory-test-macro"
-version = "0.1.115"
+version = "0.1.116"
 dependencies = [
  "convert_case",
  "proc-macro2",
@@ -2156,7 +2148,7 @@ dependencies = [
 
 [[package]]
 name = "kcl-error"
-version = "0.1.115"
+version = "0.1.116"
 dependencies = [
  "miette",
  "serde",
@@ -2166,22 +2158,21 @@ dependencies = [
 
 [[package]]
 name = "kcl-ezpz"
-version = "0.1.5"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae79e38dd74d57483135a0c29e9be71cd445e6381a2fb99ea683b637cc0934d8"
+checksum = "990cb34e933e0ee5fdfe3c919500419fe5aa49e13bb14ca96ba4bb2bdc6d2f7b"
 dependencies = [
  "faer",
  "getrandom 0.2.16",
  "indexmap 2.12.1",
  "libm",
- "newtonls_faer",
  "thiserror 2.0.17",
  "winnow",
 ]
 
 [[package]]
 name = "kcl-language-server"
-version = "0.2.115"
+version = "0.2.116"
 dependencies = [
  "anyhow",
  "clap",
@@ -2202,7 +2193,7 @@ dependencies = [
 
 [[package]]
 name = "kcl-language-server-release"
-version = "0.1.115"
+version = "0.1.116"
 dependencies = [
  "anyhow",
  "clap",
@@ -2222,8 +2213,9 @@ dependencies = [
 
 [[package]]
 name = "kcl-lib"
-version = "0.2.115"
+version = "0.2.116"
 dependencies = [
+ "ahash",
  "anyhow",
  "approx 0.5.1",
  "async-recursion",
@@ -2251,7 +2243,6 @@ dependencies = [
  "insta",
  "itertools 0.14.0",
  "js-sys",
- "kcl-api",
  "kcl-derive-docs",
  "kcl-directory-test-macro",
  "kcl-error",
@@ -2304,7 +2295,7 @@ dependencies = [
 
 [[package]]
 name = "kcl-python-bindings"
-version = "0.3.115"
+version = "0.3.116"
 dependencies = [
  "anyhow",
  "kcl-lib",
@@ -2320,7 +2311,7 @@ dependencies = [
 
 [[package]]
 name = "kcl-test-server"
-version = "0.1.115"
+version = "0.1.116"
 dependencies = [
  "anyhow",
  "hyper 0.14.32",
@@ -2333,7 +2324,7 @@ dependencies = [
 
 [[package]]
 name = "kcl-to-core"
-version = "0.1.115"
+version = "0.1.116"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -2347,7 +2338,7 @@ dependencies = [
 
 [[package]]
 name = "kcl-wasm-lib"
-version = "0.1.115"
+version = "0.1.116"
 dependencies = [
  "anyhow",
  "console_error_panic_hook",
@@ -2357,7 +2348,6 @@ dependencies = [
  "getrandom 0.3.1",
  "gloo-utils",
  "js-sys",
- "kcl-api",
  "kcl-lib",
  "kittycad",
  "kittycad-modeling-cmds",
@@ -2872,21 +2862,6 @@ dependencies = [
  "unicode-segmentation",
 ]
 
-[[package]]
-name = "newtonls_faer"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8245825be07ab6cd8121fc12aa8bbfe7d8fe94512298382a222f0104105e3cfe"
-dependencies = [
- "dyn-stack",
- "error-stack",
- "faer",
- "faer-traits",
- "num-complex",
- "num-traits 0.2.19",
- "rayon",
-]
-
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -3950,15 +3925,6 @@ version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
-[[package]]
-name = "rustc_version"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
-dependencies = [
- "semver",
-]
-
 [[package]]
 name = "rustix"
 version = "0.38.44"
@@ -5789,18 +5755,18 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.8.23"
+version = "0.8.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd97444d05a4328b90e75e503a34bad781f14e28a823ad3557f0750df1ebcbc6"
+checksum = "fd74ec98b9250adb3ca554bdde269adf631549f51d8a8f8f0a10b50f1cb298c3"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.23"
+version = "0.8.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6352c01d0edd5db859a63e2605f4ea3183ddbd15e2c4a9e7d32184df75e4f154"
+checksum = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a"
 dependencies = [
  "proc-macro2",
  "quote",

{zoo_kcl-0.3.115 → zoo_kcl-0.3.116}/Cargo.toml

@@ -1,8 +1,9 @@
 [workspace]
 resolver = "2"
-members = ["kcl-api", "kcl-derive-docs", "kcl-directory-test-macro", "kcl-error", "kcl-lib", "kcl-python-bindings"]
+members = ["kcl-derive-docs", "kcl-directory-test-macro", "kcl-error", "kcl-lib", "kcl-python-bindings"]
 
 [workspace.dependencies]
+ahash = "0.8.11"
 anyhow = { version = "1" }
 async-trait = "0.1.89"
 clap = { version = "4.5.53", features = ["derive"] }
@@ -10,7 +11,7 @@ console_error_panic_hook = "0.1.7"
 dashmap = { version = "6.1.0" }
 http = "1"
 indexmap = "2.12.1"
-kcl-ezpz = "0.1.5"
+kcl-ezpz = "0.2.2"
 kittycad = { version = "0.4.2", default-features = false, features = [
   "js",
   "requests",
@@ -72,6 +73,7 @@ debug = "line-tables-only"
 
 #Example: how to point modeling-app at a different repo (e.g. a branch or a local clone)
 # [patch.crates-io]
+# kcl-ezpz = { path = "../../ezpz/kcl-ezpz" }
 # kittycad-modeling-cmds = { git = "https://github.com/KittyCAD/modeling-api.git", branch = "ben/chamfer_angle" }
 # kittycad-modeling-session = { git = "https://github.com/KittyCAD/modeling-api.git", branch = "ben/chamfer_angle" }
 # #kittycad-modeling-session = { path = "../../modeling-api/modeling-session" }

{zoo_kcl-0.3.115 → zoo_kcl-0.3.116}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zoo-kcl
-Version: 0.3.115
+Version: 0.3.116
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

{zoo_kcl-0.3.115 → zoo_kcl-0.3.116}/kcl-derive-docs/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "kcl-derive-docs"
 description = "A tool for generating documentation from Rust derive macros"
-version = "0.1.115"
+version = "0.1.116"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/KittyCAD/modeling-app"

{zoo_kcl-0.3.115 → zoo_kcl-0.3.116}/kcl-directory-test-macro/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "kcl-directory-test-macro"
 description = "A tool for generating tests from a directory of kcl files"
-version = "0.1.115"
+version = "0.1.116"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/KittyCAD/modeling-app"

{zoo_kcl-0.3.115 → zoo_kcl-0.3.116}/kcl-error/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "kcl-error"
-version = "0.1.115"
+version = "0.1.116"
 edition = "2024"
 description = "KCL error definitions"
 license = "MIT"

{zoo_kcl-0.3.115 → zoo_kcl-0.3.116}/kcl-lib/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "kcl-lib"
 description = "KittyCAD Language implementation and tools"
-version = "0.2.115"
+version = "0.2.116"
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/KittyCAD/modeling-app"
@@ -42,6 +42,7 @@ lsp-test-util = []
 tabled = ["dep:tabled"]
 
 [dependencies]
+ahash = { workspace = true }
 anyhow = { workspace = true, features = ["backtrace"] }
 async-recursion = "1.1.1"
 async-trait = { workspace = true }
@@ -64,7 +65,6 @@ http = { workspace = true }
 image = { version = "0.25.9", default-features = false, features = ["png"] }
 indexmap = { workspace = true, features = ["serde", "rayon"] }
 itertools = "0.14.0"
-kcl-api = { version = "0.1", path = "../kcl-api" }
 kcl-derive-docs = { version = "0.1", path = "../kcl-derive-docs" }
 kcl-error = { version = "0.1", path = "../kcl-error" }
 kcl-ezpz = { workspace = true }

zoo_kcl-0.3.116/kcl-lib/src/collections.rs

@@ -0,0 +1,3 @@
+use indexmap::IndexSet;
+
+pub type AhashIndexSet<T> = IndexSet<T, ahash::RandomState>;

{zoo_kcl-0.3.115 → zoo_kcl-0.3.116}/kcl-lib/src/execution/annotations.rs

@@ -35,9 +35,17 @@ pub(crate) const IMPL: &str = "impl";
 pub(crate) const IMPL_RUST: &str = "std_rust";
 pub(crate) const IMPL_CONSTRAINT: &str = "std_rust_constraint";
 pub(crate) const IMPL_CONSTRAINABLE: &str = "std_constrainable";
+pub(crate) const IMPL_RUST_CONSTRAINABLE: &str = "std_rust_constrainable";
 pub(crate) const IMPL_KCL: &str = "kcl";
 pub(crate) const IMPL_PRIMITIVE: &str = "primitive";
-pub(super) const IMPL_VALUES: [&str; 5] = [IMPL_RUST, IMPL_KCL, IMPL_PRIMITIVE, IMPL_CONSTRAINT, IMPL_CONSTRAINABLE];
+pub(super) const IMPL_VALUES: [&str; 6] = [
+    IMPL_RUST,
+    IMPL_KCL,
+    IMPL_PRIMITIVE,
+    IMPL_CONSTRAINT,
+    IMPL_CONSTRAINABLE,
+    IMPL_RUST_CONSTRAINABLE,
+];
 
 pub(crate) const WARNINGS: &str = "warnings";
 pub(crate) const WARN_ALLOW: &str = "allow";
@@ -110,6 +118,7 @@ pub enum Impl {
     Kcl,
     KclConstrainable,
     Rust,
+    RustConstrainable,
     RustConstraint,
     Primitive,
 }
@@ -122,6 +131,7 @@ impl FromStr for Impl {
             IMPL_RUST => Ok(Self::Rust),
             IMPL_CONSTRAINT => Ok(Self::RustConstraint),
             IMPL_CONSTRAINABLE => Ok(Self::KclConstrainable),
+            IMPL_RUST_CONSTRAINABLE => Ok(Self::RustConstrainable),
             IMPL_KCL => Ok(Self::Kcl),
             IMPL_PRIMITIVE => Ok(Self::Primitive),
             _ => Err(()),

{zoo_kcl-0.3.115 → zoo_kcl-0.3.116}/kcl-lib/src/execution/artifact/mermaid_tests.rs

@@ -87,6 +87,7 @@ impl Artifact {
             Artifact::Solid2d(a) => vec![a.path_id],
             Artifact::StartSketchOnFace(a) => vec![a.face_id],
             Artifact::StartSketchOnPlane(a) => vec![a.plane_id],
+            Artifact::SketchBlock(a) => a.plane_id.map(|id| vec![id]).unwrap_or_default(),
             Artifact::PlaneOfFace(a) => vec![a.face_id],
             Artifact::Sweep(a) => vec![a.path_id],
             Artifact::Wall(a) => vec![a.seg_id, a.sweep_id],
@@ -152,6 +153,10 @@ impl Artifact {
                 // Note: Don't include these since they're parents: plane_id.
                 Vec::new()
             }
+            Artifact::SketchBlock { .. } => {
+                // Note: Don't include these since they're parents: plane_id (if present).
+                Vec::new()
+            }
             Artifact::PlaneOfFace { .. } => {
                 // Note: Don't include these since they're parents: face_id.
                 Vec::new()
@@ -267,6 +272,7 @@ impl ArtifactGraph {
                 }
                 Artifact::StartSketchOnFace { .. }
                 | Artifact::StartSketchOnPlane { .. }
+                | Artifact::SketchBlock { .. }
                 | Artifact::PlaneOfFace { .. }
                 | Artifact::Sweep(_)
                 | Artifact::Wall(_)
@@ -382,6 +388,14 @@ impl ArtifactGraph {
                 )?;
                 node_path_display(output, prefix, None, code_ref)?;
             }
+            Artifact::SketchBlock(SketchBlock { code_ref, .. }) => {
+                writeln!(
+                    output,
+                    "{prefix}{id}[\"SketchBlock<br>{:?}\"]",
+                    code_ref_display(code_ref)
+                )?;
+                node_path_display(output, prefix, None, code_ref)?;
+            }
             Artifact::PlaneOfFace(PlaneOfFace { code_ref, .. }) => {
                 writeln!(
                     output,

{zoo_kcl-0.3.115 → zoo_kcl-0.3.116}/kcl-lib/src/execution/artifact.rs

@@ -13,6 +13,7 @@ use crate::{
     KclError, NodePath, SourceRange,
     errors::KclErrorDetails,
     execution::ArtifactId,
+    front::ObjectId,
     parsing::ast::types::{Node, Program},
 };
 
@@ -215,6 +216,19 @@ pub struct StartSketchOnPlane {
     pub code_ref: CodeRef,
 }
 
+#[derive(Debug, Clone, Serialize, PartialEq, ts_rs::TS)]
+#[ts(export_to = "Artifact.ts")]
+#[serde(rename_all = "camelCase")]
+pub struct SketchBlock {
+    pub id: ArtifactId,
+    /// The plane ID if the sketch block is on a specific plane, None if it's on a default plane.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub plane_id: Option<ArtifactId>,
+    pub code_ref: CodeRef,
+    /// The sketch ID (ObjectId) for the sketch scene object.
+    pub sketch_id: ObjectId,
+}
+
 #[derive(Debug, Clone, Serialize, PartialEq, ts_rs::TS)]
 #[ts(export_to = "Artifact.ts")]
 #[serde(rename_all = "camelCase")]
@@ -351,6 +365,7 @@ pub enum Artifact {
     PlaneOfFace(PlaneOfFace),
     StartSketchOnFace(StartSketchOnFace),
     StartSketchOnPlane(StartSketchOnPlane),
+    SketchBlock(SketchBlock),
     Sweep(Sweep),
     Wall(Wall),
     Cap(Cap),
@@ -370,6 +385,7 @@ impl Artifact {
             Artifact::Solid2d(a) => a.id,
             Artifact::StartSketchOnFace(a) => a.id,
             Artifact::StartSketchOnPlane(a) => a.id,
+            Artifact::SketchBlock(a) => a.id,
             Artifact::PlaneOfFace(a) => a.id,
             Artifact::Sweep(a) => a.id,
             Artifact::Wall(a) => a.id,
@@ -392,6 +408,7 @@ impl Artifact {
             Artifact::Solid2d(_) => None,
             Artifact::StartSketchOnFace(a) => Some(&a.code_ref),
             Artifact::StartSketchOnPlane(a) => Some(&a.code_ref),
+            Artifact::SketchBlock(a) => Some(&a.code_ref),
             Artifact::PlaneOfFace(a) => Some(&a.code_ref),
             Artifact::Sweep(a) => Some(&a.code_ref),
             Artifact::Wall(_) => None,
@@ -415,6 +432,7 @@ impl Artifact {
             | Artifact::StartSketchOnFace(_)
             | Artifact::PlaneOfFace(_)
             | Artifact::StartSketchOnPlane(_)
+            | Artifact::SketchBlock(_)
             | Artifact::Sweep(_) => None,
             Artifact::Wall(a) => Some(&a.face_code_ref),
             Artifact::Cap(a) => Some(&a.face_code_ref),
@@ -433,6 +451,7 @@ impl Artifact {
             Artifact::Solid2d(_) => Some(new),
             Artifact::StartSketchOnFace { .. } => Some(new),
             Artifact::StartSketchOnPlane { .. } => Some(new),
+            Artifact::SketchBlock { .. } => Some(new),
             Artifact::PlaneOfFace { .. } => Some(new),
             Artifact::Sweep(a) => a.merge(new),
             Artifact::Wall(a) => a.merge(new),
@@ -668,6 +687,12 @@ fn fill_in_node_paths(artifact: &mut Artifact, programs: &crate::execution::Prog
                     NodePath::from_range(programs, cached_body_items, plane.code_ref.range).unwrap_or_default();
             }
         }
+        Artifact::SketchBlock(block) => {
+            if block.code_ref.node_path.is_empty() {
+                block.code_ref.node_path =
+                    NodePath::from_range(programs, cached_body_items, block.code_ref.range).unwrap_or_default();
+            }
+        }
         _ => {}
     }
 }

{zoo_kcl-0.3.115 → zoo_kcl-0.3.116}/kcl-lib/src/execution/cache.rs

@@ -111,6 +111,12 @@ impl GlobalState {
             operations: self.exec_state.root_module_artifacts.operations,
             #[cfg(feature = "artifact-graph")]
             artifact_graph: self.exec_state.artifacts.graph,
+            #[cfg(feature = "artifact-graph")]
+            scene_objects: self.exec_state.root_module_artifacts.scene_objects,
+            #[cfg(feature = "artifact-graph")]
+            source_range_to_object: self.exec_state.root_module_artifacts.source_range_to_object,
+            #[cfg(feature = "artifact-graph")]
+            var_solutions: self.exec_state.root_module_artifacts.var_solutions,
             errors: self.exec_state.errors,
             default_planes: ctx.engine.get_default_planes().read().await.clone(),
         }

{zoo_kcl-0.3.115 → zoo_kcl-0.3.116}/kcl-lib/src/execution/cad_op.rs

@@ -2,7 +2,7 @@ use indexmap::IndexMap;
 use serde::Serialize;
 
 use super::{ArtifactId, KclValue, types::NumericType};
-use crate::{ModuleId, NodePath, SourceRange, parsing::ast::types::ItemVisibility};
+use crate::{ModuleId, NodePath, SourceRange, front::ObjectId, parsing::ast::types::ItemVisibility};
 
 /// A CAD modeling operation for display in the feature tree, AKA operations
 /// timeline.
@@ -54,6 +54,16 @@ pub enum Operation {
         source_range: SourceRange,
     },
     GroupEnd,
+    #[allow(dead_code)]
+    #[serde(rename_all = "camelCase")]
+    SketchSolve {
+        /// The ID of the sketch being modified.
+        sketch_id: ObjectId,
+        /// The node path of the operation in the source code.
+        node_path: NodePath,
+        /// The source range of the operation in the source code.
+        source_range: SourceRange,
+    },
 }
 
 impl Operation {
@@ -61,7 +71,7 @@ impl Operation {
     pub(crate) fn set_std_lib_call_is_error(&mut self, is_err: bool) {
         match self {
             Self::StdLibCall { is_error, .. } => *is_error = is_err,
-            Self::VariableDeclaration { .. } | Self::GroupBegin { .. } | Self::GroupEnd => {}
+            Self::VariableDeclaration { .. } | Self::GroupBegin { .. } | Self::GroupEnd | Self::SketchSolve { .. } => {}
         }
     }
 
@@ -94,6 +104,13 @@ impl Operation {
                 node_path.fill_placeholder(programs, cached_body_items, *source_range);
             }
             Operation::GroupEnd => {}
+            Operation::SketchSolve {
+                node_path,
+                source_range,
+                ..
+            } => {
+                node_path.fill_placeholder(programs, cached_body_items, *source_range);
+            }
         }
     }
 }
@@ -250,6 +267,10 @@ impl From<&KclValue> for OpKclValue {
                 value: value.initial_value,
                 ty: value.ty,
             },
+            KclValue::SketchConstraint { .. } => {
+                debug_assert!(false, "Sketch constraint cannot be represented in operations");
+                Self::KclNone {}
+            }
             KclValue::Tuple { value, .. } | KclValue::HomArray { value, .. } => {
                 let value = value.iter().map(Self::from).collect();
                 Self::Array { value }
@@ -274,6 +295,19 @@ impl From<&KclValue> for OpKclValue {
             KclValue::Face { value } => Self::Face {
                 artifact_id: value.artifact_id,
             },
+            KclValue::Segment { value } => match &value.repr {
+                crate::execution::geometry::SegmentRepr::Unsolved { .. } => {
+                    // Arguments to constraint functions will be unsolved.
+                    Self::KclNone {}
+                }
+                crate::execution::geometry::SegmentRepr::Solved { .. } => {
+                    debug_assert!(
+                        false,
+                        "Solved segment not sent to the engine cannot be represented in operations"
+                    );
+                    Self::KclNone {}
+                }
+            },
             KclValue::Sketch { value } => Self::Sketch {
                 value: Box::new(OpSketch {
                     artifact_id: value.artifact_id,