Module/import upgrades (#4677)

* Parse more import syntax

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

* Remove unnecessary Vec from VariableDeclaration

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

* Parse export import

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

* Factor out an execution module

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

* imports: constants, globs, export import

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

* test fixups

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

---------

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

docs/kcl/std.json

@@ -78970,7 +78970,7 @@
       "model = import(\"tests/inputs/cube.gltf\")",
       "model = import(\"tests/inputs/cube.sldprt\")",
       "model = import(\"tests/inputs/cube.step\")",
-      "import height, buildSketch from 'common.kcl'\n\nplane = 'XZ'\nmargin = 2\ns1 = buildSketch(plane, [0, 0])\ns2 = buildSketch(plane, [0, height() + margin])"
+      "import height, buildSketch from \"common.kcl\"\n\nplane = 'XZ'\nmargin = 2\ns1 = buildSketch(plane, [0, 0])\ns2 = buildSketch(plane, [0, height() + margin])"
     ]
   },
   {

src/clientSideScene/sceneEntities.ts

@@ -701,8 +701,7 @@ export class SceneEntities {
       'VariableDeclaration'
     )
     if (trap(_node1)) return Promise.reject(_node1)
-    const variableDeclarationName =
+    const variableDeclarationName = _node1.node?.declaration.id?.name || ''
-      _node1.node?.declarations?.[0]?.id?.name || ''
 
     const sg = sketchFromKclValue(
       kclManager.programMemory.get(variableDeclarationName),
@@ -902,10 +901,9 @@ export class SceneEntities {
       'VariableDeclaration'
     )
     if (trap(_node1)) return Promise.reject(_node1)
-    const variableDeclarationName =
+    const variableDeclarationName = _node1.node?.declaration.id?.name || ''
-      _node1.node?.declarations?.[0]?.id?.name || ''
+    const startSketchOn = _node1.node?.declaration
-    const startSketchOn = _node1.node?.declarations
+    const startSketchOnInit = startSketchOn?.init
-    const startSketchOnInit = startSketchOn?.[0]?.init
 
     const tags: [string, string, string] = [
       findUniqueName(_ast, 'rectangleSegmentA'),
@@ -913,7 +911,7 @@ export class SceneEntities {
       findUniqueName(_ast, 'rectangleSegmentC'),
     ]
 
-    startSketchOn[0].init = createPipeExpression([
+    startSketchOn.init = createPipeExpression([
       startSketchOnInit,
       ...getRectangleCallExpressions(rectangleOrigin, tags),
     ])
@@ -943,7 +941,7 @@ export class SceneEntities {
           'VariableDeclaration'
         )
         if (trap(_node)) return Promise.reject(_node)
-        const sketchInit = _node.node?.declarations?.[0]?.init
+        const sketchInit = _node.node?.declaration.init
 
         const x = (args.intersectionPoint.twoD.x || 0) - rectangleOrigin[0]
         const y = (args.intersectionPoint.twoD.y || 0) - rectangleOrigin[1]
@@ -992,7 +990,7 @@ export class SceneEntities {
           'VariableDeclaration'
         )
         if (trap(_node)) return
-        const sketchInit = _node.node?.declarations?.[0]?.init
+        const sketchInit = _node.node?.declaration.init
 
         if (sketchInit.type !== 'PipeExpression') {
           return
@@ -1058,10 +1056,9 @@ export class SceneEntities {
     if (trap(_node1)) return Promise.reject(_node1)
 
     // startSketchOn already exists
-    const variableDeclarationName =
+    const variableDeclarationName = _node1.node?.declaration.id?.name || ''
-      _node1.node?.declarations?.[0]?.id?.name || ''
+    const startSketchOn = _node1.node?.declaration
-    const startSketchOn = _node1.node?.declarations
+    const startSketchOnInit = startSketchOn?.init
-    const startSketchOnInit = startSketchOn?.[0]?.init
 
     const tags: [string, string, string] = [
       findUniqueName(_ast, 'rectangleSegmentA'),
@@ -1069,7 +1066,7 @@ export class SceneEntities {
       findUniqueName(_ast, 'rectangleSegmentC'),
     ]
 
-    startSketchOn[0].init = createPipeExpression([
+    startSketchOn.init = createPipeExpression([
       startSketchOnInit,
       ...getRectangleCallExpressions(rectangleOrigin, tags),
     ])
@@ -1099,7 +1096,7 @@ export class SceneEntities {
           'VariableDeclaration'
         )
         if (trap(_node)) return Promise.reject(_node)
-        const sketchInit = _node.node?.declarations?.[0]?.init
+        const sketchInit = _node.node?.declaration.init
 
         const x = (args.intersectionPoint.twoD.x || 0) - rectangleOrigin[0]
         const y = (args.intersectionPoint.twoD.y || 0) - rectangleOrigin[1]
@@ -1155,7 +1152,7 @@ export class SceneEntities {
           'VariableDeclaration'
         )
         if (trap(_node)) return
-        const sketchInit = _node.node?.declarations?.[0]?.init
+        const sketchInit = _node.node?.declaration.init
 
         if (sketchInit.type === 'PipeExpression') {
           updateCenterRectangleSketch(
@@ -1224,12 +1221,11 @@ export class SceneEntities {
       'VariableDeclaration'
     )
     if (trap(_node1)) return Promise.reject(_node1)
-    const variableDeclarationName =
+    const variableDeclarationName = _node1.node?.declaration.id?.name || ''
-      _node1.node?.declarations?.[0]?.id?.name || ''
+    const startSketchOn = _node1.node?.declaration
-    const startSketchOn = _node1.node?.declarations
+    const startSketchOnInit = startSketchOn?.init
-    const startSketchOnInit = startSketchOn?.[0]?.init
 
-    startSketchOn[0].init = createPipeExpression([
+    startSketchOn.init = createPipeExpression([
       startSketchOnInit,
       createCallExpressionStdLib('circle', [
         createObjectExpression({
@@ -1271,7 +1267,7 @@ export class SceneEntities {
         )
         let modded = structuredClone(truncatedAst)
         if (trap(_node)) return
-        const sketchInit = _node.node?.declarations?.[0]?.init
+        const sketchInit = _node.node.declaration.init
 
         const x = (args.intersectionPoint.twoD.x || 0) - circleCenter[0]
         const y = (args.intersectionPoint.twoD.y || 0) - circleCenter[1]
@@ -1339,7 +1335,7 @@ export class SceneEntities {
           'VariableDeclaration'
         )
         if (trap(_node)) return
-        const sketchInit = _node.node?.declarations?.[0]?.init
+        const sketchInit = _node.node?.declaration.init
 
         let modded = structuredClone(_ast)
         if (sketchInit.type === 'PipeExpression') {
@@ -2060,7 +2056,7 @@ function prepareTruncatedMemoryAndAst(
     'VariableDeclaration'
   )
   if (err(_node)) return _node
-  const variableDeclarationName = _node.node?.declarations?.[0]?.id?.name || ''
+  const variableDeclarationName = _node.node?.declaration.id?.name || ''
   const sg = sketchFromKclValue(
     programMemory.get(variableDeclarationName),
     variableDeclarationName
@@ -2085,7 +2081,7 @@ function prepareTruncatedMemoryAndAst(
       ])
     }
     ;(
-      (_ast.body[bodyIndex] as VariableDeclaration).declarations[0]
+      (_ast.body[bodyIndex] as VariableDeclaration).declaration
         .init as PipeExpression
     ).body.push(newSegment)
     // update source ranges to section we just added.
@@ -2096,19 +2092,19 @@ function prepareTruncatedMemoryAndAst(
     const updatedSrcRangeAst = pResult.program
 
     const lastPipeItem = (
-      (updatedSrcRangeAst.body[bodyIndex] as VariableDeclaration)
+      (updatedSrcRangeAst.body[bodyIndex] as VariableDeclaration).declaration
-        .declarations[0].init as PipeExpression
+        .init as PipeExpression
     ).body.slice(-1)[0]
 
     ;(
-      (_ast.body[bodyIndex] as VariableDeclaration).declarations[0]
+      (_ast.body[bodyIndex] as VariableDeclaration).declaration
         .init as PipeExpression
     ).body.slice(-1)[0].start = lastPipeItem.start
 
     _ast.end = lastPipeItem.end
     const varDec = _ast.body[bodyIndex] as Node<VariableDeclaration>
     varDec.end = lastPipeItem.end
-    const declarator = varDec.declarations[0]
+    const declarator = varDec.declaration
     declarator.end = lastPipeItem.end
     const init = declarator.init as Node<PipeExpression>
     init.end = lastPipeItem.end
@@ -2145,7 +2141,7 @@ function prepareTruncatedMemoryAndAst(
     if (node.type !== 'VariableDeclaration') {
       continue
     }
-    const name = node.declarations[0].id.name
+    const name = node.declaration.id.name
     const memoryItem = programMemory.get(name)
     if (!memoryItem) {
       continue

src/components/AvailableVarsHelpers.tsx

@@ -169,11 +169,11 @@ export function useCalc({
         const resultDeclaration = ast.body.find(
           (a) =>
             a.type === 'VariableDeclaration' &&
-            a.declarations?.[0]?.id?.name === '__result__'
+            a.declaration.id?.name === '__result__'
         )
         const init =
           resultDeclaration?.type === 'VariableDeclaration' &&
-          resultDeclaration?.declarations?.[0]?.init
+          resultDeclaration?.declaration.init
         const result = execState.memory?.get('__result__')?.value
         setCalcResult(typeof result === 'number' ? String(result) : 'NAN')
         init && setValueNode(init)

src/lang/getNodePathFromSourceRange.test.ts

@@ -60,8 +60,7 @@ const b1 = cube([0,0], 10)`
     expect(nodePath).toEqual([
       ['body', ''],
       [0, 'index'],
-      ['declarations', 'VariableDeclaration'],
+      ['declaration', 'VariableDeclaration'],
-      [0, 'index'],
       ['init', ''],
       ['params', 'FunctionExpression'],
       [0, 'index'],
@@ -96,14 +95,12 @@ const b1 = cube([0,0], 10)`
     expect(nodePath).toEqual([
       ['body', ''],
       [0, 'index'],
-      ['declarations', 'VariableDeclaration'],
+      ['declaration', 'VariableDeclaration'],
-      [0, 'index'],
       ['init', ''],
       ['body', 'FunctionExpression'],
       ['body', 'FunctionExpression'],
       [0, 'index'],
-      ['declarations', 'VariableDeclaration'],
+      ['declaration', 'VariableDeclaration'],
-      [0, 'index'],
       ['init', ''],
       ['body', 'PipeExpression'],
       [2, 'index'],

src/lang/modifyAst.test.ts

@@ -82,11 +82,11 @@ describe('Testing createVariableDeclaration', () => {
   it('should create a variable declaration', () => {
     const result = createVariableDeclaration('myVar', createLiteral(5))
     expect(result.type).toBe('VariableDeclaration')
-    expect(result.declarations[0].type).toBe('VariableDeclarator')
+    expect(result.declaration.type).toBe('VariableDeclarator')
-    expect(result.declarations[0].id.type).toBe('Identifier')
+    expect(result.declaration.id.type).toBe('Identifier')
-    expect(result.declarations[0].id.name).toBe('myVar')
+    expect(result.declaration.id.name).toBe('myVar')
-    expect(result.declarations[0].init.type).toBe('Literal')
+    expect(result.declaration.init.type).toBe('Literal')
-    expect((result.declarations[0].init as any).value).toBe(5)
+    expect((result.declaration.init as any).value).toBe(5)
   })
 })
 describe('Testing createPipeExpression', () => {

src/lang/modifyAst.ts

@@ -66,8 +66,7 @@ export function startSketchOnDefault(
   let pathToNode: PathToNode = [
     ['body', ''],
     [sketchIndex, 'index'],
-    ['declarations', 'VariableDeclaration'],
+    ['declaration', 'VariableDeclaration'],
-    ['0', 'index'],
     ['init', 'VariableDeclarator'],
   ]
 
@@ -94,7 +93,7 @@ export function addStartProfileAt(
     return new Error('variableDeclaration.init.type !== PipeExpression')
   }
   const _node = { ...node }
-  const init = variableDeclaration.declarations[0].init
+  const init = variableDeclaration.declaration.init
   const startProfileAt = createCallExpressionStdLib('startProfileAt', [
     createArrayExpression([
       createLiteral(roundOff(at[0])),
@@ -105,7 +104,7 @@ export function addStartProfileAt(
   if (init.type === 'PipeExpression') {
     init.body.splice(1, 0, startProfileAt)
   } else {
-    variableDeclaration.declarations[0].init = createPipeExpression([
+    variableDeclaration.declaration.init = createPipeExpression([
       init,
       startProfileAt,
     ])
@@ -149,8 +148,7 @@ export function addSketchTo(
   let pathToNode: PathToNode = [
     ['body', ''],
     [sketchIndex, 'index'],
-    ['declarations', 'VariableDeclaration'],
+    ['declaration', 'VariableDeclaration'],
-    ['0', 'index'],
     ['init', 'VariableDeclarator'],
   ]
   if (axis !== 'xy') {
@@ -333,8 +331,7 @@ export function extrudeSketch(
   const pathToExtrudeArg: PathToNode = [
     ['body', ''],
     [sketchIndexInBody + 1, 'index'],
-    ['declarations', 'VariableDeclaration'],
+    ['declaration', 'VariableDeclaration'],
-    [0, 'index'],
     ['init', 'VariableDeclarator'],
     ['arguments', 'CallExpression'],
     [0, 'index'],
@@ -364,8 +361,7 @@ export function loftSketches(
   const pathToNode: PathToNode = [
     ['body', ''],
     [modifiedAst.body.length - 1, 'index'],
-    ['declarations', 'VariableDeclaration'],
+    ['declaration', 'VariableDeclaration'],
-    ['0', 'index'],
     ['init', 'VariableDeclarator'],
     ['arguments', 'CallExpression'],
     [0, 'index'],
@@ -460,8 +456,7 @@ export function revolveSketch(
   const pathToRevolveArg: PathToNode = [
     ['body', ''],
     [sketchIndexInBody + 1, 'index'],
-    ['declarations', 'VariableDeclaration'],
+    ['declaration', 'VariableDeclaration'],
-    [0, 'index'],
     ['init', 'VariableDeclarator'],
     ['arguments', 'CallExpression'],
     [0, 'index'],
@@ -547,8 +542,7 @@ export function sketchOnExtrudedFace(
   const newpathToNode: PathToNode = [
     ['body', ''],
     [expressionIndex + 1, 'index'],
-    ['declarations', 'VariableDeclaration'],
+    ['declaration', 'VariableDeclaration'],
-    [0, 'index'],
     ['init', 'VariableDeclarator'],
   ]
 
@@ -585,8 +579,7 @@ export function addOffsetPlane({
   const pathToNode: PathToNode = [
     ['body', ''],
     [modifiedAst.body.length - 1, 'index'],
-    ['declarations', 'VariableDeclaration'],
+    ['declaration', 'VariableDeclaration'],
-    ['0', 'index'],
     ['init', 'VariableDeclarator'],
     ['arguments', 'CallExpression'],
     [0, 'index'],
@@ -823,8 +816,7 @@ export function createVariableDeclaration(
     end: 0,
     moduleId: 0,
 
-    declarations: [
+    declaration: {
-      {
       type: 'VariableDeclarator',
       start: 0,
       end: 0,
@@ -833,7 +825,6 @@ export function createVariableDeclaration(
       id: createIdentifier(varName),
       init,
     },
-    ],
     visibility,
     kind,
   }
@@ -1120,7 +1111,7 @@ export async function deleteFromSelection(
     traverse(astClone, {
       enter: (node, path) => {
         if (node.type === 'VariableDeclaration') {
-          const dec = node.declarations[0]
+          const dec = node.declaration
           if (
             dec.init.type === 'CallExpression' &&
             (dec.init.callee.name === 'extrude' ||
@@ -1155,7 +1146,7 @@ export async function deleteFromSelection(
             enter: (node, path) => {
               ;(async () => {
                 if (node.type === 'VariableDeclaration') {
-                  currentVariableName = node.declarations[0].id.name
+                  currentVariableName = node.declaration.id.name
                 }
                 if (
                   // match startSketchOn(${extrudeNameToDelete})

src/lang/modifyAst/addEdgeTreatment.ts

@@ -273,7 +273,7 @@ export function getPathToExtrudeForSegmentSelection(
     'VariableDeclaration'
   )
   if (err(varDecNode)) return varDecNode
-  const sketchVar = varDecNode.node.declarations[0].id.name
+  const sketchVar = varDecNode.node.declaration.id.name
 
   const sketch = sketchFromKclValue(
     kclManager.programMemory.get(sketchVar),
@@ -367,7 +367,7 @@ function locateExtrudeDeclarator(
   if (err(nodeOfExtrudeCall)) return nodeOfExtrudeCall
 
   const { node: extrudeVarDecl } = nodeOfExtrudeCall
-  const extrudeDeclarator = extrudeVarDecl.declarations[0]
+  const extrudeDeclarator = extrudeVarDecl.declaration
   if (!extrudeDeclarator) {
     return new Error('Extrude Declarator not found.')
   }

src/lang/queryAst.test.ts

@@ -230,8 +230,7 @@ describe('testing getNodePathFromSourceRange', () => {
     expect(result).toEqual([
       ['body', ''],
       [0, 'index'],
-      ['declarations', 'VariableDeclaration'],
+      ['declaration', 'VariableDeclaration'],
-      [0, 'index'],
       ['init', ''],
       ['body', 'PipeExpression'],
       [2, 'index'],
@@ -250,8 +249,7 @@ describe('testing getNodePathFromSourceRange', () => {
     const expected = [
       ['body', ''],
       [0, 'index'],
-      ['declarations', 'VariableDeclaration'],
+      ['declaration', 'VariableDeclaration'],
-      [0, 'index'],
       ['init', ''],
       ['body', 'PipeExpression'],
       [3, 'index'],
@@ -293,8 +291,7 @@ describe('testing getNodePathFromSourceRange', () => {
     expect(result).toEqual([
       ['body', ''],
       [1, 'index'],
-      ['declarations', 'VariableDeclaration'],
+      ['declaration', 'VariableDeclaration'],
-      [0, 'index'],
       ['init', ''],
       ['cond', 'IfExpression'],
       ['left', 'BinaryExpression'],
@@ -324,8 +321,7 @@ describe('testing getNodePathFromSourceRange', () => {
     expect(result).toEqual([
       ['body', ''],
       [1, 'index'],
-      ['declarations', 'VariableDeclaration'],
+      ['declaration', 'VariableDeclaration'],
-      [0, 'index'],
       ['init', ''],
       ['then_val', 'IfExpression'],
       ['body', 'IfExpression'],
@@ -353,7 +349,8 @@ describe('testing getNodePathFromSourceRange', () => {
     expect(result).toEqual([
       ['body', ''],
       [0, 'index'],
-      ['items', 'ImportStatement'],
+      ['selector', 'ImportStatement'],
+      ['items', 'ImportSelector'],
       [1, 'index'],
       ['name', 'ImportItem'],
     ])

src/lang/queryAst.ts

@@ -259,13 +259,10 @@ function moreNodePathFromSourceRange(
     return moreNodePathFromSourceRange(expression, sourceRange, path)
   }
   if (_node.type === 'VariableDeclaration' && isInRange) {
-    const declarations = _node.declarations
+    const declaration = _node.declaration
 
-    for (let decIndex = 0; decIndex < declarations.length; decIndex++) {
-      const declaration = declarations[decIndex]
     if (declaration.start <= start && declaration.end >= end) {
-        path.push(['declarations', 'VariableDeclaration'])
+      path.push(['declaration', 'VariableDeclaration'])
-        path.push([decIndex, 'index'])
       const init = declaration.init
       if (init.start <= start && init.end >= end) {
         path.push(['init', ''])
@@ -273,22 +270,17 @@ function moreNodePathFromSourceRange(
       }
     }
   }
-  }
   if (_node.type === 'VariableDeclaration' && isInRange) {
-    const declarations = _node.declarations
+    const declaration = _node.declaration
 
-    for (let decIndex = 0; decIndex < declarations.length; decIndex++) {
-      const declaration = declarations[decIndex]
     if (declaration.start <= start && declaration.end >= end) {
       const init = declaration.init
       if (init.start <= start && init.end >= end) {
-          path.push(['declarations', 'VariableDeclaration'])
+        path.push(['declaration', 'VariableDeclaration'])
-          path.push([decIndex, 'index'])
         path.push(['init', ''])
         return moreNodePathFromSourceRange(init, sourceRange, path)
       }
     }
-    }
     return path
   }
   if (_node.type === 'UnaryExpression' && isInRange) {
@@ -380,17 +372,23 @@ function moreNodePathFromSourceRange(
   }
 
   if (_node.type === 'ImportStatement' && isInRange) {
-    const { items } = _node
+    if (_node.selector && _node.selector.type === 'List') {
+      path.push(['selector', 'ImportStatement'])
+      const { items } = _node.selector
       for (let i = 0; i < items.length; i++) {
         const item = items[i]
         if (item.start <= start && item.end >= end) {
-        path.push(['items', 'ImportStatement'])
+          path.push(['items', 'ImportSelector'])
           path.push([i, 'index'])
           if (item.name.start <= start && item.name.end >= end) {
             path.push(['name', 'ImportItem'])
             return path
           }
-        if (item.alias && item.alias.start <= start && item.alias.end >= end) {
+          if (
+            item.alias &&
+            item.alias.start <= start &&
+            item.alias.end >= end
+          ) {
             path.push(['alias', 'ImportItem'])
             return path
           }
@@ -399,6 +397,7 @@ function moreNodePathFromSourceRange(
       }
       return path
     }
+  }
 
   console.error('not implemented: ' + node.type)
 
@@ -451,13 +450,10 @@ export function traverse(
     traverse(node, option, pathToNode)
 
   if (_node.type === 'VariableDeclaration') {
-    _node.declarations.forEach((declaration, index) =>
+    _traverse(_node.declaration, [
-      _traverse(declaration, [
       ...pathToNode,
-        ['declarations', 'VariableDeclaration'],
+      ['declaration', 'VariableDeclaration'],
-        [index, 'index'],
     ])
-    )
   } else if (_node.type === 'VariableDeclarator') {
     _traverse(_node.init, [...pathToNode, ['init', '']])
   } else if (_node.type === 'PipeExpression') {
@@ -567,7 +563,7 @@ export function findAllPreviousVariablesPath(
   const variables: PrevVariable<any>[] = []
   bodyItems?.forEach?.((item) => {
     if (item.type !== 'VariableDeclaration' || item.end > startRange) return
-    const varName = item.declarations[0].id.name
+    const varName = item.declaration.id.name
     const varValue = programMemory?.get(varName)
     if (!varValue || typeof varValue?.value !== type) return
     variables.push({
@@ -761,7 +757,7 @@ export function isLinesParallelAndConstrained(
     const _varDec = getNodeFromPath(ast, primaryPath, 'VariableDeclaration')
     if (err(_varDec)) return _varDec
     const varDec = _varDec.node
-    const varName = (varDec as VariableDeclaration)?.declarations[0]?.id?.name
+    const varName = (varDec as VariableDeclaration)?.declaration.id?.name
     const sg = sketchFromKclValue(programMemory?.get(varName), varName)
     if (err(sg)) return sg
     const _primarySegment = getSketchSegmentFromSourceRange(
@@ -881,7 +877,7 @@ export function hasExtrudeSketch({
   }
   const varDec = varDecMeta.node
   if (varDec.type !== 'VariableDeclaration') return false
-  const varName = varDec.declarations[0].id.name
+  const varName = varDec.declaration.id.name
   const varValue = programMemory?.get(varName)
   return (
     varValue?.type === 'Solid' ||

src/lang/std/sketch.test.ts

@@ -164,8 +164,7 @@ mySketch001 = startSketchOn('XY')
       pathToNode: [
         ['body', ''],
         [0, 'index'],
-        ['declarations', 'VariableDeclaration'],
+        ['declaration', 'VariableDeclaration'],
-        [0, 'index'],
         ['init', 'VariableDeclarator'],
       ],
     })
@@ -189,8 +188,7 @@ mySketch001 = startSketchOn('XY')
       pathToNode: [
         ['body', ''],
         [0, 'index'],
-        ['declarations', 'VariableDeclaration'],
+        ['declaration', 'VariableDeclaration'],
-        [0, 'index'],
         ['init', 'VariableDeclarator'],
       ],
     })

src/lang/std/sketch.ts

@@ -1701,7 +1701,7 @@ export const angledLineThatIntersects: SketchLineHelper = {
     if (err(nodeMeta2)) return nodeMeta2
 
     const { node: varDec } = nodeMeta2
-    const varName = varDec.declarations[0].id.name
+    const varName = varDec.declaration.id.name
     const sketch = sketchFromKclValue(
       previousProgramMemory.get(varName),
       varName

src/lang/std/sketchConstraints.ts

@@ -111,13 +111,11 @@ export function isSketchVariablesLinked(
   let nextVarDec: VariableDeclarator | undefined
   for (const node of ast.body) {
     if (node.type !== 'VariableDeclaration') continue
-    const found = node.declarations.find(
+    if (node.declaration.id.name === secondArg.name) {
-      ({ id }) => id?.name === secondArg.name
+      nextVarDec = node.declaration
-    )
-    if (!found) continue
-    nextVarDec = found
       break
     }
+  }
   if (!nextVarDec) return false
   return isSketchVariablesLinked(nextVarDec, primaryVarDec, ast)
 }

src/lib/useCalculateKclExpression.ts

@@ -109,11 +109,11 @@ export function useCalculateKclExpression({
       const resultDeclaration = ast.body.find(
         (a) =>
           a.type === 'VariableDeclaration' &&
-          a.declarations?.[0]?.id?.name === '__result__'
+          a.declaration.id?.name === '__result__'
       )
       const init =
         resultDeclaration?.type === 'VariableDeclaration' &&
-        resultDeclaration?.declarations?.[0]?.init
+        resultDeclaration?.declaration.init
       const result = execState.memory?.get('__result__')?.value
       setCalcResult(typeof result === 'number' ? String(result) : 'NAN')
       init && setValueNode(init)

src/machines/modelingMachine.ts

@@ -2491,7 +2491,7 @@ export function canRectangleOrCircleTool({
   // This should not be returning false, and it should be caught
   // but we need to simulate old behavior to move on.
   if (err(node)) return false
-  return node.node?.declarations?.[0]?.init.type !== 'PipeExpression'
+  return node.node?.declaration.init.type !== 'PipeExpression'
 }
 
 /** If the sketch contains `close` or `circle` stdlib functions it must be closed */
@@ -2508,8 +2508,8 @@ export function isClosedSketch({
   // This should not be returning false, and it should be caught
   // but we need to simulate old behavior to move on.
   if (err(node)) return false
-  if (node.node?.declarations?.[0]?.init.type !== 'PipeExpression') return false
+  if (node.node?.declaration.init.type !== 'PipeExpression') return false
-  return node.node.declarations[0].init.body.some(
+  return node.node.declaration.init.body.some(
     (node) =>
       node.type === 'CallExpression' &&
       (node.callee.name === 'close' || node.callee.name === 'circle')

src/wasm-lib/derive-docs/src/lib.rs

@@ -395,10 +395,10 @@ fn do_stdlib_inner(
         #const_struct
 
         fn #boxed_fn_name_ident(
-            exec_state: &mut crate::executor::ExecState,
+            exec_state: &mut crate::ExecState,
             args: crate::std::Args,
         ) -> std::pin::Pin<
-            Box<dyn std::future::Future<Output = anyhow::Result<crate::executor::KclValue, crate::errors::KclError>> + Send + '_>,
+            Box<dyn std::future::Future<Output = anyhow::Result<crate::execution::KclValue, crate::errors::KclError>> + Send + '_>,
         > {
             Box::pin(#fn_name_ident(exec_state, args))
         }
@@ -770,12 +770,12 @@ fn generate_code_block_test(fn_name: &str, code_block: &str, index: usize) -> pr
         #[tokio::test(flavor = "multi_thread")]
         async fn #test_name_mock() {
             let program = crate::Program::parse_no_errs(#code_block).unwrap();
-            let ctx = crate::executor::ExecutorContext {
+            let ctx = crate::ExecutorContext {
                 engine: std::sync::Arc::new(Box::new(crate::engine::conn_mock::EngineConnection::new().await.unwrap())),
                 fs: std::sync::Arc::new(crate::fs::FileManager::new()),
                 stdlib: std::sync::Arc::new(crate::std::StdLib::new()),
                 settings: Default::default(),
-                context_type: crate::executor::ContextType::Mock,
+                context_type: crate::execution::ContextType::Mock,
             };
 
             ctx.run(program.into(), &mut crate::ExecState::default()).await.unwrap();
@@ -785,7 +785,7 @@ fn generate_code_block_test(fn_name: &str, code_block: &str, index: usize) -> pr
         async fn #test_name() {
             let code = #code_block;
             // Note, `crate` must be kcl_lib
-            let result = crate::test_server::execute_and_snapshot(code, crate::settings::types::UnitLength::Mm).await.unwrap();
+            let result = crate::test_server::execute_and_snapshot(code, crate::settings::types::UnitLength::Mm, None).await.unwrap();
             twenty_twenty::assert_image(&format!("tests/outputs/{}.png", #output_test_name_str), &result, 0.99);
         }
     }

src/wasm-lib/derive-docs/tests/args_with_lifetime.gen

@@ -3,7 +3,7 @@ mod test_examples_someFn {
     #[tokio::test(flavor = "multi_thread")]
     async fn test_mock_example_someFn0() {
         let program = crate::Program::parse_no_errs("someFn()").unwrap();
-        let ctx = crate::executor::ExecutorContext {
+        let ctx = crate::ExecutorContext {
             engine: std::sync::Arc::new(Box::new(
                 crate::engine::conn_mock::EngineConnection::new()
                     .await
@@ -12,7 +12,7 @@ mod test_examples_someFn {
             fs: std::sync::Arc::new(crate::fs::FileManager::new()),
             stdlib: std::sync::Arc::new(crate::std::StdLib::new()),
             settings: Default::default(),
-            context_type: crate::executor::ContextType::Mock,
+            context_type: crate::execution::ContextType::Mock,
         };
         ctx.run(program.into(), &mut crate::ExecState::default())
             .await
@@ -22,8 +22,11 @@ mod test_examples_someFn {
     #[tokio::test(flavor = "multi_thread", worker_threads = 5)]
     async fn kcl_test_example_someFn0() {
         let code = "someFn()";
-        let result =
+        let result = crate::test_server::execute_and_snapshot(
-            crate::test_server::execute_and_snapshot(code, crate::settings::types::UnitLength::Mm)
+            code,
+            crate::settings::types::UnitLength::Mm,
+            None,
+        )
         .await
         .unwrap();
         twenty_twenty::assert_image(
@@ -44,12 +47,12 @@ pub(crate) struct SomeFn {}
 #[doc = "Std lib function: someFn\nDocs"]
 pub(crate) const SomeFn: SomeFn = SomeFn {};
 fn boxed_someFn(
-    exec_state: &mut crate::executor::ExecState,
+    exec_state: &mut crate::ExecState,
     args: crate::std::Args,
 ) -> std::pin::Pin<
     Box<
         dyn std::future::Future<
-                Output = anyhow::Result<crate::executor::KclValue, crate::errors::KclError>,
+                Output = anyhow::Result<crate::execution::KclValue, crate::errors::KclError>,
             > + Send
             + '_,
     >,

src/wasm-lib/derive-docs/tests/args_with_refs.gen

@@ -3,7 +3,7 @@ mod test_examples_someFn {
     #[tokio::test(flavor = "multi_thread")]
     async fn test_mock_example_someFn0() {
         let program = crate::Program::parse_no_errs("someFn()").unwrap();
-        let ctx = crate::executor::ExecutorContext {
+        let ctx = crate::ExecutorContext {
             engine: std::sync::Arc::new(Box::new(
                 crate::engine::conn_mock::EngineConnection::new()
                     .await
@@ -12,7 +12,7 @@ mod test_examples_someFn {
             fs: std::sync::Arc::new(crate::fs::FileManager::new()),
             stdlib: std::sync::Arc::new(crate::std::StdLib::new()),
             settings: Default::default(),
-            context_type: crate::executor::ContextType::Mock,
+            context_type: crate::execution::ContextType::Mock,
         };
         ctx.run(program.into(), &mut crate::ExecState::default())
             .await
@@ -22,8 +22,11 @@ mod test_examples_someFn {
     #[tokio::test(flavor = "multi_thread", worker_threads = 5)]
     async fn kcl_test_example_someFn0() {
         let code = "someFn()";
-        let result =
+        let result = crate::test_server::execute_and_snapshot(
-            crate::test_server::execute_and_snapshot(code, crate::settings::types::UnitLength::Mm)
+            code,
+            crate::settings::types::UnitLength::Mm,
+            None,
+        )
         .await
         .unwrap();
         twenty_twenty::assert_image(
@@ -44,12 +47,12 @@ pub(crate) struct SomeFn {}
 #[doc = "Std lib function: someFn\nDocs"]
 pub(crate) const SomeFn: SomeFn = SomeFn {};
 fn boxed_someFn(
-    exec_state: &mut crate::executor::ExecState,
+    exec_state: &mut crate::ExecState,
     args: crate::std::Args,
 ) -> std::pin::Pin<
     Box<
         dyn std::future::Future<
-                Output = anyhow::Result<crate::executor::KclValue, crate::errors::KclError>,
+                Output = anyhow::Result<crate::execution::KclValue, crate::errors::KclError>,
             > + Send
             + '_,
     >,

src/wasm-lib/derive-docs/tests/array.gen

@@ -4,7 +4,7 @@ mod test_examples_show {
     async fn test_mock_example_show0() {
         let program =
             crate::Program::parse_no_errs("This is another code block.\nyes sirrr.\nshow").unwrap();
-        let ctx = crate::executor::ExecutorContext {
+        let ctx = crate::ExecutorContext {
             engine: std::sync::Arc::new(Box::new(
                 crate::engine::conn_mock::EngineConnection::new()
                     .await
@@ -13,7 +13,7 @@ mod test_examples_show {
             fs: std::sync::Arc::new(crate::fs::FileManager::new()),
             stdlib: std::sync::Arc::new(crate::std::StdLib::new()),
             settings: Default::default(),
-            context_type: crate::executor::ContextType::Mock,
+            context_type: crate::execution::ContextType::Mock,
         };
         ctx.run(program.into(), &mut crate::ExecState::default())
             .await
@@ -23,8 +23,11 @@ mod test_examples_show {
     #[tokio::test(flavor = "multi_thread", worker_threads = 5)]
     async fn kcl_test_example_show0() {
         let code = "This is another code block.\nyes sirrr.\nshow";
-        let result =
+        let result = crate::test_server::execute_and_snapshot(
-            crate::test_server::execute_and_snapshot(code, crate::settings::types::UnitLength::Mm)
+            code,
+            crate::settings::types::UnitLength::Mm,
+            None,
+        )
         .await
         .unwrap();
         twenty_twenty::assert_image(
@@ -38,7 +41,7 @@ mod test_examples_show {
     async fn test_mock_example_show1() {
         let program =
             crate::Program::parse_no_errs("This is code.\nIt does other shit.\nshow").unwrap();
-        let ctx = crate::executor::ExecutorContext {
+        let ctx = crate::ExecutorContext {
             engine: std::sync::Arc::new(Box::new(
                 crate::engine::conn_mock::EngineConnection::new()
                     .await
@@ -47,7 +50,7 @@ mod test_examples_show {
             fs: std::sync::Arc::new(crate::fs::FileManager::new()),
             stdlib: std::sync::Arc::new(crate::std::StdLib::new()),
             settings: Default::default(),
-            context_type: crate::executor::ContextType::Mock,
+            context_type: crate::execution::ContextType::Mock,
         };
         ctx.run(program.into(), &mut crate::ExecState::default())
             .await
@@ -57,8 +60,11 @@ mod test_examples_show {
     #[tokio::test(flavor = "multi_thread", worker_threads = 5)]
     async fn kcl_test_example_show1() {
         let code = "This is code.\nIt does other shit.\nshow";
-        let result =
+        let result = crate::test_server::execute_and_snapshot(
-            crate::test_server::execute_and_snapshot(code, crate::settings::types::UnitLength::Mm)
+            code,
+            crate::settings::types::UnitLength::Mm,
+            None,
+        )
         .await
         .unwrap();
         twenty_twenty::assert_image(
@@ -79,12 +85,12 @@ pub(crate) struct Show {}
 #[doc = "Std lib function: show\nThis is some function.\nIt does shit."]
 pub(crate) const Show: Show = Show {};
 fn boxed_show(
-    exec_state: &mut crate::executor::ExecState,
+    exec_state: &mut crate::ExecState,
     args: crate::std::Args,
 ) -> std::pin::Pin<
     Box<
         dyn std::future::Future<
-                Output = anyhow::Result<crate::executor::KclValue, crate::errors::KclError>,
+                Output = anyhow::Result<crate::execution::KclValue, crate::errors::KclError>,
             > + Send
             + '_,
     >,

src/wasm-lib/derive-docs/tests/box.gen

@@ -4,7 +4,7 @@ mod test_examples_show {
     async fn test_mock_example_show0() {
         let program =
             crate::Program::parse_no_errs("This is code.\nIt does other shit.\nshow").unwrap();
-        let ctx = crate::executor::ExecutorContext {
+        let ctx = crate::ExecutorContext {
             engine: std::sync::Arc::new(Box::new(
                 crate::engine::conn_mock::EngineConnection::new()
                     .await
@@ -13,7 +13,7 @@ mod test_examples_show {
             fs: std::sync::Arc::new(crate::fs::FileManager::new()),
             stdlib: std::sync::Arc::new(crate::std::StdLib::new()),
             settings: Default::default(),
-            context_type: crate::executor::ContextType::Mock,
+            context_type: crate::execution::ContextType::Mock,
         };
         ctx.run(program.into(), &mut crate::ExecState::default())
             .await
@@ -23,8 +23,11 @@ mod test_examples_show {
     #[tokio::test(flavor = "multi_thread", worker_threads = 5)]
     async fn kcl_test_example_show0() {
         let code = "This is code.\nIt does other shit.\nshow";
-        let result =
+        let result = crate::test_server::execute_and_snapshot(
-            crate::test_server::execute_and_snapshot(code, crate::settings::types::UnitLength::Mm)
+            code,
+            crate::settings::types::UnitLength::Mm,
+            None,
+        )
         .await
         .unwrap();
         twenty_twenty::assert_image(
@@ -45,12 +48,12 @@ pub(crate) struct Show {}
 #[doc = "Std lib function: show\nThis is some function.\nIt does shit."]
 pub(crate) const Show: Show = Show {};
 fn boxed_show(
-    exec_state: &mut crate::executor::ExecState,
+    exec_state: &mut crate::ExecState,
     args: crate::std::Args,
 ) -> std::pin::Pin<
     Box<
         dyn std::future::Future<
-                Output = anyhow::Result<crate::executor::KclValue, crate::errors::KclError>,
+                Output = anyhow::Result<crate::execution::KclValue, crate::errors::KclError>,
             > + Send
             + '_,
     >,

src/wasm-lib/derive-docs/tests/doc_comment_with_code.gen

@@ -5,7 +5,7 @@ mod test_examples_my_func {
         let program =
             crate::Program::parse_no_errs("This is another code block.\nyes sirrr.\nmyFunc")
                 .unwrap();
-        let ctx = crate::executor::ExecutorContext {
+        let ctx = crate::ExecutorContext {
             engine: std::sync::Arc::new(Box::new(
                 crate::engine::conn_mock::EngineConnection::new()
                     .await
@@ -14,7 +14,7 @@ mod test_examples_my_func {
             fs: std::sync::Arc::new(crate::fs::FileManager::new()),
             stdlib: std::sync::Arc::new(crate::std::StdLib::new()),
             settings: Default::default(),
-            context_type: crate::executor::ContextType::Mock,
+            context_type: crate::execution::ContextType::Mock,
         };
         ctx.run(program.into(), &mut crate::ExecState::default())
             .await
@@ -24,8 +24,11 @@ mod test_examples_my_func {
     #[tokio::test(flavor = "multi_thread", worker_threads = 5)]
     async fn kcl_test_example_my_func0() {
         let code = "This is another code block.\nyes sirrr.\nmyFunc";
-        let result =
+        let result = crate::test_server::execute_and_snapshot(
-            crate::test_server::execute_and_snapshot(code, crate::settings::types::UnitLength::Mm)
+            code,
+            crate::settings::types::UnitLength::Mm,
+            None,
+        )
         .await
         .unwrap();
         twenty_twenty::assert_image(
@@ -39,7 +42,7 @@ mod test_examples_my_func {
     async fn test_mock_example_my_func1() {
         let program =
             crate::Program::parse_no_errs("This is code.\nIt does other shit.\nmyFunc").unwrap();
-        let ctx = crate::executor::ExecutorContext {
+        let ctx = crate::ExecutorContext {
             engine: std::sync::Arc::new(Box::new(
                 crate::engine::conn_mock::EngineConnection::new()
                     .await
@@ -48,7 +51,7 @@ mod test_examples_my_func {
             fs: std::sync::Arc::new(crate::fs::FileManager::new()),
             stdlib: std::sync::Arc::new(crate::std::StdLib::new()),
             settings: Default::default(),
-            context_type: crate::executor::ContextType::Mock,
+            context_type: crate::execution::ContextType::Mock,
         };
         ctx.run(program.into(), &mut crate::ExecState::default())
             .await
@@ -58,8 +61,11 @@ mod test_examples_my_func {
     #[tokio::test(flavor = "multi_thread", worker_threads = 5)]
     async fn kcl_test_example_my_func1() {
         let code = "This is code.\nIt does other shit.\nmyFunc";
-        let result =
+        let result = crate::test_server::execute_and_snapshot(
-            crate::test_server::execute_and_snapshot(code, crate::settings::types::UnitLength::Mm)
+            code,
+            crate::settings::types::UnitLength::Mm,
+            None,
+        )
         .await
         .unwrap();
         twenty_twenty::assert_image(
@@ -80,12 +86,12 @@ pub(crate) struct MyFunc {}
 #[doc = "Std lib function: myFunc\nThis is some function.\nIt does shit."]
 pub(crate) const MyFunc: MyFunc = MyFunc {};
 fn boxed_my_func(
-    exec_state: &mut crate::executor::ExecState,
+    exec_state: &mut crate::ExecState,
     args: crate::std::Args,
 ) -> std::pin::Pin<
     Box<
         dyn std::future::Future<
-                Output = anyhow::Result<crate::executor::KclValue, crate::errors::KclError>,
+                Output = anyhow::Result<crate::execution::KclValue, crate::errors::KclError>,
             > + Send
             + '_,
     >,

src/wasm-lib/derive-docs/tests/lineTo.gen

@@ -5,7 +5,7 @@ mod test_examples_line_to {
         let program =
             crate::Program::parse_no_errs("This is another code block.\nyes sirrr.\nlineTo")
                 .unwrap();
-        let ctx = crate::executor::ExecutorContext {
+        let ctx = crate::ExecutorContext {
             engine: std::sync::Arc::new(Box::new(
                 crate::engine::conn_mock::EngineConnection::new()
                     .await
@@ -14,7 +14,7 @@ mod test_examples_line_to {
             fs: std::sync::Arc::new(crate::fs::FileManager::new()),
             stdlib: std::sync::Arc::new(crate::std::StdLib::new()),
             settings: Default::default(),
-            context_type: crate::executor::ContextType::Mock,
+            context_type: crate::execution::ContextType::Mock,
         };
         ctx.run(program.into(), &mut crate::ExecState::default())
             .await
@@ -24,8 +24,11 @@ mod test_examples_line_to {
     #[tokio::test(flavor = "multi_thread", worker_threads = 5)]
     async fn kcl_test_example_line_to0() {
         let code = "This is another code block.\nyes sirrr.\nlineTo";
-        let result =
+        let result = crate::test_server::execute_and_snapshot(
-            crate::test_server::execute_and_snapshot(code, crate::settings::types::UnitLength::Mm)
+            code,
+            crate::settings::types::UnitLength::Mm,
+            None,
+        )
         .await
         .unwrap();
         twenty_twenty::assert_image(
@@ -39,7 +42,7 @@ mod test_examples_line_to {
     async fn test_mock_example_line_to1() {
         let program =
             crate::Program::parse_no_errs("This is code.\nIt does other shit.\nlineTo").unwrap();
-        let ctx = crate::executor::ExecutorContext {
+        let ctx = crate::ExecutorContext {
             engine: std::sync::Arc::new(Box::new(
                 crate::engine::conn_mock::EngineConnection::new()
                     .await
@@ -48,7 +51,7 @@ mod test_examples_line_to {
             fs: std::sync::Arc::new(crate::fs::FileManager::new()),
             stdlib: std::sync::Arc::new(crate::std::StdLib::new()),
             settings: Default::default(),
-            context_type: crate::executor::ContextType::Mock,
+            context_type: crate::execution::ContextType::Mock,
         };
         ctx.run(program.into(), &mut crate::ExecState::default())
             .await
@@ -58,8 +61,11 @@ mod test_examples_line_to {
     #[tokio::test(flavor = "multi_thread", worker_threads = 5)]
     async fn kcl_test_example_line_to1() {
         let code = "This is code.\nIt does other shit.\nlineTo";
-        let result =
+        let result = crate::test_server::execute_and_snapshot(
-            crate::test_server::execute_and_snapshot(code, crate::settings::types::UnitLength::Mm)
+            code,
+            crate::settings::types::UnitLength::Mm,
+            None,
+        )
         .await
         .unwrap();
         twenty_twenty::assert_image(
@@ -80,12 +86,12 @@ pub(crate) struct LineTo {}
 #[doc = "Std lib function: lineTo\nThis is some function.\nIt does shit."]
 pub(crate) const LineTo: LineTo = LineTo {};
 fn boxed_line_to(
-    exec_state: &mut crate::executor::ExecState,
+    exec_state: &mut crate::ExecState,
     args: crate::std::Args,
 ) -> std::pin::Pin<
     Box<
         dyn std::future::Future<
-                Output = anyhow::Result<crate::executor::KclValue, crate::errors::KclError>,
+                Output = anyhow::Result<crate::execution::KclValue, crate::errors::KclError>,
             > + Send
             + '_,
     >,

src/wasm-lib/derive-docs/tests/min.gen

@@ -4,7 +4,7 @@ mod test_examples_min {
     async fn test_mock_example_min0() {
         let program =
             crate::Program::parse_no_errs("This is another code block.\nyes sirrr.\nmin").unwrap();
-        let ctx = crate::executor::ExecutorContext {
+        let ctx = crate::ExecutorContext {
             engine: std::sync::Arc::new(Box::new(
                 crate::engine::conn_mock::EngineConnection::new()
                     .await
@@ -13,7 +13,7 @@ mod test_examples_min {
             fs: std::sync::Arc::new(crate::fs::FileManager::new()),
             stdlib: std::sync::Arc::new(crate::std::StdLib::new()),
             settings: Default::default(),
-            context_type: crate::executor::ContextType::Mock,
+            context_type: crate::execution::ContextType::Mock,
         };
         ctx.run(program.into(), &mut crate::ExecState::default())
             .await
@@ -23,8 +23,11 @@ mod test_examples_min {
     #[tokio::test(flavor = "multi_thread", worker_threads = 5)]
     async fn kcl_test_example_min0() {
         let code = "This is another code block.\nyes sirrr.\nmin";
-        let result =
+        let result = crate::test_server::execute_and_snapshot(
-            crate::test_server::execute_and_snapshot(code, crate::settings::types::UnitLength::Mm)
+            code,
+            crate::settings::types::UnitLength::Mm,
+            None,
+        )
         .await
         .unwrap();
         twenty_twenty::assert_image(
@@ -38,7 +41,7 @@ mod test_examples_min {
     async fn test_mock_example_min1() {
         let program =
             crate::Program::parse_no_errs("This is code.\nIt does other shit.\nmin").unwrap();
-        let ctx = crate::executor::ExecutorContext {
+        let ctx = crate::ExecutorContext {
             engine: std::sync::Arc::new(Box::new(
                 crate::engine::conn_mock::EngineConnection::new()
                     .await
@@ -47,7 +50,7 @@ mod test_examples_min {
             fs: std::sync::Arc::new(crate::fs::FileManager::new()),
             stdlib: std::sync::Arc::new(crate::std::StdLib::new()),
             settings: Default::default(),
-            context_type: crate::executor::ContextType::Mock,
+            context_type: crate::execution::ContextType::Mock,
         };
         ctx.run(program.into(), &mut crate::ExecState::default())
             .await
@@ -57,8 +60,11 @@ mod test_examples_min {
     #[tokio::test(flavor = "multi_thread", worker_threads = 5)]
     async fn kcl_test_example_min1() {
         let code = "This is code.\nIt does other shit.\nmin";
-        let result =
+        let result = crate::test_server::execute_and_snapshot(
-            crate::test_server::execute_and_snapshot(code, crate::settings::types::UnitLength::Mm)
+            code,
+            crate::settings::types::UnitLength::Mm,
+            None,
+        )
         .await
         .unwrap();
         twenty_twenty::assert_image(
@@ -79,12 +85,12 @@ pub(crate) struct Min {}
 #[doc = "Std lib function: min\nThis is some function.\nIt does shit."]
 pub(crate) const Min: Min = Min {};
 fn boxed_min(
-    exec_state: &mut crate::executor::ExecState,
+    exec_state: &mut crate::ExecState,
     args: crate::std::Args,
 ) -> std::pin::Pin<
     Box<
         dyn std::future::Future<
-                Output = anyhow::Result<crate::executor::KclValue, crate::errors::KclError>,
+                Output = anyhow::Result<crate::execution::KclValue, crate::errors::KclError>,
             > + Send
             + '_,
     >,

src/wasm-lib/derive-docs/tests/option.gen

@@ -4,7 +4,7 @@ mod test_examples_show {
     async fn test_mock_example_show0() {
         let program =
             crate::Program::parse_no_errs("This is code.\nIt does other shit.\nshow").unwrap();
-        let ctx = crate::executor::ExecutorContext {
+        let ctx = crate::ExecutorContext {
             engine: std::sync::Arc::new(Box::new(
                 crate::engine::conn_mock::EngineConnection::new()
                     .await
@@ -13,7 +13,7 @@ mod test_examples_show {
             fs: std::sync::Arc::new(crate::fs::FileManager::new()),
             stdlib: std::sync::Arc::new(crate::std::StdLib::new()),
             settings: Default::default(),
-            context_type: crate::executor::ContextType::Mock,
+            context_type: crate::execution::ContextType::Mock,
         };
         ctx.run(program.into(), &mut crate::ExecState::default())
             .await
@@ -23,8 +23,11 @@ mod test_examples_show {
     #[tokio::test(flavor = "multi_thread", worker_threads = 5)]
     async fn kcl_test_example_show0() {
         let code = "This is code.\nIt does other shit.\nshow";
-        let result =
+        let result = crate::test_server::execute_and_snapshot(
-            crate::test_server::execute_and_snapshot(code, crate::settings::types::UnitLength::Mm)
+            code,
+            crate::settings::types::UnitLength::Mm,
+            None,
+        )
         .await
         .unwrap();
         twenty_twenty::assert_image(
@@ -45,12 +48,12 @@ pub(crate) struct Show {}
 #[doc = "Std lib function: show\nThis is some function.\nIt does shit."]
 pub(crate) const Show: Show = Show {};
 fn boxed_show(
-    exec_state: &mut crate::executor::ExecState,
+    exec_state: &mut crate::ExecState,
     args: crate::std::Args,
 ) -> std::pin::Pin<
     Box<
         dyn std::future::Future<
-                Output = anyhow::Result<crate::executor::KclValue, crate::errors::KclError>,
+                Output = anyhow::Result<crate::execution::KclValue, crate::errors::KclError>,
             > + Send
             + '_,
     >,

src/wasm-lib/derive-docs/tests/option_input_format.gen

@@ -4,7 +4,7 @@ mod test_examples_import {
     async fn test_mock_example_import0() {
         let program =
             crate::Program::parse_no_errs("This is code.\nIt does other shit.\nimport").unwrap();
-        let ctx = crate::executor::ExecutorContext {
+        let ctx = crate::ExecutorContext {
             engine: std::sync::Arc::new(Box::new(
                 crate::engine::conn_mock::EngineConnection::new()
                     .await
@@ -13,7 +13,7 @@ mod test_examples_import {
             fs: std::sync::Arc::new(crate::fs::FileManager::new()),
             stdlib: std::sync::Arc::new(crate::std::StdLib::new()),
             settings: Default::default(),
-            context_type: crate::executor::ContextType::Mock,
+            context_type: crate::execution::ContextType::Mock,
         };
         ctx.run(program.into(), &mut crate::ExecState::default())
             .await
@@ -23,8 +23,11 @@ mod test_examples_import {
     #[tokio::test(flavor = "multi_thread", worker_threads = 5)]
     async fn kcl_test_example_import0() {
         let code = "This is code.\nIt does other shit.\nimport";
-        let result =
+        let result = crate::test_server::execute_and_snapshot(
-            crate::test_server::execute_and_snapshot(code, crate::settings::types::UnitLength::Mm)
+            code,
+            crate::settings::types::UnitLength::Mm,
+            None,
+        )
         .await
         .unwrap();
         twenty_twenty::assert_image(
@@ -45,12 +48,12 @@ pub(crate) struct Import {}
 #[doc = "Std lib function: import\nThis is some function.\nIt does shit."]
 pub(crate) const Import: Import = Import {};
 fn boxed_import(
-    exec_state: &mut crate::executor::ExecState,
+    exec_state: &mut crate::ExecState,
     args: crate::std::Args,
 ) -> std::pin::Pin<
     Box<
         dyn std::future::Future<
-                Output = anyhow::Result<crate::executor::KclValue, crate::errors::KclError>,
+                Output = anyhow::Result<crate::execution::KclValue, crate::errors::KclError>,
             > + Send
             + '_,
     >,

src/wasm-lib/derive-docs/tests/return_vec_box_sketch.gen

@@ -4,7 +4,7 @@ mod test_examples_import {
     async fn test_mock_example_import0() {
         let program =
             crate::Program::parse_no_errs("This is code.\nIt does other shit.\nimport").unwrap();
-        let ctx = crate::executor::ExecutorContext {
+        let ctx = crate::ExecutorContext {
             engine: std::sync::Arc::new(Box::new(
                 crate::engine::conn_mock::EngineConnection::new()
                     .await
@@ -13,7 +13,7 @@ mod test_examples_import {
             fs: std::sync::Arc::new(crate::fs::FileManager::new()),
             stdlib: std::sync::Arc::new(crate::std::StdLib::new()),
             settings: Default::default(),
-            context_type: crate::executor::ContextType::Mock,
+            context_type: crate::execution::ContextType::Mock,
         };
         ctx.run(program.into(), &mut crate::ExecState::default())
             .await
@@ -23,8 +23,11 @@ mod test_examples_import {
     #[tokio::test(flavor = "multi_thread", worker_threads = 5)]
     async fn kcl_test_example_import0() {
         let code = "This is code.\nIt does other shit.\nimport";
-        let result =
+        let result = crate::test_server::execute_and_snapshot(
-            crate::test_server::execute_and_snapshot(code, crate::settings::types::UnitLength::Mm)
+            code,
+            crate::settings::types::UnitLength::Mm,
+            None,
+        )
         .await
         .unwrap();
         twenty_twenty::assert_image(
@@ -45,12 +48,12 @@ pub(crate) struct Import {}
 #[doc = "Std lib function: import\nThis is some function.\nIt does shit."]
 pub(crate) const Import: Import = Import {};
 fn boxed_import(
-    exec_state: &mut crate::executor::ExecState,
+    exec_state: &mut crate::ExecState,
     args: crate::std::Args,
 ) -> std::pin::Pin<
     Box<
         dyn std::future::Future<
-                Output = anyhow::Result<crate::executor::KclValue, crate::errors::KclError>,
+                Output = anyhow::Result<crate::execution::KclValue, crate::errors::KclError>,
             > + Send
             + '_,
     >,

src/wasm-lib/derive-docs/tests/return_vec_sketch.gen

@@ -4,7 +4,7 @@ mod test_examples_import {
     async fn test_mock_example_import0() {
         let program =
             crate::Program::parse_no_errs("This is code.\nIt does other shit.\nimport").unwrap();
-        let ctx = crate::executor::ExecutorContext {
+        let ctx = crate::ExecutorContext {
             engine: std::sync::Arc::new(Box::new(
                 crate::engine::conn_mock::EngineConnection::new()
                     .await
@@ -13,7 +13,7 @@ mod test_examples_import {
             fs: std::sync::Arc::new(crate::fs::FileManager::new()),
             stdlib: std::sync::Arc::new(crate::std::StdLib::new()),
             settings: Default::default(),
-            context_type: crate::executor::ContextType::Mock,
+            context_type: crate::execution::ContextType::Mock,
         };
         ctx.run(program.into(), &mut crate::ExecState::default())
             .await
@@ -23,8 +23,11 @@ mod test_examples_import {
     #[tokio::test(flavor = "multi_thread", worker_threads = 5)]
     async fn kcl_test_example_import0() {
         let code = "This is code.\nIt does other shit.\nimport";
-        let result =
+        let result = crate::test_server::execute_and_snapshot(
-            crate::test_server::execute_and_snapshot(code, crate::settings::types::UnitLength::Mm)
+            code,
+            crate::settings::types::UnitLength::Mm,
+            None,
+        )
         .await
         .unwrap();
         twenty_twenty::assert_image(
@@ -45,12 +48,12 @@ pub(crate) struct Import {}
 #[doc = "Std lib function: import\nThis is some function.\nIt does shit."]
 pub(crate) const Import: Import = Import {};
 fn boxed_import(
-    exec_state: &mut crate::executor::ExecState,
+    exec_state: &mut crate::ExecState,
     args: crate::std::Args,
 ) -> std::pin::Pin<
     Box<
         dyn std::future::Future<
-                Output = anyhow::Result<crate::executor::KclValue, crate::errors::KclError>,
+                Output = anyhow::Result<crate::execution::KclValue, crate::errors::KclError>,
             > + Send
             + '_,
     >,

src/wasm-lib/derive-docs/tests/show.gen

@@ -4,7 +4,7 @@ mod test_examples_show {
     async fn test_mock_example_show0() {
         let program =
             crate::Program::parse_no_errs("This is code.\nIt does other shit.\nshow").unwrap();
-        let ctx = crate::executor::ExecutorContext {
+        let ctx = crate::ExecutorContext {
             engine: std::sync::Arc::new(Box::new(
                 crate::engine::conn_mock::EngineConnection::new()
                     .await
@@ -13,7 +13,7 @@ mod test_examples_show {
             fs: std::sync::Arc::new(crate::fs::FileManager::new()),
             stdlib: std::sync::Arc::new(crate::std::StdLib::new()),
             settings: Default::default(),
-            context_type: crate::executor::ContextType::Mock,
+            context_type: crate::execution::ContextType::Mock,
         };
         ctx.run(program.into(), &mut crate::ExecState::default())
             .await
@@ -23,8 +23,11 @@ mod test_examples_show {
     #[tokio::test(flavor = "multi_thread", worker_threads = 5)]
     async fn kcl_test_example_show0() {
         let code = "This is code.\nIt does other shit.\nshow";
-        let result =
+        let result = crate::test_server::execute_and_snapshot(
-            crate::test_server::execute_and_snapshot(code, crate::settings::types::UnitLength::Mm)
+            code,
+            crate::settings::types::UnitLength::Mm,
+            None,
+        )
         .await
         .unwrap();
         twenty_twenty::assert_image(
@@ -45,12 +48,12 @@ pub(crate) struct Show {}
 #[doc = "Std lib function: show\nThis is some function.\nIt does shit."]
 pub(crate) const Show: Show = Show {};
 fn boxed_show(
-    exec_state: &mut crate::executor::ExecState,
+    exec_state: &mut crate::ExecState,
     args: crate::std::Args,
 ) -> std::pin::Pin<
     Box<
         dyn std::future::Future<
-                Output = anyhow::Result<crate::executor::KclValue, crate::errors::KclError>,
+                Output = anyhow::Result<crate::execution::KclValue, crate::errors::KclError>,
             > + Send
             + '_,
     >,

src/wasm-lib/derive-docs/tests/test_args_with_exec_state.gen

@@ -3,7 +3,7 @@ mod test_examples_some_function {
     #[tokio::test(flavor = "multi_thread")]
     async fn test_mock_example_some_function0() {
         let program = crate::Program::parse_no_errs("someFunction()").unwrap();
-        let ctx = crate::executor::ExecutorContext {
+        let ctx = crate::ExecutorContext {
             engine: std::sync::Arc::new(Box::new(
                 crate::engine::conn_mock::EngineConnection::new()
                     .await
@@ -12,7 +12,7 @@ mod test_examples_some_function {
             fs: std::sync::Arc::new(crate::fs::FileManager::new()),
             stdlib: std::sync::Arc::new(crate::std::StdLib::new()),
             settings: Default::default(),
-            context_type: crate::executor::ContextType::Mock,
+            context_type: crate::execution::ContextType::Mock,
         };
         ctx.run(program.into(), &mut crate::ExecState::default())
             .await
@@ -22,8 +22,11 @@ mod test_examples_some_function {
     #[tokio::test(flavor = "multi_thread", worker_threads = 5)]
     async fn kcl_test_example_some_function0() {
         let code = "someFunction()";
-        let result =
+        let result = crate::test_server::execute_and_snapshot(
-            crate::test_server::execute_and_snapshot(code, crate::settings::types::UnitLength::Mm)
+            code,
+            crate::settings::types::UnitLength::Mm,
+            None,
+        )
         .await
         .unwrap();
         twenty_twenty::assert_image(
@@ -44,12 +47,12 @@ pub(crate) struct SomeFunction {}
 #[doc = "Std lib function: someFunction\nDocs"]
 pub(crate) const SomeFunction: SomeFunction = SomeFunction {};
 fn boxed_some_function(
-    exec_state: &mut crate::executor::ExecState,
+    exec_state: &mut crate::ExecState,
     args: crate::std::Args,
 ) -> std::pin::Pin<
     Box<
         dyn std::future::Future<
-                Output = anyhow::Result<crate::executor::KclValue, crate::errors::KclError>,
+                Output = anyhow::Result<crate::execution::KclValue, crate::errors::KclError>,
             > + Send
             + '_,
     >,

src/wasm-lib/kcl/benches/executor_benchmark_criterion.rs

@@ -18,7 +18,7 @@ pub fn bench_execute(c: &mut Criterion) {
             let rt = Runtime::new().unwrap();
             // Spawn a future onto the runtime
             b.iter(|| {
-                rt.block_on(test_server::execute_and_snapshot(s, Mm)).unwrap();
+                rt.block_on(test_server::execute_and_snapshot(s, Mm, None)).unwrap();
             });
         });
         group.finish();
@@ -38,7 +38,7 @@ pub fn bench_lego(c: &mut Criterion) {
             let code = LEGO_PROGRAM.replace("{{N}}", &size.to_string());
             // Spawn a future onto the runtime
             b.iter(|| {
-                rt.block_on(test_server::execute_and_snapshot(&code, Mm)).unwrap();
+                rt.block_on(test_server::execute_and_snapshot(&code, Mm, None)).unwrap();
             });
         });
     }

src/wasm-lib/kcl/benches/executor_benchmark_iai.rs

@@ -3,7 +3,7 @@ use iai::black_box;
 async fn execute_server_rack_heavy() {
     let code = SERVER_RACK_HEAVY_PROGRAM;
     black_box(
-        kcl_lib::test_server::execute_and_snapshot(code, kcl_lib::UnitLength::Mm)
+        kcl_lib::test_server::execute_and_snapshot(code, kcl_lib::UnitLength::Mm, None)
             .await
             .unwrap(),
     );
@@ -12,7 +12,7 @@ async fn execute_server_rack_heavy() {
 async fn execute_server_rack_lite() {
     let code = SERVER_RACK_LITE_PROGRAM;
     black_box(
-        kcl_lib::test_server::execute_and_snapshot(code, kcl_lib::UnitLength::Mm)
+        kcl_lib::test_server::execute_and_snapshot(code, kcl_lib::UnitLength::Mm, None)
             .await
             .unwrap(),
     );

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

@@ -1,3 +0,0 @@
-pub mod cache;
-pub mod modify;
-pub mod types;

src/wasm-lib/kcl/src/engine/conn.rs

@@ -22,7 +22,7 @@ use super::ExecutionKind;
 use crate::{
     engine::EngineManager,
     errors::{KclError, KclErrorDetails},
-    executor::{DefaultPlanes, IdGenerator},
+    execution::{DefaultPlanes, IdGenerator},
     SourceRange,
 };
 

src/wasm-lib/kcl/src/engine/conn_mock.rs

@@ -20,7 +20,7 @@ use kittycad_modeling_cmds::{self as kcmc};
 use super::ExecutionKind;
 use crate::{
     errors::KclError,
-    executor::{DefaultPlanes, IdGenerator},
+    execution::{DefaultPlanes, IdGenerator},
     SourceRange,
 };
 

src/wasm-lib/kcl/src/engine/conn_wasm.rs

@@ -11,7 +11,7 @@ use wasm_bindgen::prelude::*;
 use crate::{
     engine::ExecutionKind,
     errors::{KclError, KclErrorDetails},
-    executor::{DefaultPlanes, IdGenerator},
+    execution::{DefaultPlanes, IdGenerator},
     SourceRange,
 };
 

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

@@ -32,7 +32,7 @@ use uuid::Uuid;
 
 use crate::{
     errors::{KclError, KclErrorDetails},
-    executor::{DefaultPlanes, IdGenerator, Point3d},
+    execution::{DefaultPlanes, IdGenerator, Point3d},
     SourceRange,
 };
 

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

@@ -4,11 +4,13 @@ use async_recursion::async_recursion;
 
 use crate::{
     errors::{KclError, KclErrorDetails},
-    executor::{BodyType, ExecState, ExecutorContext, KclValue, Metadata, StatementKind, TagEngineInfo, TagIdentifier},
+    execution::{
+        BodyType, ExecState, ExecutorContext, KclValue, Metadata, StatementKind, TagEngineInfo, TagIdentifier,
+    },
     parsing::ast::types::{
         ArrayExpression, ArrayRangeExpression, BinaryExpression, BinaryOperator, BinaryPart, CallExpression,
         CallExpressionKw, Expr, IfExpression, LiteralIdentifier, LiteralValue, MemberExpression, MemberObject, Node,
-        ObjectExpression, TagDeclarator, UnaryExpression, UnaryOperator,
+        ObjectExpression, PipeExpression, TagDeclarator, UnaryExpression, UnaryOperator,
     },
     source_range::SourceRange,
     std::{args::Arg, FunctionKind},
@@ -807,3 +809,10 @@ impl Property {
         }
     }
 }
+
+impl Node<PipeExpression> {
+    #[async_recursion]
+    pub async fn get_result(&self, exec_state: &mut ExecState, ctx: &ExecutorContext) -> Result<KclValue, KclError> {
+        execute_pipe_body(exec_state, &self.body, self.into(), ctx).await
+    }
+}

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

@@ -2,7 +2,7 @@ use schemars::JsonSchema;
 
 use crate::{
     errors::KclError,
-    executor::{
+    execution::{
         call_user_defined_function, ExecState, ExecutorContext, KclValue, MemoryFunction, Metadata, ProgramMemory,
     },
     parsing::ast::types::FunctionExpression,

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

@@ -7,7 +7,7 @@ use serde::{Deserialize, Serialize};
 use crate::{
     errors::KclErrorDetails,
     exec::{ProgramMemory, Sketch},
-    executor::{Face, ImportedGeometry, MemoryFunction, Metadata, Plane, SketchSet, Solid, SolidSet, TagIdentifier},
+    execution::{Face, ImportedGeometry, MemoryFunction, Metadata, Plane, SketchSet, Solid, SolidSet, TagIdentifier},
     parsing::ast::types::{FunctionExpression, KclNone, LiteralValue, TagDeclarator, TagNode},
     std::{args::Arg, FnAsArg},
     ExecState, ExecutorContext, KclError, SourceRange,
@@ -262,9 +262,6 @@ impl KclValue {
         }
     }
 
-    pub(crate) fn is_function(&self) -> bool {
-        matches!(self, KclValue::Function { .. })
-    }
     /// Put the number into a KCL value.
     pub const fn from_number(f: f64, meta: Vec<Metadata>) -> Self {
         Self::Number { value: f, meta }
@@ -496,7 +493,7 @@ impl KclValue {
             )
             .await
         } else {
-            crate::executor::call_user_defined_function(
+            crate::execution::call_user_defined_function(
                 args,
                 closure_memory.as_ref(),
                 expression.as_ref(),

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

@@ -1,6 +1,6 @@
 //! The executor for the AST.
 
-use std::{collections::HashSet, sync::Arc};
+use std::{path::PathBuf, sync::Arc};
 
 use anyhow::Result;
 use async_recursion::async_recursion;
@@ -20,14 +20,18 @@ use serde::{Deserialize, Serialize};
 type Point2D = kcmc::shared::Point2d<f64>;
 type Point3D = kcmc::shared::Point3d<f64>;
 
-pub use crate::kcl_value::KclValue;
+pub use function_param::FunctionParam;
+pub use kcl_value::{KclObjectFields, KclValue};
+
 use crate::{
     engine::{EngineManager, ExecutionKind},
     errors::{KclError, KclErrorDetails},
     fs::{FileManager, FileSystem},
     parsing::ast::{
         cache::{get_changed_program, CacheInformation},
-        types::{BodyItem, Expr, FunctionExpression, ItemVisibility, Node, NodeRef, TagDeclarator, TagNode},
+        types::{
+            BodyItem, Expr, FunctionExpression, ImportSelector, ItemVisibility, Node, NodeRef, TagDeclarator, TagNode,
+        },
     },
     settings::types::UnitLength,
     source_range::{ModuleId, SourceRange},
@@ -35,6 +39,10 @@ use crate::{
     ExecError, Program,
 };
 
+mod exec_ast;
+mod function_param;
+mod kcl_value;
+
 /// State for executing a program.
 #[derive(Debug, Default, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
 #[ts(export)]
@@ -50,7 +58,7 @@ pub struct ExecState {
     /// expression.  If we're not currently in a pipeline, this will be None.
     pub pipe_value: Option<KclValue>,
     /// Identifiers that have been exported from the current module.
-    pub module_exports: HashSet<String>,
+    pub module_exports: Vec<String>,
     /// The stack of import statements for detecting circular module imports.
     /// If this is empty, we're not currently executing an import statement.
     pub import_stack: Vec<std::path::PathBuf>,
@@ -61,7 +69,7 @@ pub struct ExecState {
 }
 
 impl ExecState {
-    pub fn add_module(&mut self, path: std::path::PathBuf) -> ModuleId {
+    fn add_module(&mut self, path: std::path::PathBuf) -> ModuleId {
         // Need to avoid borrowing self in the closure.
         let new_module_id = ModuleId::from_usize(self.path_to_source_id.len());
         let mut is_new = false;
@@ -1498,6 +1506,9 @@ pub struct ExecutorSettings {
     /// Should engine store this for replay?
     /// If so, under what name?
     pub replay: Option<String>,
+    /// The directory of the current project.  This is used for resolving import
+    /// paths.  If None is given, the current working directory is used.
+    pub project_directory: Option<PathBuf>,
 }
 
 impl Default for ExecutorSettings {
@@ -1508,6 +1519,7 @@ impl Default for ExecutorSettings {
             enable_ssao: false,
             show_grid: false,
             replay: None,
+            project_directory: None,
         }
     }
 }
@@ -1520,6 +1532,7 @@ impl From<crate::settings::types::Configuration> for ExecutorSettings {
             enable_ssao: config.settings.modeling.enable_ssao.into(),
             show_grid: config.settings.modeling.show_scale_grid,
             replay: None,
+            project_directory: None,
         }
     }
 }
@@ -1532,6 +1545,7 @@ impl From<crate::settings::types::project::ProjectConfiguration> for ExecutorSet
             enable_ssao: config.settings.modeling.enable_ssao.into(),
             show_grid: config.settings.modeling.show_scale_grid,
             replay: None,
+            project_directory: None,
         }
     }
 }
@@ -1544,6 +1558,7 @@ impl From<crate::settings::types::ModelingSettings> for ExecutorSettings {
             enable_ssao: modeling.enable_ssao.into(),
             show_grid: modeling.show_scale_grid,
             replay: None,
+            project_directory: None,
         }
     }
 }
@@ -1774,6 +1789,7 @@ impl ExecutorContext {
                 enable_ssao: false,
                 show_grid: false,
                 replay: None,
+                project_directory: None,
             },
             None,
             engine_addr,
@@ -1785,7 +1801,7 @@ impl ExecutorContext {
     pub async fn reset_scene(
         &self,
         exec_state: &mut ExecState,
-        source_range: crate::executor::SourceRange,
+        source_range: crate::execution::SourceRange,
     ) -> Result<(), KclError> {
         self.engine
             .clear_scene(&mut exec_state.id_generator, source_range)
@@ -1850,7 +1866,7 @@ impl ExecutorContext {
             )
             .await?;
 
-        self.inner_execute(&cache_result.program, exec_state, crate::executor::BodyType::Root)
+        self.inner_execute(&cache_result.program, exec_state, crate::execution::BodyType::Root)
             .await?;
         let session_data = self.engine.get_session_data();
         Ok(session_data)
@@ -1870,67 +1886,15 @@ impl ExecutorContext {
             match statement {
                 BodyItem::ImportStatement(import_stmt) => {
                     let source_range = SourceRange::from(import_stmt);
-                    let path = import_stmt.path.clone();
+                    let (module_memory, module_exports) =
-                    // Empty path is used by the top-level module.
+                        self.open_module(&import_stmt.path, exec_state, source_range).await?;
-                    if path.is_empty() {
-                        return Err(KclError::Semantic(KclErrorDetails {
-                            message: "import path cannot be empty".to_owned(),
-                            source_ranges: vec![source_range],
-                        }));
-                    }
-                    let resolved_path = std::path::PathBuf::from(&path);
-                    if exec_state.import_stack.contains(&resolved_path) {
-                        return Err(KclError::ImportCycle(KclErrorDetails {
-                            message: format!(
-                                "circular import of modules is not allowed: {} -> {}",
-                                exec_state
-                                    .import_stack
-                                    .iter()
-                                    .map(|p| p.as_path().to_string_lossy())
-                                    .collect::<Vec<_>>()
-                                    .join(" -> "),
-                                resolved_path.to_string_lossy()
-                            ),
-                            source_ranges: vec![import_stmt.into()],
-                        }));
-                    }
-                    let module_id = exec_state.add_module(resolved_path.clone());
-                    let source = self.fs.read_to_string(&resolved_path, source_range).await?;
-                    // TODO handle parsing errors properly
-                    let program = crate::parsing::parse_str(&source, module_id).parse_errs_as_err()?;
-                    let (module_memory, module_exports) = {
-                        exec_state.import_stack.push(resolved_path.clone());
-                        let original_execution = self.engine.replace_execution_kind(ExecutionKind::Isolated);
-                        let original_memory = std::mem::take(&mut exec_state.memory);
-                        let original_exports = std::mem::take(&mut exec_state.module_exports);
-                        let result = self
-                            .inner_execute(&program, exec_state, crate::executor::BodyType::Root)
-                            .await;
-                        let module_exports = std::mem::replace(&mut exec_state.module_exports, original_exports);
-                        let module_memory = std::mem::replace(&mut exec_state.memory, original_memory);
-                        self.engine.replace_execution_kind(original_execution);
-                        exec_state.import_stack.pop();
 
-                        result.map_err(|err| {
+                    match &import_stmt.selector {
-                            if let KclError::ImportCycle(_) = err {
+                        ImportSelector::List { items } => {
-                                // It was an import cycle.  Keep the original message.
+                            for import_item in items {
-                                err.override_source_ranges(vec![source_range])
-                            } else {
-                                KclError::Semantic(KclErrorDetails {
-                                    message: format!(
-                                        "Error loading imported file. Open it to view more details. {path}: {}",
-                                        err.message()
-                                    ),
-                                    source_ranges: vec![source_range],
-                                })
-                            }
-                        })?;
-
-                        (module_memory, module_exports)
-                    };
-                    for import_item in &import_stmt.items {
                                 // Extract the item from the module.
-                        let item = module_memory
+                                let item =
+                                    module_memory
                                         .get(&import_item.name.name, import_item.into())
                                         .map_err(|_err| {
                                             KclError::UndefinedValue(KclErrorDetails {
@@ -1955,6 +1919,33 @@ impl ExecutorContext {
                                     item.clone(),
                                     SourceRange::from(&import_item.name),
                                 )?;
+
+                                if let ItemVisibility::Export = import_stmt.visibility {
+                                    exec_state.module_exports.push(import_item.identifier().to_owned());
+                                }
+                            }
+                        }
+                        ImportSelector::Glob(_) => {
+                            for name in module_exports.iter() {
+                                let item = module_memory.get(name, source_range).map_err(|_err| {
+                                    KclError::Internal(KclErrorDetails {
+                                        message: format!("{} is not defined in module (but was exported?)", name),
+                                        source_ranges: vec![source_range],
+                                    })
+                                })?;
+                                exec_state.memory.add(name, item.clone(), source_range)?;
+
+                                if let ItemVisibility::Export = import_stmt.visibility {
+                                    exec_state.module_exports.push(name.clone());
+                                }
+                            }
+                        }
+                        ImportSelector::None(_) => {
+                            return Err(KclError::Semantic(KclErrorDetails {
+                                message: "Importing whole module is not yet implemented, sorry.".to_owned(),
+                                source_ranges: vec![source_range],
+                            }));
+                        }
                     }
                     last_expr = None;
                 }
@@ -1971,34 +1962,23 @@ impl ExecutorContext {
                     );
                 }
                 BodyItem::VariableDeclaration(variable_declaration) => {
-                    for declaration in &variable_declaration.declarations {
+                    let var_name = variable_declaration.declaration.id.name.to_string();
-                        let var_name = declaration.id.name.to_string();
+                    let source_range = SourceRange::from(&variable_declaration.declaration.init);
-                        let source_range = SourceRange::from(&declaration.init);
                     let metadata = Metadata { source_range };
 
                     let memory_item = self
                         .execute_expr(
-                                &declaration.init,
+                            &variable_declaration.declaration.init,
                             exec_state,
                             &metadata,
                             StatementKind::Declaration { name: &var_name },
                         )
                         .await?;
-                        let is_function = memory_item.is_function();
                     exec_state.memory.add(&var_name, memory_item, source_range)?;
+
                     // Track exports.
-                        match variable_declaration.visibility {
+                    if let ItemVisibility::Export = variable_declaration.visibility {
-                            ItemVisibility::Export => {
+                        exec_state.module_exports.push(var_name);
-                                if !is_function {
-                                    return Err(KclError::Semantic(KclErrorDetails {
-                                        message: "Only functions can be exported".to_owned(),
-                                        source_ranges: vec![source_range],
-                                    }));
-                                }
-                                exec_state.module_exports.insert(var_name);
-                            }
-                            ItemVisibility::Default => {}
-                        }
                     }
                     last_expr = None;
                 }
@@ -2033,6 +2013,68 @@ impl ExecutorContext {
         Ok(last_expr)
     }
 
+    async fn open_module(
+        &self,
+        path: &str,
+        exec_state: &mut ExecState,
+        source_range: SourceRange,
+    ) -> Result<(ProgramMemory, Vec<String>), KclError> {
+        let resolved_path = if let Some(project_dir) = &self.settings.project_directory {
+            project_dir.join(path)
+        } else {
+            std::path::PathBuf::from(&path)
+        };
+
+        if exec_state.import_stack.contains(&resolved_path) {
+            return Err(KclError::ImportCycle(KclErrorDetails {
+                message: format!(
+                    "circular import of modules is not allowed: {} -> {}",
+                    exec_state
+                        .import_stack
+                        .iter()
+                        .map(|p| p.as_path().to_string_lossy())
+                        .collect::<Vec<_>>()
+                        .join(" -> "),
+                    resolved_path.to_string_lossy()
+                ),
+                source_ranges: vec![source_range],
+            }));
+        }
+        let module_id = exec_state.add_module(resolved_path.clone());
+        let source = self.fs.read_to_string(&resolved_path, source_range).await?;
+        // TODO handle parsing errors properly
+        let program = crate::parsing::parse_str(&source, module_id).parse_errs_as_err()?;
+
+        exec_state.import_stack.push(resolved_path.clone());
+        let original_execution = self.engine.replace_execution_kind(ExecutionKind::Isolated);
+        let original_memory = std::mem::take(&mut exec_state.memory);
+        let original_exports = std::mem::take(&mut exec_state.module_exports);
+        let result = self
+            .inner_execute(&program, exec_state, crate::execution::BodyType::Root)
+            .await;
+        let module_exports = std::mem::replace(&mut exec_state.module_exports, original_exports);
+        let module_memory = std::mem::replace(&mut exec_state.memory, original_memory);
+        self.engine.replace_execution_kind(original_execution);
+        exec_state.import_stack.pop();
+
+        result.map_err(|err| {
+            if let KclError::ImportCycle(_) = err {
+                // It was an import cycle.  Keep the original message.
+                err.override_source_ranges(vec![source_range])
+            } else {
+                KclError::Semantic(KclErrorDetails {
+                    message: format!(
+                        "Error loading imported file. Open it to view more details. {path}: {}",
+                        err.message()
+                    ),
+                    source_ranges: vec![source_range],
+                })
+            }
+        })?;
+
+        Ok((module_memory, module_exports))
+    }
+
     pub async fn execute_expr<'a>(
         &self,
         init: &Expr,
@@ -2120,7 +2162,7 @@ impl ExecutorContext {
         self.engine
             .send_modeling_cmd(
                 uuid::Uuid::new_v4(),
-                crate::executor::SourceRange::default(),
+                crate::execution::SourceRange::default(),
                 ModelingCmd::from(mcmd::ZoomToFit {
                     object_ids: Default::default(),
                     animated: false,
@@ -2134,7 +2176,7 @@ impl ExecutorContext {
             .engine
             .send_modeling_cmd(
                 uuid::Uuid::new_v4(),
-                crate::executor::SourceRange::default(),
+                crate::execution::SourceRange::default(),
                 ModelingCmd::from(mcmd::TakeSnapshot {
                     format: ImageFormat::Png,
                 }),

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

@@ -60,10 +60,8 @@ mod coredump;
 mod docs;
 mod engine;
 mod errors;
-mod executor;
+mod execution;
 mod fs;
-mod function_param;
-mod kcl_value;
 pub mod lint;
 mod log;
 mod lsp;
@@ -84,7 +82,7 @@ mod wasm;
 pub use coredump::CoreDump;
 pub use engine::{EngineManager, ExecutionKind};
 pub use errors::{CompilationError, ConnectionError, ExecError, KclError};
-pub use executor::{ExecState, ExecutorContext, ExecutorSettings};
+pub use execution::{ExecState, ExecutorContext, ExecutorSettings};
 pub use lsp::{
     copilot::Backend as CopilotLspBackend,
     kcl::{Backend as KclLspBackend, Server as KclLspServerSubCommand},
@@ -100,7 +98,7 @@ pub use source_range::{ModuleId, SourceRange};
 // Rather than make executor public and make lots of it pub(crate), just re-export into a new module.
 // Ideally we wouldn't export these things at all, they should only be used for testing.
 pub mod exec {
-    pub use crate::executor::{DefaultPlanes, IdGenerator, KclValue, PlaneType, ProgramMemory, Sketch};
+    pub use crate::execution::{DefaultPlanes, IdGenerator, KclValue, PlaneType, ProgramMemory, Sketch};
 }
 
 #[cfg(target_arch = "wasm32")]

src/wasm-lib/kcl/src/lint/checks/camel_case.rs

@@ -60,11 +60,7 @@ pub fn lint_variables(decl: Node) -> Result<Vec<Discovered>> {
         return Ok(vec![]);
     };
 
-    Ok(decl
+    lint_lower_camel_case_var(&decl.declaration)
-        .declarations
-        .iter()
-        .flat_map(|v| lint_lower_camel_case_var(v).unwrap_or_default())
-        .collect())
 }
 
 pub fn lint_object_properties(decl: Node) -> Result<Vec<Discovered>> {

src/wasm-lib/kcl/src/lsp/kcl/custom_notifications.rs

@@ -19,7 +19,7 @@ impl Notification for AstUpdated {
 pub enum MemoryUpdated {}
 
 impl Notification for MemoryUpdated {
-    type Params = crate::executor::ProgramMemory;
+    type Params = crate::execution::ProgramMemory;
     const METHOD: &'static str = "kcl/memoryUpdated";
 }
 

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

@@ -115,7 +115,7 @@ pub struct Backend {
     /// information.
     pub last_successful_ast_state: Arc<RwLock<Option<OldAstState>>>,
     /// Memory maps.
-    pub memory_map: DashMap<String, crate::executor::ProgramMemory>,
+    pub memory_map: DashMap<String, crate::execution::ProgramMemory>,
     /// Current code.
     pub code_map: DashMap<String, Vec<u8>>,
     /// Diagnostics.
@@ -129,7 +129,7 @@ pub struct Backend {
     /// If we can send telemetry for this user.
     pub can_send_telemetry: bool,
     /// Optional executor context to use if we want to execute the code.
-    pub executor_ctx: Arc<RwLock<Option<crate::executor::ExecutorContext>>>,
+    pub executor_ctx: Arc<RwLock<Option<crate::execution::ExecutorContext>>>,
     /// If we are currently allowed to execute the ast.
     pub can_execute: Arc<RwLock<bool>>,
 
@@ -140,7 +140,7 @@ impl Backend {
     #[cfg(target_arch = "wasm32")]
     pub fn new_wasm(
         client: Client,
-        executor_ctx: Option<crate::executor::ExecutorContext>,
+        executor_ctx: Option<crate::execution::ExecutorContext>,
         fs: crate::fs::wasm::FileSystemManager,
         zoo_client: kittycad::Client,
         can_send_telemetry: bool,
@@ -157,7 +157,7 @@ impl Backend {
     #[cfg(not(target_arch = "wasm32"))]
     pub fn new(
         client: Client,
-        executor_ctx: Option<crate::executor::ExecutorContext>,
+        executor_ctx: Option<crate::execution::ExecutorContext>,
         zoo_client: kittycad::Client,
         can_send_telemetry: bool,
     ) -> Result<Self, String> {
@@ -172,7 +172,7 @@ impl Backend {
 
     fn with_file_manager(
         client: Client,
-        executor_ctx: Option<crate::executor::ExecutorContext>,
+        executor_ctx: Option<crate::execution::ExecutorContext>,
         fs: crate::fs::FileManager,
         zoo_client: kittycad::Client,
         can_send_telemetry: bool,
@@ -297,7 +297,7 @@ impl crate::lsp::backend::Backend for Backend {
 
         // Try to get the memory for the current code.
         let has_memory = if let Some(memory) = self.memory_map.get(&filename) {
-            *memory != crate::executor::ProgramMemory::default()
+            *memory != crate::execution::ProgramMemory::default()
         } else {
             false
         };
@@ -406,7 +406,7 @@ impl Backend {
         *self.can_execute.read().await
     }
 
-    pub async fn executor_ctx(&self) -> tokio::sync::RwLockReadGuard<'_, Option<crate::executor::ExecutorContext>> {
+    pub async fn executor_ctx(&self) -> tokio::sync::RwLockReadGuard<'_, Option<crate::execution::ExecutorContext>> {
         self.executor_ctx.read().await
     }
 
@@ -871,7 +871,7 @@ impl Backend {
 
             // Try to get the memory for the current code.
             let has_memory = if let Some(memory) = self.memory_map.get(&filename) {
-                *memory != crate::executor::ProgramMemory::default()
+                *memory != crate::execution::ProgramMemory::default()
             } else {
                 false
             };

src/wasm-lib/kcl/src/lsp/test_util.rs

@@ -9,10 +9,10 @@ pub async fn kcl_lsp_server(execute: bool) -> Result<crate::lsp::kcl::Backend> {
     let stdlib_completions = crate::lsp::kcl::get_completions_from_stdlib(&stdlib)?;
     let stdlib_signatures = crate::lsp::kcl::get_signatures_from_stdlib(&stdlib)?;
 
-    let zoo_client = crate::executor::new_zoo_client(None, None)?;
+    let zoo_client = crate::execution::new_zoo_client(None, None)?;
 
     let executor_ctx = if execute {
-        Some(crate::executor::ExecutorContext::new(&zoo_client, Default::default()).await?)
+        Some(crate::execution::ExecutorContext::new(&zoo_client, Default::default()).await?)
     } else {
         None
     };

src/wasm-lib/kcl/src/lsp/tests.rs

@@ -7,7 +7,7 @@ use tower_lsp::{
 };
 
 use crate::{
-    executor::ProgramMemory,
+    execution::ProgramMemory,
     lsp::test_util::{copilot_lsp_server, kcl_lsp_server},
     parsing::ast::types::{Node, Program},
 };

src/wasm-lib/kcl/src/parsing/ast/cache.rs

@@ -4,7 +4,7 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    executor::ExecState,
+    execution::ExecState,
     parsing::ast::types::{Node, Program},
 };
 
@@ -27,7 +27,7 @@ pub struct OldAstState {
     /// The exec state.
     pub exec_state: ExecState,
     /// The last settings used for execution.
-    pub settings: crate::executor::ExecutorSettings,
+    pub settings: crate::execution::ExecutorSettings,
 }
 
 impl From<crate::Program> for CacheInformation {
@@ -55,7 +55,7 @@ pub struct CacheResult {
 // the cache.
 pub fn get_changed_program(
     info: CacheInformation,
-    new_settings: &crate::executor::ExecutorSettings,
+    new_settings: &crate::execution::ExecutorSettings,
 ) -> Option<CacheResult> {
     let Some(old) = info.old else {
         // We have no old info, we need to re-execute the whole thing.
@@ -109,14 +109,14 @@ mod tests {
     use super::*;
 
     async fn execute(program: &crate::Program) -> Result<ExecState> {
-        let ctx = crate::executor::ExecutorContext {
+        let ctx = crate::execution::ExecutorContext {
             engine: Arc::new(Box::new(crate::engine::conn_mock::EngineConnection::new().await?)),
             fs: Arc::new(crate::fs::FileManager::new()),
             stdlib: Arc::new(crate::std::StdLib::new()),
             settings: Default::default(),
-            context_type: crate::executor::ContextType::Mock,
+            context_type: crate::execution::ContextType::Mock,
         };
-        let mut exec_state = crate::executor::ExecState::default();
+        let mut exec_state = crate::execution::ExecState::default();
         ctx.run(program.clone().into(), &mut exec_state).await?;
 
         Ok(exec_state)

src/wasm-lib/kcl/src/parsing/ast/digest.rs

@@ -4,9 +4,10 @@ use super::types::{DefaultParamVal, ItemVisibility, VariableKind};
 use crate::parsing::ast::types::{
     ArrayExpression, ArrayRangeExpression, BinaryExpression, BinaryPart, BodyItem, CallExpression, CallExpressionKw,
     CommentStyle, ElseIf, Expr, ExpressionStatement, FnArgType, FunctionExpression, Identifier, IfExpression,
-    ImportItem, ImportStatement, Literal, LiteralIdentifier, MemberExpression, MemberObject, NonCodeMeta, NonCodeNode,
+    ImportItem, ImportSelector, ImportStatement, Literal, LiteralIdentifier, MemberExpression, MemberObject,
-    NonCodeValue, ObjectExpression, ObjectProperty, Parameter, PipeExpression, PipeSubstitution, Program,
+    NonCodeMeta, NonCodeNode, NonCodeValue, ObjectExpression, ObjectProperty, Parameter, PipeExpression,
-    ReturnStatement, TagDeclarator, UnaryExpression, VariableDeclaration, VariableDeclarator,
+    PipeSubstitution, Program, ReturnStatement, TagDeclarator, UnaryExpression, VariableDeclaration,
+    VariableDeclarator,
 };
 
 /// Position-independent digest of the AST node.
@@ -52,9 +53,20 @@ impl ImportItem {
 
 impl ImportStatement {
     compute_digest!(|slf, hasher| {
-        for item in &mut slf.items {
+        match &mut slf.selector {
+            ImportSelector::List { items } => {
+                for item in items {
                     hasher.update(item.compute_digest());
                 }
+            }
+            ImportSelector::Glob(_) => hasher.update(b"ImportSelector::Glob"),
+            ImportSelector::None(None) => hasher.update(b"ImportSelector::None"),
+            ImportSelector::None(Some(alias)) => {
+                hasher.update(b"ImportSelector::None");
+                hasher.update(alias.compute_digest());
+            }
+        }
+        hasher.update(slf.visibility.digestable_id());
         let path = slf.path.as_bytes();
         hasher.update(path.len().to_ne_bytes());
         hasher.update(path);
@@ -270,10 +282,7 @@ impl ExpressionStatement {
 
 impl VariableDeclaration {
     compute_digest!(|slf, hasher| {
-        hasher.update(slf.declarations.len().to_ne_bytes());
+        hasher.update(slf.declaration.compute_digest());
-        for declarator in &mut slf.declarations {
-            hasher.update(declarator.compute_digest());
-        }
         hasher.update(slf.visibility.digestable_id());
         hasher.update(slf.kind.digestable_id());
     });

src/wasm-lib/kcl/src/parsing/ast/mod.rs

@@ -1,6 +1,74 @@
 pub(crate) mod cache;
 pub(crate) mod digest;
-pub(crate) mod execute;
 pub mod modify;
-pub(crate) mod source_range;
 pub mod types;
+
+use crate::parsing::ast::types::{BinaryPart, BodyItem, Expr, LiteralIdentifier, MemberObject};
+use crate::source_range::ModuleId;
+
+impl BodyItem {
+    pub fn module_id(&self) -> ModuleId {
+        match self {
+            BodyItem::ImportStatement(stmt) => stmt.module_id,
+            BodyItem::ExpressionStatement(expression_statement) => expression_statement.module_id,
+            BodyItem::VariableDeclaration(variable_declaration) => variable_declaration.module_id,
+            BodyItem::ReturnStatement(return_statement) => return_statement.module_id,
+        }
+    }
+}
+
+impl Expr {
+    pub fn module_id(&self) -> ModuleId {
+        match self {
+            Expr::Literal(literal) => literal.module_id,
+            Expr::Identifier(identifier) => identifier.module_id,
+            Expr::TagDeclarator(tag) => tag.module_id,
+            Expr::BinaryExpression(binary_expression) => binary_expression.module_id,
+            Expr::FunctionExpression(function_expression) => function_expression.module_id,
+            Expr::CallExpression(call_expression) => call_expression.module_id,
+            Expr::CallExpressionKw(call_expression) => call_expression.module_id,
+            Expr::PipeExpression(pipe_expression) => pipe_expression.module_id,
+            Expr::PipeSubstitution(pipe_substitution) => pipe_substitution.module_id,
+            Expr::ArrayExpression(array_expression) => array_expression.module_id,
+            Expr::ArrayRangeExpression(array_range) => array_range.module_id,
+            Expr::ObjectExpression(object_expression) => object_expression.module_id,
+            Expr::MemberExpression(member_expression) => member_expression.module_id,
+            Expr::UnaryExpression(unary_expression) => unary_expression.module_id,
+            Expr::IfExpression(expr) => expr.module_id,
+            Expr::None(none) => none.module_id,
+        }
+    }
+}
+
+impl BinaryPart {
+    pub fn module_id(&self) -> ModuleId {
+        match self {
+            BinaryPart::Literal(literal) => literal.module_id,
+            BinaryPart::Identifier(identifier) => identifier.module_id,
+            BinaryPart::BinaryExpression(binary_expression) => binary_expression.module_id,
+            BinaryPart::CallExpression(call_expression) => call_expression.module_id,
+            BinaryPart::CallExpressionKw(call_expression) => call_expression.module_id,
+            BinaryPart::UnaryExpression(unary_expression) => unary_expression.module_id,
+            BinaryPart::MemberExpression(member_expression) => member_expression.module_id,
+            BinaryPart::IfExpression(e) => e.module_id,
+        }
+    }
+}
+
+impl MemberObject {
+    pub fn module_id(&self) -> ModuleId {
+        match self {
+            MemberObject::MemberExpression(member_expression) => member_expression.module_id,
+            MemberObject::Identifier(identifier) => identifier.module_id,
+        }
+    }
+}
+
+impl LiteralIdentifier {
+    pub fn module_id(&self) -> ModuleId {
+        match self {
+            LiteralIdentifier::Identifier(identifier) => identifier.module_id,
+            LiteralIdentifier::Literal(literal) => literal.module_id,
+        }
+    }
+}

src/wasm-lib/kcl/src/parsing/ast/modify.rs

@@ -9,7 +9,7 @@ use kittycad_modeling_cmds as kcmc;
 use crate::{
     engine::EngineManager,
     errors::{KclError, KclErrorDetails},
-    executor::Point2d,
+    execution::Point2d,
     parsing::ast::types::{
         ArrayExpression, CallExpression, ConstraintLevel, FormatOptions, Literal, Node, PipeExpression,
         PipeSubstitution, VariableDeclarator,
@@ -42,7 +42,7 @@ pub async fn modify_ast_for_sketch(
     // The name of the sketch.
     sketch_name: &str,
     // The type of plane the sketch is on. `XY` or `XZ`, etc
-    plane: crate::executor::PlaneType,
+    plane: crate::execution::PlaneType,
     // The ID of the parent sketch.
     sketch_id: uuid::Uuid,
 ) -> Result<String, KclError> {
@@ -196,7 +196,7 @@ fn create_start_sketch_on(
     name: &str,
     start: [f64; 2],
     end: [f64; 2],
-    plane: crate::executor::PlaneType,
+    plane: crate::execution::PlaneType,
     additional_lines: Vec<[f64; 2]>,
 ) -> Result<Node<VariableDeclarator>, KclError> {
     let start_sketch_on = CallExpression::new("startSketchOn", vec![Literal::new(plane.to_string().into()).into()])?;

src/wasm-lib/kcl/src/parsing/ast/source_range.rs

@@ -1,71 +0,0 @@
-use crate::{
-    parsing::ast::types::{BinaryPart, BodyItem, Expr, LiteralIdentifier, MemberObject},
-    source_range::ModuleId,
-};
-
-impl BodyItem {
-    pub fn module_id(&self) -> ModuleId {
-        match self {
-            BodyItem::ImportStatement(stmt) => stmt.module_id,
-            BodyItem::ExpressionStatement(expression_statement) => expression_statement.module_id,
-            BodyItem::VariableDeclaration(variable_declaration) => variable_declaration.module_id,
-            BodyItem::ReturnStatement(return_statement) => return_statement.module_id,
-        }
-    }
-}
-
-impl Expr {
-    pub fn module_id(&self) -> ModuleId {
-        match self {
-            Expr::Literal(literal) => literal.module_id,
-            Expr::Identifier(identifier) => identifier.module_id,
-            Expr::TagDeclarator(tag) => tag.module_id,
-            Expr::BinaryExpression(binary_expression) => binary_expression.module_id,
-            Expr::FunctionExpression(function_expression) => function_expression.module_id,
-            Expr::CallExpression(call_expression) => call_expression.module_id,
-            Expr::CallExpressionKw(call_expression) => call_expression.module_id,
-            Expr::PipeExpression(pipe_expression) => pipe_expression.module_id,
-            Expr::PipeSubstitution(pipe_substitution) => pipe_substitution.module_id,
-            Expr::ArrayExpression(array_expression) => array_expression.module_id,
-            Expr::ArrayRangeExpression(array_range) => array_range.module_id,
-            Expr::ObjectExpression(object_expression) => object_expression.module_id,
-            Expr::MemberExpression(member_expression) => member_expression.module_id,
-            Expr::UnaryExpression(unary_expression) => unary_expression.module_id,
-            Expr::IfExpression(expr) => expr.module_id,
-            Expr::None(none) => none.module_id,
-        }
-    }
-}
-
-impl BinaryPart {
-    pub fn module_id(&self) -> ModuleId {
-        match self {
-            BinaryPart::Literal(literal) => literal.module_id,
-            BinaryPart::Identifier(identifier) => identifier.module_id,
-            BinaryPart::BinaryExpression(binary_expression) => binary_expression.module_id,
-            BinaryPart::CallExpression(call_expression) => call_expression.module_id,
-            BinaryPart::CallExpressionKw(call_expression) => call_expression.module_id,
-            BinaryPart::UnaryExpression(unary_expression) => unary_expression.module_id,
-            BinaryPart::MemberExpression(member_expression) => member_expression.module_id,
-            BinaryPart::IfExpression(e) => e.module_id,
-        }
-    }
-}
-
-impl MemberObject {
-    pub fn module_id(&self) -> ModuleId {
-        match self {
-            MemberObject::MemberExpression(member_expression) => member_expression.module_id,
-            MemberObject::Identifier(identifier) => identifier.module_id,
-        }
-    }
-}
-
-impl LiteralIdentifier {
-    pub fn module_id(&self) -> ModuleId {
-        match self {
-            LiteralIdentifier::Identifier(identifier) => identifier.module_id,
-            LiteralIdentifier::Literal(literal) => literal.module_id,
-        }
-    }
-}

src/wasm-lib/kcl/src/parsing/ast/types/mod.rs

@@ -8,7 +8,7 @@ use std::{
 };
 
 use anyhow::Result;
-use async_recursion::async_recursion;
+
 use parse_display::{Display, FromStr};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -17,7 +17,7 @@ use tower_lsp::lsp_types::{
     CompletionItem, CompletionItemKind, DocumentSymbol, FoldingRange, FoldingRangeKind, Range as LspRange, SymbolKind,
 };
 
-use super::{digest::Digest, execute::execute_pipe_body};
+use super::digest::Digest;
 pub use crate::parsing::ast::types::{
     condition::{ElseIf, IfExpression},
     literal_value::LiteralValue,
@@ -26,7 +26,7 @@ pub use crate::parsing::ast::types::{
 use crate::{
     docs::StdLibFn,
     errors::KclError,
-    executor::{ExecState, ExecutorContext, KclValue, Metadata, TagIdentifier},
+    execution::{KclValue, Metadata, TagIdentifier},
     parsing::PIPE_OPERATOR,
     source_range::{ModuleId, SourceRange},
 };
@@ -466,13 +466,11 @@ impl Program {
                     continue;
                 }
                 BodyItem::VariableDeclaration(ref mut variable_declaration) => {
-                    for declaration in &mut variable_declaration.declarations {
+                    if variable_declaration.declaration.id.name == name {
-                        if declaration.id.name == name {
+                        variable_declaration.declaration = declarator;
-                            *declaration = declarator;
                         return;
                     }
                 }
-                }
                 BodyItem::ReturnStatement(_return_statement) => continue,
             }
         }
@@ -501,20 +499,16 @@ impl Program {
         for item in &self.body {
             match item {
                 BodyItem::ImportStatement(stmt) => {
-                    for import_item in &stmt.items {
+                    if stmt.get_variable(name) {
-                        if import_item.identifier() == name {
+                        return Some(Definition::Import(stmt));
-                            return Some(Definition::Import(stmt.as_ref()));
-                        }
                     }
                 }
                 BodyItem::ExpressionStatement(_expression_statement) => {
                     continue;
                 }
                 BodyItem::VariableDeclaration(variable_declaration) => {
-                    for declaration in &variable_declaration.declarations {
+                    if variable_declaration.declaration.id.name == name {
-                        if declaration.id.name == name {
+                        return Some(Definition::Variable(&variable_declaration.declaration));
-                            return Some(Definition::Variable(declaration));
-                        }
                     }
                 }
                 BodyItem::ReturnStatement(_return_statement) => continue,
@@ -1125,7 +1119,7 @@ impl NonCodeMeta {
 pub struct ImportItem {
     /// Name of the item to import.
     pub name: Node<Identifier>,
-    /// Rename the item using an identifier after "as".
+    /// Rename the item using an identifier after `as`.
     pub alias: Option<Node<Identifier>>,
 
     #[serde(default, skip_serializing_if = "Option::is_none")]
@@ -1174,25 +1168,24 @@ impl ImportItem {
 #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
 #[ts(export)]
 #[serde(tag = "type")]
-pub struct ImportStatement {
+#[allow(clippy::large_enum_variant)]
-    pub items: NodeList<ImportItem>,
+pub enum ImportSelector {
-    pub path: String,
+    /// A comma-separated list of names and possible aliases to import (may be a single item, but never zero).
-    pub raw_path: String,
+    /// E.g., `import bar as baz from "foo.kcl"`
-
+    List { items: NodeList<ImportItem> },
-    #[serde(default, skip_serializing_if = "Option::is_none")]
+    /// Import all public items from a module.
-    #[ts(optional)]
+    /// E.g., `import * from "foo.kcl"`
-    pub digest: Option<Digest>,
+    Glob(Node<()>),
+    /// Import the module itself (the param is an optional alias).
+    /// E.g., `import "foo.kcl" as bar`
+    None(Option<Node<Identifier>>),
 }
 
-impl Node<ImportStatement> {
+impl ImportSelector {
-    pub fn get_constraint_level(&self) -> ConstraintLevel {
-        ConstraintLevel::Full {
-            source_ranges: vec![self.into()],
-        }
-    }
-
     pub fn rename_symbol(&mut self, new_name: &str, pos: usize) -> Option<String> {
-        for item in &mut self.items {
+        match self {
+            ImportSelector::List { items } => {
+                for item in items {
                     let source_range = SourceRange::from(&*item);
                     if source_range.contains(pos) {
                         let old_name = item.rename_symbol(new_name, pos);
@@ -1203,13 +1196,96 @@ impl Node<ImportStatement> {
                 }
                 None
             }
+            ImportSelector::Glob(_) => None,
+            ImportSelector::None(None) => None,
+            ImportSelector::None(Some(alias)) => {
+                let alias_source_range = SourceRange::from(&*alias);
+                if !alias_source_range.contains(pos) {
+                    return None;
+                }
+                let old_name = std::mem::replace(&mut alias.name, new_name.to_owned());
+                Some(old_name)
+            }
+        }
+    }
+
+    pub fn rename_identifiers(&mut self, old_name: &str, new_name: &str) {
+        match self {
+            ImportSelector::List { items } => {
+                for item in items {
+                    item.rename_identifiers(old_name, new_name);
+                }
+            }
+            ImportSelector::Glob(_) => {}
+            ImportSelector::None(None) => {}
+            ImportSelector::None(Some(alias)) => alias.rename(old_name, new_name),
+        }
+    }
+}
+
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
+#[ts(export)]
+#[serde(tag = "type")]
+pub struct ImportStatement {
+    pub selector: ImportSelector,
+    pub path: String,
+    pub visibility: ItemVisibility,
+
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    #[ts(optional)]
+    pub digest: Option<Digest>,
+}
+
+impl Node<ImportStatement> {
+    pub fn get_variable(&self, name: &str) -> bool {
+        match &self.selector {
+            ImportSelector::List { items } => {
+                for import_item in items {
+                    if import_item.identifier() == name {
+                        return true;
+                    }
+                }
+                false
+            }
+            ImportSelector::Glob(_) => false,
+            ImportSelector::None(_) => name == self.module_name().unwrap(),
+        }
+    }
+
+    /// Get the name of the module object for this import.
+    /// Validated during parsing and guaranteed to return `Some` if the statement imports
+    /// the module itself (i.e., self.selector is ImportSelector::None).
+    pub fn module_name(&self) -> Option<String> {
+        if let ImportSelector::None(Some(alias)) = &self.selector {
+            return Some(alias.name.clone());
+        }
+
+        let mut parts = self.path.split('.');
+        let name = parts.next()?;
+        let ext = parts.next()?;
+        let rest = parts.next();
+
+        if rest.is_some() || ext != "kcl" {
+            return None;
+        }
+
+        Some(name.to_owned())
+    }
+
+    pub fn get_constraint_level(&self) -> ConstraintLevel {
+        ConstraintLevel::Full {
+            source_ranges: vec![self.into()],
+        }
+    }
+
+    pub fn rename_symbol(&mut self, new_name: &str, pos: usize) -> Option<String> {
+        self.selector.rename_symbol(new_name, pos)
+    }
 }
 
 impl ImportStatement {
     pub fn rename_identifiers(&mut self, old_name: &str, new_name: &str) {
-        for item in &mut self.items {
+        self.selector.rename_identifiers(old_name, new_name);
-            item.rename_identifiers(old_name, new_name);
-        }
     }
 }
 
@@ -1471,7 +1547,7 @@ impl ItemVisibility {
 #[ts(export)]
 #[serde(tag = "type")]
 pub struct VariableDeclaration {
-    pub declarations: NodeList<VariableDeclarator>,
+    pub declaration: Node<VariableDeclarator>,
     #[serde(default, skip_serializing_if = "ItemVisibility::is_default")]
     pub visibility: ItemVisibility,
     pub kind: VariableKind, // Change to enum if there are specific values
@@ -1483,10 +1559,8 @@ pub struct VariableDeclaration {
 
 impl From<&Node<VariableDeclaration>> for Vec<CompletionItem> {
     fn from(declaration: &Node<VariableDeclaration>) -> Self {
-        let mut completions = vec![];
+        vec![CompletionItem {
-        for variable in &declaration.declarations {
+            label: declaration.declaration.id.name.to_string(),
-            completions.push(CompletionItem {
-                label: variable.id.name.to_string(),
             label_details: None,
             kind: Some(match declaration.inner.kind {
                 VariableKind::Const => CompletionItemKind::CONSTANT,
@@ -1507,9 +1581,7 @@ impl From<&Node<VariableDeclaration>> for Vec<CompletionItem> {
             commit_characters: None,
             data: None,
             tags: None,
-            })
+        }]
-        }
-        completions
     }
 }
 
@@ -1543,23 +1615,21 @@ impl Node<VariableDeclaration> {
             return None;
         }
 
-        for declaration in &mut self.declarations {
+        let declaration_source_range: SourceRange = self.declaration.id.clone().into();
-            let declaration_source_range: SourceRange = declaration.id.clone().into();
         if declaration_source_range.contains(pos) {
-                let old_name = declaration.id.name.clone();
+            let old_name = self.declaration.id.name.clone();
-                declaration.id.name = new_name.to_string();
+            self.declaration.id.name = new_name.to_string();
             return Some(old_name);
         }
-        }
 
         None
     }
 }
 
 impl VariableDeclaration {
-    pub fn new(declarations: NodeList<VariableDeclarator>, visibility: ItemVisibility, kind: VariableKind) -> Self {
+    pub fn new(declaration: Node<VariableDeclarator>, visibility: ItemVisibility, kind: VariableKind) -> Self {
         Self {
-            declarations,
+            declaration,
             visibility,
             kind,
             digest: None,
@@ -1567,18 +1637,14 @@ impl VariableDeclaration {
     }
 
     pub fn replace_value(&mut self, source_range: SourceRange, new_value: Expr) {
-        for declaration in &mut self.declarations {
+        self.declaration.init.replace_value(source_range, new_value.clone());
-            declaration.init.replace_value(source_range, new_value.clone());
-        }
     }
 
     /// Returns an Expr that includes the given character position.
     pub fn get_expr_for_position(&self, pos: usize) -> Option<&Expr> {
-        for declaration in &self.declarations {
+        let source_range: SourceRange = self.declaration.clone().into();
-            let source_range: SourceRange = declaration.into();
         if source_range.contains(pos) {
-                return Some(&declaration.init);
+            return Some(&self.declaration.init);
-            }
         }
 
         None
@@ -1586,40 +1652,31 @@ impl VariableDeclaration {
 
     /// Returns an Expr that includes the given character position.
     pub fn get_mut_expr_for_position(&mut self, pos: usize) -> Option<&mut Expr> {
-        for declaration in &mut self.declarations {
+        let source_range: SourceRange = self.declaration.clone().into();
-            let source_range: SourceRange = declaration.clone().into();
         if source_range.contains(pos) {
-                return Some(&mut declaration.init);
+            return Some(&mut self.declaration.init);
-            }
         }
 
         None
     }
 
     pub fn rename_identifiers(&mut self, old_name: &str, new_name: &str) {
-        for declaration in &mut self.declarations {
         // Skip the init for the variable with the new name since it is the one we are renaming.
-            if declaration.id.name == new_name {
+        if self.declaration.id.name != new_name {
-                continue;
+            self.declaration.init.rename_identifiers(old_name, new_name);
-            }
-
-            declaration.init.rename_identifiers(old_name, new_name);
         }
     }
 
     pub fn get_lsp_symbols(&self, code: &str) -> Vec<DocumentSymbol> {
-        let mut symbols = vec![];
+        let source_range: SourceRange = self.declaration.clone().into();
-
+        let inner_source_range: SourceRange = self.declaration.id.clone().into();
-        for declaration in &self.declarations {
-            let source_range: SourceRange = declaration.into();
-            let inner_source_range: SourceRange = declaration.id.clone().into();
 
         let mut symbol_kind = match self.kind {
             VariableKind::Fn => SymbolKind::FUNCTION,
             VariableKind::Const => SymbolKind::CONSTANT,
         };
 
-            let children = match &declaration.init {
+        let children = match &self.declaration.init {
             Expr::FunctionExpression(function_expression) => {
                 symbol_kind = SymbolKind::FUNCTION;
                 let mut children = vec![];
@@ -1654,9 +1711,10 @@ impl VariableDeclaration {
             _ => vec![],
         };
 
+        vec![
             #[allow(deprecated)]
-            symbols.push(DocumentSymbol {
+            DocumentSymbol {
-                name: declaration.id.name.clone(),
+                name: self.declaration.id.name.clone(),
                 detail: Some(self.kind.to_string()),
                 kind: symbol_kind,
                 range: source_range.to_lsp_range(code),
@@ -1664,10 +1722,8 @@ impl VariableDeclaration {
                 children: Some(children),
                 tags: None,
                 deprecated: None,
-            });
+            },
-        }
+        ]
-
-        symbols
     }
 }
 
@@ -2629,11 +2685,6 @@ impl Node<PipeExpression> {
 
         constraint_levels.get_constraint_level(self.into())
     }
-
-    #[async_recursion]
-    pub async fn get_result(&self, exec_state: &mut ExecState, ctx: &ExecutorContext) -> Result<KclValue, KclError> {
-        execute_pipe_body(exec_state, &self.body, self.into(), ctx).await
-    }
 }
 
 impl PipeExpression {
@@ -3243,7 +3294,7 @@ const cylinder = startSketchOn('-XZ')
         let BodyItem::VariableDeclaration(var_decl) = function else {
             panic!("expected a variable declaration")
         };
-        let Expr::FunctionExpression(ref func_expr) = var_decl.declarations.first().unwrap().init else {
+        let Expr::FunctionExpression(ref func_expr) = var_decl.declaration.init else {
             panic!("expected a function expression")
         };
         let params = &func_expr.params;
@@ -3265,7 +3316,7 @@ const cylinder = startSketchOn('-XZ')
         let BodyItem::VariableDeclaration(var_decl) = function else {
             panic!("expected a variable declaration")
         };
-        let Expr::FunctionExpression(ref func_expr) = var_decl.declarations.first().unwrap().init else {
+        let Expr::FunctionExpression(ref func_expr) = var_decl.declaration.init else {
             panic!("expected a function expression")
         };
         let params = &func_expr.params;
@@ -3288,7 +3339,7 @@ const cylinder = startSketchOn('-XZ')
         let BodyItem::VariableDeclaration(var_decl) = function else {
             panic!("expected a variable declaration")
         };
-        let Expr::FunctionExpression(ref func_expr) = var_decl.declarations.first().unwrap().init else {
+        let Expr::FunctionExpression(ref func_expr) = var_decl.declaration.init else {
             panic!("expected a function expression")
         };
         let params = &func_expr.params;
@@ -3362,7 +3413,7 @@ const cylinder = startSketchOn('-XZ')
         let BodyItem::VariableDeclaration(var_decl) = function else {
             panic!("expected a variable declaration")
         };
-        let Expr::FunctionExpression(ref func_expr) = var_decl.declarations.first().unwrap().init else {
+        let Expr::FunctionExpression(ref func_expr) = var_decl.declaration.init else {
             panic!("expected a function expression")
         };
         let params = &func_expr.params;

src/wasm-lib/kcl/src/parsing/ast/types/none.rs

@@ -4,7 +4,7 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
 use super::Node;
-use crate::{executor::KclValue, parsing::ast::types::ConstraintLevel};
+use crate::{execution::KclValue, parsing::ast::types::ConstraintLevel};
 
 const KCL_NONE_ID: &str = "KCL_NONE_ID";
 

src/wasm-lib/kcl/src/parsing/parser.rs

@@ -19,11 +19,11 @@ use crate::{
         ast::types::{
             ArrayExpression, ArrayRangeExpression, BinaryExpression, BinaryOperator, BinaryPart, BodyItem, BoxNode,
             CallExpression, CallExpressionKw, CommentStyle, DefaultParamVal, ElseIf, Expr, ExpressionStatement,
-            FnArgPrimitive, FnArgType, FunctionExpression, Identifier, IfExpression, ImportItem, ImportStatement,
+            FnArgPrimitive, FnArgType, FunctionExpression, Identifier, IfExpression, ImportItem, ImportSelector,
-            ItemVisibility, LabeledArg, Literal, LiteralIdentifier, LiteralValue, MemberExpression, MemberObject, Node,
+            ImportStatement, ItemVisibility, LabeledArg, Literal, LiteralIdentifier, LiteralValue, MemberExpression,
-            NonCodeMeta, NonCodeNode, NonCodeValue, ObjectExpression, ObjectProperty, Parameter, PipeExpression,
+            MemberObject, Node, NodeList, NonCodeMeta, NonCodeNode, NonCodeValue, ObjectExpression, ObjectProperty,
-            PipeSubstitution, Program, ReturnStatement, Shebang, TagDeclarator, UnaryExpression, UnaryOperator,
+            Parameter, PipeExpression, PipeSubstitution, Program, ReturnStatement, Shebang, TagDeclarator,
-            VariableDeclaration, VariableDeclarator, VariableKind,
+            UnaryExpression, UnaryOperator, VariableDeclaration, VariableDeclarator, VariableKind,
         },
         math::BinaryExpressionToken,
         token::{Token, TokenType},
@@ -1217,7 +1217,6 @@ fn noncode_just_after_code(i: TokenSlice) -> PResult<Node<NonCodeNode>> {
 // the large_enum_variant lint below introduces a LOT of code complexity in a
 // match!() that's super clean that isn't worth it for the marginal space
 // savings. revisit if that's a lie.
-
 #[derive(Debug)]
 #[allow(clippy::large_enum_variant)]
 enum WithinFunction {
@@ -1238,7 +1237,8 @@ fn body_items_within_function(i: TokenSlice) -> PResult<WithinFunction> {
     // Any of the body item variants, each of which can optionally be followed by a comment.
     // If there is a comment, it may be preceded by whitespace.
     let item = dispatch! {peek(any);
-        token if token.declaration_keyword().is_some() || token.visibility_keyword().is_some() =>
+        token if token.visibility_keyword().is_some() => (alt((declaration.map(BodyItem::VariableDeclaration), import_stmt.map(BodyItem::ImportStatement))), opt(noncode_just_after_code)).map(WithinFunction::BodyItem),
+        token if token.declaration_keyword().is_some() =>
             (declaration.map(BodyItem::VariableDeclaration), opt(noncode_just_after_code)).map(WithinFunction::BodyItem),
         token if token.value == "import" && matches!(token.token_type, TokenType::Keyword) =>
             (import_stmt.map(BodyItem::ImportStatement), opt(noncode_just_after_code)).map(WithinFunction::BodyItem),
@@ -1407,7 +1407,22 @@ fn function_body(i: TokenSlice) -> PResult<Node<Program>> {
     ))
 }
 
+fn import_items(i: TokenSlice) -> PResult<NodeList<ImportItem>> {
+    separated(1.., import_item, comma_sep)
+        .parse_next(i)
+        .map_err(|e| e.cut())
+}
+
+fn glob(i: TokenSlice) -> PResult<Token> {
+    one_of((TokenType::Operator, "*"))
+        .context(expected("the multiple import operator, *"))
+        .parse_next(i)
+}
+
 fn import_stmt(i: TokenSlice) -> PResult<BoxNode<ImportStatement>> {
+    let (visibility, visibility_token) = opt(terminated(item_visibility, whitespace))
+        .parse_next(i)?
+        .map_or((ItemVisibility::Default, None), |pair| (pair.0, Some(pair.1)));
     let import_token = any
         .try_map(|token: Token| {
             if matches!(token.token_type, TokenType::Keyword) && token.value == "import" {
@@ -1421,16 +1436,29 @@ fn import_stmt(i: TokenSlice) -> PResult<BoxNode<ImportStatement>> {
         })
         .context(expected("the 'import' keyword"))
         .parse_next(i)?;
-    let start = import_token.start;
+
+    let module_id = import_token.module_id;
+    let start = visibility_token.unwrap_or(import_token).start;
 
     require_whitespace(i)?;
 
-    let items = separated(1.., import_item, comma_sep)
+    let (mut selector, path) = alt((
-        .parse_next(i)
+        string_literal.map(|s| (ImportSelector::None(None), Some(s))),
-        .map_err(|e| e.cut())?;
+        glob.map(|t| {
+            let s = t.as_source_range();
+            (
+                ImportSelector::Glob(Node::new((), s.start(), s.end(), s.module_id())),
+                None,
+            )
+        }),
+        import_items.map(|items| (ImportSelector::List { items }, None)),
+    ))
+    .parse_next(i)?;
 
+    let path = match path {
+        Some(path) => path,
+        None => {
             require_whitespace(i)?;
-
             any.try_map(|token: Token| {
                 if matches!(token.token_type, TokenType::Keyword | TokenType::Word) && token.value == "from" {
                     Ok(())
@@ -1447,12 +1475,24 @@ fn import_stmt(i: TokenSlice) -> PResult<BoxNode<ImportStatement>> {
 
             require_whitespace(i)?;
 
-    let path = string_literal(i)?;
+            string_literal(i)?
-    let end = path.end;
+        }
+    };
+
+    let mut end: usize = path.end;
     let path_string = match path.inner.value {
         LiteralValue::String(s) => s,
         _ => unreachable!(),
     };
+    if path_string.is_empty() {
+        return Err(ErrMode::Cut(
+            CompilationError::fatal(
+                SourceRange::new(path.start, path.end, path.module_id),
+                "import path cannot be empty",
+            )
+            .into(),
+        ));
+    }
     if path_string
         .chars()
         .any(|c| !c.is_ascii_alphanumeric() && c != '_' && c != '-' && c != '.')
@@ -1465,16 +1505,44 @@ fn import_stmt(i: TokenSlice) -> PResult<BoxNode<ImportStatement>> {
             .into(),
         ));
     }
+
+    if let ImportSelector::None(ref mut a) = selector {
+        if let Some(alias) = opt(preceded(
+            (whitespace, import_as_keyword, whitespace),
+            identifier.context(expected("an identifier to alias the import")),
+        ))
+        .parse_next(i)?
+        {
+            end = alias.end;
+            *a = Some(alias);
+        }
+
+        if a.is_none()
+            && (!path_string.ends_with(".kcl")
+                || path_string.starts_with("_")
+                || path_string.contains('-')
+                || path_string[0..path_string.len() - 4].contains('.'))
+        {
+            return Err(ErrMode::Cut(
+                CompilationError::fatal(
+                    SourceRange::new(path.start, path.end, path.module_id),
+                    "import path is not a valid identifier and must be aliased.".to_owned(),
+                )
+                .into(),
+            ));
+        }
+    }
+
     Ok(Node::boxed(
         ImportStatement {
-            items,
+            selector,
+            visibility,
             path: path_string,
-            raw_path: path.inner.raw,
             digest: None,
         },
         start,
         end,
-        import_token.module_id,
+        module_id,
     ))
 }
 
@@ -1707,7 +1775,7 @@ fn declaration(i: TokenSlice) -> PResult<BoxNode<VariableDeclaration>> {
     let end = val.end();
     Ok(Box::new(Node {
         inner: VariableDeclaration {
-            declarations: vec![Node {
+            declaration: Node {
                 start: id.start,
                 end,
                 module_id,
@@ -1716,7 +1784,7 @@ fn declaration(i: TokenSlice) -> PResult<BoxNode<VariableDeclaration>> {
                     init: val,
                     digest: None,
                 },
-            }],
+            },
             visibility,
             kind,
             digest: None,
@@ -2383,10 +2451,11 @@ mod tests {
         // example, "return" is the problem.
         assert!(
             err.message.starts_with("Unexpected token: ")
+                || err.message.starts_with("= is not")
                 || err
                     .message
                     .starts_with("Cannot assign a variable to a reserved keyword: "),
-            "Error message is: {}",
+            "Error message is: `{}`",
             err.message,
         );
     }
@@ -2449,7 +2518,7 @@ mod tests {
         let tokens = crate::parsing::token::lexer("x = 4", ModuleId::default()).unwrap();
         let vardec = declaration(&mut tokens.as_slice()).unwrap();
         assert_eq!(vardec.inner.kind, VariableKind::Const);
-        let vardec = vardec.declarations.first().unwrap();
+        let vardec = &vardec.declaration;
         assert_eq!(vardec.id.name, "x");
         let Expr::Literal(init_val) = &vardec.init else {
             panic!("weird init value")
@@ -2524,10 +2593,10 @@ const mySk1 = startSketchAt([0, 0])"#;
     fn test_comment_in_pipe() {
         let tokens = crate::parsing::token::lexer(r#"const x = y() |> /*hi*/ z(%)"#, ModuleId::default()).unwrap();
         let mut body = program.parse(&tokens).unwrap().inner.body;
-        let BodyItem::VariableDeclaration(mut item) = body.remove(0) else {
+        let BodyItem::VariableDeclaration(item) = body.remove(0) else {
             panic!("expected vardec");
         };
-        let val = item.declarations.remove(0).inner.init;
+        let val = item.inner.declaration.inner.init;
         let Expr::PipeExpression(pipe) = val else {
             panic!("expected pipe");
         };
@@ -2795,14 +2864,14 @@ const mySk1 = startSketchAt([0, 0])"#;
         .enumerate()
         {
             let tokens = crate::parsing::token::lexer(test_input, ModuleId::default()).unwrap();
-            let mut actual = match declaration.parse(&tokens) {
+            let actual = match declaration.parse(&tokens) {
                 Err(e) => panic!("Could not parse test {i}: {e:#?}"),
                 Ok(a) => a,
             };
-            let Expr::BinaryExpression(_expr) = actual.declarations.remove(0).inner.init else {
+            let Expr::BinaryExpression(_expr) = &actual.declaration.inner.init else {
                 panic!(
                     "Expected test {i} to be a binary expression but it wasn't, it was {:?}",
-                    actual.declarations[0]
+                    actual.declaration
                 );
             };
             // TODO: check both sides are 1... probably not necessary but should do.
@@ -3144,16 +3213,15 @@ const mySk1 = startSketchAt([0, 0])"#;
             };
 
             // Run the second parser, check it matches the first parser.
-            let mut actual = declaration.parse(&tokens).unwrap();
+            let actual = declaration.parse(&tokens).unwrap();
             assert_eq!(expected, actual);
 
             // Inspect its output in more detail.
             assert_eq!(actual.inner.kind, VariableKind::Const);
             assert_eq!(actual.start, 0);
-            assert_eq!(actual.declarations.len(), 1);
+            let decl = &actual.declaration;
-            let decl = actual.declarations.pop().unwrap();
             assert_eq!(decl.id.name, "myVar");
-            let Expr::Literal(value) = decl.inner.init else {
+            let Expr::Literal(value) = &decl.inner.init else {
                 panic!("value should be a literal")
             };
             assert_eq!(value.end, test.len());
@@ -3697,6 +3765,46 @@ e
         )
     }
 
+    #[test]
+    fn bad_imports() {
+        assert_err(
+            r#"import cube from "../cube.kcl""#,
+            "import path may only contain alphanumeric characters, underscore, hyphen, and period. Files in other directories are not yet supported.",
+            [17, 30],
+        );
+        assert_err(
+            r#"import * as foo from "dsfs""#,
+            "as is not the 'from' keyword",
+            [9, 11],
+        );
+        assert_err(r#"import a from "dsfs" as b"#, "Unexpected token: as", [21, 23]);
+        assert_err(r#"import * from "dsfs" as b"#, "Unexpected token: as", [21, 23]);
+        assert_err(r#"import a from b"#, "invalid string literal", [14, 15]);
+        assert_err(r#"import * "dsfs""#, "\"dsfs\" is not the 'from' keyword", [9, 15]);
+        assert_err(r#"import from "dsfs""#, "\"dsfs\" is not the 'from' keyword", [12, 18]);
+        assert_err(r#"import "dsfs.kcl" as *"#, "Unexpected token: as", [18, 20]);
+        assert_err(
+            r#"import "dsfs""#,
+            "import path is not a valid identifier and must be aliased.",
+            [7, 13],
+        );
+        assert_err(
+            r#"import "foo.bar.kcl""#,
+            "import path is not a valid identifier and must be aliased.",
+            [7, 20],
+        );
+        assert_err(
+            r#"import "_foo.kcl""#,
+            "import path is not a valid identifier and must be aliased.",
+            [7, 17],
+        );
+        assert_err(
+            r#"import "foo-bar.kcl""#,
+            "import path is not a valid identifier and must be aliased.",
+            [7, 20],
+        );
+    }
+
     #[test]
     fn zero_param_function() {
         let code = r#"

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__a.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 3893
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 143,
         "id": {
           "end": 15,
@@ -238,8 +235,7 @@ snapshot_kind: text
         },
         "start": 6,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 143,
       "kind": "const",
       "start": 0,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__aa.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 3963
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 17,
         "id": {
           "end": 8,
@@ -32,8 +29,7 @@ snapshot_kind: text
         },
         "start": 6,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 17,
       "kind": "const",
       "start": 0,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__ac.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 3965
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 23,
         "id": {
           "end": 13,
@@ -41,8 +38,7 @@ snapshot_kind: text
         },
         "start": 6,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 23,
       "kind": "const",
       "start": 0,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__ad.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 3966
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 57,
         "id": {
           "end": 24,
@@ -45,8 +42,7 @@ snapshot_kind: text
         },
         "start": 8,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 57,
       "kind": "fn",
       "start": 5,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__ae.snap

@@ -1,13 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 49,
         "id": {
           "end": 8,
@@ -54,8 +52,7 @@ snapshot_kind: text
         },
         "start": 3,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 49,
       "kind": "fn",
       "start": 0,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__af.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 3981
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 165,
         "id": {
           "end": 14,
@@ -230,8 +227,7 @@ snapshot_kind: text
         },
         "start": 6,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 165,
       "kind": "const",
       "start": 0,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__ag.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 3989
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 70,
         "id": {
           "end": 14,
@@ -128,8 +125,7 @@ snapshot_kind: text
         },
         "start": 6,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 70,
       "kind": "const",
       "start": 0,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__ah.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 3993
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 30,
         "id": {
           "end": 11,
@@ -39,8 +36,7 @@ snapshot_kind: text
         },
         "start": 6,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 30,
       "kind": "const",
       "start": 0,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__ai.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 3994
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 29,
         "id": {
           "end": 11,
@@ -76,8 +73,7 @@ snapshot_kind: text
         },
         "start": 6,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 29,
       "kind": "const",
       "start": 0,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__aj.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 3995
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 49,
         "id": {
           "end": 11,
@@ -90,8 +87,7 @@ snapshot_kind: text
         },
         "start": 6,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 49,
       "kind": "const",
       "start": 0,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__ap.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 4001
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 37,
         "id": {
           "end": 14,
@@ -56,8 +53,7 @@ snapshot_kind: text
         },
         "start": 6,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 37,
       "kind": "const",
       "start": 0,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__au.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 4005
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 107,
         "id": {
           "end": 14,
@@ -158,8 +155,7 @@ snapshot_kind: text
         },
         "start": 6,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 107,
       "kind": "const",
       "start": 0,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__av.snap

@@ -1,13 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 49,
         "id": {
           "end": 4,
@@ -80,8 +78,7 @@ snapshot_kind: text
         },
         "start": 3,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 49,
       "kind": "fn",
       "start": 0,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__aw.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 4007
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 91,
         "id": {
           "end": 11,
@@ -71,8 +68,7 @@ snapshot_kind: text
         },
         "start": 4,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 91,
       "kind": "const",
       "start": 0,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__ax.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 4016
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 91,
         "id": {
           "end": 11,
@@ -71,8 +68,7 @@ snapshot_kind: text
         },
         "start": 4,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 91,
       "kind": "const",
       "start": 0,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__ay.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 4025
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 80,
         "id": {
           "end": 9,
@@ -81,8 +78,7 @@ snapshot_kind: text
         },
         "start": 4,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 80,
       "kind": "const",
       "start": 0,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__az.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 4033
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 79,
         "id": {
           "end": 9,
@@ -81,8 +78,7 @@ snapshot_kind: text
         },
         "start": 4,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 79,
       "kind": "const",
       "start": 0,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__b.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 3902
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 36,
         "id": {
           "end": 11,
@@ -77,8 +74,7 @@ snapshot_kind: text
         },
         "start": 6,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 36,
       "kind": "const",
       "start": 0,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__ba.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 4041
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 132,
         "id": {
           "end": 16,
@@ -115,8 +112,7 @@ snapshot_kind: text
         },
         "start": 7,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 132,
       "kind": "const",
       "start": 1,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__bb.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 4052
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 31,
         "id": {
           "end": 11,
@@ -86,8 +83,7 @@ snapshot_kind: text
         },
         "start": 7,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 31,
       "kind": "const",
       "start": 1,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__bc.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 4058
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 74,
         "id": {
           "end": 7,
@@ -74,8 +71,7 @@ snapshot_kind: text
         },
         "start": 6,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 74,
       "kind": "const",
       "start": 0,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__bd.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 4066
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 121,
         "id": {
           "end": 7,
@@ -122,8 +119,7 @@ snapshot_kind: text
         },
         "start": 6,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 121,
       "kind": "const",
       "start": 0,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__be.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 4076
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 14,
         "id": {
           "end": 5,
@@ -41,8 +38,7 @@ snapshot_kind: text
         },
         "start": 4,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 14,
       "kind": "const",
       "start": 0,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__bf.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 4077
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 14,
         "id": {
           "end": 5,
@@ -41,8 +38,7 @@ snapshot_kind: text
         },
         "start": 4,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 14,
       "kind": "const",
       "start": 0,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__bg.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 4078
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 5,
         "id": {
           "end": 1,
@@ -26,8 +23,7 @@ snapshot_kind: text
         },
         "start": 0,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 5,
       "kind": "const",
       "start": 0,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__bh.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 4079
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 42,
         "id": {
           "end": 9,
@@ -80,8 +77,7 @@ snapshot_kind: text
         },
         "start": 6,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 42,
       "kind": "const",
       "start": 0,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__bi.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 4080
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 5,
         "id": {
           "end": 1,
@@ -26,8 +23,7 @@ snapshot_kind: text
         },
         "start": 0,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 5,
       "kind": "const",
       "start": 0,
@@ -35,8 +31,7 @@ snapshot_kind: text
       "type": "VariableDeclaration"
     },
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 30,
         "id": {
           "end": 17,
@@ -91,8 +86,7 @@ snapshot_kind: text
         },
         "start": 14,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 30,
       "kind": "const",
       "start": 14,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__c.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 3904
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 35,
         "id": {
           "end": 11,
@@ -77,8 +74,7 @@ snapshot_kind: text
         },
         "start": 6,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 35,
       "kind": "const",
       "start": 0,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__d.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 3905
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 36,
         "id": {
           "end": 11,
@@ -77,8 +74,7 @@ snapshot_kind: text
         },
         "start": 6,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 36,
       "kind": "const",
       "start": 0,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__d2.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 3915
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 27,
         "id": {
           "end": 7,
@@ -46,8 +43,7 @@ snapshot_kind: text
         },
         "start": 6,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 27,
       "kind": "const",
       "start": 0,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__e.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 3906
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 18,
         "id": {
           "end": 5,
@@ -56,8 +53,7 @@ snapshot_kind: text
         },
         "start": 4,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 18,
       "kind": "const",
       "start": 0,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__f.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 3907
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 11,
         "id": {
           "end": 7,
@@ -26,8 +23,7 @@ snapshot_kind: text
         },
         "start": 6,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 11,
       "kind": "const",
       "start": 0,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__g.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 3908
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 58,
         "id": {
           "end": 4,
@@ -57,8 +54,7 @@ snapshot_kind: text
         },
         "start": 3,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 58,
       "kind": "fn",
       "start": 0,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__h.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 3916
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 26,
         "id": {
           "end": 9,
@@ -64,8 +61,7 @@ snapshot_kind: text
         },
         "start": 6,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 26,
       "kind": "const",
       "start": 0,
@@ -73,8 +69,7 @@ snapshot_kind: text
       "type": "VariableDeclaration"
     },
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 55,
         "id": {
           "end": 43,
@@ -120,8 +115,7 @@ snapshot_kind: text
         },
         "start": 37,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 55,
       "kind": "const",
       "start": 31,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__i.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 3921
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 26,
         "id": {
           "end": 9,
@@ -64,8 +61,7 @@ snapshot_kind: text
         },
         "start": 6,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 26,
       "kind": "const",
       "start": 0,
@@ -73,8 +69,7 @@ snapshot_kind: text
       "type": "VariableDeclaration"
     },
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 59,
         "id": {
           "end": 44,
@@ -121,8 +116,7 @@ snapshot_kind: text
         },
         "start": 38,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 59,
       "kind": "const",
       "start": 32,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__j.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 3926
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 26,
         "id": {
           "end": 9,
@@ -64,8 +61,7 @@ snapshot_kind: text
         },
         "start": 6,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 26,
       "kind": "const",
       "start": 0,
@@ -73,8 +69,7 @@ snapshot_kind: text
       "type": "VariableDeclaration"
     },
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 58,
         "id": {
           "end": 43,
@@ -121,8 +116,7 @@ snapshot_kind: text
         },
         "start": 37,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 58,
       "kind": "const",
       "start": 31,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__k.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 3931
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 26,
         "id": {
           "end": 9,
@@ -64,8 +61,7 @@ snapshot_kind: text
         },
         "start": 6,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 26,
       "kind": "const",
       "start": 0,
@@ -73,8 +69,7 @@ snapshot_kind: text
       "type": "VariableDeclaration"
     },
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 63,
         "id": {
           "end": 43,
@@ -137,8 +132,7 @@ snapshot_kind: text
         },
         "start": 37,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 63,
       "kind": "const",
       "start": 31,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__kw_function_all_named.snap

@@ -5,8 +5,7 @@ expression: actual
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 21,
         "id": {
           "end": 3,
@@ -59,8 +58,7 @@ expression: actual
         },
         "start": 0,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 21,
       "kind": "const",
       "start": 0,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__kw_function_unnamed_first.snap

@@ -5,8 +5,7 @@ expression: actual
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 18,
         "id": {
           "end": 3,
@@ -51,8 +50,7 @@ expression: actual
         },
         "start": 0,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 18,
       "kind": "const",
       "start": 0,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__l.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 3936
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 26,
         "id": {
           "end": 9,
@@ -64,8 +61,7 @@ snapshot_kind: text
         },
         "start": 6,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 26,
       "kind": "const",
       "start": 0,
@@ -73,8 +69,7 @@ snapshot_kind: text
       "type": "VariableDeclaration"
     },
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 63,
         "id": {
           "end": 43,
@@ -137,8 +132,7 @@ snapshot_kind: text
         },
         "start": 37,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 63,
       "kind": "const",
       "start": 31,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__m.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 3941
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 26,
         "id": {
           "end": 9,
@@ -64,8 +61,7 @@ snapshot_kind: text
         },
         "start": 6,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 26,
       "kind": "const",
       "start": 0,
@@ -73,8 +69,7 @@ snapshot_kind: text
       "type": "VariableDeclaration"
     },
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 62,
         "id": {
           "end": 43,
@@ -137,8 +132,7 @@ snapshot_kind: text
         },
         "start": 37,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 62,
       "kind": "const",
       "start": 31,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__n.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 3946
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 24,
         "id": {
           "end": 12,
@@ -54,8 +51,7 @@ snapshot_kind: text
         },
         "start": 6,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 24,
       "kind": "const",
       "start": 0,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__o.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 3947
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 21,
         "id": {
           "end": 9,
@@ -56,8 +53,7 @@ snapshot_kind: text
         },
         "start": 6,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 21,
       "kind": "const",
       "start": 0,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__p.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 3948
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 22,
         "id": {
           "end": 10,
@@ -56,8 +53,7 @@ snapshot_kind: text
         },
         "start": 6,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 22,
       "kind": "const",
       "start": 0,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__q.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 3949
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 30,
         "id": {
           "end": 12,
@@ -56,8 +53,7 @@ snapshot_kind: text
         },
         "start": 6,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 30,
       "kind": "const",
       "start": 0,

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__r.snap

@@ -1,14 +1,11 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 3950
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 26,
         "id": {
           "end": 9,
@@ -64,8 +61,7 @@ snapshot_kind: text
         },
         "start": 6,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 26,
       "kind": "const",
       "start": 0,
@@ -73,8 +69,7 @@ snapshot_kind: text
       "type": "VariableDeclaration"
     },
     {
-      "declarations": [
+      "declaration": {
-        {
         "end": 54,
         "id": {
           "end": 43,
@@ -106,8 +101,7 @@ snapshot_kind: text
         },
         "start": 37,
         "type": "VariableDeclarator"
-        }
+      },
-      ],
       "end": 54,
       "kind": "const",
       "start": 31,