A snapshot a day keeps the bugs away! 📷🐛 (OS: namespace-profile-ubuntu-8-cores)

.github/workflows/build-apps.yml

@@ -7,11 +7,14 @@ on:
       - main
     tags:
       - 'v[0-9]+.[0-9]+.[0-9]+'
-      - 'nightly-v[0-9]+.[0-9]+.[0-9]+'
+  schedule:
+    - cron: '0 4 * * *'
+  # Daily at 04:00 AM UTC
+  # Will checkout the last commit from the default branch (main as of 2023-10-04)
 
 env:
-  IS_RELEASE: ${{ github.ref_type == 'tag' && startsWith(github.ref_name, 'v') }}
+  IS_RELEASE: ${{ github.ref_type == 'tag' }}
-  IS_NIGHTLY: ${{ github.ref_type == 'tag' && startsWith(github.ref_name, 'nightly-v') }}
+  IS_NIGHTLY: ${{ github.event_name == 'schedule' }}
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -29,7 +32,6 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'yarn'
 
       - run: yarn install
 
@@ -50,10 +52,7 @@ jobs:
 
       - name: Set nightly version, product name, release notes, and icons
         if: ${{ env.IS_NIGHTLY == 'true' }}
-        run: |
+        run: yarn files:flip-to-nightly
-          export VERSION=${GITHUB_REF_NAME#nightly-v}
-          yarn files:set-version
-          yarn files:flip-to-nightly
 
       - name: Set release version
         if: ${{ env.IS_RELEASE == 'true' }}
@@ -124,11 +123,9 @@ jobs:
           cp prepared-files/assets/icon.ico assets/icon.ico
           cp prepared-files/assets/icon.png assets/icon.png
 
-      - name: Sync node version and setup cache
+      - uses: actions/setup-node@v4
-        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'yarn' # Set this to npm, yarn or pnpm.
 
       - name: yarn install
         # Windows is picky sometimes and fails on fetch. Step takes about ~30s
@@ -273,7 +270,7 @@ jobs:
     runs-on: ubuntu-22.04
     permissions:
       contents: write
-    if: ${{ github.ref_type == 'tag' }}
+    if: ${{ github.ref_type == 'tag' || github.event_name == 'schedule' }}
     env:
       VERSION_NO_V: ${{ needs.prepare-files.outputs.version }}
       VERSION: ${{ format('v{0}', needs.prepare-files.outputs.version) }}
@@ -330,8 +327,8 @@ jobs:
         env:
           NOTES: ${{ needs.prepare-files.outputs.notes }}
           PUB_DATE: ${{ github.event.repository.updated_at }}
-          WEBSITE_DIR: ${{ env.IS_NIGHTLY == 'true' && 'dl.zoo.dev/releases/modeling-app/nightly' || 'dl.zoo.dev/releases/modeling-app' }}
+          WEBSITE_DIR: ${{ github.event_name == 'schedule' && 'dl.zoo.dev/releases/modeling-app/nightly' || 'dl.zoo.dev/releases/modeling-app' }}
-          URL_CODED_NAME: ${{ env.IS_NIGHTLY == 'true' && 'Zoo%20Modeling%20App%20%28Nightly%29' || 'Zoo%20Modeling%20App' }}
+          URL_CODED_NAME: ${{ github.event_name == 'schedule' && 'Zoo%20Modeling%20App%20%28Nightly%29' || 'Zoo%20Modeling%20App' }}
         run: |
           RELEASE_DIR=https://${WEBSITE_DIR}
           jq --null-input \
@@ -414,3 +411,14 @@ jobs:
       - name: Invalidate bucket cache on latest*.yml and last_download.json files
         if: ${{ env.IS_NIGHTLY == 'true' }}
         run: yarn files:invalidate-bucket:nightly
+
+      - name: Tag nightly commit
+        if: ${{ env.IS_NIGHTLY == 'true' }}
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const { VERSION } = process.env          
+            const { owner, repo } = context.repo
+            const { sha } = context
+            const ref = `refs/tags/nightly-${VERSION}`
+            github.rest.git.createRef({ owner, repo, sha, ref })

.github/workflows/tag-nightly.yml

@@ -1,39 +0,0 @@
-name: tag-nightly
-
-permissions:
-  contents: write
-on:
-  schedule:
-    - cron: '0 4 * * *'
-  # Daily at 04:00 AM UTC
-  # Will checkout the last commit from the default branch (main as of 2023-10-04)
-  
-jobs:
-  tag-nightly:
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/create-github-app-token@v1
-        id: app-token
-        with:
-          app-id: ${{ secrets.MODELING_APP_GH_APP_ID }}
-          private-key: ${{ secrets.MODELING_APP_GH_APP_PRIVATE_KEY }}
-          owner: ${{ github.repository_owner }}
-
-      - uses: actions/checkout@v4
-        with:
-          token: ${{ steps.app-token.outputs.token }}
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-
-      - run: yarn install
-
-      - name: Push tag
-        run: |
-          VERSION_NO_V=$(date +'%-y.%-m.%-d')
-          TAG="nightly-v$VERSION_NO_V"
-          git config --local user.email "github-actions[bot]@users.noreply.github.com"
-          git config --local user.name "github-actions[bot]"
-          git tag $TAG
-          git push origin tag $TAG

.gitignore

@@ -24,7 +24,7 @@ yarn-debug.log*
 yarn-error.log*
 
 .idea
-.vscode
+# .vscode
 .helix
 src/wasm-lib/.idea
 src/wasm-lib/.vscode

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "rust-analyzer.linkedProjects": [
+        "src/wasm-lib/Cargo.toml"
+    ]
+}

package.json

@@ -95,7 +95,7 @@
     "build:wasm-dev": "yarn wasm-prep && (cd src/wasm-lib && wasm-pack build --dev --target web --out-dir pkg && cargo test -p kcl-lib export_bindings) && yarn isomorphic-copy-wasm && yarn fmt",
     "build:wasm:nocopy": "yarn wasm-prep && cd src/wasm-lib && wasm-pack build --release --target web --out-dir pkg && cargo test -p kcl-lib export_bindings",
     "build:wasm": "yarn build:wasm:nocopy && cp src/wasm-lib/pkg/wasm_lib_bg.wasm public && yarn fmt",
-    "build:wasm:windows": "yarn install:wasm-pack:cargo && yarn build:wasm:nocopy && ./scripts/copy-wasm.ps1  && yarn fmt",
+    "build:wasm:windows": "yarn install:wasm-pack:cargo && yarn build:wasm:nocopy && copy src\\wasm-lib\\pkg\\wasm_lib_bg.wasm public && yarn fmt",
     "remove-importmeta": "sed -i 's/import.meta.url/window.location.origin/g' \"./src/wasm-lib/pkg/wasm_lib.js\"; sed -i '' 's/import.meta.url/window.location.origin/g' \"./src/wasm-lib/pkg/wasm_lib.js\" || echo \"sed for both mac and linux\"",
     "wasm-prep": "rimraf src/wasm-lib/pkg && mkdirp src/wasm-lib/pkg && rimraf src/wasm-lib/kcl/bindings",
     "lint-fix": "eslint --fix --ext .ts --ext .tsx src e2e packages/codemirror-lsp-client/src",

scripts/copy-wasm.ps1

@@ -1 +0,0 @@
-copy src\wasm-lib\pkg\wasm_lib_bg.wasm public

scripts/flip-files-to-nightly.sh

@@ -1,8 +1,10 @@
 #!/bin/bash
 
+export VERSION=$(date +'%-y.%-m.%-d')
 export COMMIT=$(git rev-parse --short HEAD)
 
 # package.json
+yarn files:set-version
 PACKAGE=$(jq '.productName="Zoo Modeling App (Nightly)" | .name="zoo-modeling-app-nightly"' package.json --indent 2)
 echo "$PACKAGE" > package.json
 
@@ -12,7 +14,7 @@ yq -i '.appId = "dev.zoo.modeling-app-nightly"' electron-builder.yml
 yq -i '.nsis.include = "./scripts/installer-nightly.nsh"' electron-builder.yml
 
 # Release notes
-echo "Nightly build (commit $COMMIT)" > release-notes.md
+echo "Nightly build $VERSION (commit $COMMIT)" > release-notes.md
 
 # icons
 cp assets/icon-nightly.png assets/icon.png

src/lang/errors.test.ts

@@ -13,7 +13,6 @@ describe('test kclErrToDiagnostic', () => {
         operations: [],
         artifactCommands: [],
         artifactGraph: defaultArtifactGraph(),
-        filenames: {},
       },
       {
         name: '',
@@ -24,7 +23,6 @@ describe('test kclErrToDiagnostic', () => {
         operations: [],
         artifactCommands: [],
         artifactGraph: defaultArtifactGraph(),
-        filenames: {},
       },
     ]
     const diagnostics = kclErrorsToDiagnostics(errors)

src/lang/errors.ts

@@ -13,7 +13,6 @@ import {
   SourceRange,
 } from 'lang/wasm'
 import { Operation } from 'wasm-lib/kcl/bindings/Operation'
-import { ModulePath } from 'wasm-lib/kcl/bindings/ModulePath'
 
 type ExtractKind<T> = T extends { kind: infer K } ? K : never
 export class KCLError extends Error {
@@ -23,7 +22,6 @@ export class KCLError extends Error {
   operations: Operation[]
   artifactCommands: ArtifactCommand[]
   artifactGraph: ArtifactGraph
-  filenames: { [x: number]: ModulePath | undefined }
 
   constructor(
     kind: ExtractKind<RustKclError> | 'name',
@@ -31,8 +29,7 @@ export class KCLError extends Error {
     sourceRange: SourceRange,
     operations: Operation[],
     artifactCommands: ArtifactCommand[],
-    artifactGraph: ArtifactGraph,
+    artifactGraph: ArtifactGraph
-    filenames: { [x: number]: ModulePath | undefined }
   ) {
     super()
     this.kind = kind
@@ -41,7 +38,6 @@ export class KCLError extends Error {
     this.operations = operations
     this.artifactCommands = artifactCommands
     this.artifactGraph = artifactGraph
-    this.filenames = filenames
     Object.setPrototypeOf(this, KCLError.prototype)
   }
 }
@@ -52,8 +48,7 @@ export class KCLLexicalError extends KCLError {
     sourceRange: SourceRange,
     operations: Operation[],
     artifactCommands: ArtifactCommand[],
-    artifactGraph: ArtifactGraph,
+    artifactGraph: ArtifactGraph
-    filenames: { [x: number]: ModulePath | undefined }
   ) {
     super(
       'lexical',
@@ -61,8 +56,7 @@ export class KCLLexicalError extends KCLError {
       sourceRange,
       operations,
       artifactCommands,
-      artifactGraph,
+      artifactGraph
-      filenames
     )
     Object.setPrototypeOf(this, KCLSyntaxError.prototype)
   }
@@ -74,8 +68,7 @@ export class KCLInternalError extends KCLError {
     sourceRange: SourceRange,
     operations: Operation[],
     artifactCommands: ArtifactCommand[],
-    artifactGraph: ArtifactGraph,
+    artifactGraph: ArtifactGraph
-    filenames: { [x: number]: ModulePath | undefined }
   ) {
     super(
       'internal',
@@ -83,8 +76,7 @@ export class KCLInternalError extends KCLError {
       sourceRange,
       operations,
       artifactCommands,
-      artifactGraph,
+      artifactGraph
-      filenames
     )
     Object.setPrototypeOf(this, KCLSyntaxError.prototype)
   }
@@ -96,8 +88,7 @@ export class KCLSyntaxError extends KCLError {
     sourceRange: SourceRange,
     operations: Operation[],
     artifactCommands: ArtifactCommand[],
-    artifactGraph: ArtifactGraph,
+    artifactGraph: ArtifactGraph
-    filenames: { [x: number]: ModulePath | undefined }
   ) {
     super(
       'syntax',
@@ -105,8 +96,7 @@ export class KCLSyntaxError extends KCLError {
       sourceRange,
       operations,
       artifactCommands,
-      artifactGraph,
+      artifactGraph
-      filenames
     )
     Object.setPrototypeOf(this, KCLSyntaxError.prototype)
   }
@@ -118,8 +108,7 @@ export class KCLSemanticError extends KCLError {
     sourceRange: SourceRange,
     operations: Operation[],
     artifactCommands: ArtifactCommand[],
-    artifactGraph: ArtifactGraph,
+    artifactGraph: ArtifactGraph
-    filenames: { [x: number]: ModulePath | undefined }
   ) {
     super(
       'semantic',
@@ -127,8 +116,7 @@ export class KCLSemanticError extends KCLError {
       sourceRange,
       operations,
       artifactCommands,
-      artifactGraph,
+      artifactGraph
-      filenames
     )
     Object.setPrototypeOf(this, KCLSemanticError.prototype)
   }
@@ -140,18 +128,9 @@ export class KCLTypeError extends KCLError {
     sourceRange: SourceRange,
     operations: Operation[],
     artifactCommands: ArtifactCommand[],
-    artifactGraph: ArtifactGraph,
+    artifactGraph: ArtifactGraph
-    filenames: { [x: number]: ModulePath | undefined }
   ) {
-    super(
+    super('type', msg, sourceRange, operations, artifactCommands, artifactGraph)
-      'type',
-      msg,
-      sourceRange,
-      operations,
-      artifactCommands,
-      artifactGraph,
-      filenames
-    )
     Object.setPrototypeOf(this, KCLTypeError.prototype)
   }
 }
@@ -162,8 +141,7 @@ export class KCLUnimplementedError extends KCLError {
     sourceRange: SourceRange,
     operations: Operation[],
     artifactCommands: ArtifactCommand[],
-    artifactGraph: ArtifactGraph,
+    artifactGraph: ArtifactGraph
-    filenames: { [x: number]: ModulePath | undefined }
   ) {
     super(
       'unimplemented',
@@ -171,8 +149,7 @@ export class KCLUnimplementedError extends KCLError {
       sourceRange,
       operations,
       artifactCommands,
-      artifactGraph,
+      artifactGraph
-      filenames
     )
     Object.setPrototypeOf(this, KCLUnimplementedError.prototype)
   }
@@ -184,8 +161,7 @@ export class KCLUnexpectedError extends KCLError {
     sourceRange: SourceRange,
     operations: Operation[],
     artifactCommands: ArtifactCommand[],
-    artifactGraph: ArtifactGraph,
+    artifactGraph: ArtifactGraph
-    filenames: { [x: number]: ModulePath | undefined }
   ) {
     super(
       'unexpected',
@@ -193,8 +169,7 @@ export class KCLUnexpectedError extends KCLError {
       sourceRange,
       operations,
       artifactCommands,
-      artifactGraph,
+      artifactGraph
-      filenames
     )
     Object.setPrototypeOf(this, KCLUnexpectedError.prototype)
   }
@@ -206,8 +181,7 @@ export class KCLValueAlreadyDefined extends KCLError {
     sourceRange: SourceRange,
     operations: Operation[],
     artifactCommands: ArtifactCommand[],
-    artifactGraph: ArtifactGraph,
+    artifactGraph: ArtifactGraph
-    filenames: { [x: number]: ModulePath | undefined }
   ) {
     super(
       'name',
@@ -215,8 +189,7 @@ export class KCLValueAlreadyDefined extends KCLError {
       sourceRange,
       operations,
       artifactCommands,
-      artifactGraph,
+      artifactGraph
-      filenames
     )
     Object.setPrototypeOf(this, KCLValueAlreadyDefined.prototype)
   }
@@ -228,8 +201,7 @@ export class KCLUndefinedValueError extends KCLError {
     sourceRange: SourceRange,
     operations: Operation[],
     artifactCommands: ArtifactCommand[],
-    artifactGraph: ArtifactGraph,
+    artifactGraph: ArtifactGraph
-    filenames: { [x: number]: ModulePath | undefined }
   ) {
     super(
       'name',
@@ -237,8 +209,7 @@ export class KCLUndefinedValueError extends KCLError {
       sourceRange,
       operations,
       artifactCommands,
-      artifactGraph,
+      artifactGraph
-      filenames
     )
     Object.setPrototypeOf(this, KCLUndefinedValueError.prototype)
   }
@@ -261,8 +232,7 @@ export function lspDiagnosticsToKclErrors(
           [posToOffset(doc, range.start)!, posToOffset(doc, range.end)!, 0],
           [],
           [],
-          defaultArtifactGraph(),
+          defaultArtifactGraph()
-          {}
         )
     )
     .sort((a, b) => {

src/lang/executor.test.ts

@@ -511,8 +511,7 @@ const theExtrude = startSketchOn('XY')
         topLevelRange(129, 135),
         [],
         [],
-        defaultArtifactGraph(),
+        defaultArtifactGraph()
-        {}
       )
     )
   })

src/lang/wasm.ts

@@ -60,7 +60,6 @@ import { MetaSettings } from 'wasm-lib/kcl/bindings/MetaSettings'
 import { UnitAngle, UnitLength } from 'wasm-lib/kcl/bindings/ModelingCmd'
 import { UnitLen } from 'wasm-lib/kcl/bindings/UnitLen'
 import { UnitAngle as UnitAng } from 'wasm-lib/kcl/bindings/UnitAngle'
-import { ModulePath } from 'wasm-lib/kcl/bindings/ModulePath'
 
 export type { Artifact } from 'wasm-lib/kcl/bindings/Artifact'
 export type { ArtifactCommand } from 'wasm-lib/kcl/bindings/Artifact'
@@ -267,8 +266,7 @@ export const parse = (code: string | Error): ParseResult | Error => {
       firstSourceRange(parsed),
       [],
       [],
-      defaultArtifactGraph(),
+      defaultArtifactGraph()
-      {}
     )
   }
 }
@@ -298,7 +296,6 @@ export interface ExecState {
   artifactCommands: ArtifactCommand[]
   artifactGraph: ArtifactGraph
   errors: CompilationError[]
-  filenames: { [x: number]: ModulePath | undefined }
 }
 
 /**
@@ -313,7 +310,6 @@ export function emptyExecState(): ExecState {
     artifactCommands: [],
     artifactGraph: defaultArtifactGraph(),
     errors: [],
-    filenames: [],
   }
 }
 
@@ -340,7 +336,6 @@ function execStateFromRust(
     artifactCommands: execOutcome.artifactCommands,
     artifactGraph,
     errors: execOutcome.errors,
-    filenames: execOutcome.filenames,
   }
 }
 
@@ -352,7 +347,6 @@ function mockExecStateFromRust(execOutcome: RustExecOutcome): ExecState {
     artifactCommands: execOutcome.artifactCommands,
     artifactGraph: new Map<ArtifactId, Artifact>(),
     errors: execOutcome.errors,
-    filenames: execOutcome.filenames,
   }
 }
 
@@ -480,7 +474,7 @@ const jsAppSettings = async () => {
 }
 
 const errFromErrWithOutputs = (e: any): KCLError => {
-  console.log(e)
+  console.log('execute error', e)
   const parsed: KclErrorWithOutputs = JSON.parse(e.toString())
   return new KCLError(
     parsed.error.kind,
@@ -488,8 +482,7 @@ const errFromErrWithOutputs = (e: any): KCLError => {
     firstSourceRange(parsed.error),
     parsed.operations,
     parsed.artifactCommands,
-    rustArtifactGraphToMap(parsed.artifactGraph),
+    rustArtifactGraphToMap(parsed.artifactGraph)
-    parsed.filenames
   )
 }
 
@@ -555,8 +548,7 @@ export const modifyAstForSketch = async (
       firstSourceRange(parsed),
       [],
       [],
-      defaultArtifactGraph(),
+      defaultArtifactGraph()
-      {}
     )
 
     return Promise.reject(kclError)

src/wasm-lib/Cargo.toml

@@ -103,7 +103,3 @@ path = "tests/modify/main.rs"
 #[patch.crates-io]
 #kittycad-modeling-cmds = { path = "../../../modeling-api/modeling-cmds" }
 #kittycad-modeling-session = { path = "../../../modeling-api/modeling-session" }
-
-# Local development only. Placeholder to speed up development cycle
-#[package.metadata.wasm-pack.profile.release]
-#wasm-opt = false

src/wasm-lib/kcl/src/errors.rs

@@ -2,12 +2,9 @@ use serde::{Deserialize, Serialize};
 use thiserror::Error;
 use tower_lsp::lsp_types::{Diagnostic, DiagnosticSeverity};
 
-use indexmap::IndexMap;
-
 use crate::{
     execution::{ArtifactCommand, ArtifactGraph, Operation},
     lsp::IntoDiagnostic,
-    modules::ModulePath,
     source_range::SourceRange,
     ModuleId,
 };
@@ -119,7 +116,6 @@ pub struct KclErrorWithOutputs {
     pub operations: Vec<Operation>,
     pub artifact_commands: Vec<ArtifactCommand>,
     pub artifact_graph: ArtifactGraph,
-    pub filenames: IndexMap<ModuleId, ModulePath>,
 }
 
 impl KclErrorWithOutputs {
@@ -128,14 +124,12 @@ impl KclErrorWithOutputs {
         operations: Vec<Operation>,
         artifact_commands: Vec<ArtifactCommand>,
         artifact_graph: ArtifactGraph,
-        filenames: IndexMap<ModuleId, ModulePath>,
     ) -> Self {
         Self {
             error,
             operations,
             artifact_commands,
             artifact_graph,
-            filenames,
         }
     }
     pub fn no_outputs(error: KclError) -> Self {
@@ -144,7 +138,6 @@ impl KclErrorWithOutputs {
             operations: Default::default(),
             artifact_commands: Default::default(),
             artifact_graph: Default::default(),
-            filenames: Default::default(),
         }
     }
 }

src/wasm-lib/kcl/src/execution/exec_ast.rs

@@ -329,8 +329,6 @@ impl ExecutorContext {
                 }
 
                 let id = exec_state.next_module_id();
-                // Add file path string to global state even if it fails to import
-                exec_state.add_path_to_source_id(resolved_path.clone(), id);
                 let source = resolved_path.source(&self.fs, source_range).await?;
                 // TODO handle parsing errors properly
                 let parsed = crate::parsing::parse_str(&source, id).parse_errs_as_err()?;
@@ -345,8 +343,6 @@ impl ExecutorContext {
 
                 let id = exec_state.next_module_id();
                 let path = resolved_path.expect_path();
-                // Add file path string to global state even if it fails to import
-                exec_state.add_path_to_source_id(resolved_path.clone(), id);
                 let format = super::import::format_from_annotations(attrs, path, source_range)?;
                 let geom = super::import::import_foreign(path, format, exec_state, self, source_range).await?;
                 exec_state.add_module(id, resolved_path, ModuleRepr::Foreign(geom));
@@ -358,8 +354,6 @@ impl ExecutorContext {
                 }
 
                 let id = exec_state.next_module_id();
-                // Add file path string to global state even if it fails to import
-                exec_state.add_path_to_source_id(resolved_path.clone(), id);
                 let source = resolved_path.source(&self.fs, source_range).await?;
                 let parsed = crate::parsing::parse_str(&source, id).parse_errs_as_err().unwrap();
                 exec_state.add_module(id, resolved_path, ModuleRepr::Kcl(parsed, None));

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

@@ -23,7 +23,6 @@ use crate::{
         cache::{CacheInformation, CacheResult},
     },
     fs::FileManager,
-    modules::{ModuleId, ModulePath},
     parsing::ast::types::{Expr, ImportPath, Node, NodeRef, Program},
     settings::types::UnitLength,
     source_range::SourceRange,
@@ -71,8 +70,6 @@ pub struct ExecOutcome {
     pub artifact_graph: ArtifactGraph,
     /// Non-fatal errors and warnings.
     pub errors: Vec<CompilationError>,
-    /// File Names in module Id array index order
-    pub filenames: IndexMap<ModuleId, ModulePath>,
 }
 
 #[derive(Debug, Default, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
@@ -715,19 +712,11 @@ impl ExecutorContext {
             .execute_and_build_graph(program, exec_state, preserve_mem)
             .await
             .map_err(|e| {
-                let module_id_to_module_path: IndexMap<ModuleId, ModulePath> = exec_state
-                    .global
-                    .path_to_source_id
-                    .iter()
-                    .map(|(k, v)| ((*v), k.clone()))
-                    .collect();
-
                 KclErrorWithOutputs::new(
                     e,
                     exec_state.mod_local.operations.clone(),
                     exec_state.global.artifact_commands.clone(),
                     exec_state.global.artifact_graph.clone(),
-                    module_id_to_module_path,
                 )
             })?;
 

src/wasm-lib/kcl/src/execution/state.rs

@@ -124,12 +124,6 @@ impl ExecState {
             artifact_commands: self.global.artifact_commands,
             artifact_graph: self.global.artifact_graph,
             errors: self.global.errors,
-            filenames: self
-                .global
-                .path_to_source_id
-                .iter()
-                .map(|(k, v)| ((*v), k.clone()))
-                .collect(),
         }
     }
 
@@ -147,7 +141,6 @@ impl ExecState {
             artifact_commands: Default::default(),
             artifact_graph: Default::default(),
             errors: self.global.errors,
-            filenames: Default::default(),
         }
     }
 
@@ -176,13 +169,11 @@ impl ExecState {
         self.global.path_to_source_id.get(path).cloned()
     }
 
-    pub(super) fn add_path_to_source_id(&mut self, path: ModulePath, id: ModuleId) {
-        debug_assert!(!self.global.path_to_source_id.contains_key(&path));
-        self.global.path_to_source_id.insert(path.clone(), id);
-    }
-
     pub(super) fn add_module(&mut self, id: ModuleId, path: ModulePath, repr: ModuleRepr) {
-        debug_assert!(self.global.path_to_source_id.contains_key(&path));
+        debug_assert!(!self.global.path_to_source_id.contains_key(&path));
+
+        self.global.path_to_source_id.insert(path.clone(), id);
+
         let module_info = ModuleInfo { id, repr, path };
         self.global.module_infos.insert(id, module_info);
     }
@@ -234,15 +225,11 @@ impl GlobalState {
             root_id,
             ModuleInfo {
                 id: root_id,
-                path: ModulePath::Local {
+                path: ModulePath::Local(root_path.clone()),
-                    value: root_path.clone(),
-                },
                 repr: ModuleRepr::Root,
             },
         );
-        global
+        global.path_to_source_id.insert(ModulePath::Local(root_path), root_id);
-            .path_to_source_id
-            .insert(ModulePath::Local { value: root_path }, root_id);
         global
     }
 }

src/wasm-lib/kcl/src/modules.rs

@@ -64,13 +64,13 @@ impl ModuleLoader {
     }
 
     pub(crate) fn enter_module(&mut self, path: &ModulePath) {
-        if let ModulePath::Local { value: ref path } = path {
+        if let ModulePath::Local(ref path) = path {
             self.import_stack.push(path.clone());
         }
     }
 
     pub(crate) fn leave_module(&mut self, path: &ModulePath) {
-        if let ModulePath::Local { value: ref path } = path {
+        if let ModulePath::Local(ref path) = path {
             let popped = self.import_stack.pop().unwrap();
             assert_eq!(path, &popped);
         }
@@ -119,32 +119,31 @@ pub enum ModuleRepr {
 }
 
 #[allow(clippy::large_enum_variant)]
-#[derive(Debug, Clone, Eq, PartialEq, Deserialize, Serialize, Hash, ts_rs::TS)]
+#[derive(Debug, Clone, Eq, PartialEq, Deserialize, Serialize, Hash)]
-#[serde(tag = "type")]
 pub enum ModulePath {
-    Local { value: PathBuf },
+    Local(PathBuf),
-    Std { value: String },
+    Std(String),
 }
 
 impl ModulePath {
     pub(crate) fn expect_path(&self) -> &PathBuf {
         match self {
-            ModulePath::Local { value: p } => p,
+            ModulePath::Local(p) => p,
             _ => unreachable!(),
         }
     }
 
     pub(crate) fn std_path(&self) -> Option<String> {
         match self {
-            ModulePath::Local { value: _ } => None,
+            ModulePath::Local(_) => None,
-            ModulePath::Std { value: p } => Some(p.clone()),
+            ModulePath::Std(p) => Some(p.clone()),
         }
     }
 
     pub(crate) async fn source(&self, fs: &FileManager, source_range: SourceRange) -> Result<String, KclError> {
         match self {
-            ModulePath::Local { value: p } => fs.read_to_string(p, source_range).await,
+            ModulePath::Local(p) => fs.read_to_string(p, source_range).await,
-            ModulePath::Std { value: name } => read_std(name)
+            ModulePath::Std(name) => read_std(name)
                 .ok_or_else(|| {
                     KclError::Semantic(KclErrorDetails {
                         message: format!("Cannot find standard library module to import: std::{name}."),
@@ -163,14 +162,14 @@ impl ModulePath {
                 } else {
                     std::path::PathBuf::from(path)
                 };
-                ModulePath::Local { value: resolved_path }
+                ModulePath::Local(resolved_path)
             }
             ImportPath::Std { path } => {
                 // For now we only support importing from singly-nested modules inside std.
                 assert_eq!(path.len(), 2);
                 assert_eq!(&path[0], "std");
 
-                ModulePath::Std { value: path[1].clone() }
+                ModulePath::Std(path[1].clone())
             }
         }
     }
@@ -179,8 +178,8 @@ impl ModulePath {
 impl fmt::Display for ModulePath {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
-            ModulePath::Local { value: path } => path.display().fmt(f),
+            ModulePath::Local(path) => path.display().fmt(f),
-            ModulePath::Std { value: s } => write!(f, "std::{s}"),
+            ModulePath::Std(s) => write!(f, "std::{s}"),
         }
     }
 }

src/wasm-lib/kcl/src/simulation_tests.rs

@@ -1990,29 +1990,7 @@ mod helix_simple {
     /// Test parsing KCL.
     #[test]
     fn parse() {
-        super::parse(TEST_NAME);
+        super::parse(TEST_NAME)
-    }
-
-    /// Test that parsing and unparsing KCL produces the original KCL input.
-    #[test]
-    fn unparse() {
-        super::unparse(TEST_NAME)
-    }
-
-    /// Test that KCL is executed correctly.
-    #[tokio::test(flavor = "multi_thread")]
-    async fn kcl_test_execute() {
-        super::execute(TEST_NAME, true).await
-    }
-}
-
-mod import_file_parse_error {
-    const TEST_NAME: &str = "import_file_parse_error";
-
-    /// Test parsing KCL.
-    #[test]
-    fn parse() {
-        super::parse(TEST_NAME);
     }
 
     /// Test that parsing and unparsing KCL produces the original KCL input.

src/wasm-lib/kcl/tests/import_file_parse_error/artifact_commands.snap

@@ -1,284 +0,0 @@
----
-source: kcl/src/simulation_tests.rs
-description: Artifact commands import_file_parse_error.kcl
----
-[
-  {
-    "cmdId": "[uuid]",
-    "range": [
-      0,
-      0,
-      0
-    ],
-    "command": {
-      "type": "make_plane",
-      "origin": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0
-      },
-      "x_axis": {
-        "x": 1.0,
-        "y": 0.0,
-        "z": 0.0
-      },
-      "y_axis": {
-        "x": 0.0,
-        "y": 1.0,
-        "z": 0.0
-      },
-      "size": 100.0,
-      "clobber": false,
-      "hide": true
-    }
-  },
-  {
-    "cmdId": "[uuid]",
-    "range": [
-      0,
-      0,
-      0
-    ],
-    "command": {
-      "type": "plane_set_color",
-      "plane_id": "[uuid]",
-      "color": {
-        "r": 0.7,
-        "g": 0.28,
-        "b": 0.28,
-        "a": 0.4
-      }
-    }
-  },
-  {
-    "cmdId": "[uuid]",
-    "range": [
-      0,
-      0,
-      0
-    ],
-    "command": {
-      "type": "make_plane",
-      "origin": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0
-      },
-      "x_axis": {
-        "x": 0.0,
-        "y": 1.0,
-        "z": 0.0
-      },
-      "y_axis": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 1.0
-      },
-      "size": 100.0,
-      "clobber": false,
-      "hide": true
-    }
-  },
-  {
-    "cmdId": "[uuid]",
-    "range": [
-      0,
-      0,
-      0
-    ],
-    "command": {
-      "type": "plane_set_color",
-      "plane_id": "[uuid]",
-      "color": {
-        "r": 0.28,
-        "g": 0.7,
-        "b": 0.28,
-        "a": 0.4
-      }
-    }
-  },
-  {
-    "cmdId": "[uuid]",
-    "range": [
-      0,
-      0,
-      0
-    ],
-    "command": {
-      "type": "make_plane",
-      "origin": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0
-      },
-      "x_axis": {
-        "x": 1.0,
-        "y": 0.0,
-        "z": 0.0
-      },
-      "y_axis": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 1.0
-      },
-      "size": 100.0,
-      "clobber": false,
-      "hide": true
-    }
-  },
-  {
-    "cmdId": "[uuid]",
-    "range": [
-      0,
-      0,
-      0
-    ],
-    "command": {
-      "type": "plane_set_color",
-      "plane_id": "[uuid]",
-      "color": {
-        "r": 0.28,
-        "g": 0.28,
-        "b": 0.7,
-        "a": 0.4
-      }
-    }
-  },
-  {
-    "cmdId": "[uuid]",
-    "range": [
-      0,
-      0,
-      0
-    ],
-    "command": {
-      "type": "make_plane",
-      "origin": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0
-      },
-      "x_axis": {
-        "x": -1.0,
-        "y": 0.0,
-        "z": 0.0
-      },
-      "y_axis": {
-        "x": 0.0,
-        "y": 1.0,
-        "z": 0.0
-      },
-      "size": 100.0,
-      "clobber": false,
-      "hide": true
-    }
-  },
-  {
-    "cmdId": "[uuid]",
-    "range": [
-      0,
-      0,
-      0
-    ],
-    "command": {
-      "type": "make_plane",
-      "origin": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0
-      },
-      "x_axis": {
-        "x": 0.0,
-        "y": -1.0,
-        "z": 0.0
-      },
-      "y_axis": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 1.0
-      },
-      "size": 100.0,
-      "clobber": false,
-      "hide": true
-    }
-  },
-  {
-    "cmdId": "[uuid]",
-    "range": [
-      0,
-      0,
-      0
-    ],
-    "command": {
-      "type": "make_plane",
-      "origin": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0
-      },
-      "x_axis": {
-        "x": -1.0,
-        "y": 0.0,
-        "z": 0.0
-      },
-      "y_axis": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 1.0
-      },
-      "size": 100.0,
-      "clobber": false,
-      "hide": true
-    }
-  },
-  {
-    "cmdId": "[uuid]",
-    "range": [
-      0,
-      0,
-      0
-    ],
-    "command": {
-      "type": "edge_lines_visible",
-      "hidden": false
-    }
-  },
-  {
-    "cmdId": "[uuid]",
-    "range": [
-      0,
-      0,
-      0
-    ],
-    "command": {
-      "type": "set_scene_units",
-      "unit": "mm"
-    }
-  },
-  {
-    "cmdId": "[uuid]",
-    "range": [
-      0,
-      0,
-      0
-    ],
-    "command": {
-      "type": "object_visible",
-      "object_id": "[uuid]",
-      "hidden": true
-    }
-  },
-  {
-    "cmdId": "[uuid]",
-    "range": [
-      0,
-      0,
-      0
-    ],
-    "command": {
-      "type": "object_visible",
-      "object_id": "[uuid]",
-      "hidden": true
-    }
-  }
-]

src/wasm-lib/kcl/tests/import_file_parse_error/artifact_graph_flowchart.snap

@@ -1,6 +0,0 @@
----
-source: kcl/src/simulation_tests.rs
-description: Artifact graph flowchart import_file_parse_error.kcl
-extension: md
-snapshot_kind: binary
----

src/wasm-lib/kcl/tests/import_file_parse_error/artifact_graph_flowchart.snap.md

@@ -1,3 +0,0 @@
-```mermaid
-flowchart LR
-```

src/wasm-lib/kcl/tests/import_file_parse_error/ast.snap

@@ -1,39 +0,0 @@
----
-source: kcl/src/simulation_tests.rs
-description: Result of parsing import_file_parse_error.kcl
----
-{
-  "Ok": {
-    "body": [
-      {
-        "end": 38,
-        "path": {
-          "type": "Kcl",
-          "filename": "parse-failure.kcl"
-        },
-        "selector": {
-          "type": "List",
-          "items": [
-            {
-              "alias": null,
-              "end": 13,
-              "name": {
-                "end": 13,
-                "name": "hotdog",
-                "start": 7,
-                "type": "Identifier"
-              },
-              "start": 7,
-              "type": "ImportItem"
-            }
-          ]
-        },
-        "start": 0,
-        "type": "ImportStatement",
-        "type": "ImportStatement"
-      }
-    ],
-    "end": 39,
-    "start": 0
-  }
-}

src/wasm-lib/kcl/tests/import_file_parse_error/execution_error.snap

@@ -1,11 +0,0 @@
----
-source: kcl/src/simulation_tests.rs
-description: Error from executing import_file_parse_error.kcl
----
-KCL Syntax error
-
-  × syntax: Unexpected token: }
-   ╭────
- 1 │ import hotdog from "parse-failure.kcl"
-   ·                                 ─
-   ╰────

src/wasm-lib/kcl/tests/import_file_parse_error/input.kcl

@@ -1 +0,0 @@
-import hotdog from "parse-failure.kcl"

src/wasm-lib/kcl/tests/import_file_parse_error/ops.snap

@@ -1,5 +0,0 @@
----
-source: kcl/src/simulation_tests.rs
-description: Operations executed import_file_parse_error.kcl
----
-[]

src/wasm-lib/kcl/tests/import_file_parse_error/parse-failure.kcl

@@ -1,3 +0,0 @@
-export fn hotdog () {
-  return 
-}