commands have state and context

src/main/framework/commands.ts

@@ -5,9 +5,11 @@ import short from 'short-uuid'
 import { runInNewContext } from 'node:vm'
 import * as tryRequire from 'try-require'
 import { compile } from '../vendor/webpack'
+import { ExecuteContext } from './runtime'
 
 export class Commands {
   public lib: object = {}
+  public state: Map<string, object> = new Map<string, object>()
 
   constructor(
     private workingDirectory: string,
@@ -18,6 +20,38 @@ export class Commands {
     return tryRequire.default(path)
   }
 
+  setTimeout = global.setTimeout
+  console = global.console
+
+  has(key: string): boolean {
+    return !!this.lib[key]
+  }
+
+  async run(context: ExecuteContext, key: string, ...args: string[]): Promise<unknown> {
+    let state = this.state[key]
+    const cmd = this.lib[key]
+
+    if (!state) {
+      state = {}
+
+      this.state[key] = state
+    }
+
+    const scoped = {
+      ...state,
+      context
+    }
+
+    const exec = cmd.call(scoped, ...args)
+
+    this.state[key] = {
+      ...scoped,
+      context: undefined
+    }
+
+    return exec
+  }
+
   async load(): Promise<void> {
     const filesToCreate = [
       { templateFile: 'package.json', outputFile: 'package.json' },
@@ -57,6 +91,7 @@ export class Commands {
     await compile(scriptFile, temp, join(this.workingDirectory, 'node_modules'))
 
     const jsFile: Buffer = await readFile(join(temp, 'commands.js'))
+
     runInNewContext(`${jsFile}`, this)
   }
 }

src/main/framework/runtime-events.ts

@@ -148,16 +148,19 @@ export function attach({ app, workspace }: BootstrapContext): void {
       }
       const finish = (code: number): void => {
         result.code = code
+
+        command.complete = true
+        command.error = result.code !== 0
       }
 
-      const finalizeConfirm = await execute(
+      const finalizeConfirm = await execute({
         platform,
         workspace,
-        runtimeTarget,
+        runtime: runtimeTarget,
         command,
         out,
         finish
-      )
+      })
       if (finalizeConfirm !== undefined && finalizeConfirm === false) {
         finalize = false
       }

src/main/framework/runtime-executor.ts

@@ -1,19 +1,13 @@
-import { Command, Runtime } from './runtime'
-import { resolveFolderPathForMTERM, Workspace } from './workspace'
+import { ExecuteContext } from './runtime'
+import { resolveFolderPathForMTERM } from './workspace'
 import { RunnerWindow } from '../window/windows/runner'
 import { app } from 'electron'
 import { spawn } from 'node:child_process'
 import { resolve } from 'path'
 import { pathExists } from 'fs-extra'
 
-export async function execute(
-  platform: string,
-  workspace: Workspace,
-  runtime: Runtime,
-  command: Command,
-  out: (text: string, error?: boolean) => void,
-  finish: (code: number) => void
-): Promise<void | boolean> {
+export async function execute(context: ExecuteContext): Promise<void | boolean> {
+  const { platform, workspace, runtime, command, out, finish } = context
   const [cmd, ...args] = command.prompt.split(' ')
 
   // check for system commands
@@ -81,10 +75,8 @@ export async function execute(
     }
   }
 
-  if (workspace.commands.lib[cmd]) {
-    const exec = workspace.commands.lib[cmd]
-
-    const result = await Promise.resolve(exec(...args))
+  if (workspace.commands.has(cmd)) {
+    const result = await Promise.resolve(workspace.commands.run(context, cmd, ...args))
 
     if (!result) {
       // nothing was replied with, assume this is a run that will happen in time

src/main/framework/runtime.ts

@@ -1,4 +1,4 @@
-import { resolveFolderPathForMTERM } from './workspace'
+import { resolveFolderPathForMTERM, Workspace } from './workspace'
 import short from 'short-uuid'
 import { ChildProcessWithoutNullStreams } from 'node:child_process'
 
@@ -65,3 +65,12 @@ export class Runtime {
     title: 'mterm [$idx]'
   }
 }
+
+export interface ExecuteContext {
+  platform: string
+  workspace: Workspace
+  runtime: Runtime
+  command: Command
+  out: (text: string, error?: boolean) => void
+  finish: (code: number) => void
+}

tsconfig.json

@@ -1,7 +1,7 @@
 {
   "files": [],
   "compilerOptions": {
-    "esModuleInterop": true
+    "esModuleInterop": true,
   },
   "references": [{ "path": "./tsconfig.node.json" }, { "path": "./tsconfig.web.json" }]
 }