diff --git a/src/lang/langHelpers.ts b/src/lang/langHelpers.ts index 64920e7ae..96f9e91bc 100644 --- a/src/lang/langHelpers.ts +++ b/src/lang/langHelpers.ts @@ -1,6 +1,6 @@ import { Program, - _executor, + executor, ProgramMemory, kclLint, emptyExecState, @@ -64,7 +64,7 @@ export async function executeAst({ try { const execState = await (programMemoryOverride ? enginelessExecutor(ast, programMemoryOverride) - : _executor(ast, engineCommandManager)) + : executor(ast, engineCommandManager)) await engineCommandManager.waitForAllCommands() diff --git a/src/lang/wasm.ts b/src/lang/wasm.ts index 31e8d7135..84c4dd527 100644 --- a/src/lang/wasm.ts +++ b/src/lang/wasm.ts @@ -506,22 +506,6 @@ export const executor = async ( return Promise.reject(programMemoryOverride) // eslint-disable-next-line @typescript-eslint/no-floating-promises - engineCommandManager.startNewSession() - const _programMemory = await _executor( - node, - engineCommandManager, - programMemoryOverride - ) - await engineCommandManager.waitForAllCommands() - - return _programMemory -} - -export const _executor = async ( - node: Node, - engineCommandManager: EngineCommandManager, - programMemoryOverride: ProgramMemory | Error | null = null -): Promise => { if (programMemoryOverride !== null && err(programMemoryOverride)) return Promise.reject(programMemoryOverride) diff --git a/src/lib/testHelpers.ts b/src/lib/testHelpers.ts index 7453086ae..720bceec2 100644 --- a/src/lib/testHelpers.ts +++ b/src/lib/testHelpers.ts @@ -1,20 +1,16 @@ import { Program, ProgramMemory, - _executor, + executor, SourceRange, ExecState, } from '../lang/wasm' -import { - EngineCommandManager, - EngineCommandManagerEvents, -} from 'lang/std/engineConnection' +import { EngineCommandManager } from 'lang/std/engineConnection' import { EngineCommand } from 'lang/std/artifactGraph' import { Models } from '@kittycad/lib' import { v4 as uuidv4 } from 'uuid' import { DefaultPlanes } from 'wasm-lib/kcl/bindings/DefaultPlanes' -import { err, reportRejection } from 'lib/trap' -import { toSync } from './utils' +import { err } from 'lib/trap' import { Node } from 'wasm-lib/kcl/bindings/Node' type WebSocketResponse = Models['WebSocketResponse_type'] @@ -94,36 +90,7 @@ export async function enginelessExecutor( }) as any as EngineCommandManager // eslint-disable-next-line @typescript-eslint/no-floating-promises mockEngineCommandManager.startNewSession() - const execState = await _executor(ast, mockEngineCommandManager, pmo) + const execState = await executor(ast, mockEngineCommandManager, pmo) await mockEngineCommandManager.waitForAllCommands() return execState } - -export async function executor( - ast: Node, - pmo: ProgramMemory = ProgramMemory.empty() -): Promise { - const engineCommandManager = new EngineCommandManager() - engineCommandManager.start({ - setIsStreamReady: () => {}, - setMediaStream: () => {}, - width: 0, - height: 0, - makeDefaultPlanes: () => { - return new Promise((resolve) => resolve(defaultPlanes)) - }, - }) - - return new Promise((resolve) => { - engineCommandManager.addEventListener( - EngineCommandManagerEvents.SceneReady, - toSync(async () => { - // eslint-disable-next-line @typescript-eslint/no-floating-promises - engineCommandManager.startNewSession() - const execState = await _executor(ast, engineCommandManager, pmo) - await engineCommandManager.waitForAllCommands() - resolve(execState) - }, reportRejection) - ) - }) -}