@tui-sandbox/library 9.6.0 → 10.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tui-sandbox/library",
-  "version": "9.6.0",
+  "version": "10.1.0",
   "license": "MIT",
   "type": "module",
   "bin": {
@@ -8,8 +8,8 @@
   },
   "dependencies": {
     "@catppuccin/palette": "1.7.1",
-    "@trpc/client": "11.0.0-rc.824",
-    "@trpc/server": "11.0.0-rc.824",
+    "@trpc/client": "11.0.1",
+    "@trpc/server": "11.0.1",
     "@xterm/addon-attach": "0.11.0",
     "@xterm/addon-fit": "0.10.0",
     "@xterm/xterm": "5.5.0",
@@ -22,19 +22,19 @@
     "node-pty": "1.0.0",
     "prettier": "3.5.3",
     "tsx": "4.19.3",
-    "type-fest": "4.37.0",
+    "type-fest": "4.38.0",
     "winston": "3.17.0",
     "zod": "3.24.2"
   },
   "devDependencies": {
-    "@runtyping/zod": "2.1.1",
+    "@runtyping/zod": "3.0.0",
     "@types/command-exists": "1.2.3",
     "@types/cors": "2.8.17",
-    "@types/express": "5.0.0",
-    "@types/node": "22.13.9",
+    "@types/express": "5.0.1",
+    "@types/node": "22.13.14",
     "nodemon": "3.1.9",
-    "vite": "6.2.0",
-    "vitest": "3.0.7"
+    "vite": "6.2.3",
+    "vitest": "3.0.9"
   },
   "peerDependencies": {
     "cypress": "^13 || ^14",

package/src/browser/neovim-client.ts

@@ -75,10 +75,12 @@ window.startTerminalApplication = async function (
 ): Promise<GenericTerminalBrowserApi> {
   const terminal = terminalClient.get()
   const testDirectory = await terminal.startTerminalApplication(args)
-  return {
+
+  const terminalBrowserApi: GenericTerminalBrowserApi = {
     dir: testDirectory,
     runBlockingShellCommand(input) {
       return terminal.runBlockingShellCommand(input)
     },
   }
+  return terminalBrowserApi
 }

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

@@ -1,4 +1,4 @@
-import { createTRPCClient, httpBatchLink, splitLink, unstable_httpSubscriptionLink } from "@trpc/client"
+import { createTRPCClient, httpBatchLink, httpSubscriptionLink, splitLink } from "@trpc/client"
 import type { Terminal } from "@xterm/xterm"
 import "@xterm/xterm/css/xterm.css"
 import type { BlockingCommandClientInput } from "../server/blockingCommandInputSchema.js"
@@ -26,7 +26,7 @@ export class NeovimTerminalClient {
       links: [
         splitLink({
           condition: operation => operation.type === "subscription",
-          true: unstable_httpSubscriptionLink({
+          true: httpSubscriptionLink({
             url: "/trpc",
           }),
           false: httpBatchLink({
@@ -56,7 +56,7 @@ export class NeovimTerminalClient {
     // time to complete
     this.ready = new Promise<void>(resolve => {
       console.log("Subscribing to stdout")
-      trpc.neovim.onStdout.subscribe(
+      trpc.neovim.initializeStdout.subscribe(
         { client: tabId },
         {
           onStarted() {

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

@@ -1,4 +1,4 @@
-import { createTRPCClient, httpBatchLink, splitLink, unstable_httpSubscriptionLink } from "@trpc/client"
+import { createTRPCClient, httpBatchLink, httpSubscriptionLink, splitLink } from "@trpc/client"
 import type { Terminal } from "@xterm/xterm"
 import "@xterm/xterm/css/xterm.css"
 import type { BlockingCommandClientInput } from "../server/blockingCommandInputSchema.js"
@@ -21,7 +21,7 @@ export class TerminalTerminalClient {
       links: [
         splitLink({
           condition: operation => operation.type === "subscription",
-          true: unstable_httpSubscriptionLink({
+          true: httpSubscriptionLink({
             url: "/trpc",
           }),
           false: httpBatchLink({

package/src/scripts/tui.ts

@@ -3,6 +3,7 @@ import path from "node:path"
 import { createCypressSupportFile } from "../server/cypress-support/createCypressSupportFile.js"
 import type { TestServerConfig } from "../server/index.js"
 import { startTestServer, updateTestdirectorySchemaFile } from "../server/index.js"
+import { installDependencies } from "../server/neovim/index.js"
 import type { StdoutOrStderrMessage } from "../server/neovim/NeovimApplication.js"
 import { NeovimApplication } from "../server/neovim/NeovimApplication.js"
 import { prepareNewTestDirectory } from "../server/neovim/prepareNewTestDirectory.js"
@@ -28,6 +29,15 @@ const config = {
 const args = process.argv.slice(2)
 
 if (args[0] === "neovim") {
+  if (args[1] === "prepare" && args.length === 2) {
+    console.log("🚀 Installing neovim dependencies...")
+    await installDependencies(config.directories.testEnvironmentPath, config.directories).catch((err: unknown) => {
+      console.error("Error installing neovim dependencies", err)
+      process.exit(1)
+    })
+    process.exit(0)
+  }
+
   if (!(args[1] === "exec" && args.length === 3)) {
     showUsageAndExit()
   }

package/src/server/cypress-support/contents.ts

@@ -125,6 +125,12 @@ Cypress.Commands.add("startNeovim", (startArguments?: MyStartNeovimServerArgumen
   })
 })
 
+Cypress.Commands.add("nvim_isRunning", () => {
+  return cy.window().then(async _ => {
+    return !!testNeovim
+  })
+})
+
 Cypress.Commands.add("startTerminalApplication", (args: StartTerminalGenericArguments) => {
   cy.window().then(async win => {
     const terminal: GenericTerminalBrowserApi = await win.startTerminalApplication(args)
@@ -189,6 +195,10 @@ declare global {
        */
       nvim_runExCommand(input: ExCommandClientInput): Chainable<RunExCommandOutput>
 
+      /** Returns true if neovim is running. Useful to conditionally run
+       * afterEach actions based on whether it's running. */
+      nvim_isRunning(): Chainable<boolean>
+
       terminal_runBlockingShellCommand(input: MyBlockingCommandClientInput): Chainable<BlockingShellCommandOutput>
     }
   }

package/src/server/server.ts

@@ -103,6 +103,10 @@ export async function createAppRouter(config: DirectoriesConfig) {
       onStdout: trpc.procedure.input(z.object({ client: tabIdSchema })).subscription(options => {
         return neovim.initializeStdout(options.input, options.signal, config.testEnvironmentPath)
       }),
+
+      initializeStdout: trpc.procedure.input(z.object({ client: tabIdSchema })).subscription(options => {
+        return neovim.initializeStdout(options.input, options.signal, config.testEnvironmentPath)
+      }),
       sendStdin: trpc.procedure.input(z.object({ tabId: tabIdSchema, data: z.string() })).mutation(options => {
         return neovim.sendStdin(options.input)
       }),
@@ -116,15 +120,8 @@ export async function createAppRouter(config: DirectoriesConfig) {
       }),
 
       waitForLuaCode: trpc.procedure.input(pollLuaCodeInputSchema).mutation(async options => {
-        try {
-          const result = await timeoutable(
-            options.input.timeoutMs,
-            neovim.waitForLuaCode(options.input, options.signal)
-          )
-          return result
-        } catch (e) {
-          throw e
-        }
+        const result = await timeoutable(options.input.timeoutMs, neovim.waitForLuaCode(options.input, options.signal))
+        return result
       }),
 
       runExCommand: trpc.procedure.input(exCommandInputSchema).mutation(options => {
@@ -139,26 +136,14 @@ export async function createAppRouter(config: DirectoriesConfig) {
 export type AppRouter = Awaited<ReturnType<typeof createAppRouter>>
 export type RouterInput = inferRouterInputs<AppRouter>
 
-export async function startTestServer(config: TestServerConfig): Promise<TestServer> {
+export async function startTestServer(config: TestServerConfig): Promise<void> {
   try {
     const testServer = new TestServer({
       port: config.port,
     })
     const appRouter = await createAppRouter(config.directories)
 
-    const neovimTask: Promise<void> = neovim
-      .installDependencies(config.directories.testEnvironmentPath, config.directories)
-      .catch((err: unknown) => {
-        console.error("Error installing neovim dependencies", err)
-        // suppress the error because neovim is optional - other applications
-        // can still be tested
-      })
-
-    const startServerTask = testServer.startAndRun(appRouter)
-
-    await Promise.all([neovimTask, startServerTask])
-
-    return testServer
+    await testServer.startAndRun(appRouter)
   } catch (err: unknown) {
     console.error("Error starting test server", err)
     throw err