bump v0.9.0 (#673 )

Handle relative paths at kcl level (#506 )
* handle relative paths at kcl level * fmt * update kittycad Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * bump Signed-off-by: Jess Frazelle <github@jessfraz.com> * fix tests Signed-off-by: Jess Frazelle <github@jessfraz.com> --------- Signed-off-by: Jess Frazelle <github@jessfraz.com> Co-authored-by: Jess Frazelle <github@jessfraz.com> Co-authored-by: Jess Frazelle <jessfraz@users.noreply.github.com>
2023-09-21 10:38:40 +10:00 · 2023-09-21 10:36:26 +10:00 · 2023-09-20 16:22:47 -07:00 · 2023-09-20 16:59:03 -05:00 · 2023-09-20 13:15:28 -05:00
15 changed files with 339 additions and 55 deletions
--- a/.github/workflows/cargo-clippy.yml
+++ b/.github/workflows/cargo-clippy.yml
@ -54,4 +54,4 @@ jobs:
      - name: Run clippy
        run: |
          cd "${{ matrix.dir }}"
-          cargo clippy --all --tests -- -D warnings
+          cargo clippy --all --tests --benches -- -D warnings
--- a/.github/workflows/cargo-criterion.yml
+++ b/.github/workflows/cargo-criterion.yml
@ -0,0 +1,37 @@
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - '**.rs'
+      - '**/Cargo.toml'
+      - '**/Cargo.lock'
+      - '**/rust-toolchain.toml'
+      - .github/workflows/cargo-criterion.yml
+  pull_request:
+    paths:
+      - '**.rs'
+      - '**/Cargo.toml'
+      - '**/Cargo.lock'
+      - '**/rust-toolchain.toml'
+      - .github/workflows/cargo-criterion.yml
+  workflow_dispatch:
+permissions: read-all
+name: cargo criterion
+jobs:
+  cargocriterion:
+    name: cargo criterion
+    runs-on: ubuntu-latest-8-cores
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+      - name: Install dependencies
+        run: |
+          cargo install cargo-criterion
+      - name: Rust Cache
+        uses: Swatinem/rust-cache@v2.6.1
+      - name: Benchmark kcl library
+        shell: bash
+        run: |-
+          cd src/wasm-lib/kcl; cargo criterion
+
--- a/.gitignore
+++ b/.gitignore
@ -22,6 +22,8 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*

+src/wasm-lib/.idea
+
 # rust
 src/wasm-lib/target
 src/wasm-lib/bindings
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "untitled-app",
-  "version": "0.8.2",
+  "version": "0.9.0",
  "private": true,
  "dependencies": {
    "@codemirror/autocomplete": "^6.9.0",
@ -10,7 +10,7 @@
    "@fortawesome/react-fontawesome": "^0.2.0",
    "@headlessui/react": "^1.7.13",
    "@headlessui/tailwindcss": "^0.2.0",
-    "@kittycad/lib": "^0.0.37",
+    "@kittycad/lib": "^0.0.38",
    "@lezer/javascript": "^1.4.7",
    "@open-rpc/client-js": "^1.8.1",
    "@react-hook/resize-observer": "^1.2.6",
@ -65,7 +65,7 @@
    "pretest": "yarn remove-importmeta",
    "test": "vitest --mode development",
    "test:nowatch": "vitest run --mode development",
-    "test:rust": "(cd src/wasm-lib && cargo test --all && cargo clippy --all --tests)",
+    "test:rust": "(cd src/wasm-lib && cargo test --all && cargo clippy --all --tests --benches)",
    "test:cov": "vitest run --coverage --mode development",
    "simpleserver:ci": "yarn pretest && http-server ./public --cors -p 3000 &",
    "simpleserver": "yarn pretest && http-server ./public --cors -p 3000",
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@ -8,7 +8,7 @@
  },
  "package": {
    "productName": "kittycad-modeling",
-    "version": "0.8.2"
+    "version": "0.9.0"
  },
  "tauri": {
    "allowlist": {
--- a/src/wasm-lib/Cargo.lock
+++ b/src/wasm-lib/Cargo.lock
@ -63,6 +63,12 @@ dependencies = [
 "libc",
 ]

+[[package]]
+name = "anes"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
+
 [[package]]
 name = "anstream"
 version = "0.5.0"
@ -220,6 +226,20 @@ dependencies = [
 "num-traits",
 ]

+[[package]]
+name = "bigdecimal"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "454bca3db10617b88b566f205ed190aedb0e0e6dd4cad61d3988a72e8c5594cb"
+dependencies = [
+ "autocfg",
+ "libm",
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+ "serde",
+]
+
 [[package]]
 name = "bincode"
 version = "1.3.3"
@ -337,6 +357,12 @@ dependencies = [
 "serde",
 ]

+[[package]]
+name = "cast"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
+
 [[package]]
 name = "cc"
 version = "1.0.83"
@ -374,6 +400,33 @@ dependencies = [
 "windows-targets 0.48.5",
 ]

+[[package]]
+name = "ciborium"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926"
+dependencies = [
+ "ciborium-io",
+ "ciborium-ll",
+ "serde",
+]
+
+[[package]]
+name = "ciborium-io"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656"
+
+[[package]]
+name = "ciborium-ll"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b"
+dependencies = [
+ "ciborium-io",
+ "half 1.8.2",
+]
+
 [[package]]
 name = "clang-sys"
 version = "1.6.1"
@ -507,6 +560,42 @@ dependencies = [
 "cfg-if",
 ]

+[[package]]
+name = "criterion"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f"
+dependencies = [
+ "anes",
+ "cast",
+ "ciborium",
+ "clap",
+ "criterion-plot",
+ "is-terminal",
+ "itertools 0.10.5",
+ "num-traits",
+ "once_cell",
+ "oorandom",
+ "plotters",
+ "rayon",
+ "regex",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "tinytemplate",
+ "walkdir",
+]
+
+[[package]]
+name = "criterion-plot"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
+dependencies = [
+ "cast",
+ "itertools 0.10.5",
+]
+
 [[package]]
 name = "crossbeam-channel"
 version = "0.5.8"
@ -716,7 +805,7 @@ checksum = "832a761f35ab3e6664babfbdc6cef35a4860e816ec3916dcfd0882954e98a8a8"
 dependencies = [
 "bit_field",
 "flume",
- "half",
+ "half 2.2.1",
 "lebe",
 "miniz_oxide",
 "rayon-core",
@ -983,6 +1072,12 @@ dependencies = [
 "tracing",
 ]

+[[package]]
+name = "half"
+version = "1.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
+
 [[package]]
 name = "half"
 version = "2.2.1"
@ -1287,6 +1382,7 @@ dependencies = [
 "async-trait",
 "bson",
 "clap",
+ "criterion",
 "dashmap",
 "derive-docs",
 "expectorate",
@ -1315,13 +1411,14 @@ dependencies = [

 [[package]]
 name = "kittycad"
-version = "0.2.25"
+version = "0.2.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9cf962b1e81a0b4eb923a727e761b40672cbacc7f5f0b75e13579d346352bc7"
+checksum = "e2623ee601ce203476229df3f9d3a14664cb43e3f7455e9ac8ed91aacaa6163d"
 dependencies = [
 "anyhow",
 "async-trait",
 "base64 0.21.4",
+ "bigdecimal 0.4.1",
 "bytes",
 "chrono",
 "data-encoding",
@ -1383,6 +1480,12 @@ dependencies = [
 "winapi",
 ]

+[[package]]
+name = "libm"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
+
 [[package]]
 name = "linked-hash-map"
 version = "0.5.6"
@ -1606,6 +1709,12 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44d11de466f4a3006fe8a5e7ec84e93b79c70cb992ae0aa0eb631ad2df8abfe2"

+[[package]]
+name = "oorandom"
+version = "11.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
+
 [[package]]
 name = "openapitor"
 version = "0.0.9"
@ -1839,6 +1948,34 @@ version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"

+[[package]]
+name = "plotters"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45"
+dependencies = [
+ "num-traits",
+ "plotters-backend",
+ "plotters-svg",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "plotters-backend"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609"
+
+[[package]]
+name = "plotters-svg"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab"
+dependencies = [
+ "plotters-backend",
+]
+
 [[package]]
 name = "png"
 version = "0.17.10"
@ -2313,7 +2450,8 @@ version = "0.8.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f7b0ce13155372a76ee2e1c5ffba1fe61ede73fbea5630d61eee6fac4929c0c"
 dependencies = [
- "bigdecimal",
+ "bigdecimal 0.3.1",
+ "bigdecimal 0.4.1",
 "bytes",
 "chrono",
 "dyn-clone",
@ -2853,6 +2991,16 @@ dependencies = [
 "time-core",
 ]

+[[package]]
+name = "tinytemplate"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
+dependencies = [
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "tinyvec"
 version = "1.6.0"
--- a/src/wasm-lib/kcl/Cargo.toml
+++ b/src/wasm-lib/kcl/Cargo.toml
@ -50,7 +50,12 @@ panic = "abort"
 debug = true

 [dev-dependencies]
+criterion = "0.5.1"
 expectorate = "1.0.7"
 itertools = "0.11.0"
 pretty_assertions = "1.4.0"
 tokio = { version = "1.32.0", features = ["rt-multi-thread", "macros", "time"] }
+
+[[bench]]
+name = "compiler_benchmark"
+harness = false
--- a/src/wasm-lib/kcl/benches/compiler_benchmark.rs
+++ b/src/wasm-lib/kcl/benches/compiler_benchmark.rs
@ -0,0 +1,27 @@
+use criterion::{criterion_group, criterion_main, Criterion};
+
+pub fn criterion_benchmark(c: &mut Criterion) {
+    c.bench_function("parse + lex cube program", |b| b.iter(lex_and_parse_cube));
+}
+
+fn lex_and_parse_cube() {
+    let program = r#"
+fn cube = (pos, scale) => {
+  const sg = startSketchAt(pos)
+    |> line([0, scale], %)
+    |> line([scale, 0], %)
+    |> line([0, -scale], %)
+
+  return sg
+}
+
+const b1 = cube([0,0], 10)
+const pt1 = b1[0]
+show(b1)"#;
+    let tokens = kcl_lib::tokeniser::lexer(program);
+    let parser = kcl_lib::parser::Parser::new(tokens);
+    parser.ast().unwrap();
+}
+
+criterion_group!(benches, criterion_benchmark);
+criterion_main!(benches);
--- a/src/wasm-lib/kcl/src/engine/conn.rs
+++ b/src/wasm-lib/kcl/src/engine/conn.rs
@ -3,10 +3,11 @@

 use std::sync::Arc;

-use anyhow::Result;
+use anyhow::{anyhow, Result};
 use dashmap::DashMap;
 use futures::{SinkExt, StreamExt};
 use kittycad::types::{OkWebSocketResponseData, WebSocketRequest, WebSocketResponse};
+use tokio::sync::{mpsc, oneshot};
 use tokio_tungstenite::tungstenite::Message as WsMsg;

 use crate::{
@ -14,10 +15,11 @@ use crate::{
    errors::{KclError, KclErrorDetails},
 };

-#[derive(Debug)]
+type WebSocketTcpWrite = futures::stream::SplitSink<tokio_tungstenite::WebSocketStream<reqwest::Upgraded>, WsMsg>;
+#[derive(Debug, Clone)]
 pub struct EngineConnection {
-    tcp_write: futures::stream::SplitSink<tokio_tungstenite::WebSocketStream<reqwest::Upgraded>, WsMsg>,
-    tcp_read_handle: tokio::task::JoinHandle<Result<()>>,
+    engine_req_tx: mpsc::Sender<ToEngineReq>,
+    tcp_read_handle: Arc<tokio::task::JoinHandle<Result<()>>>,
    responses: Arc<DashMap<uuid::Uuid, WebSocketResponse>>,
 }

@ -46,7 +48,36 @@ impl TcpRead {
    }
 }

+/// Requests to send to the engine, and a way to await a response.
+struct ToEngineReq {
+    /// The request to send
+    req: WebSocketRequest,
+    /// If this resolves to Ok, the request was sent.
+    /// If this resolves to Err, the request could not be sent.
+    /// If this has not yet resolved, the request has not been sent yet.
+    request_sent: oneshot::Sender<Result<()>>,
+}
+
 impl EngineConnection {
+    /// Start waiting for incoming engine requests, and send each one over the WebSocket to the engine.
+    async fn start_write_actor(mut tcp_write: WebSocketTcpWrite, mut engine_req_rx: mpsc::Receiver<ToEngineReq>) {
+        while let Some(req) = engine_req_rx.recv().await {
+            let ToEngineReq { req, request_sent } = req;
+            let res = Self::inner_send_to_engine(req, &mut tcp_write).await;
+            let _ = request_sent.send(res);
+        }
+    }
+
+    /// Send the given `request` to the engine via the WebSocket connection `tcp_write`.
+    async fn inner_send_to_engine(request: WebSocketRequest, tcp_write: &mut WebSocketTcpWrite) -> Result<()> {
+        let msg = serde_json::to_string(&request).map_err(|e| anyhow!("could not serialize json: {e}"))?;
+        tcp_write
+            .send(WsMsg::Text(msg))
+            .await
+            .map_err(|e| anyhow!("could not send json over websocket: {e}"))?;
+        Ok(())
+    }
+
    pub async fn new(ws: reqwest::Upgraded) -> Result<EngineConnection> {
        let ws_stream = tokio_tungstenite::WebSocketStream::from_raw_socket(
            ws,
@ -56,6 +87,8 @@ impl EngineConnection {
        .await;

        let (tcp_write, tcp_read) = ws_stream.split();
+        let (engine_req_tx, engine_req_rx) = mpsc::channel(10);
+        tokio::task::spawn(Self::start_write_actor(tcp_write, engine_req_rx));

        let mut tcp_read = TcpRead { stream: tcp_read };

@ -80,18 +113,11 @@ impl EngineConnection {
        });

        Ok(EngineConnection {
-            tcp_write,
-            tcp_read_handle,
+            engine_req_tx,
+            tcp_read_handle: Arc::new(tcp_read_handle),
            responses,
        })
    }
-
-    pub async fn tcp_send(&mut self, msg: WebSocketRequest) -> Result<()> {
-        let msg = serde_json::to_string(&msg)?;
-        self.tcp_write.send(WsMsg::Text(msg)).await?;
-
-        Ok(())
-    }
 }

 #[async_trait::async_trait(?Send)]
@ -99,7 +125,7 @@ impl EngineManager for EngineConnection {
    /// Send a modeling command.
    /// Do not wait for the response message.
    fn send_modeling_cmd(
-        &mut self,
+        &self,
        id: uuid::Uuid,
        source_range: crate::executor::SourceRange,
        cmd: kittycad::types::ModelingCmd,
@ -110,12 +136,19 @@ impl EngineManager for EngineConnection {

    /// Send a modeling command and wait for the response message.
    async fn send_modeling_cmd_get_response(
-        &mut self,
+        &self,
        id: uuid::Uuid,
        source_range: crate::executor::SourceRange,
        cmd: kittycad::types::ModelingCmd,
    ) -> Result<OkWebSocketResponseData, KclError> {
-        self.tcp_send(WebSocketRequest::ModelingCmdReq { cmd, cmd_id: id })
+        let (tx, rx) = oneshot::channel();
+
+        // Send the request to the engine, via the actor.
+        self.engine_req_tx
+            .send(ToEngineReq {
+                req: WebSocketRequest::ModelingCmdReq { cmd, cmd_id: id },
+                request_sent: tx,
+            })
            .await
            .map_err(|e| {
                KclError::Engine(KclErrorDetails {
@ -124,17 +157,32 @@ impl EngineManager for EngineConnection {
                })
            })?;

+        // Wait for the request to be sent.
+        rx.await
+            .map_err(|e| {
+                KclError::Engine(KclErrorDetails {
+                    message: format!("could not send request to the engine actor: {e}"),
+                    source_ranges: vec![source_range],
+                })
+            })?
+            .map_err(|e| {
+                KclError::Engine(KclErrorDetails {
+                    message: format!("could not send request to the engine: {e}"),
+                    source_ranges: vec![source_range],
+                })
+            })?;
+
        // Wait for the response.
        loop {
            if let Some(resp) = self.responses.get(&id) {
-                if let Some(data) = &resp.resp {
-                    return Ok(data.clone());
+                return if let Some(data) = &resp.resp {
+                    Ok(data.clone())
                } else {
-                    return Err(KclError::Engine(KclErrorDetails {
+                    Err(KclError::Engine(KclErrorDetails {
                        message: format!("Modeling command failed: {:?}", resp.errors),
                        source_ranges: vec![source_range],
-                    }));
-                }
+                    }))
+                };
            }
        }
    }
--- a/src/wasm-lib/kcl/src/engine/conn_mock.rs
+++ b/src/wasm-lib/kcl/src/engine/conn_mock.rs
@ -6,7 +6,7 @@ use kittycad::types::OkWebSocketResponseData;

 use crate::errors::KclError;

-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct EngineConnection {}

 impl EngineConnection {
@ -18,7 +18,7 @@ impl EngineConnection {
 #[async_trait::async_trait(?Send)]
 impl crate::engine::EngineManager for EngineConnection {
    fn send_modeling_cmd(
-        &mut self,
+        &self,
        _id: uuid::Uuid,
        _source_range: crate::executor::SourceRange,
        _cmd: kittycad::types::ModelingCmd,
@ -27,7 +27,7 @@ impl crate::engine::EngineManager for EngineConnection {
    }

    async fn send_modeling_cmd_get_response(
-        &mut self,
+        &self,
        _id: uuid::Uuid,
        _source_range: crate::executor::SourceRange,
        _cmd: kittycad::types::ModelingCmd,
--- a/src/wasm-lib/kcl/src/engine/conn_wasm.rs
+++ b/src/wasm-lib/kcl/src/engine/conn_wasm.rs
@ -35,7 +35,7 @@ impl EngineConnection {
 #[async_trait::async_trait(?Send)]
 impl crate::engine::EngineManager for EngineConnection {
    fn send_modeling_cmd(
-        &mut self,
+        &self,
        id: uuid::Uuid,
        source_range: crate::executor::SourceRange,
        cmd: kittycad::types::ModelingCmd,
@ -60,7 +60,7 @@ impl crate::engine::EngineManager for EngineConnection {
    }

    async fn send_modeling_cmd_get_response(
-        &mut self,
+        &self,
        id: uuid::Uuid,
        source_range: crate::executor::SourceRange,
        cmd: kittycad::types::ModelingCmd,
--- a/src/wasm-lib/kcl/src/engine/mod.rs
+++ b/src/wasm-lib/kcl/src/engine/mod.rs
@ -32,11 +32,11 @@ use anyhow::Result;
 pub use conn_mock::EngineConnection;

 #[async_trait::async_trait(?Send)]
-pub trait EngineManager {
+pub trait EngineManager: Clone {
    /// Send a modeling command.
    /// Do not wait for the response message.
    fn send_modeling_cmd(
-        &mut self,
+        &self,
        id: uuid::Uuid,
        source_range: crate::executor::SourceRange,
        cmd: kittycad::types::ModelingCmd,
@ -44,7 +44,7 @@ pub trait EngineManager {

    /// Send a modeling command and wait for the response message.
    async fn send_modeling_cmd_get_response(
-        &mut self,
+        &self,
        id: uuid::Uuid,
        source_range: crate::executor::SourceRange,
        cmd: kittycad::types::ModelingCmd,
--- a/src/wasm-lib/kcl/src/std/sketch.rs
+++ b/src/wasm-lib/kcl/src/std/sketch.rs
@ -67,6 +67,7 @@ fn inner_line_to(
                    y: to[1],
                    z: 0.0,
                },
+                relative: false,
            },
        },
    )?;
@ -201,6 +202,7 @@ fn inner_line(data: LineData, sketch_group: Box<SketchGroup>, args: &mut Args) -
        LineData::Point(to) => *to,
    };

+    let delta = inner_args;
    let to = [from.x + inner_args[0], from.y + inner_args[1]];

    let id = uuid::Uuid::new_v4();
@ -211,10 +213,11 @@ fn inner_line(data: LineData, sketch_group: Box<SketchGroup>, args: &mut Args) -
            path: sketch_group.id,
            segment: kittycad::types::PathSegment::Line {
                end: Point3D {
-                    x: to[0],
-                    y: to[1],
+                    x: delta[0],
+                    y: delta[1],
                    z: 0.0,
                },
+                relative: true,
            },
        },
    )?;
@ -349,10 +352,15 @@ fn inner_angled_line(
        AngledLineData::AngleWithTag { angle, length, .. } => (*angle, *length),
        AngledLineData::AngleAndLength(angle_and_length) => (angle_and_length[0], angle_and_length[1]),
    };
-    let to: [f64; 2] = [
-        from.x + length * f64::cos(angle.to_radians()),
-        from.y + length * f64::sin(angle.to_radians()),
+
+    //double check me on this one - mike
+    let delta: [f64; 2] = [
+        length * f64::cos(angle.to_radians()),
+        length * f64::sin(angle.to_radians()),
    ];
+    let relative = true;
+
+    let to: [f64; 2] = [from.x + delta[0], from.y + delta[1]];

    let id = uuid::Uuid::new_v4();

@ -378,10 +386,11 @@ fn inner_angled_line(
            path: sketch_group.id,
            segment: kittycad::types::PathSegment::Line {
                end: Point3D {
-                    x: to[0],
-                    y: to[1],
+                    x: delta[0],
+                    y: delta[1],
                    z: 0.0,
                },
+                relative,
            },
        },
    )?;
@ -832,9 +841,14 @@ fn inner_arc(data: ArcData, sketch_group: Box<SketchGroup>, args: &mut Args) ->
                angle_end: angle_end.degrees(),
                center: center.into(),
                radius,
+                relative: false,
            },
        },
    )?;
+
+    // TODO:  Dont do this (move path pen) - mike
+    // lets review what the needs are here and see if any existing arc endpoints can accomplish this
+
    // Move the path pen to the end of the arc.
    // Since that is where we want to draw the next path.
    // TODO: the engine should automatically move the pen to the end of the arc.
@ -927,6 +941,8 @@ fn inner_bezier_curve(
        BezierData::Points { to, control1, control2 } => (to, control1, control2),
    };

+    let relative = true;
+    let delta = to;
    let to = [from.x + to[0], from.y + to[1]];

    let id = uuid::Uuid::new_v4();
@ -937,20 +953,21 @@ fn inner_bezier_curve(
            path: sketch_group.id,
            segment: kittycad::types::PathSegment::Bezier {
                control1: Point3D {
-                    x: from.x + control1[0],
-                    y: from.y + control1[1],
+                    x: control1[0],
+                    y: control1[1],
                    z: 0.0,
                },
                control2: Point3D {
-                    x: from.x + control2[0],
-                    y: from.y + control2[1],
+                    x: control2[0],
+                    y: control2[1],
                    z: 0.0,
                },
                end: Point3D {
-                    x: to[0],
-                    y: to[1],
+                    x: delta[0],
+                    y: delta[1],
                    z: 0.0,
                },
+                relative,
            },
        },
    )?;
--- a/src/wasm-lib/tests/executor/outputs/member_expression_sketch_group.png
+++ b/src/wasm-lib/tests/executor/outputs/member_expression_sketch_group.png
--- a/yarn.lock
+++ b/yarn.lock
@ -1530,10 +1530,10 @@
  resolved "https://registry.yarnpkg.com/@juggle/resize-observer/-/resize-observer-3.4.0.tgz#08d6c5e20cf7e4cc02fd181c4b0c225cd31dbb60"
  integrity sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA==

-"@kittycad/lib@^0.0.37":
-  version "0.0.37"
-  resolved "https://registry.yarnpkg.com/@kittycad/lib/-/lib-0.0.37.tgz#ec4f6c4fb5d06402a19339f3374036b6582d2265"
-  integrity sha512-P8p9FeLV79/0Lfd0RioBta1drzhmpROnU4YV38+zsAA4LhibQCTjeekRkxVvHztGumPxz9pPsAeeLJyuz2RWKQ==
+"@kittycad/lib@^0.0.38":
+  version "0.0.38"
+  resolved "https://registry.yarnpkg.com/@kittycad/lib/-/lib-0.0.38.tgz#50474266f679990bd414c30f884f2d42a0d5dba9"
+  integrity sha512-Lv9P7jqVRoGgOnCsRCsG8OwZH5n3scxXYrElR+5/Rsd6/KIarLB4bSBngJrXebOnmTw5md0OPeY+b3ZDbZFDeg==
  dependencies:
    node-fetch "3.3.2"
    openapi-types "^12.0.0"
Author	SHA1	Message	Date
Kurt Hutten	888104080e	bump v0.9.0 (#673 )	2023-09-21 10:38:40 +10:00
mlfarrell	b6769889e3	Handle relative paths at kcl level (#506 ) * handle relative paths at kcl level * fmt * update kittycad Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * bump Signed-off-by: Jess Frazelle <github@jessfraz.com> * fix tests Signed-off-by: Jess Frazelle <github@jessfraz.com> --------- Signed-off-by: Jess Frazelle <github@jessfraz.com> Co-authored-by: Jess Frazelle <github@jessfraz.com> Co-authored-by: Jess Frazelle <jessfraz@users.noreply.github.com>	2023-09-21 10:36:26 +10:00
Adam Chalmers	a32258dac4	Engine manager can be cloned (#671 )	2023-09-20 16:22:47 -07:00
Adam Chalmers	18dbbad244	Use an actor to manage the Tokio engine connection (#669 ) * Use an actor to manage the Tokio engine connection This means EngineManager trait's methods take &self not &mut self, and the tokio implementation can be cloned. * Clean up code	2023-09-20 16:59:03 -05:00
Adam Chalmers	b67c16cc9d	Benchmark for KCL parser (#664 ) * KCL benchmarks * CI for benchmarks * More specific name for benchmark * Benchmark the right directory * Format	2023-09-20 13:15:28 -05:00