@tui-sandbox/library 11.4.0 → 11.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tui-sandbox/library",
-  "version": "11.4.0",
+  "version": "11.4.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/mikavilpas/tui-sandbox"

package/src/browser/neovim-client.ts

@@ -1,5 +1,5 @@
 import type { Terminal } from "@xterm/xterm"
-import { TerminalClient as NeovimTerminalClient } from "../client/index.js"
+import { NeovimTerminalClient } from "../client/neovim-terminal-client.js"
 import type { TuiTerminalApi } from "../client/startTerminal.js"
 import { TerminalTerminalClient } from "../client/terminal-terminal-client.js"
 import type {

package/src/client/index.ts

@@ -2,5 +2,3 @@
 
 export { rgbify } from "./color-utilities.js"
 export { textIsVisibleWithBackgroundColor, textIsVisibleWithColor } from "./cypress-assertions.js"
-export { NeovimTerminalClient as TerminalClient } from "./neovim-terminal-client.js"
-export { TerminalTerminalClient } from "./terminal-terminal-client.js"

package/src/client/terminal-terminal-client.ts

@@ -7,7 +7,6 @@ import type { AppRouter } from "../server/server.js"
 import type { BlockingShellCommandOutput, TestDirectory } from "../server/types.js"
 import type { TuiTerminalApi } from "./startTerminal.js"
 import { getTabId, startTerminal } from "./startTerminal.js"
-import "./style.css"
 import { supportDA1 } from "./terminal-config.js"
 
 /** Manages the terminal state in the browser as well as the (browser's)

package/src/scripts/commands/commandTuiNeovimExec.ts

@@ -0,0 +1,23 @@
+import { NeovimApplication, type StdoutOrStderrMessage } from "../../server/applications/neovim/NeovimApplication.js"
+import { prepareNewTestDirectory } from "../../server/applications/neovim/prepareNewTestDirectory.js"
+import type { NeovimExec } from "../parseArguments.js"
+import { config } from "../tui.js"
+
+export async function commandTuiNeovimExec(command: NeovimExec): Promise<void> {
+  // automatically dispose of the neovim instance when done
+  await using app = new NeovimApplication(config.directories.testEnvironmentPath)
+  app.events.on("stdout" satisfies StdoutOrStderrMessage, data => {
+    console.log(`  neovim output: ${data}`)
+  })
+  const testDirectory = await prepareNewTestDirectory(config.directories)
+  await app.startNextAndKillCurrent(
+    testDirectory,
+    {
+      filename: "empty.txt",
+      headlessCmd: command.command,
+      NVIM_APPNAME: process.env["NVIM_APPNAME"],
+    },
+    { cols: 80, rows: 24 }
+  )
+  await app.application.untilExit()
+}

package/src/scripts/commands/commandTuiNeovimPrepare.ts

@@ -0,0 +1,16 @@
+import { installDependencies } from "../../server/applications/neovim/api.js"
+import { config } from "../tui.js"
+
+export async function commandTuiNeovimPrepare(): Promise<void> {
+  const NVIM_APPNAME = process.env["NVIM_APPNAME"]
+  console.log(`🚀 Installing neovim dependencies${NVIM_APPNAME ? ` for NVIM_APPNAME=${NVIM_APPNAME}` : ""}...`)
+  await installDependencies(
+    config.directories.testEnvironmentPath,
+    process.env["NVIM_APPNAME"],
+    config.directories
+  ).catch((err: unknown) => {
+    console.error("Error installing neovim dependencies", err)
+    process.exit(1)
+  })
+  process.exit(0)
+}

package/src/scripts/commands/commandTuiStart.ts

@@ -0,0 +1,29 @@
+import path from "path"
+import { createCypressSupportFile } from "../../server/cypress-support/createCypressSupportFile.js"
+import { startTestServer } from "../../server/server.js"
+import { updateTestdirectorySchemaFile } from "../../server/updateTestdirectorySchemaFile.js"
+import { config, cwd } from "../tui.js"
+
+export async function commandTuiStart(): Promise<void> {
+  try {
+    await createCypressSupportFile({
+      cypressSupportDirectoryPath: path.join(cwd, "cypress", "support"),
+      supportFileName: "tui-sandbox.ts",
+    })
+  } catch (e) {
+    console.error("Failed to createCypressSupportFile", e)
+  }
+
+  try {
+    await updateTestdirectorySchemaFile(config.directories)
+  } catch (e) {
+    console.error("Failed to updateTestdirectorySchemaFile", e)
+  }
+
+  try {
+    console.log(`🚀 Starting test server in ${cwd} - this should be the root of your integration-tests directory 🤞🏻`)
+    await startTestServer(config)
+  } catch (e) {
+    console.error("Failed to startTestServer", e)
+  }
+}

package/src/scripts/parseArguments.ts

@@ -14,7 +14,7 @@ export const parseArguments = async (args: string[]): Promise<ParseArgumentsResu
   }
 
   {
-    // tui neovim exec <command> [<args>...]
+    // tui neovim exec <command> <args>
     const schema = z.tuple([z.literal("neovim"), z.literal("exec"), z.string()])
     const execArguments = schema.safeParse(args)
     if (execArguments.success) {
@@ -39,10 +39,17 @@ export const parseArguments = async (args: string[]): Promise<ParseArgumentsResu
   }
 }
 
-export type ParseArgumentsResult =
-  | { action: "neovim prepare" }
-  | {
-      action: "neovim exec"
-      command: string
-    }
-  | { action: "start" }
+export type ParseArgumentsResult = NeovimPrepare | NeovimExec | TuiStart
+
+export type NeovimExec = {
+  action: "neovim exec"
+  command: string
+}
+
+export type NeovimPrepare = {
+  action: "neovim prepare"
+}
+
+export type TuiStart = {
+  action: "start"
+}

package/src/scripts/tui.ts

@@ -1,11 +1,8 @@
 import path from "node:path"
-import { installDependencies } from "../server/applications/neovim/api.js"
-import type { StdoutOrStderrMessage } from "../server/applications/neovim/NeovimApplication.js"
-import { NeovimApplication } from "../server/applications/neovim/NeovimApplication.js"
-import { prepareNewTestDirectory } from "../server/applications/neovim/prepareNewTestDirectory.js"
-import { createCypressSupportFile } from "../server/cypress-support/createCypressSupportFile.js"
 import type { TestServerConfig } from "../server/index.js"
-import { startTestServer, updateTestdirectorySchemaFile } from "../server/index.js"
+import { commandTuiNeovimExec } from "./commands/commandTuiNeovimExec.js"
+import { commandTuiNeovimPrepare } from "./commands/commandTuiNeovimPrepare.js"
+import { commandTuiStart } from "./commands/commandTuiStart.js"
 import { parseArguments } from "./parseArguments.js"
 
 //
@@ -16,8 +13,8 @@ const outputFileName = "MyTestDirectory.ts"
 
 /** The cwd in the user's directory when they are running this script. Not the
  * cwd of the script itself. */
-const cwd = process.cwd()
-const config = {
+export const cwd = process.cwd()
+export const config = {
   directories: {
     testEnvironmentPath: path.join(cwd, "test-environment/"),
     outputFilePath: path.join(cwd, outputFileName),
@@ -32,59 +29,15 @@ const command = await parseArguments(args)
 
 switch (command?.action) {
   case "neovim prepare": {
-    const NVIM_APPNAME = process.env["NVIM_APPNAME"]
-    console.log(`🚀 Installing neovim dependencies${NVIM_APPNAME ? ` for NVIM_APPNAME=${NVIM_APPNAME}` : ""}...`)
-    await installDependencies(
-      config.directories.testEnvironmentPath,
-      process.env["NVIM_APPNAME"],
-      config.directories
-    ).catch((err: unknown) => {
-      console.error("Error installing neovim dependencies", err)
-      process.exit(1)
-    })
-    process.exit(0)
+    await commandTuiNeovimPrepare()
+    break
   }
   case "neovim exec": {
-    // automatically dispose of the neovim instance when done
-    await using app = new NeovimApplication(config.directories.testEnvironmentPath)
-    app.events.on("stdout" satisfies StdoutOrStderrMessage, data => {
-      console.log(`  neovim output: ${data}`)
-    })
-    const testDirectory = await prepareNewTestDirectory(config.directories)
-    await app.startNextAndKillCurrent(
-      testDirectory,
-      {
-        filename: "empty.txt",
-        headlessCmd: command.command,
-        NVIM_APPNAME: process.env["NVIM_APPNAME"],
-      },
-      { cols: 80, rows: 24 }
-    )
-    await app.application.untilExit()
+    await commandTuiNeovimExec(command)
     break
   }
   case "start": {
-    try {
-      await createCypressSupportFile({
-        cypressSupportDirectoryPath: path.join(cwd, "cypress", "support"),
-        supportFileName: "tui-sandbox.ts",
-      })
-    } catch (e) {
-      console.error("Failed to createCypressSupportFile", e)
-    }
-
-    try {
-      await updateTestdirectorySchemaFile(config.directories)
-    } catch (e) {
-      console.error("Failed to updateTestdirectorySchemaFile", e)
-    }
-
-    try {
-      console.log(`🚀 Starting test server in ${cwd} - this should be the root of your integration-tests directory 🤞🏻`)
-      await startTestServer(config)
-    } catch (e) {
-      console.error("Failed to startTestServer", e)
-    }
+    await commandTuiStart()
     break
   }
   default: {