@tui-sandbox/library 7.0.1 → 7.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tui-sandbox/library",
-  "version": "7.0.1",
+  "version": "7.2.0",
   "license": "MIT",
   "type": "module",
   "bin": {
@@ -8,8 +8,8 @@
   },
   "dependencies": {
     "@catppuccin/palette": "1.7.1",
-    "@trpc/client": "11.0.0-rc.638",
-    "@trpc/server": "11.0.0-rc.638",
+    "@trpc/client": "11.0.0-rc.643",
+    "@trpc/server": "11.0.0-rc.643",
     "@xterm/addon-attach": "0.11.0",
     "@xterm/addon-fit": "0.10.0",
     "@xterm/xterm": "5.5.0",

package/src/browser/neovim-client.ts

@@ -1,6 +1,12 @@
 import { TerminalClient } from "../client/index.js"
-import type { BlockingCommandClientInput } from "../server/server.js"
-import type { BlockingShellCommandOutput, StartNeovimGenericArguments, TestDirectory } from "../server/types.js"
+import type { BlockingCommandClientInput, ExCommandClientInput, LuaCodeClientInput } from "../server/server.js"
+import type {
+  BlockingShellCommandOutput,
+  RunExCommandOutput,
+  RunLuaCodeOutput,
+  StartNeovimGenericArguments,
+  TestDirectory,
+} from "../server/types.js"
 
 const app = document.querySelector<HTMLElement>("#app")
 if (!app) {
@@ -26,9 +32,19 @@ window.runBlockingShellCommand = async function (
   return client.runBlockingShellCommand(input)
 }
 
+window.runLuaCode = async function (input: LuaCodeClientInput): Promise<RunLuaCodeOutput> {
+  return client.runLuaCode(input)
+}
+
+window.runExCommand = async function (input: ExCommandClientInput): Promise<RunExCommandOutput> {
+  return client.runExCommand(input)
+}
+
 declare global {
   interface Window {
     startNeovim(startArguments?: StartNeovimGenericArguments): Promise<TestDirectory>
     runBlockingShellCommand(input: BlockingCommandClientInput): Promise<BlockingShellCommandOutput>
+    runLuaCode(input: LuaCodeClientInput): Promise<RunLuaCodeOutput>
+    runExCommand(input: ExCommandClientInput): Promise<RunExCommandOutput>
   }
 }

package/src/client/style.css

@@ -20,7 +20,13 @@
   font-family: "DejaVuSansMNerdFontMono", monospace;
 }
 
+.xterm .xterm-viewport {
+  /* hide the scrollbar */
+  overflow-y: hidden;
+}
+
 body {
   overflow-y: hidden;
   overflow-x: hidden;
+  margin: 0;
 }

package/src/client/terminal-client.ts

@@ -1,8 +1,19 @@
 import { createTRPCClient, httpBatchLink, splitLink, unstable_httpSubscriptionLink } from "@trpc/client"
 import type { Terminal } from "@xterm/xterm"
 import "@xterm/xterm/css/xterm.css"
-import type { AppRouter, BlockingCommandClientInput } from "../server/server.js"
-import type { BlockingShellCommandOutput, StartNeovimGenericArguments, TestDirectory } from "../server/types.js"
+import type {
+  AppRouter,
+  BlockingCommandClientInput,
+  ExCommandClientInput,
+  LuaCodeClientInput,
+} from "../server/server.js"
+import type {
+  BlockingShellCommandOutput,
+  RunExCommandOutput,
+  RunLuaCodeOutput,
+  StartNeovimGenericArguments,
+  TestDirectory,
+} from "../server/types.js"
 import "./style.css"
 import { getTabId, startTerminal } from "./websocket-client.js"
 
@@ -92,4 +103,20 @@ export class TerminalClient {
       tabId: this.tabId,
     })
   }
+
+  public async runLuaCode(input: LuaCodeClientInput): Promise<RunLuaCodeOutput> {
+    await this.ready
+    return this.trpc.neovim.runLuaCode.mutate({
+      luaCode: input.luaCode,
+      tabId: this.tabId,
+    })
+  }
+
+  public async runExCommand(input: ExCommandClientInput): Promise<RunExCommandOutput> {
+    await this.ready
+    return this.trpc.neovim.runExCommand.mutate({
+      command: input.command,
+      tabId: this.tabId,
+    })
+  }
 }

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

@@ -7,9 +7,15 @@ it("should return the expected contents", async () => {
     //
     // This file is autogenerated by tui-sandbox. Do not edit it directly.
     //
-    import type { BlockingCommandClientInput } from "@tui-sandbox/library/dist/src/server/server"
+    import type {
+      BlockingCommandClientInput,
+      ExCommandClientInput,
+      LuaCodeClientInput,
+    } from "@tui-sandbox/library/dist/src/server/server"
     import type {
       BlockingShellCommandOutput,
+      RunExCommandOutput,
+      RunLuaCodeOutput,
       StartNeovimGenericArguments,
     } from "@tui-sandbox/library/dist/src/server/types"
     import type { OverrideProperties } from "type-fest"
@@ -24,6 +30,8 @@ it("should return the expected contents", async () => {
       interface Window {
         startNeovim(startArguments?: MyStartNeovimServerArguments): Promise<NeovimContext>
         runBlockingShellCommand(input: BlockingCommandClientInput): Promise<BlockingShellCommandOutput>
+        runLuaCode(input: LuaCodeClientInput): Promise<RunLuaCodeOutput>
+        runExCommand(input: ExCommandClientInput): Promise<RunExCommandOutput>
       }
     }
 
@@ -54,6 +62,18 @@ it("should return the expected contents", async () => {
       cy.get("textarea").focus().type(text, options)
     })
 
+    Cypress.Commands.add("runLuaCode", (input: LuaCodeClientInput) => {
+      cy.window().then(async win => {
+        return await win.runLuaCode(input)
+      })
+    })
+
+    Cypress.Commands.add("runExCommand", (input: ExCommandClientInput) => {
+      cy.window().then(async win => {
+        return await win.runExCommand(input)
+      })
+    })
+
     before(function () {
       // disable Cypress's default behavior of logging all XMLHttpRequests and
       // fetches to the Command Log
@@ -73,6 +93,10 @@ it("should return the expected contents", async () => {
           /** Runs a shell command in a blocking manner, waiting for the command to
            * finish before returning. Requires neovim to be running. */
           runBlockingShellCommand(input: BlockingCommandClientInput): Chainable<BlockingShellCommandOutput>
+
+          runLuaCode(input: LuaCodeClientInput): Chainable<RunLuaCodeOutput>
+
+          runExCommand(input: ExCommandClientInput): Chainable<RunExCommandOutput>
         }
       }
     }

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

@@ -6,14 +6,19 @@ const __filename = fileURLToPath(import.meta.url)
 export async function createCypressSupportFileContents(): Promise<string> {
   // this is the interface of tui-sandbox as far as cypress in the user's
   // application is concerned
-  let text = ` 
-/// <reference types="cypress" />
+  let text = `/// <reference types="cypress" />
 //
 // This file is autogenerated by tui-sandbox. Do not edit it directly.
 //
-import type { BlockingCommandClientInput } from "@tui-sandbox/library/dist/src/server/server"
+import type {
+  BlockingCommandClientInput,
+  ExCommandClientInput,
+  LuaCodeClientInput,
+} from "@tui-sandbox/library/dist/src/server/server"
 import type {
   BlockingShellCommandOutput,
+  RunExCommandOutput,
+  RunLuaCodeOutput,
   StartNeovimGenericArguments,
 } from "@tui-sandbox/library/dist/src/server/types"
 import type { OverrideProperties } from "type-fest"
@@ -28,6 +33,8 @@ declare global {
   interface Window {
     startNeovim(startArguments?: MyStartNeovimServerArguments): Promise<NeovimContext>
     runBlockingShellCommand(input: BlockingCommandClientInput): Promise<BlockingShellCommandOutput>
+    runLuaCode(input: LuaCodeClientInput): Promise<RunLuaCodeOutput>
+    runExCommand(input: ExCommandClientInput): Promise<RunExCommandOutput>
   }
 }
 
@@ -58,6 +65,18 @@ Cypress.Commands.add("typeIntoTerminal", (text: string, options?: Partial<Cypres
   cy.get("textarea").focus().type(text, options)
 })
 
+Cypress.Commands.add("runLuaCode", (input: LuaCodeClientInput) => {
+  cy.window().then(async win => {
+    return await win.runLuaCode(input)
+  })
+})
+
+Cypress.Commands.add("runExCommand", (input: ExCommandClientInput) => {
+  cy.window().then(async win => {
+    return await win.runExCommand(input)
+  })
+})
+
 before(function () {
   // disable Cypress's default behavior of logging all XMLHttpRequests and
   // fetches to the Command Log
@@ -77,6 +96,10 @@ declare global {
       /** Runs a shell command in a blocking manner, waiting for the command to
        * finish before returning. Requires neovim to be running. */
       runBlockingShellCommand(input: BlockingCommandClientInput): Chainable<BlockingShellCommandOutput>
+
+      runLuaCode(input: LuaCodeClientInput): Chainable<RunLuaCodeOutput>
+
+      runExCommand(input: ExCommandClientInput): Chainable<RunExCommandOutput>
     }
   }
 }

package/src/server/neovim/index.ts

@@ -2,8 +2,14 @@ import assert from "assert"
 import { exec } from "child_process"
 import "core-js/proposals/async-explicit-resource-management.js"
 import util from "util"
-import type { BlockingCommandInput } from "../server.js"
-import type { BlockingShellCommandOutput, StartNeovimGenericArguments, TestDirectory } from "../types.js"
+import type { BlockingCommandInput, ExCommandInput, LuaCodeInput } from "../server.js"
+import type {
+  BlockingShellCommandOutput,
+  RunExCommandOutput,
+  RunLuaCodeOutput,
+  StartNeovimGenericArguments,
+  TestDirectory,
+} from "../types.js"
 import type { TestServerConfig } from "../updateTestdirectorySchemaFile.js"
 import { convertEventEmitterToAsyncGenerator } from "../utilities/generator.js"
 import type { TabId } from "../utilities/tabId.js"
@@ -110,3 +116,55 @@ export async function runBlockingShellCommand(
     throw new Error(`Error running shell blockingCommand (${input.command})`, { cause: e })
   }
 }
+
+export async function runLuaCode(options: LuaCodeInput): Promise<RunLuaCodeOutput> {
+  const neovim = neovims.get(options.tabId.tabId)
+  assert(
+    neovim !== undefined,
+    `Neovim instance for clientId not found - cannot run Lua code. Maybe neovim's not started yet?`
+  )
+  assert(
+    neovim.application,
+    `Neovim application not found for client id ${options.tabId.tabId}. Maybe it's not started yet?`
+  )
+
+  const api = await neovim.state?.client.get()
+  if (!api) {
+    throw new Error(`Neovim API not available for client id ${options.tabId.tabId}. Maybe it's not started yet?`)
+  }
+
+  console.log(`Neovim ${neovim.application.processId()} running Lua code: ${options.luaCode}`)
+  try {
+    const value = await api.lua(options.luaCode)
+    return { value }
+  } catch (e) {
+    console.warn(`Error running Lua code: ${options.luaCode}`, e)
+    throw new Error(`Error running Lua code: ${options.luaCode}`, { cause: e })
+  }
+}
+
+export async function runExCommand(options: ExCommandInput): Promise<RunExCommandOutput> {
+  const neovim = neovims.get(options.tabId.tabId)
+  assert(
+    neovim !== undefined,
+    `Neovim instance for clientId not found - cannot runExCommand. Maybe neovim's not started yet?`
+  )
+  assert(
+    neovim.application,
+    `Neovim application not found for client id ${options.tabId.tabId}. Maybe it's not started yet?`
+  )
+
+  const api = await neovim.state?.client.get()
+  if (!api) {
+    throw new Error(`Neovim API not available for client id ${options.tabId.tabId}. Maybe it's not started yet?`)
+  }
+
+  console.log(`Neovim ${neovim.application.processId()} running Ex command: ${options.command}`)
+  try {
+    const output = await api.commandOutput(options.command)
+    return { value: output }
+  } catch (e) {
+    console.warn(`Error running Ex command: ${options.command}`, e)
+    throw new Error(`Error running Ex command: ${options.command}`, { cause: e })
+  }
+}

package/src/server/server.ts

@@ -25,6 +25,14 @@ const blockingCommandInputSchema = z.object({
 export type BlockingCommandClientInput = Except<BlockingCommandInput, "tabId">
 export type BlockingCommandInput = z.infer<typeof blockingCommandInputSchema>
 
+const luaCodeInputSchema = z.object({ tabId: tabIdSchema, luaCode: z.string() })
+export type LuaCodeClientInput = Except<LuaCodeInput, "tabId">
+export type LuaCodeInput = z.infer<typeof luaCodeInputSchema>
+
+const exCommandInputSchema = z.object({ tabId: tabIdSchema, command: z.string() })
+export type ExCommandClientInput = Except<ExCommandInput, "tabId">
+export type ExCommandInput = z.infer<typeof exCommandInputSchema>
+
 /** @private */
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 export async function createAppRouter(config: TestServerConfig) {
@@ -72,6 +80,14 @@ export async function createAppRouter(config: TestServerConfig) {
       runBlockingShellCommand: trpc.procedure.input(blockingCommandInputSchema).mutation(async options => {
         return neovim.runBlockingShellCommand(options.signal, options.input, options.input.allowFailure ?? false)
       }),
+
+      runLuaCode: trpc.procedure.input(luaCodeInputSchema).mutation(options => {
+        return neovim.runLuaCode(options.input)
+      }),
+
+      runExCommand: trpc.procedure.input(exCommandInputSchema).mutation(options => {
+        return neovim.runExCommand(options.input)
+      }),
     }),
   })
 

package/src/server/types.ts

@@ -1,3 +1,5 @@
+import type { VimValue } from "neovim/lib/types/VimValue.js"
+
 /** Describes the contents of the test directory, which is a blueprint for
  * files and directories. Tests can create a unique, safe environment for
  * interacting with the contents of such a directory.
@@ -42,3 +44,10 @@ export type BlockingShellCommandOutput =
       // for now we log the error to the server's console output. It will be
       // visible when running the tests.
     }
+
+export type RunLuaCodeOutput = {
+  value?: VimValue
+  // to catch errors, use pcall() in the Lua code
+}
+
+export type RunExCommandOutput = { value?: string }

package/tsconfig.json

@@ -25,7 +25,6 @@
   "include": [
     //
     "./src/",
-    "src/scripts/tui.ts",
-    "./src/scripts/server.ts"
+    "src/scripts/tui.ts"
   ]
 }