Merge remote-tracking branch 'origin/main' into paultag/import

Move axes to std constants; move helix, revolve, and mirror2d to be declated in KCL

Signed-off-by: Nick Cameron <nrc@ncameron.org>

.eslintrc

@@ -1,103 +0,0 @@
-{
-    "parser": "@typescript-eslint/parser",
-    "parserOptions": {
-      "project": "./tsconfig.json"
-    },
-    "plugins": [
-      "react-perf",
-      "css-modules",
-      "jest",
-      "jsx-a11y",
-      "react",
-      "react-hooks",
-      "suggest-no-throw",
-      "testing-library",
-      "@typescript-eslint"
-    ],
-    "extends": [
-      "plugin:css-modules/recommended",
-      "plugin:jsx-a11y/recommended",
-      "plugin:react-hooks/recommended"
-    ],
-    "rules": {
-      "no-array-constructor": "off", // This is wrong; use the @typescript-eslint one instead.
-      "@typescript-eslint/no-array-constructor": "error",
-      "@typescript-eslint/no-array-delete": "error",
-      "@typescript-eslint/no-duplicate-enum-values": "error",
-      "@typescript-eslint/no-duplicate-type-constituents": "error",
-      "@typescript-eslint/no-empty-object-type": "error",
-      "@typescript-eslint/no-extra-non-null-assertion": "error",
-      "@typescript-eslint/no-floating-promises": "error",
-      "@typescript-eslint/no-for-in-array": "error",
-      "no-implied-eval": "off", // This is wrong; use the @typescript-eslint one instead.
-      "@typescript-eslint/no-implied-eval": "error",
-      "@typescript-eslint/no-misused-new": "error",
-      "@typescript-eslint/no-misused-promises": "error",
-      "@typescript-eslint/no-namespace": "error",
-      "@typescript-eslint/no-non-null-asserted-optional-chain": "error",
-      "@typescript-eslint/no-redundant-type-constituents": "error",
-      "@typescript-eslint/no-this-alias": "warn",
-      "@typescript-eslint/no-unnecessary-type-assertion": "error",
-      "@typescript-eslint/no-unnecessary-type-constraint": "error",
-      "no-unused-vars": "off", // This is wrong; use the @typescript-eslint one instead.
-      "@typescript-eslint/no-unused-vars": ["error", {
-        "varsIgnorePattern": "^_",
-        "argsIgnorePattern": "^_",
-        "ignoreRestSiblings": true,
-        "vars": "all",
-        "args": "none"
-      }],
-      "@typescript-eslint/no-unsafe-unary-minus": "error",
-      "@typescript-eslint/no-wrapper-object-types": "error",
-      "no-throw-literal": "off", // Use @typescript-eslint/only-throw-error instead.
-      "@typescript-eslint/only-throw-error": "error",
-      "@typescript-eslint/prefer-as-const": "warn",
-      "@typescript-eslint/prefer-namespace-keyword": "error",
-      "@typescript-eslint/restrict-plus-operands": "error",
-      "jsx-a11y/click-events-have-key-events": "off",
-      "jsx-a11y/no-autofocus": "off",
-      "jsx-a11y/no-noninteractive-element-interactions": "off",
-      "no-restricted-globals": [
-        "error",
-        {
-          "name": "isNaN",
-          "message": "Use Number.isNaN() instead."
-        }
-      ],
-      "no-restricted-syntax": [
-        "error",
-        {
-          "selector": "CallExpression[callee.object.name='Array'][callee.property.name='isArray']",
-          "message": "Use isArray() in lib/utils.ts instead of Array.isArray()."
-        }
-      ],
-      "semi": [
-        "error",
-        "never"
-      ],
-      "react-hooks/exhaustive-deps": "off",
-      "suggest-no-throw/suggest-no-throw": "error"
-    },
-    "overrides": [
-      {
-        "files": ["e2e/**/*.ts"], // Update the pattern based on your file structure
-        "extends": [
-          "plugin:testing-library/react"
-        ],
-        "rules": {
-          "suggest-no-throw/suggest-no-throw": "off",
-          "testing-library/prefer-screen-queries": "off",
-          "jest/valid-expect": "off"
-        }
-      },
-      {
-        "files": ["src/**/*.test.ts"],
-        "extends": [
-          "plugin:testing-library/react"
-        ],
-        "rules": {
-          "suggest-no-throw/suggest-no-throw": "off"
-        }
-      }
-    ]
-}

.eslintrc.json

@@ -0,0 +1,127 @@
+{
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+    "project": "./tsconfig.json"
+  },
+  "plugins": [
+    "react-perf",
+    "css-modules",
+    "jest",
+    "jsx-a11y",
+    "react",
+    "react-hooks",
+    "suggest-no-throw",
+    "testing-library",
+    "@typescript-eslint"
+  ],
+  "extends": [
+    "plugin:css-modules/recommended",
+    "plugin:jsx-a11y/recommended",
+    "plugin:react-hooks/recommended"
+  ],
+  "rules": {
+    "no-array-constructor": "off", // This is wrong; use the @typescript-eslint one instead.
+    "@typescript-eslint/no-array-constructor": "error",
+    "@typescript-eslint/no-array-delete": "error",
+    "@typescript-eslint/no-duplicate-enum-values": "error",
+    "@typescript-eslint/no-duplicate-type-constituents": "error",
+    "@typescript-eslint/no-empty-object-type": "error",
+    "@typescript-eslint/no-extra-non-null-assertion": "error",
+    "@typescript-eslint/no-floating-promises": "error",
+    "@typescript-eslint/no-for-in-array": "error",
+    "no-implied-eval": "off", // This is wrong; use the @typescript-eslint one instead.
+    "@typescript-eslint/no-implied-eval": "error",
+    "@typescript-eslint/no-misused-new": "error",
+    "@typescript-eslint/no-misused-promises": "error",
+    "@typescript-eslint/no-namespace": "error",
+    "@typescript-eslint/no-non-null-asserted-optional-chain": "error",
+    "@typescript-eslint/no-redundant-type-constituents": "error",
+    "@typescript-eslint/no-this-alias": "warn",
+    "@typescript-eslint/no-unnecessary-type-assertion": "error",
+    "@typescript-eslint/no-unnecessary-type-constraint": "error",
+    "no-unused-vars": "off", // This is wrong; use the @typescript-eslint one instead.
+    "@typescript-eslint/no-unused-vars": [
+      "error",
+      {
+        "varsIgnorePattern": "^_",
+        "argsIgnorePattern": "^_",
+        "ignoreRestSiblings": true,
+        "vars": "all",
+        "args": "none"
+      }
+    ],
+    "@typescript-eslint/no-unsafe-unary-minus": "error",
+    "@typescript-eslint/no-wrapper-object-types": "error",
+    "no-throw-literal": "off", // Use @typescript-eslint/only-throw-error instead.
+    "@typescript-eslint/only-throw-error": "error",
+    "@typescript-eslint/prefer-as-const": "warn",
+    "@typescript-eslint/prefer-namespace-keyword": "error",
+    "@typescript-eslint/consistent-type-imports": "error",
+    "@typescript-eslint/restrict-plus-operands": "error",
+    "jsx-a11y/click-events-have-key-events": "off",
+    "jsx-a11y/no-autofocus": "off",
+    "jsx-a11y/no-noninteractive-element-interactions": "off",
+    "no-restricted-globals": [
+      "error",
+      {
+        "name": "isNaN",
+        "message": "Use Number.isNaN() instead."
+      }
+    ],
+    "no-restricted-syntax": [
+      "error",
+      {
+        "selector": "CallExpression[callee.object.name='Array'][callee.property.name='isArray']",
+        "message": "Use isArray() in lib/utils.ts instead of Array.isArray()."
+      },
+      {
+        "selector": "CallExpression[callee.object.name='TOML'][callee.property.name='stringify']",
+        "message": "Do not use TOML.stringify directly. Use the wrappers in test-utils instead like settingsToToml."
+      },
+      {
+        "selector": "CallExpression[callee.object.name='TOML'][callee.property.name='parse']",
+        "message": "Do not use TOML.parse directly. Use the wrappers in test-utils instead like tomlToSettings."
+      }
+    ],
+    "no-restricted-imports": [
+      "error",
+      {
+        "patterns": [
+          // Restrict all relative imports except for .css files.
+          {
+            "group": ["./*", "../*", "!./*.css", "!../*.css"],
+            "message": "Use absolute imports instead."
+          }
+        ]
+      }
+    ],
+    "semi": ["error", "never"],
+    "react-hooks/exhaustive-deps": "off",
+    "suggest-no-throw/suggest-no-throw": "error"
+  },
+  "overrides": [
+    {
+      "files": ["e2e/**/*.ts"], // Update the pattern based on your file structure
+      "extends": ["plugin:testing-library/react"],
+      "rules": {
+        "suggest-no-throw/suggest-no-throw": "off",
+        "testing-library/prefer-screen-queries": "off",
+        "jest/valid-expect": "off"
+      }
+    },
+    {
+      "files": ["src/**/*.test.ts"],
+      "extends": ["plugin:testing-library/react"],
+      "rules": {
+        "suggest-no-throw/suggest-no-throw": "off"
+      }
+    },
+    {
+      "files": ["packages/**/*.ts", "rust/**/*.ts"],
+      "extends": [],
+      "rules": {
+        "no-restricted-imports": "off"
+      }
+    }
+  ]
+}

.github/workflows/static-analysis.yml

@@ -136,6 +136,36 @@ jobs:
 
       - run: yarn lint
 
+  yarn-circular-dependencies:
+    runs-on: ubuntu-latest
+    needs: yarn-build-wasm
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+          cache: 'yarn'
+      - run: yarn install
+
+      - name: Download all artifacts
+        uses: actions/download-artifact@v4
+
+      - name: Copy prepared wasm
+        run: |
+          ls -R prepared-wasm
+          cp prepared-wasm/kcl_wasm_lib_bg.wasm public
+          mkdir rust/kcl-wasm-lib/pkg
+          cp prepared-wasm/kcl_wasm_lib* rust/kcl-wasm-lib/pkg
+
+      - name: Copy prepared ts-rs bindings
+        run: |
+          ls -R prepared-ts-rs-bindings
+          mkdir rust/kcl-lib/bindings
+          cp -r prepared-ts-rs-bindings/* rust/kcl-lib/bindings/
+
+      - run: yarn circular-deps:diff
+
   python-codespell:
     runs-on: ubuntu-22.04
     steps:

Makefile

@@ -4,18 +4,38 @@ all: install build check
 ###############################################################################
 # INSTALL
 
-WASM_PACK ?= ~/.cargo/bin/wasm-pack
+ifeq ($(OS),Windows_NT)
+	CARGO ?= ~/.cargo/bin/cargo.exe
+	WASM_PACK ?= ~/.cargo/bin/wasm-pack.exe
+else
+	CARGO ?= ~/.cargo/bin/cargo
+	WASM_PACK ?= ~/.cargo/bin/wasm-pack
+endif
 
 .PHONY: install
-install: node_modules/.yarn-integrity $(WASM_PACK) ## Install dependencies
+install: node_modules/.yarn-integrity $(CARGO) $(WASM_PACK) ## Install dependencies
 
 node_modules/.yarn-integrity: package.json yarn.lock
 	yarn install
+ifeq ($(OS),Windows_NT)
+	@ type nul > $@
+else
 	@ touch $@
+endif
+
+$(CARGO):
+ifeq ($(OS),Windows_NT)
+	yarn install:rust:windows
+else
+	yarn install:rust
+endif
 
 $(WASM_PACK):
-	yarn install:rust
+ifeq ($(OS),Windows_NT)
+	yarn install:wasm-pack:cargo
+else
 	yarn install:wasm-pack:sh
+endif
 
 ###############################################################################
 # BUILD
@@ -31,13 +51,17 @@ VITE_SOURCES := $(wildcard vite.*) $(wildcard vite/**/*.tsx)
 build: build-web build-desktop
 
 .PHONY: build-web
-build-web: public/kcl_wasm_lib_bg.wasm build/index.html
+build-web: install public/kcl_wasm_lib_bg.wasm build/index.html
 
 .PHONY: build-desktop
-build-desktop: public/kcl_wasm_lib_bg.wasm .vite/build/main.js
+build-desktop: install public/kcl_wasm_lib_bg.wasm .vite/build/main.js
 
-public/kcl_wasm_lib_bg.wasm: $(CARGO_SOURCES)$(RUST_SOURCES)
+public/kcl_wasm_lib_bg.wasm: $(CARGO_SOURCES) $(RUST_SOURCES)
+ifeq ($(OS),Windows_NT)
+	yarn build:wasm:dev:windows
+else
 	yarn build:wasm:dev
+endif
 
 build/index.html: $(REACT_SOURCES) $(TYPESCRIPT_SOURCES) $(VITE_SOURCES)
 	yarn build:local
@@ -63,8 +87,10 @@ lint: install ## Lint the code
 ###############################################################################
 # RUN
 
+TARGET ?= web
+
 .PHONY: run
-run: run-web
+run: run-$(TARGET)
 
 .PHONY: run-web
 run-web: install build-web ## Start the web app
@@ -90,7 +116,7 @@ test-unit: install ## Run the unit tests
 	yarn test:unit
 
 .PHONY: test-e2e
-test-e2e: test-e2e-desktop
+test-e2e: test-e2e-$(TARGET)
 
 .PHONY: test-e2e-web
 test-e2e-web: install build-web ## Run the web e2e tests
@@ -106,15 +132,23 @@ test-e2e-desktop: install build-desktop ## Run the desktop e2e tests
 
 .PHONY: clean
 clean: ## Delete all artifacts
+ifeq ($(OS),Windows_NT)
+	git clean --force -d -X
+else
 	rm -rf .vite/ build/
 	rm -rf trace.zip playwright-report/ test-results/
 	rm -rf public/kcl_wasm_lib_bg.wasm
 	rm -rf rust/*/bindings/ rust/*/pkg/ rust/target/
 	rm -rf node_modules/ rust/*/node_modules/
+endif
 
 .PHONY: help
 help: install
+ifeq ($(OS),Windows_NT)
+	@ powershell -Command "Get-Content $(MAKEFILE_LIST) | Select-String -Pattern '^[^\s]+:.*##\s.*$$' | ForEach-Object { $$line = $$_.Line -split ':.*?##\s+'; Write-Host -NoNewline $$line[0].PadRight(30) -ForegroundColor Cyan; Write-Host $$line[1] }"
+else
 	@ grep -E '^[^[:space:]]+:.*## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+endif
 
 .DEFAULT_GOAL := help
 

docs/kcl/appearance.md

@@ -54,7 +54,7 @@ example = extrude(exampleSketch, length = 5)
 // Add color to a revolved solid.
 sketch001 = startSketchOn(XY)
   |> circle(center = [15, 0], radius = 5)
-  |> revolve(angle = 360, axis = 'y')
+  |> revolve(angle = 360, axis = Y)
   |> appearance(color = '#ff0000', metalness = 90, roughness = 90)
 ```
 

docs/kcl/consts.md

@@ -9,9 +9,12 @@ layout: manual
 
 ### `std`
 
+- [`X`](/docs/kcl/consts/std-X)
 - [`XY`](/docs/kcl/consts/std-XY)
 - [`XZ`](/docs/kcl/consts/std-XZ)
+- [`Y`](/docs/kcl/consts/std-Y)
 - [`YZ`](/docs/kcl/consts/std-YZ)
+- [`Z`](/docs/kcl/consts/std-Z)
 
 ### `std::math`
 

docs/kcl/consts/std-X.md

@@ -0,0 +1,15 @@
+---
+title: "std::X"
+excerpt: ""
+layout: manual
+---
+
+
+
+
+
+```js
+std::X
+```
+
+

docs/kcl/consts/std-Y.md

@@ -0,0 +1,15 @@
+---
+title: "std::Y"
+excerpt: ""
+layout: manual
+---
+
+
+
+
+
+```js
+std::Y
+```
+
+

docs/kcl/consts/std-Z.md

@@ -0,0 +1,15 @@
+---
+title: "std::Z"
+excerpt: ""
+layout: manual
+---
+
+
+
+
+
+```js
+std::Z
+```
+
+

docs/kcl/index.md

@@ -22,6 +22,9 @@ layout: manual
   * [`string`](kcl/types/string)
   * [`tag`](kcl/types/tag)
 * **std**
+  * [`Axis2d`](kcl/types/Axis2d)
+  * [`Axis3d`](kcl/types/Axis3d)
+  * [`Edge`](kcl/types/Edge)
   * [`Face`](kcl/types/Face)
   * [`Helix`](kcl/types/Helix)
   * [`Plane`](kcl/types/Plane)
@@ -29,9 +32,12 @@ layout: manual
   * [`Point3d`](kcl/types/Point3d)
   * [`Sketch`](kcl/types/Sketch)
   * [`Solid`](kcl/types/Solid)
+  * [`X`](kcl/consts/std-X)
   * [`XY`](kcl/consts/std-XY)
   * [`XZ`](kcl/consts/std-XZ)
+  * [`Y`](kcl/consts/std-Y)
   * [`YZ`](kcl/consts/std-YZ)
+  * [`Z`](kcl/consts/std-Z)
   * [`abs`](kcl/abs)
   * [`acos`](kcl/acos)
   * [`angleToMatchLengthX`](kcl/angleToMatchLengthX)
@@ -68,7 +74,7 @@ layout: manual
   * [`getNextAdjacentEdge`](kcl/getNextAdjacentEdge)
   * [`getOppositeEdge`](kcl/getOppositeEdge)
   * [`getPreviousAdjacentEdge`](kcl/getPreviousAdjacentEdge)
-  * [`helix`](kcl/helix)
+  * [`helix`](kcl/std-helix)
   * [`hole`](kcl/hole)
   * [`hollow`](kcl/hollow)
   * [`inch`](kcl/inch)
@@ -87,7 +93,6 @@ layout: manual
   * [`map`](kcl/map)
   * [`max`](kcl/max)
   * [`min`](kcl/min)
-  * [`mirror2d`](kcl/mirror2d)
   * [`mm`](kcl/mm)
   * [`offsetPlane`](kcl/offsetPlane)
   * [`patternCircular2d`](kcl/patternCircular2d)
@@ -106,7 +111,7 @@ layout: manual
   * [`push`](kcl/push)
   * [`reduce`](kcl/reduce)
   * [`rem`](kcl/rem)
-  * [`revolve`](kcl/revolve)
+  * [`revolve`](kcl/std-revolve)
   * [`rotate`](kcl/rotate)
   * [`round`](kcl/round)
   * [`scale`](kcl/scale)
@@ -142,6 +147,7 @@ layout: manual
   * [`tan`](kcl/std-math-tan)
 * **std::sketch**
   * [`circle`](kcl/std-sketch-circle)
+  * [`mirror2d`](kcl/std-sketch-mirror2d)
 * **std::turns**
   * [`turns::HALF_TURN`](kcl/consts/std-turns-HALF_TURN)
   * [`turns::QUARTER_TURN`](kcl/consts/std-turns-QUARTER_TURN)

docs/kcl/startSketchOn.md

@@ -146,7 +146,7 @@ exampleSketch = startSketchOn(XY)
   |> line(end = [-2, 0])
   |> close()
 
-example = revolve(exampleSketch, axis = 'y', angle = 180)
+example = revolve(exampleSketch, axis = Y, angle = 180)
 
 exampleSketch002 = startSketchOn(example, 'end')
   |> startProfileAt([4.5, -5], %)
@@ -177,7 +177,7 @@ exampleSketch = startSketchOn(XY)
 
 example = revolve(
   exampleSketch,
-  axis = 'y',
+  axis = Y,
   angle = 180,
   tagEnd = $end01,
 )

docs/kcl/sweep.md

@@ -74,7 +74,7 @@ helixPath = helix(
   revolutions = 4,
   length = 10,
   radius = 5,
-  axis = 'Z',
+  axis = Z,
 )
 
 // Create a spring by sweeping around the helix path.

docs/kcl/types/Axis2d.md

@@ -0,0 +1,12 @@
+---
+title: "std::Axis2d"
+excerpt: "An infinite line in 2d space."
+layout: manual
+---
+
+An infinite line in 2d space.
+
+
+
+
+

docs/kcl/types/Axis3d.md

@@ -0,0 +1,12 @@
+---
+title: "std::Axis3d"
+excerpt: "An infinite line in 3d space."
+layout: manual
+---
+
+An infinite line in 3d space.
+
+
+
+
+

docs/kcl/types/Edge.md

@@ -0,0 +1,12 @@
+---
+title: "std::Edge"
+excerpt: "The edge of a solid."
+layout: manual
+---
+
+The edge of a solid.
+
+
+
+
+

e2e/playwright/app-header-tests.spec.ts

@@ -1,4 +1,4 @@
-import { test, expect } from './zoo-test'
+import { expect, test } from '@e2e/playwright/zoo-test'
 
 test.describe('Electron app header tests', () => {
   test(

e2e/playwright/basic-sketch.spec.ts

@@ -1,13 +1,14 @@
-import { Page } from '@playwright/test'
-import { test, expect } from './zoo-test'
+import type { Page } from '@playwright/test'
+
+import type { HomePageFixture } from '@e2e/playwright/fixtures/homePageFixture'
 import {
-  getUtils,
+  PERSIST_MODELING_CONTEXT,
   TEST_COLORS,
   commonPoints,
-  PERSIST_MODELING_CONTEXT,
+  getUtils,
   orRunWhenFullSuiteEnabled,
-} from './test-utils'
-import { HomePageFixture } from './fixtures/homePageFixture'
+} from '@e2e/playwright/test-utils'
+import { expect, test } from '@e2e/playwright/zoo-test'
 
 test.setTimeout(120000)
 

e2e/playwright/boolean.spec.ts

@@ -1,7 +1,8 @@
-import { test, expect } from './zoo-test'
 import fs from 'node:fs/promises'
 import path from 'node:path'
 
+import { expect, test } from '@e2e/playwright/zoo-test'
+
 test.describe('Point and click for boolean workflows', () => {
   // Boolean operations to test
   const booleanOperations = [

e2e/playwright/can-create-sketches-on-all-planes-and-their-back-sides.spec.ts

@@ -1,10 +1,11 @@
-import { Page } from '@playwright/test'
-import { test, expect } from './zoo-test'
-import { HomePageFixture } from './fixtures/homePageFixture'
-import { getUtils } from './test-utils'
-import { EngineCommand } from 'lang/std/artifactGraph'
-import { uuidv4 } from 'lib/utils'
-import { SceneFixture } from './fixtures/sceneFixture'
+import type { Page } from '@playwright/test'
+import type { EngineCommand } from '@src/lang/std/artifactGraph'
+import { uuidv4 } from '@src/lib/utils'
+
+import type { HomePageFixture } from '@e2e/playwright/fixtures/homePageFixture'
+import type { SceneFixture } from '@e2e/playwright/fixtures/sceneFixture'
+import { getUtils } from '@e2e/playwright/test-utils'
+import { expect, test } from '@e2e/playwright/zoo-test'
 
 test.describe(
   'Can create sketches on all planes and their back sides',

e2e/playwright/code-pane-and-errors.spec.ts

@@ -1,13 +1,14 @@
-import { test, expect } from './zoo-test'
-import {
-  orRunWhenFullSuiteEnabled,
-  getUtils,
-  executorInputPath,
-} from './test-utils'
-import { join } from 'path'
-import { bracket } from 'lib/exampleKcl'
-import { TEST_CODE_LONG_WITH_ERROR_OUT_OF_VIEW } from './storageStates'
+import { bracket } from '@src/lib/exampleKcl'
 import fsp from 'fs/promises'
+import { join } from 'path'
+
+import { TEST_CODE_LONG_WITH_ERROR_OUT_OF_VIEW } from '@e2e/playwright/storageStates'
+import {
+  executorInputPath,
+  getUtils,
+  orRunWhenFullSuiteEnabled,
+} from '@e2e/playwright/test-utils'
+import { expect, test } from '@e2e/playwright/zoo-test'
 
 test.describe('Code pane and errors', { tag: ['@skipWin'] }, () => {
   test('Typing KCL errors induces a badge on the code pane button', async ({

e2e/playwright/command-bar-tests.spec.ts

@@ -1,12 +1,13 @@
-import { test, expect } from './zoo-test'
+import { KCL_DEFAULT_LENGTH } from '@src/lib/constants'
 import * as fsp from 'fs/promises'
+import path, { join } from 'path'
+
 import {
   executorInputPath,
   getUtils,
   orRunWhenFullSuiteEnabled,
-} from './test-utils'
-import { KCL_DEFAULT_LENGTH } from 'lib/constants'
-import path, { join } from 'path'
+} from '@e2e/playwright/test-utils'
+import { expect, test } from '@e2e/playwright/zoo-test'
 
 test.describe('Command bar tests', { tag: ['@skipWin'] }, () => {
   test('Extrude from command bar selects extrude line after', async ({

e2e/playwright/copilot-ghost-test.spec.ts

@@ -1,5 +1,5 @@
-import { test, expect } from './zoo-test'
-import { getUtils } from './test-utils'
+import { getUtils } from '@e2e/playwright/test-utils'
+import { expect, test } from '@e2e/playwright/zoo-test'
 
 test.describe('Copilot ghost text', () => {
   // eslint-disable-next-line jest/valid-title

e2e/playwright/debug-pane.spec.ts

@@ -1,6 +1,5 @@
-import { test, expect } from './zoo-test'
-
-import { getUtils } from './test-utils'
+import { getUtils } from '@e2e/playwright/test-utils'
+import { expect, test } from '@e2e/playwright/zoo-test'
 
 function countNewlines(input: string): number {
   let count = 0

e2e/playwright/desktop-export.spec.ts

@@ -1,11 +1,12 @@
-import { test, expect } from './zoo-test'
+import fsp from 'fs/promises'
 import path from 'path'
+
 import {
-  getUtils,
   executorInputPath,
   getPlaywrightDownloadDir,
-} from './test-utils'
-import fsp from 'fs/promises'
+  getUtils,
+} from '@e2e/playwright/test-utils'
+import { expect, test } from '@e2e/playwright/zoo-test'
 
 test(
   'export works on the first try',

e2e/playwright/editor-tests.spec.ts

@@ -1,14 +1,14 @@
-import { test, expect } from './zoo-test'
+import { uuidv4 } from '@src/lib/utils'
 import fsp from 'fs/promises'
-import { uuidv4 } from 'lib/utils'
+import { join } from 'path'
+
 import {
+  TEST_COLORS,
   executorInputPath,
   getUtils,
   orRunWhenFullSuiteEnabled,
-  TEST_COLORS,
-} from './test-utils'
-
-import { join } from 'path'
+} from '@e2e/playwright/test-utils'
+import { expect, test } from '@e2e/playwright/zoo-test'
 
 test.describe('Editor tests', { tag: ['@skipWin'] }, () => {
   test('can comment out code with ctrl+/', async ({ page, homePage }) => {
@@ -985,12 +985,13 @@ sketch001 = startSketchOn(XZ)
   test(
     'Can undo a sketch modification with ctrl+z',
     { tag: ['@skipWin'] },
-    async ({ page, homePage }) => {
+    async ({ page, homePage, editor }) => {
       const u = await getUtils(page)
       await page.addInitScript(async () => {
         localStorage.setItem(
           'persistCode',
-          `sketch001 = startSketchOn(XZ)
+          `@settings(defaultLengthUnit=in)
+sketch001 = startSketchOn(XZ)
   |> startProfileAt([4.61, -10.01], %)
   |> line(end = [12.73, -0.09])
   |> tangentialArcTo([24.95, -0.38], %)
@@ -1080,41 +1081,45 @@ sketch001 = startSketchOn(XZ)
       await expect(page.locator('.cm-content')).not.toHaveText(prevContent)
 
       // expect the code to have changed
-      await expect(page.locator('.cm-content'))
-        .toHaveText(`sketch001 = startSketchOn(XZ)
+      await editor.expectEditor.toContain(
+        `sketch001 = startSketchOn(XZ)
     |> startProfileAt([2.71, -2.71], %)
     |> line(end = [15.4, -2.78])
     |> tangentialArcTo([27.6, -3.05], %)
     |> close()
-    |> extrude(length = 5)
-  `)
+    |> extrude(length = 5)`,
+        { shouldNormalise: true }
+      )
 
       // Hit undo
       await page.keyboard.down('Control')
       await page.keyboard.press('KeyZ')
       await page.keyboard.up('Control')
 
-      await expect(page.locator('.cm-content'))
-        .toHaveText(`sketch001 = startSketchOn(XZ)
+      await editor.expectEditor.toContain(
+        `sketch001 = startSketchOn(XZ)
     |> startProfileAt([2.71, -2.71], %)
     |> line(end = [15.4, -2.78])
     |> tangentialArcTo([24.95, -0.38], %)
     |> close()
-    |> extrude(length = 5)`)
+    |> extrude(length = 5)`,
+        { shouldNormalise: true }
+      )
 
       // Hit undo again.
       await page.keyboard.down('Control')
       await page.keyboard.press('KeyZ')
       await page.keyboard.up('Control')
 
-      await expect(page.locator('.cm-content'))
-        .toHaveText(`sketch001 = startSketchOn(XZ)
+      await editor.expectEditor.toContain(
+        `sketch001 = startSketchOn(XZ)
     |> startProfileAt([2.71, -2.71], %)
     |> line(end = [12.73, -0.09])
     |> tangentialArcTo([24.95, -0.38], %)
     |> close()
-    |> extrude(length = 5)
-  `)
+    |> extrude(length = 5)`,
+        { shouldNormalise: true }
+      )
 
       // Hit undo again.
       await page.keyboard.down('Control')
@@ -1122,13 +1127,15 @@ sketch001 = startSketchOn(XZ)
       await page.keyboard.up('Control')
 
       await page.waitForTimeout(100)
-      await expect(page.locator('.cm-content'))
-        .toHaveText(`sketch001 = startSketchOn(XZ)
-  |> startProfileAt([4.61, -10.01], %)
-  |> line(end = [12.73, -0.09])
-  |> tangentialArcTo([24.95, -0.38], %)
-  |> close()
-  |> extrude(length = 5)`)
+      await editor.expectEditor.toContain(
+        `sketch001 = startSketchOn(XZ)
+    |> startProfileAt([4.61, -10.01], %)
+    |> line(end = [12.73, -0.09])
+    |> tangentialArcTo([24.95, -0.38], %)
+    |> close()
+    |> extrude(length = 5)`,
+        { shouldNormalise: true }
+      )
     }
   )
 

e2e/playwright/feature-tree-pane.spec.ts

@@ -1,7 +1,8 @@
-import { test, expect } from './zoo-test'
 import * as fsp from 'fs/promises'
 import { join } from 'path'
 
+import { expect, test } from '@e2e/playwright/zoo-test'
+
 const FEATURE_TREE_EXAMPLE_CODE = `export fn timesFive(x) {
   return 5 * x
 }
@@ -21,7 +22,7 @@ sketch001 = startSketchOn(XZ)
   |> angledLine([-45, length001], %)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
-revolve001 = revolve(sketch001, axis = "X")
+revolve001 = revolve(sketch001, axis = X)
 triangle()
   |> extrude(length = 30)
 plane001 = offsetPlane(XY, offset = 10)
@@ -126,7 +127,7 @@ test.describe('Feature Tree pane', () => {
       await testViewSource({
         operationName: 'Revolve',
         operationIndex: 0,
-        expectedActiveLine: 'revolve001 = revolve(sketch001, axis = "X")',
+        expectedActiveLine: 'revolve001 = revolve(sketch001, axis = X)',
       })
       await testViewSource({
         operationName: 'Triangle',

e2e/playwright/file-tree.spec.ts

@@ -1,15 +1,16 @@
-import { test, expect } from './zoo-test'
-import * as fsp from 'fs/promises'
+import { FILE_EXT } from '@src/lib/constants'
 import * as fs from 'fs'
+import * as fsp from 'fs/promises'
+import { join } from 'path'
+
 import {
   createProject,
   executorInputPath,
   getUtils,
   orRunWhenFullSuiteEnabled,
   runningOnWindows,
-} from './test-utils'
-import { join } from 'path'
-import { FILE_EXT } from 'lib/constants'
+} from '@e2e/playwright/test-utils'
+import { expect, test } from '@e2e/playwright/zoo-test'
 
 test.describe('integrations tests', () => {
   test(

e2e/playwright/fixtures/cmdBarFixture.ts

@@ -1,5 +1,5 @@
-import type { Page, Locator, Route, Request } from '@playwright/test'
-import { expect, TestInfo } from '@playwright/test'
+import type { Locator, Page, Request, Route, TestInfo } from '@playwright/test'
+import { expect } from '@playwright/test'
 import * as fs from 'fs'
 import * as path from 'path'
 

e2e/playwright/fixtures/editorFixture.ts

@@ -1,11 +1,12 @@
-import type { Page, Locator } from '@playwright/test'
+import type { Locator, Page } from '@playwright/test'
 import { expect } from '@playwright/test'
+
 import {
-  closePane,
   checkIfPaneIsOpen,
+  closePane,
   openPane,
   sansWhitespace,
-} from '../test-utils'
+} from '@e2e/playwright/test-utils'
 
 interface EditorState {
   activeLines: Array<string>

e2e/playwright/fixtures/fixtureSetup.ts

@@ -1,28 +1,28 @@
 /* eslint-disable react-hooks/rules-of-hooks */
-
 import type {
   BrowserContext,
   ElectronApplication,
-  TestInfo,
   Page,
+  TestInfo,
 } from '@playwright/test'
-
 import { _electron as electron } from '@playwright/test'
 
-import * as TOML from '@iarna/toml'
-import { TEST_SETTINGS } from '../storageStates'
-import { SETTINGS_FILE_NAME } from 'lib/constants'
-import { getUtils, setup } from '../test-utils'
+import { SETTINGS_FILE_NAME } from '@src/lib/constants'
+import type { DeepPartial } from '@src/lib/types'
 import fsp from 'fs/promises'
 import fs from 'node:fs'
 import path from 'path'
-import { CmdBarFixture } from './cmdBarFixture'
-import { EditorFixture } from './editorFixture'
-import { ToolbarFixture } from './toolbarFixture'
-import { SceneFixture } from './sceneFixture'
-import { HomePageFixture } from './homePageFixture'
-import { DeepPartial } from 'lib/types'
-import { Settings } from '@rust/kcl-lib/bindings/Settings'
+
+import type { Settings } from '@rust/kcl-lib/bindings/Settings'
+
+import { CmdBarFixture } from '@e2e/playwright/fixtures/cmdBarFixture'
+import { EditorFixture } from '@e2e/playwright/fixtures/editorFixture'
+import { HomePageFixture } from '@e2e/playwright/fixtures/homePageFixture'
+import { SceneFixture } from '@e2e/playwright/fixtures/sceneFixture'
+import { ToolbarFixture } from '@e2e/playwright/fixtures/toolbarFixture'
+
+import { TEST_SETTINGS } from '@e2e/playwright/storageStates'
+import { getUtils, settingsToToml, setup } from '@e2e/playwright/test-utils'
 
 export class AuthenticatedApp {
   public readonly page: Page
@@ -287,26 +287,30 @@ export class ElectronZoo {
     let settingsOverridesToml = ''
 
     if (appSettings) {
-      settingsOverridesToml = TOML.stringify({
-        // @ts-expect-error
+      settingsOverridesToml = settingsToToml({
         settings: {
           ...TEST_SETTINGS,
           ...appSettings,
           app: {
             ...TEST_SETTINGS.app,
-            project_directory: this.projectDirName,
             ...appSettings.app,
           },
+          project: {
+            ...TEST_SETTINGS.project,
+            directory: this.projectDirName,
+          },
         },
       })
     } else {
-      settingsOverridesToml = TOML.stringify({
-        // @ts-expect-error
+      settingsOverridesToml = settingsToToml({
         settings: {
           ...TEST_SETTINGS,
           app: {
             ...TEST_SETTINGS.app,
-            project_directory: this.projectDirName,
+          },
+          project: {
+            ...TEST_SETTINGS.project,
+            directory: this.projectDirName,
           },
         },
       })

e2e/playwright/fixtures/homePageFixture.ts

@@ -1,4 +1,4 @@
-import type { Page, Locator } from '@playwright/test'
+import type { Locator, Page } from '@playwright/test'
 import { expect } from '@playwright/test'
 
 interface ProjectCardState {

e2e/playwright/fixtures/sceneFixture.ts

@@ -1,15 +1,17 @@
-import type { Page, Locator } from '@playwright/test'
-import { expect } from '../zoo-test'
-import { isArray, uuidv4 } from 'lib/utils'
-import { CmdBarFixture } from './cmdBarFixture'
+import type { Locator, Page } from '@playwright/test'
+import { isArray, uuidv4 } from '@src/lib/utils'
+
+import type { CmdBarFixture } from '@e2e/playwright/fixtures/cmdBarFixture'
+
 import {
   closeDebugPanel,
   doAndWaitForImageDiff,
   getPixelRGBs,
+  getUtils,
   openAndClearDebugPanel,
   sendCustomCmd,
-  getUtils,
-} from '../test-utils'
+} from '@e2e/playwright/test-utils'
+import { expect } from '@e2e/playwright/zoo-test'
 
 type MouseParams = {
   pixelDiff?: number

e2e/playwright/fixtures/toolbarFixture.ts

@@ -1,14 +1,18 @@
-import { type Page, type Locator, test } from '@playwright/test'
-import { expect } from '../zoo-test'
+import { type Locator, type Page, test } from '@playwright/test'
+import type { SidebarType } from '@src/components/ModelingSidebar/ModelingPanes'
+import { SIDEBAR_BUTTON_SUFFIX } from '@src/lib/constants'
+import type { ToolbarModeName } from '@src/lib/toolbar'
+
 import {
   checkIfPaneIsOpen,
   closePane,
   doAndWaitForImageDiff,
   openPane,
-} from '../test-utils'
-import { SidebarType } from 'components/ModelingSidebar/ModelingPanes'
-import { SIDEBAR_BUTTON_SUFFIX } from 'lib/constants'
-import { ToolbarModeName } from 'lib/toolbar'
+} from '@e2e/playwright/test-utils'
+import { expect } from '@e2e/playwright/zoo-test'
+import { type baseUnitLabels } from '@src/lib/settings/settingsTypes'
+
+type LengthUnitLabel = (typeof baseUnitLabels)[keyof typeof baseUnitLabels]
 
 export class ToolbarFixture {
   public page: Page
@@ -235,6 +239,12 @@ export class ToolbarFixture {
   async checkIfFeatureTreePaneIsOpen() {
     return this.checkIfPaneIsOpen(this.featureTreeId)
   }
+  async selectUnit(unit: LengthUnitLabel) {
+    await this.page.getByTestId('units-menu').click()
+    const optionLocator = this.page.getByRole('button', { name: unit })
+    await expect(optionLocator).toBeVisible()
+    await optionLocator.click()
+  }
 
   /**
    * Get a specific operation button from the Feature Tree pane.

e2e/playwright/machines.spec.ts

@@ -1,7 +1,8 @@
-import { test, expect } from './zoo-test'
-import { executorInputPath } from './test-utils'
-import { join } from 'path'
 import fsp from 'fs/promises'
+import { join } from 'path'
+
+import { executorInputPath } from '@e2e/playwright/test-utils'
+import { expect, test } from '@e2e/playwright/zoo-test'
 
 test(
   'When machine-api server not found butt is disabled and shows the reason',

e2e/playwright/named-views.spec.ts

@@ -1,13 +1,15 @@
-import { test, expect } from './zoo-test'
-import { PROJECT_SETTINGS_FILE_NAME } from 'lib/constants'
+import { PROJECT_SETTINGS_FILE_NAME } from '@src/lib/constants'
 import * as fsp from 'fs/promises'
 import { join } from 'path'
+
+import type { NamedView } from '@rust/kcl-lib/bindings/NamedView'
+
 import {
   createProject,
-  tomlToPerProjectSettings,
   perProjectsettingsToToml,
-} from './test-utils'
-import { NamedView } from '@rust/kcl-lib/bindings/NamedView'
+  tomlToPerProjectSettings,
+} from '@e2e/playwright/test-utils'
+import { expect, test } from '@e2e/playwright/zoo-test'
 
 // Helper function to determine if the file path on disk exists
 // Specifically this is used to check if project.toml exists on disk

e2e/playwright/native-file-menu.spec.ts

@@ -1,4 +1,4 @@
-import { test, expect } from './zoo-test'
+import { expect, test } from '@e2e/playwright/zoo-test'
 
 /**
  * Not all menu actions are tested. Some are default electron menu actions.
@@ -10,6 +10,7 @@ test.describe('Native file menu', { tag: ['@electron'] }, () => {
       test('File.Create project', async ({ tronApp, cmdBar, page }) => {
         if (!tronApp) fail()
         // Run electron snippet to find the Menu!
+        await page.waitForTimeout(100) // wait for createModelingPageMenu() to run
         await tronApp.electron.evaluate(async ({ app }) => {
           if (!app || !app.applicationMenu) fail()
           const newProject =
@@ -29,6 +30,7 @@ test.describe('Native file menu', { tag: ['@electron'] }, () => {
       test('File.Open project', async ({ tronApp, cmdBar, page }) => {
         if (!tronApp) fail()
         // Run electron snippet to find the Menu!
+        await page.waitForTimeout(100) // wait for createModelingPageMenu() to run
         await tronApp.electron.evaluate(async ({ app }) => {
           if (!app || !app.applicationMenu) fail()
           const openProject =
@@ -52,6 +54,7 @@ test.describe('Native file menu', { tag: ['@electron'] }, () => {
       }) => {
         if (!tronApp) fail()
         // Run electron snippet to find the Menu!
+        await page.waitForTimeout(100) // wait for createModelingPageMenu() to run
         await tronApp.electron.evaluate(async ({ app }) => {
           if (!app || !app.applicationMenu) fail()
           const userSettings = app.applicationMenu.getMenuItemById(
@@ -75,6 +78,7 @@ test.describe('Native file menu', { tag: ['@electron'] }, () => {
       }) => {
         if (!tronApp) fail()
         // Run electron snippet to find the Menu!
+        await page.waitForTimeout(100) // wait for createModelingPageMenu() to run
         await tronApp.electron.evaluate(async ({ app }) => {
           if (!app || !app.applicationMenu) fail()
           const keybindings = app.applicationMenu.getMenuItemById(
@@ -96,6 +100,7 @@ test.describe('Native file menu', { tag: ['@electron'] }, () => {
       }) => {
         if (!tronApp) fail()
         // Run electron snippet to find the Menu!
+        await page.waitForTimeout(100) // wait for createModelingPageMenu() to run
         await tronApp.electron.evaluate(async ({ app }) => {
           if (!app || !app.applicationMenu) fail()
           const menu = app.applicationMenu.getMenuItemById(
@@ -112,6 +117,7 @@ test.describe('Native file menu', { tag: ['@electron'] }, () => {
       test('File.Preferences.Theme', async ({ tronApp, cmdBar, page }) => {
         if (!tronApp) fail()
         // Run electron snippet to find the Menu!
+        await page.waitForTimeout(100) // wait for createModelingPageMenu() to run
         await tronApp.electron.evaluate(async ({ app }) => {
           if (!app || !app.applicationMenu) fail()
           const menu = app.applicationMenu.getMenuItemById(
@@ -136,6 +142,7 @@ test.describe('Native file menu', { tag: ['@electron'] }, () => {
       }) => {
         if (!tronApp) fail()
         // Run electron snippet to find the Menu!
+        await page.waitForTimeout(100) // wait for createModelingPageMenu() to run
         await tronApp.electron.evaluate(async ({ app }) => {
           if (!app || !app.applicationMenu) fail()
           const menu = app.applicationMenu.getMenuItemById(
@@ -152,6 +159,7 @@ test.describe('Native file menu', { tag: ['@electron'] }, () => {
       test('File.Preferences.Sign out', async ({ tronApp, cmdBar, page }) => {
         if (!tronApp) fail()
         // Run electron snippet to find the Menu!
+        await page.waitForTimeout(100) // wait for createModelingPageMenu() to run
         await tronApp.electron.evaluate(async ({ app }) => {
           if (!app || !app.applicationMenu) fail()
           const menu = app.applicationMenu.getMenuItemById('File.Sign out')
@@ -170,6 +178,7 @@ test.describe('Native file menu', { tag: ['@electron'] }, () => {
       test('Edit.Rename project', async ({ tronApp, cmdBar, page }) => {
         if (!tronApp) fail()
         // Run electron snippet to find the Menu!
+        await page.waitForTimeout(100) // wait for createModelingPageMenu() to run
         await tronApp.electron.evaluate(async ({ app }) => {
           if (!app || !app.applicationMenu) fail()
           const menu = app.applicationMenu.getMenuItemById(
@@ -188,6 +197,7 @@ test.describe('Native file menu', { tag: ['@electron'] }, () => {
       test('Edit.Delete project', async ({ tronApp, cmdBar, page }) => {
         if (!tronApp) fail()
         // Run electron snippet to find the Menu!
+        await page.waitForTimeout(100) // wait for createModelingPageMenu() to run
         await tronApp.electron.evaluate(async ({ app }) => {
           if (!app || !app.applicationMenu) fail()
           const menu = app.applicationMenu.getMenuItemById(
@@ -210,6 +220,7 @@ test.describe('Native file menu', { tag: ['@electron'] }, () => {
       }) => {
         if (!tronApp) fail()
         // Run electron snippet to find the Menu!
+        await page.waitForTimeout(100) // wait for createModelingPageMenu() to run
         await tronApp.electron.evaluate(async ({ app }) => {
           if (!app || !app.applicationMenu) fail()
           const menu = app.applicationMenu.getMenuItemById(
@@ -228,6 +239,7 @@ test.describe('Native file menu', { tag: ['@electron'] }, () => {
       test('View.Command Palette...', async ({ tronApp, cmdBar, page }) => {
         if (!tronApp) fail()
         // Run electron snippet to find the Menu!
+        await page.waitForTimeout(100) // wait for createModelingPageMenu() to run
         await tronApp.electron.evaluate(async ({ app }) => {
           if (!app || !app.applicationMenu) fail()
           const menu = app.applicationMenu.getMenuItemById(
@@ -245,6 +257,7 @@ test.describe('Native file menu', { tag: ['@electron'] }, () => {
       test('Help.Show all commands', async ({ tronApp, cmdBar, page }) => {
         if (!tronApp) fail()
         // Run electron snippet to find the Menu!
+        await page.waitForTimeout(100) // wait for createModelingPageMenu() to run
         await tronApp.electron.evaluate(async ({ app }) => {
           if (!app || !app.applicationMenu) fail()
           const menu = app.applicationMenu.getMenuItemById(
@@ -260,6 +273,7 @@ test.describe('Native file menu', { tag: ['@electron'] }, () => {
       test('Help.KCL code samples', async ({ tronApp, cmdBar, page }) => {
         if (!tronApp) fail()
         // Run electron snippet to find the Menu!
+        await page.waitForTimeout(100) // wait for createModelingPageMenu() to run
         await tronApp.electron.evaluate(async ({ app }) => {
           if (!app || !app.applicationMenu) fail()
           const menu = app.applicationMenu.getMenuItemById(
@@ -275,6 +289,7 @@ test.describe('Native file menu', { tag: ['@electron'] }, () => {
       }) => {
         if (!tronApp) fail()
         // Run electron snippet to find the Menu!
+        await page.waitForTimeout(100) // wait for createModelingPageMenu() to run
         await tronApp.electron.evaluate(async ({ app }) => {
           if (!app || !app.applicationMenu) fail()
           const menu = app.applicationMenu.getMenuItemById(
@@ -293,6 +308,7 @@ test.describe('Native file menu', { tag: ['@electron'] }, () => {
       test('Help.Reset onboarding', async ({ tronApp, cmdBar, page }) => {
         if (!tronApp) fail()
         // Run electron snippet to find the Menu!
+        await page.waitForTimeout(100) // wait for createModelingPageMenu() to run
         await tronApp.electron.evaluate(async ({ app }) => {
           if (!app || !app.applicationMenu) fail()
           const menu = app.applicationMenu.getMenuItemById(

e2e/playwright/null.spec.ts

@@ -2,8 +2,7 @@
 // application, check it can make it to the project pane, and nothing more.
 // It also tests our test wrappers are working.
 // Additionally this serves as a nice minimal example.
-
-import { test, expect } from './zoo-test'
+import { expect, test } from '@e2e/playwright/zoo-test'
 
 test.describe('Open the application', () => {
   test('see the project view', async ({ page, context }) => {

e2e/playwright/onboarding-tests.spec.ts

@@ -1,22 +1,23 @@
-import { test, expect } from './zoo-test'
-import { join } from 'path'
+import { bracket } from '@src/lib/exampleKcl'
+import { onboardingPaths } from '@src/routes/Onboarding/paths'
 import fsp from 'fs/promises'
-import {
-  getUtils,
-  executorInputPath,
-  createProject,
-  settingsToToml,
-  orRunWhenFullSuiteEnabled,
-} from './test-utils'
-import { bracket } from 'lib/exampleKcl'
-import { onboardingPaths } from 'routes/Onboarding/paths'
+import { join } from 'path'
+
+import { expectPixelColor } from '@e2e/playwright/fixtures/sceneFixture'
 import {
   TEST_SETTINGS_KEY,
-  TEST_SETTINGS_ONBOARDING_START,
   TEST_SETTINGS_ONBOARDING_EXPORT,
+  TEST_SETTINGS_ONBOARDING_START,
   TEST_SETTINGS_ONBOARDING_USER_MENU,
-} from './storageStates'
-import { expectPixelColor } from './fixtures/sceneFixture'
+} from '@e2e/playwright/storageStates'
+import {
+  createProject,
+  executorInputPath,
+  getUtils,
+  orRunWhenFullSuiteEnabled,
+  settingsToToml,
+} from '@e2e/playwright/test-utils'
+import { expect, test } from '@e2e/playwright/zoo-test'
 
 // Because our default test settings have the onboardingStatus set to 'dismissed',
 // we must set it to empty for the tests where we want to see the onboarding immediately.

e2e/playwright/playwright-deprecated.ts

@@ -1,4 +1,4 @@
-import { test, expect } from '@playwright/test'
+import { expect, test } from '@playwright/test'
 
 /** @deprecated, import from ./fixtureSetup.ts instead */
 export const _test = test

e2e/playwright/point-click.spec.ts

@@ -1,12 +1,12 @@
-import { Page } from '@playwright/test'
-import { test, expect } from './zoo-test'
-import { EditorFixture } from './fixtures/editorFixture'
-import { SceneFixture } from './fixtures/sceneFixture'
-import { ToolbarFixture } from './fixtures/toolbarFixture'
+import type { Locator, Page } from '@playwright/test'
 import fs from 'node:fs/promises'
 import path from 'node:path'
-import { getUtils, orRunWhenFullSuiteEnabled } from './test-utils'
-import { Locator } from '@playwright/test'
+
+import type { EditorFixture } from '@e2e/playwright/fixtures/editorFixture'
+import type { SceneFixture } from '@e2e/playwright/fixtures/sceneFixture'
+import type { ToolbarFixture } from '@e2e/playwright/fixtures/toolbarFixture'
+import { getUtils, orRunWhenFullSuiteEnabled } from '@e2e/playwright/test-utils'
+import { expect, test } from '@e2e/playwright/zoo-test'
 
 // test file is for testing point an click code gen functionality that's not sketch mode related
 
@@ -1084,8 +1084,8 @@ openSketch = startSketchOn(XY)
   }) => {
     // One dumb hardcoded screen pixel value
     const testPoint = { x: 620, y: 257 }
-    const expectedOutput = `helix001 = helix(  axis = 'X',  radius = 5,  length = 5,  revolutions = 1,  angleStart = 360,  ccw = false,)`
-    const expectedLine = `axis='X',`
+    const expectedOutput = `helix001 = helix(  axis = X,  radius = 5,  length = 5,  revolutions = 1,  angleStart = 360,  ccw = false,)`
+    const expectedLine = `axis=X,`
 
     await homePage.goToModelingScene()
 
@@ -1217,7 +1217,7 @@ openSketch = startSketchOn(XY)
         cmdBar,
       }) => {
         page.on('console', console.log)
-        const initialCode = `sketch001 = startSketchOn('XZ')
+        const initialCode = `sketch001 = startSketchOn(XZ)
   profile001 = startProfileAt([0, 0], sketch001)
     |> yLine(length = 100)
     |> line(endAbsolute = [100, 0])
@@ -3474,7 +3474,7 @@ segAng(rectangleSegmentA002),
       await cmdBar.progressCmdBar()
       await cmdBar.progressCmdBar()
 
-      const newCodeToFind = `revolve001 = revolve(sketch002, angle = 360, axis = 'X')`
+      const newCodeToFind = `revolve001 = revolve(sketch002, angle = 360, axis = X)`
       expect(editor.expectEditor.toContain(newCodeToFind)).toBeTruthy()
 
       // Edit flow

e2e/playwright/projects.spec.ts

@@ -1,19 +1,20 @@
-import { test, expect } from './zoo-test'
+import { DEFAULT_PROJECT_KCL_FILE } from '@src/lib/constants'
+import fs from 'fs'
+import fsp from 'fs/promises'
+import path from 'path'
+
+import type { Paths } from '@e2e/playwright/test-utils'
 import {
+  createProject,
   doExport,
   executorInputPath,
+  getPlaywrightDownloadDir,
   getUtils,
   isOutOfViewInScrollContainer,
-  Paths,
-  createProject,
-  getPlaywrightDownloadDir,
   orRunWhenFullSuiteEnabled,
   runningOnWindows,
-} from './test-utils'
-import fsp from 'fs/promises'
-import fs from 'fs'
-import path from 'path'
-import { DEFAULT_PROJECT_KCL_FILE } from 'lib/constants'
+} from '@e2e/playwright/test-utils'
+import { expect, test } from '@e2e/playwright/zoo-test'
 
 test(
   'projects reload if a new one is created, deleted, or renamed externally',

e2e/playwright/prompt-to-edit-snapshot-tests.spec.ts

@@ -1,4 +1,5 @@
-import { test, expect } from './zoo-test'
+import { expect, test } from '@e2e/playwright/zoo-test'
+
 /* eslint-disable jest/no-conditional-expect */
 
 /**

e2e/playwright/prompt-to-edit.spec.ts

@@ -1,5 +1,5 @@
-import { test, expect } from './zoo-test'
-import { orRunWhenFullSuiteEnabled } from './test-utils'
+import { orRunWhenFullSuiteEnabled } from '@e2e/playwright/test-utils'
+import { expect, test } from '@e2e/playwright/zoo-test'
 
 /* eslint-disable jest/no-conditional-expect */
 

e2e/playwright/regression-tests.spec.ts

@@ -1,17 +1,18 @@
-import { Page } from '@playwright/test'
-import { test, expect } from './zoo-test'
-import path from 'path'
+import type { Page } from '@playwright/test'
+import { bracket } from '@src/lib/exampleKcl'
+import { reportRejection } from '@src/lib/trap'
 import * as fsp from 'fs/promises'
+import path from 'path'
+
+import { TEST_CODE_TRIGGER_ENGINE_EXPORT_ERROR } from '@e2e/playwright/storageStates'
+import type { TestColor } from '@e2e/playwright/test-utils'
 import {
-  getUtils,
   TEST_COLORS,
-  TestColor,
   executorInputPath,
+  getUtils,
   orRunWhenFullSuiteEnabled,
-} from './test-utils'
-import { TEST_CODE_TRIGGER_ENGINE_EXPORT_ERROR } from './storageStates'
-import { bracket } from 'lib/exampleKcl'
-import { reportRejection } from 'lib/trap'
+} from '@e2e/playwright/test-utils'
+import { expect, test } from '@e2e/playwright/zoo-test'
 
 test.describe('Regression tests', { tag: ['@skipWin'] }, () => {
   // bugs we found that don't fit neatly into other categories
@@ -797,6 +798,74 @@ plane002 = offsetPlane(XZ, offset = -2 * x)`
       await page.getByTestId('custom-cmd-send-button').click()
     }
   )
+
+  test('scale other than default works with sketch mode', async ({
+    page,
+    homePage,
+    toolbar,
+    editor,
+    scene,
+  }) => {
+    await test.step('Load the washer code', async () => {
+      await page.addInitScript(async () => {
+        localStorage.setItem(
+          'persistCode',
+          `@settings(defaultLengthUnit = in)
+
+innerDiameter = 0.203
+outerDiameter = 0.438
+thicknessMax = 0.038
+thicknessMin = 0.024
+washerSketch = startSketchOn(XY)
+  |> circle(center = [0, 0], radius = outerDiameter / 2)
+
+washer = extrude(washerSketch, length = thicknessMax)`
+        )
+      })
+      await page.setBodyDimensions({ width: 1200, height: 500 })
+      await homePage.goToModelingScene()
+    })
+    const [circleCenterClick] = scene.makeMouseHelpers(650, 300)
+    const [circleRadiusClick] = scene.makeMouseHelpers(800, 320)
+    const [washerFaceClick] = scene.makeMouseHelpers(657, 286)
+
+    await page.waitForTimeout(100)
+    await test.step('Start sketching on the washer face', async () => {
+      await toolbar.startSketchPlaneSelection()
+      await washerFaceClick()
+      await page.waitForTimeout(600) // engine animation
+      await toolbar.expectToolbarMode.toBe('sketching')
+    })
+
+    await test.step('Draw a circle and verify code', async () => {
+      // select circle tool
+      await expect
+        .poll(async () => {
+          await toolbar.circleBtn.click()
+          return toolbar.circleBtn.getAttribute('aria-pressed')
+        })
+        .toBe('true')
+      await page.waitForTimeout(100)
+      await circleCenterClick()
+      // this number will be different if the scale is not set correctly for inches
+      await editor.expectEditor.toContain(
+        'circle(sketch001, center = [0.06, -0.06]'
+      )
+      await circleRadiusClick()
+
+      await editor.expectEditor.toContain(
+        'circle(sketch001, center = [0.06, -0.06], radius = 0.18'
+      )
+    })
+
+    await test.step('Exit sketch mode', async () => {
+      await toolbar.exitSketch()
+      await toolbar.expectToolbarMode.toBe('modeling')
+
+      await toolbar.selectUnit('Yards')
+      await editor.expectEditor.toContain('@settings(defaultLengthUnit = yd)')
+    })
+  })
 })
 
 async function clickExportButton(page: Page) {

e2e/playwright/sketch-tests.spec.ts

@@ -1,20 +1,20 @@
-import { Page } from '@playwright/test'
-import { test, expect } from './zoo-test'
+import type { Page } from '@playwright/test'
+import { roundOff, uuidv4 } from '@src/lib/utils'
 import fs from 'node:fs/promises'
 import path from 'node:path'
-import { HomePageFixture } from './fixtures/homePageFixture'
 
+import type { CmdBarFixture } from '@e2e/playwright/fixtures/cmdBarFixture'
+import type { HomePageFixture } from '@e2e/playwright/fixtures/homePageFixture'
+import type { SceneFixture } from '@e2e/playwright/fixtures/sceneFixture'
+import type { ToolbarFixture } from '@e2e/playwright/fixtures/toolbarFixture'
 import {
-  getMovementUtils,
-  getUtils,
   PERSIST_MODELING_CONTEXT,
   TEST_COLORS,
+  getMovementUtils,
+  getUtils,
   orRunWhenFullSuiteEnabled,
-} from './test-utils'
-import { uuidv4, roundOff } from 'lib/utils'
-import { SceneFixture } from './fixtures/sceneFixture'
-import { ToolbarFixture } from './fixtures/toolbarFixture'
-import { CmdBarFixture } from './fixtures/cmdBarFixture'
+} from '@e2e/playwright/test-utils'
+import { expect, test } from '@e2e/playwright/zoo-test'
 
 test.describe('Sketch tests', { tag: ['@skipWin'] }, () => {
   test('multi-sketch file shows multiple Edit Sketch buttons', async ({
@@ -479,7 +479,8 @@ sketch001 = startProfileAt([12.34, -12.34], sketch002)
     await page.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
-        `sketch001 = startSketchOn(XZ)
+        `@settings(defaultLengthUnit=in)
+sketch001 = startSketchOn(XZ)
     |> circle(center = [4.61, -5.01], radius = 8)`
       )
     })
@@ -564,12 +565,14 @@ sketch001 = startProfileAt([12.34, -12.34], sketch002)
   test('Can edit a sketch that has been extruded in the same pipe', async ({
     page,
     homePage,
+    editor,
   }) => {
     const u = await getUtils(page)
     await page.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
-        `sketch001 = startSketchOn(XZ)
+        `@settings(defaultLengthUnit=in)
+sketch001 = startSketchOn(XZ)
   |> startProfileAt([4.61, -10.01], %)
   |> line(end = [12.73, -0.09])
   |> tangentialArcTo([24.95, -0.38], %)
@@ -654,31 +657,34 @@ sketch001 = startProfileAt([12.34, -12.34], sketch002)
     await expect(page.locator('.cm-content')).not.toHaveText(prevContent)
 
     // expect the code to have changed
-    await expect(page.locator('.cm-content'))
-      .toHaveText(`sketch001 = startSketchOn(XZ)
+    await editor.expectEditor.toContain(
+      `sketch001 = startSketchOn(XZ)
     |> startProfileAt([7.12, -12.68], %)
     |> line(end = [12.68, -1.09])
     |> tangentialArcTo([24.89, 0.68], %)
     |> close()
-    |> extrude(length = 5)
-  `)
+    |> extrude(length = 5)`,
+      { shouldNormalise: true }
+    )
   })
 
   test('Can edit a sketch that has been revolved in the same pipe', async ({
     page,
     homePage,
     scene,
+    editor,
   }) => {
     const u = await getUtils(page)
     await page.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
-        `sketch001 = startSketchOn(XZ)
+        `@settings(defaultLengthUnit=in)
+sketch001 = startSketchOn(XZ)
   |> startProfileAt([4.61, -14.01], %)
   |> line(end = [12.73, -0.09])
   |> tangentialArcTo([24.95, -5.38], %)
   |> close()
-  |> revolve(axis = "X")`
+  |> revolve(axis = X)`
       )
     })
 
@@ -758,14 +764,16 @@ sketch001 = startProfileAt([12.34, -12.34], sketch002)
     await expect(page.locator('.cm-content')).not.toHaveText(prevContent)
 
     // expect the code to have changed
-    await expect(page.locator('.cm-content'))
-      .toHaveText(`sketch001 = startSketchOn(XZ)
+    await editor.expectEditor.toContain(
+      `sketch001 = startSketchOn(XZ)
   |> startProfileAt([6.44, -12.07], %)
   |> line(end = [14.72, 1.97])
   |> tangentialArcTo([24.95, -5.38], %)
   |> line(end = [1.97, 2.06])
   |> close()
-  |> revolve(axis = "X")`)
+  |> revolve(axis = X)`,
+      { shouldNormalise: true }
+    )
   })
   test('Can add multiple sketches', async ({ page, homePage }) => {
     const u = await getUtils(page)
@@ -1215,7 +1223,7 @@ profile001 = startProfileAt([${roundOff(scale * 69.6)}, ${roundOff(
           |> xLine(endAbsolute = 0 + .001)
           |> yLine(endAbsolute = 0)
           |> close()
-          |> revolve(axis = "Y")
+          |> revolve(axis = Y)
 
         return lugSketch
       }

e2e/playwright/snapshot-tests.spec.ts

@@ -1,21 +1,22 @@
-import { test, expect } from './zoo-test'
-import { secrets } from './secrets'
-import {
-  Paths,
-  doExport,
-  getUtils,
-  settingsToToml,
-  orRunWhenFullSuiteEnabled,
-} from './test-utils'
-import { Models } from '@kittycad/lib'
-import fsp from 'fs/promises'
+import type { Models } from '@kittycad/lib'
+import { KCL_DEFAULT_LENGTH } from '@src/lib/constants'
 import { spawn } from 'child_process'
-import { KCL_DEFAULT_LENGTH } from 'lib/constants'
+import fsp from 'fs/promises'
 import JSZip from 'jszip'
 import path from 'path'
-import { TEST_SETTINGS, TEST_SETTINGS_KEY } from './storageStates'
-import { SceneFixture } from './fixtures/sceneFixture'
-import { CmdBarFixture } from './fixtures/cmdBarFixture'
+
+import type { CmdBarFixture } from '@e2e/playwright/fixtures/cmdBarFixture'
+import type { SceneFixture } from '@e2e/playwright/fixtures/sceneFixture'
+import { secrets } from '@e2e/playwright/secrets'
+import { TEST_SETTINGS, TEST_SETTINGS_KEY } from '@e2e/playwright/storageStates'
+import type { Paths } from '@e2e/playwright/test-utils'
+import {
+  doExport,
+  getUtils,
+  orRunWhenFullSuiteEnabled,
+  settingsToToml,
+} from '@e2e/playwright/test-utils'
+import { expect, test } from '@e2e/playwright/zoo-test'
 
 test.beforeEach(async ({ page, context }) => {
   // Make the user avatar image always 404
@@ -345,7 +346,9 @@ const extrudeDefaultPlane = async (
           app: {
             onboarding_status: 'dismissed',
             show_debug_panel: true,
-            theme: 'dark',
+            appearance: {
+              theme: 'dark',
+            },
           },
           project: {
             default_project_name: 'project-$nnn',
@@ -452,7 +455,7 @@ test(
     await page.waitForTimeout(700) // TODO detect animation ending, or disable animation
 
     await page.mouse.click(startXPx + PUR * 10, 500 - PUR * 10)
-    code += `profile001 = startProfileAt([7.19, -9.7], sketch001)`
+    code += `profile001 = startProfileAt([182.59, -246.32], sketch001)`
     await expect(page.locator('.cm-content')).toHaveText(code)
     await page.waitForTimeout(100)
 
@@ -470,7 +473,7 @@ test(
     await page.waitForTimeout(500)
 
     code += `
-  |> xLine(length = 7.25)`
+  |> xLine(length = 184.3)`
     await expect(page.locator('.cm-content')).toHaveText(code)
 
     await page
@@ -628,7 +631,7 @@ test(
       mask: [page.getByTestId('model-state-indicator')],
     })
     await expect(page.locator('.cm-content')).toHaveText(
-      `sketch001 = startSketchOn(XZ)profile001 = circle(sketch001, center = [14.44, -2.44], radius = 1)`
+      `sketch001 = startSketchOn(XZ)profile001 = circle(sketch001, center = [366.89, -62.01], radius = 1)`
     )
   }
 )
@@ -665,7 +668,7 @@ test.describe(
 
       const startXPx = 600
       await page.mouse.click(startXPx + PUR * 10, 500 - PUR * 10)
-      code += `profile001 = startProfileAt([7.19, -9.7], sketch001)`
+      code += `profile001 = startProfileAt([182.59, -246.32], sketch001)`
       await expect(u.codeLocator).toHaveText(code)
       await page.waitForTimeout(100)
 
@@ -673,7 +676,7 @@ test.describe(
       await page.waitForTimeout(100)
 
       code += `
-  |> xLine(length = 7.25)`
+  |> xLine(length = 184.3)`
       await expect(u.codeLocator).toHaveText(code)
 
       await page
@@ -688,7 +691,7 @@ test.describe(
       await page.mouse.click(startXPx + PUR * 30, 500 - PUR * 20)
 
       code += `
-  |> tangentialArcTo([21.7, -2.44], %)`
+  |> tangentialArcTo([551.2, -62.01], %)`
       await expect(u.codeLocator).toHaveText(code)
 
       // click tangential arc tool again to unequip it

e2e/playwright/snapshots/prompt-to-edit/prompt-to-edit-snapshot-tests-spec-ts--edit-with-ai-example-snapshots--change-colour.snap.json

@@ -29,5 +29,5 @@
       }
     }
   ],
-  "kcl_version": "0.2.54"
+  "kcl_version": "0.2.57"
 }

e2e/playwright/storageStates.ts

@@ -1,17 +1,19 @@
-import { Settings } from '@rust/kcl-lib/bindings/Settings'
-import { SaveSettingsPayload } from 'lib/settings/settingsTypes'
-import { Themes } from 'lib/theme'
-import { DeepPartial } from 'lib/types'
-import { onboardingPaths } from 'routes/Onboarding/paths'
+import type { SaveSettingsPayload } from '@src/lib/settings/settingsTypes'
+import { Themes } from '@src/lib/theme'
+import type { DeepPartial } from '@src/lib/types'
+import { onboardingPaths } from '@src/routes/Onboarding/paths'
+
+import type { Settings } from '@rust/kcl-lib/bindings/Settings'
 
 export const IS_PLAYWRIGHT_KEY = 'playwright'
 
 export const TEST_SETTINGS_KEY = '/settings.toml'
 export const TEST_SETTINGS: DeepPartial<Settings> = {
   app: {
-    theme: Themes.Dark,
+    appearance: {
+      theme: Themes.Dark,
+    },
     onboarding_status: 'dismissed',
-    project_directory: '',
     show_debug_panel: true,
   },
   modeling: {
@@ -22,6 +24,7 @@ export const TEST_SETTINGS: DeepPartial<Settings> = {
   },
   project: {
     default_project_name: 'project-$nnn',
+    directory: '',
   },
   text_editor: {
     text_wrapping: true,
@@ -54,7 +57,7 @@ export const TEST_SETTINGS_ONBOARDING_START: DeepPartial<Settings> = {
 
 export const TEST_SETTINGS_DEFAULT_THEME: DeepPartial<Settings> = {
   ...TEST_SETTINGS,
-  app: { ...TEST_SETTINGS.app, theme: Themes.System },
+  app: { ...TEST_SETTINGS.app, appearance: { theme: Themes.System } },
 }
 
 export const TEST_SETTINGS_CORRUPTED = {

e2e/playwright/test-network-and-connection-issues.spec.ts

@@ -1,7 +1,12 @@
-import { test, expect } from './zoo-test'
-import { commonPoints, getUtils, orRunWhenFullSuiteEnabled } from './test-utils'
-import { EngineCommand } from 'lang/std/artifactGraph'
-import { uuidv4 } from 'lib/utils'
+import type { EngineCommand } from '@src/lang/std/artifactGraph'
+import { uuidv4 } from '@src/lib/utils'
+
+import {
+  commonPoints,
+  getUtils,
+  orRunWhenFullSuiteEnabled,
+} from '@e2e/playwright/test-utils'
+import { expect, test } from '@e2e/playwright/zoo-test'
 
 test.describe('Test network and connection issues', () => {
   test(

e2e/playwright/test-utils.test.ts

@@ -1,9 +1,9 @@
 import {
+  orRunWhenFullSuiteEnabled,
   runningOnLinux,
   runningOnMac,
   runningOnWindows,
-  orRunWhenFullSuiteEnabled,
-} from './test-utils'
+} from '@e2e/playwright/test-utils'
 
 describe('platform detection utilities', () => {
   const originalPlatform = process.platform

e2e/playwright/test-utils.ts

@@ -1,32 +1,29 @@
-import {
-  expect,
-  BrowserContext,
-  TestInfo,
-  Locator,
-  Page,
-} from '@playwright/test'
-import { test } from './zoo-test'
-import { EngineCommand } from 'lang/std/artifactGraph'
+import * as TOML from '@iarna/toml'
+import type { Models } from '@kittycad/lib'
+import type { BrowserContext, Locator, Page, TestInfo } from '@playwright/test'
+import { expect } from '@playwright/test'
+import type { EngineCommand } from '@src/lang/std/artifactGraph'
+import type { Configuration } from '@src/lang/wasm'
+import { COOKIE_NAME } from '@src/lib/constants'
+import { reportRejection } from '@src/lib/trap'
+import type { DeepPartial } from '@src/lib/types'
+import { isArray } from '@src/lib/utils'
 import fsp from 'fs/promises'
 import path from 'path'
 import pixelMatch from 'pixelmatch'
+import type { Protocol } from 'playwright-core/types/protocol'
 import { PNG } from 'pngjs'
-import { Protocol } from 'playwright-core/types/protocol'
-import type { Models } from '@kittycad/lib'
-import { COOKIE_NAME } from 'lib/constants'
-import { secrets } from './secrets'
+
+import type { ProjectConfiguration } from '@rust/kcl-lib/bindings/ProjectConfiguration'
+
+import { isErrorWhitelisted } from '@e2e/playwright/lib/console-error-whitelist'
+import { secrets } from '@e2e/playwright/secrets'
 import {
-  TEST_SETTINGS_KEY,
-  TEST_SETTINGS,
   IS_PLAYWRIGHT_KEY,
-} from './storageStates'
-import * as TOML from '@iarna/toml'
-import { isErrorWhitelisted } from './lib/console-error-whitelist'
-import { isArray } from 'lib/utils'
-import { reportRejection } from 'lib/trap'
-import { DeepPartial } from 'lib/types'
-import { Configuration } from 'lang/wasm'
-import { ProjectConfiguration } from '@rust/kcl-lib/bindings/ProjectConfiguration'
+  TEST_SETTINGS,
+  TEST_SETTINGS_KEY,
+} from '@e2e/playwright/storageStates'
+import { test } from '@e2e/playwright/zoo-test'
 
 const toNormalizedCode = (text: string) => {
   return text.replace(/\s+/g, '')
@@ -683,8 +680,8 @@ const _makeTemplate = (
           isArray(currentOptions)
             ? currentOptions[i]
             : typeof currentOptions === 'number'
-            ? currentOptions
-            : ''
+              ? currentOptions
+              : ''
         )
       )
     })
@@ -903,15 +900,21 @@ export async function setup(
         settings: {
           ...TEST_SETTINGS,
           app: {
+            appearance: {
+              ...TEST_SETTINGS.app?.appearance,
+              theme: 'dark',
+            },
             ...TEST_SETTINGS.project,
-            project_directory: TEST_SETTINGS.app?.project_directory,
             onboarding_status: 'dismissed',
-            theme: 'dark',
+          },
+          project: {
+            ...TEST_SETTINGS.project,
+            directory: TEST_SETTINGS.project?.directory,
           },
         },
       }),
       IS_PLAYWRIGHT_KEY,
-      PLAYWRIGHT_TEST_DIR: TEST_SETTINGS.app?.project_directory || '',
+      PLAYWRIGHT_TEST_DIR: TEST_SETTINGS.project?.directory || '',
       PERSIST_MODELING_CONTEXT,
     }
   )
@@ -1112,21 +1115,25 @@ export async function pollEditorLinesSelectedLength(page: Page, lines: number) {
 }
 
 export function settingsToToml(settings: DeepPartial<Configuration>) {
+  // eslint-disable-next-line no-restricted-syntax
   return TOML.stringify(settings as any)
 }
 
 export function tomlToSettings(toml: string): DeepPartial<Configuration> {
+  // eslint-disable-next-line no-restricted-syntax
   return TOML.parse(toml)
 }
 
 export function tomlToPerProjectSettings(
   toml: string
 ): DeepPartial<ProjectConfiguration> {
+  // eslint-disable-next-line no-restricted-syntax
   return TOML.parse(toml)
 }
 
 export function perProjectsettingsToToml(
   settings: DeepPartial<ProjectConfiguration>
 ) {
+  // eslint-disable-next-line no-restricted-syntax
   return TOML.stringify(settings as any)
 }

e2e/playwright/testing-camera-movement.spec.ts

@@ -1,7 +1,8 @@
-import { test, expect } from './zoo-test'
-import { EngineCommand } from 'lang/std/artifactGraph'
-import { uuidv4 } from 'lib/utils'
-import { getUtils, orRunWhenFullSuiteEnabled } from './test-utils'
+import type { EngineCommand } from '@src/lang/std/artifactGraph'
+import { uuidv4 } from '@src/lib/utils'
+
+import { getUtils, orRunWhenFullSuiteEnabled } from '@e2e/playwright/test-utils'
+import { expect, test } from '@e2e/playwright/zoo-test'
 
 test.describe('Testing Camera Movement', { tag: ['@skipWin'] }, () => {
   test('Can move camera reliably', async ({ page, context, homePage }) => {

e2e/playwright/testing-constraints.spec.ts

@@ -1,14 +1,15 @@
-import { test, expect } from './zoo-test'
+import { XOR } from '@src/lib/utils'
 import * as fsp from 'fs/promises'
-import {
-  getUtils,
-  TEST_COLORS,
-  pollEditorLinesSelectedLength,
-  orRunWhenFullSuiteEnabled,
-} from './test-utils'
-import { XOR } from 'lib/utils'
 import path from 'node:path'
 
+import {
+  TEST_COLORS,
+  getUtils,
+  orRunWhenFullSuiteEnabled,
+  pollEditorLinesSelectedLength,
+} from '@e2e/playwright/test-utils'
+import { expect, test } from '@e2e/playwright/zoo-test'
+
 test.describe('Testing constraints', { tag: ['@skipWin'] }, () => {
   test('Can constrain line length', async ({ page, homePage }) => {
     await page.addInitScript(async () => {
@@ -1097,7 +1098,7 @@ test.describe('Electron constraint tests', () => {
   test(
     'Able to double click label to set constraint',
     { tag: '@electron' },
-    async ({ page, context, homePage, scene, editor, toolbar }) => {
+    async ({ page, context, homePage, scene, editor, toolbar, cmdBar }) => {
       await context.folderSetupFn(async (dir) => {
         const bracketDir = path.join(dir, 'test-sample')
         await fsp.mkdir(bracketDir, { recursive: true })
@@ -1131,6 +1132,14 @@ test.describe('Electron constraint tests', () => {
         await scene.waitForExecutionDone()
       })
 
+      async function clickOnFirstSegmentLabel() {
+        const child = page
+          .locator('.segment-length-label-text')
+          .first()
+          .locator('xpath=..')
+        await child.dblclick()
+      }
+
       await test.step('Double click to constrain', async () => {
         // Enter sketch edit mode via feature tree
         await toolbar.openPane('feature-tree')
@@ -1138,21 +1147,19 @@ test.describe('Electron constraint tests', () => {
         await op.dblclick()
         await toolbar.closePane('feature-tree')
 
-        const child = page
-          .locator('.segment-length-label-text')
-          .first()
-          .locator('xpath=..')
-        await child.dblclick()
-        const cmdBarSubmitButton = page.getByRole('button', {
-          name: 'arrow right Continue',
-        })
-        await cmdBarSubmitButton.click()
-        await expect(page.locator('.cm-content')).toContainText(
-          'length001 = 15.3'
-        )
-        await expect(page.locator('.cm-content')).toContainText(
-          '|> angledLine([9, length001], %)'
-        )
+        await clickOnFirstSegmentLabel()
+        await cmdBar.progressCmdBar()
+        await editor.expectEditor.toContain('length001 = 15.3')
+        await editor.expectEditor.toContain('|> angledLine([9, length001], %)')
+      })
+
+      await test.step('Double click again and expect failure', async () => {
+        await clickOnFirstSegmentLabel()
+
+        await expect(
+          page.getByText('Unable to constrain the length of this segment')
+        ).toBeVisible()
+
         await page.getByRole('button', { name: 'Exit Sketch' }).click()
       })
     }

e2e/playwright/testing-gizmo.spec.ts

@@ -1,7 +1,8 @@
-import { test, expect } from './zoo-test'
-import { getUtils } from './test-utils'
-import { uuidv4 } from 'lib/utils'
-import { TEST_CODE_GIZMO } from './storageStates'
+import { uuidv4 } from '@src/lib/utils'
+
+import { TEST_CODE_GIZMO } from '@e2e/playwright/storageStates'
+import { getUtils } from '@e2e/playwright/test-utils'
+import { expect, test } from '@e2e/playwright/zoo-test'
 
 test.describe('Testing Gizmo', { tag: ['@skipWin'] }, () => {
   const cases = [

e2e/playwright/testing-perspective-toggle.spec.ts

@@ -1,5 +1,5 @@
-import { test, expect } from './zoo-test'
-import { getUtils, orRunWhenFullSuiteEnabled } from './test-utils'
+import { getUtils, orRunWhenFullSuiteEnabled } from '@e2e/playwright/test-utils'
+import { expect, test } from '@e2e/playwright/zoo-test'
 
 test.describe('Test toggling perspective', () => {
   test('via command palette and toggle', async ({ page, homePage }) => {

e2e/playwright/testing-samples-loading.spec.ts

@@ -1,9 +1,10 @@
-import { test, expect } from './zoo-test'
-import { getUtils } from './test-utils'
-import { bracket } from 'lib/exampleKcl'
+import { FILE_EXT } from '@src/lib/constants'
+import { bracket } from '@src/lib/exampleKcl'
 import * as fsp from 'fs/promises'
 import { join } from 'path'
-import { FILE_EXT } from 'lib/constants'
+
+import { getUtils } from '@e2e/playwright/test-utils'
+import { expect, test } from '@e2e/playwright/zoo-test'
 
 test.describe('Testing in-app sample loading', () => {
   /**

e2e/playwright/testing-segment-overlays.spec.ts

@@ -1,15 +1,15 @@
-import { Page } from '@playwright/test'
-import { test, expect } from './zoo-test'
+import type { Page } from '@playwright/test'
+import type { LineInputsType } from '@src/lang/std/sketchcombos'
+import { uuidv4 } from '@src/lib/utils'
 
+import type { EditorFixture } from '@e2e/playwright/fixtures/editorFixture'
 import {
   deg,
   getUtils,
-  wiggleMove,
   orRunWhenFullSuiteEnabled,
-} from './test-utils'
-import { LineInputsType } from 'lang/std/sketchcombos'
-import { uuidv4 } from 'lib/utils'
-import { EditorFixture } from './fixtures/editorFixture'
+  wiggleMove,
+} from '@e2e/playwright/test-utils'
+import { expect, test } from '@e2e/playwright/zoo-test'
 
 test.describe('Testing segment overlays', { tag: ['@skipWin'] }, () => {
   test('Hover over a segment should show its overlay, hovering over the input overlays should show its popover, clicking the input overlay should constrain/unconstrain it:\nfor the following segments', () => {

e2e/playwright/testing-selections.spec.ts

@@ -1,9 +1,13 @@
-import { test, expect } from './zoo-test'
+import type { Coords2d } from '@src/lang/std/sketch'
+import { KCL_DEFAULT_LENGTH } from '@src/lib/constants'
+import { uuidv4 } from '@src/lib/utils'
 
-import { commonPoints, getUtils, orRunWhenFullSuiteEnabled } from './test-utils'
-import { Coords2d } from 'lang/std/sketch'
-import { KCL_DEFAULT_LENGTH } from 'lib/constants'
-import { uuidv4 } from 'lib/utils'
+import {
+  commonPoints,
+  getUtils,
+  orRunWhenFullSuiteEnabled,
+} from '@e2e/playwright/test-utils'
+import { expect, test } from '@e2e/playwright/zoo-test'
 
 test.describe('Testing selections', { tag: ['@skipWin'] }, () => {
   test.setTimeout(90_000)
@@ -320,7 +324,7 @@ part009 = startSketchOn(XY)
   |> line(end = [0, pipeLength])
   |> angledLineToX({ angle = 60, to = pipeLargeDia }, %)
   |> close()
-rev = revolve(part009, axis = 'y')
+rev = revolve(part009, axis = Y)
 sketch006 = startSketchOn(XY)
 profile001 = circle(
   sketch006,
@@ -377,7 +381,7 @@ profile003 = startProfileAt([40.16, -120.48], sketch006)
     await page.waitForTimeout(200)
 
     await expect(u.codeLocator).not.toContainText(
-      `rev = revolve(part009, axis: 'y')`
+      `rev = revolve(part009, axis: Y)`
     )
 
     // FIXME (commented section below), this test would select a wall that had a sketch on it, and delete the underlying extrude

e2e/playwright/testing-settings.spec.ts

@@ -1,24 +1,29 @@
-import { test, expect } from './zoo-test'
+import {
+  PROJECT_SETTINGS_FILE_NAME,
+  SETTINGS_FILE_NAME,
+} from '@src/lib/constants'
+import type { SettingsLevel } from '@src/lib/settings/settingsTypes'
+import type { DeepPartial } from '@src/lib/types'
 import * as fsp from 'fs/promises'
 import { join } from 'path'
+
+import type { Settings } from '@rust/kcl-lib/bindings/Settings'
+
 import {
-  getUtils,
-  executorInputPath,
-  createProject,
-  tomlToSettings,
-  TEST_COLORS,
-  orRunWhenFullSuiteEnabled,
-} from './test-utils'
-import { SettingsLevel } from 'lib/settings/settingsTypes'
-import { SETTINGS_FILE_NAME, PROJECT_SETTINGS_FILE_NAME } from 'lib/constants'
-import {
-  TEST_SETTINGS_KEY,
-  TEST_SETTINGS_CORRUPTED,
   TEST_SETTINGS,
+  TEST_SETTINGS_CORRUPTED,
   TEST_SETTINGS_DEFAULT_THEME,
-} from './storageStates'
-import { DeepPartial } from 'lib/types'
-import { Settings } from '@rust/kcl-lib/bindings/Settings'
+  TEST_SETTINGS_KEY,
+} from '@e2e/playwright/storageStates'
+import {
+  TEST_COLORS,
+  createProject,
+  executorInputPath,
+  getUtils,
+  orRunWhenFullSuiteEnabled,
+  tomlToSettings,
+} from '@e2e/playwright/test-utils'
+import { expect, test } from '@e2e/playwright/zoo-test'
 
 test.describe('Testing settings', () => {
   test('Stored settings are validated and fall back to defaults', async ({
@@ -45,12 +50,12 @@ test.describe('Testing settings', () => {
       )
     )
 
-    expect(storedSettings.settings?.app?.theme).toBe('dark')
+    expect(storedSettings.settings?.app?.appearance?.theme).toBe('dark')
 
     // Check that the invalid settings were changed to good defaults
     expect(storedSettings.settings?.modeling?.base_unit).toBe('in')
     expect(storedSettings.settings?.modeling?.mouse_controls).toBe('zoo')
-    expect(storedSettings.settings?.app?.project_directory).toBe('')
+    expect(storedSettings.settings?.project?.directory).toBe('')
     expect(storedSettings.settings?.project?.default_project_name).toBe(
       'project-$nnn'
     )
@@ -381,7 +386,9 @@ test.describe('Testing settings', () => {
       }
       await tronApp.cleanProjectDir({
         app: {
-          theme_color: '259',
+          appearance: {
+            color: 259,
+          },
         },
       })
 
@@ -413,9 +420,12 @@ test.describe('Testing settings', () => {
 
       await tronApp.cleanProjectDir({
         app: {
-          // Doesn't matter what you set it to. It will
-          // default to 264.5
-          theme_color: '0',
+          appearance: {
+            // Doesn't matter what you set it to. It will
+            // default to 264.5
+
+            color: 0,
+          },
         },
       })
 

e2e/playwright/text-to-cad-tests.spec.ts

@@ -1,12 +1,13 @@
-import { Page } from '@playwright/test'
-import { test, expect } from './zoo-test'
-import {
-  getUtils,
-  createProject,
-  orRunWhenFullSuiteEnabled,
-} from './test-utils'
-import { join } from 'path'
+import type { Page } from '@playwright/test'
 import fs from 'fs'
+import { join } from 'path'
+
+import {
+  createProject,
+  getUtils,
+  orRunWhenFullSuiteEnabled,
+} from '@e2e/playwright/test-utils'
+import { expect, test } from '@e2e/playwright/zoo-test'
 
 test.describe('Text-to-CAD tests', { tag: ['@skipWin'] }, () => {
   test('basic lego happy case', async ({ page, homePage }) => {

e2e/playwright/various.spec.ts

@@ -1,11 +1,10 @@
-import { test, expect } from './zoo-test'
-
 import {
   doExport,
   getUtils,
   makeTemplate,
   orRunWhenFullSuiteEnabled,
-} from './test-utils'
+} from '@e2e/playwright/test-utils'
+import { expect, test } from '@e2e/playwright/zoo-test'
 
 test('Units menu', async ({ page, homePage }) => {
   test.fixme(orRunWhenFullSuiteEnabled())

e2e/playwright/zoo-test.ts

@@ -1,12 +1,11 @@
 /* eslint-disable react-hooks/rules-of-hooks */
-
 import { test as playwrightTestFn } from '@playwright/test'
 
+import type { Fixtures } from '@e2e/playwright/fixtures/fixtureSetup'
 import {
-  fixturesBasedOnProcessEnvPlatform,
-  Fixtures,
   ElectronZoo,
-} from './fixtures/fixtureSetup'
+  fixturesBasedOnProcessEnvPlatform,
+} from '@e2e/playwright/fixtures/fixtureSetup'
 
 export { expect } from '@playwright/test'
 

forge.config.ts

@@ -1,6 +1,6 @@
-import type { ForgeConfig } from '@electron-forge/shared-types'
-import { VitePlugin } from '@electron-forge/plugin-vite'
 import { FusesPlugin } from '@electron-forge/plugin-fuses'
+import { VitePlugin } from '@electron-forge/plugin-vite'
+import type { ForgeConfig } from '@electron-forge/shared-types'
 import { FuseV1Options, FuseVersion } from '@electron/fuses'
 import path from 'path'
 

forge.env.d.ts

@@ -26,7 +26,7 @@ declare global {
 
 declare module 'vite' {
   interface ConfigEnv<
-    K extends keyof VitePluginConfig = keyof VitePluginConfig
+    K extends keyof VitePluginConfig = keyof VitePluginConfig,
   > {
     root: string
     forgeConfig: VitePluginConfig

interface.d.ts

@@ -1,13 +1,10 @@
-import fs from 'node:fs/promises'
-import fsSync from 'node:fs'
-import path from 'path'
-import { dialog, shell } from 'electron'
 import { MachinesListing } from 'components/MachineManagerProvider'
-import type { Channel } from 'src/menu/channels'
-import { Menu, WebContents } from 'electron'
-import { ZooLabel, ZooMenuEvents } from 'menu/roles'
-import type { MenuActionIPC } from 'menu/rules'
+import 'electron'
+import { dialog, shell } from 'electron'
 import type { WebContentSendPayload } from 'menu/channels'
+import { ZooLabel } from 'menu/roles'
+import fs from 'node:fs/promises'
+import path from 'path'
 
 // Extend the interface with additional custom properties
 declare module 'electron' {