Replace my-ts-node

Author: AndreasArvidsson

package.json

@@ -32,7 +32,7 @@
     "test:update": "pnpm -r test:update",
     "test:update:subset": "pnpm -r test:update:subset",
     "generate-grammar": "pnpm -r generate-grammar",
-    "transform-recorded-tests": "pnpm exec ./packages/common/scripts/my-ts-node.js ./packages/cursorless-engine/src/scripts/transformRecordedTests/index.ts"
+    "transform-recorded-tests": "c-tsx ./packages/cursorless-engine/src/scripts/transformRecordedTests/index.ts"
   },
   "devDependencies": {
     "@eslint/config-helpers": "^0.5.3",

packages/cheatsheet-local/jest.config.ts

@@ -6,7 +6,6 @@ const config: Config = {
   testEnvironment: "jsdom",
   moduleNameMapper: {
     ...preactModuleNameMapper,
-    "^@cursorless/cheatsheet$": "<rootDir>/../cheatsheet/src/index.ts",
     "\\.(css|scss)$": "<rootDir>/src/test/styleMock.ts",
   },
 };

packages/common/package.json

@@ -5,7 +5,7 @@
   "license": "MIT",
   "type": "module",
   "bin": {
-    "my-ts-node": "./scripts/my-ts-node.js"
+    "c-tsx": "./scripts/c-tsx.js"
   },
   "exports": {
     ".": "./src/index.ts",

packages/common/scripts/c-tsx.js

@@ -0,0 +1,33 @@
+#!/usr/bin/env node
+/* global process, console */
+
+import { spawn } from "node:child_process";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const [fileToRun, ...childArgs] = process.argv.slice(2);
+
+if (fileToRun == null) {
+  console.error("Error: No input file specified.");
+  console.error("Usage: c-tsx <file.ts> [script args...]");
+  process.exit(1);
+}
+
+const scriptDirectory = dirname(fileURLToPath(import.meta.url));
+const repoRoot = join(scriptDirectory, "../../..");
+
+const child = spawn(
+  process.platform === "win32" ? "tsx.cmd" : "tsx",
+  [fileToRun, ...childArgs],
+  {
+    stdio: "inherit",
+    env: {
+      ...process.env,
+      CURSORLESS_REPO_ROOT: repoRoot,
+    },
+  },
+);
+
+child.on("close", (code) => {
+  process.exit(code ?? undefined);
+});

packages/common/scripts/my-ts-node.js

@@ -17,7 +17,7 @@ init.lua
 And here is the call path when running Neovim tests on CI:
 
 ```
-.github/workflows/test.yml -> packages/test-harness/package.json -> my-ts-node src/scripts/runNeovimTestsCI.ts -> packages/test-harness/src/launchNeovimAndRunTests.ts
+.github/workflows/test.yml -> packages/test-harness/package.json -> c-tsx src/scripts/runNeovimTestsCI.ts -> packages/test-harness/src/launchNeovimAndRunTests.ts
 
 launchNeovimAndRunTests.ts
   -> copies packages/test-harness/src/config/init.lua to default nvim config folder
@@ -215,7 +215,7 @@ if: runner.os == 'Linux' && matrix.app_version == 'stable'
 This triggers the script in `packages/test-harness/package.json`:
 
 ```json
-"test:neovim": "env CURSORLESS_MODE=test my-ts-node src/scripts/runNeovimTestsCI.ts",
+"test:neovim": "c-tsx src/scripts/runNeovimTestsCI.ts",
 ```
 
 This ends up calling the default function from `package/test-harness/src/scripts/runNeovimTestsCI.ts` which calls `launchNeovimAndRunTests()` from `packages/test-harness/src/launchNeovimAndRunTests.ts`:

packages/cursorless-org-docs/src/docs/contributing/architecture/neovim-test-infrastructure.md

@@ -1291,15 +1291,15 @@
     "bundle:watch": "pnpm run bundle:base --sourcemap --watch",
     "bundle": "pnpm run bundle:base --minify",
     "bundle:meta": "pnpm run bundle:base --metafile=meta.json",
-    "populate-dist": "my-ts-node ./src/scripts/populateDist/index.ts",
-    "init-launch-sandbox": "my-ts-node src/scripts/initLaunchSandbox.ts",
-    "preprocess-svg-hats": "my-ts-node src/scripts/preprocessSvgHats.ts",
-    "hat-adjustment-add": "my-ts-node src/scripts/hatAdjustments/add.ts",
-    "hat-adjustment-average": "my-ts-node src/scripts/hatAdjustments/average.ts",
-    "generate-grammar:base": "nearleyc src/keyboard/grammar/grammar.ne",
-    "ensure-grammar-up-to-date": "pnpm -s generate-grammar:base | diff -u src/keyboard/grammar/generated/grammar.ts -",
-    "generate-grammar": "pnpm generate-grammar:base -o src/keyboard/grammar/generated/grammar.ts",
-    "generate-railroad": "mkdir -p out && nearley-railroad src/keyboard/grammar/grammar.ne -o out/railroad.html",
+    "populate-dist": "c-tsx ./src/scripts/populateDist/index.ts",
+    "init-launch-sandbox": "c-tsx ./src/scripts/initLaunchSandbox.ts",
+    "preprocess-svg-hats": "c-tsx ./src/scripts/preprocessSvgHats.ts",
+    "hat-adjustment-add": "c-tsx ./src/scripts/hatAdjustments/add.ts",
+    "hat-adjustment-average": "c-tsx ./src/scripts/hatAdjustments/average.ts",
+    "generate-grammar:base": "nearleyc ./src/keyboard/grammar/grammar.ne",
+    "ensure-grammar-up-to-date": "pnpm -s generate-grammar:base | diff -u ./src/keyboard/grammar/generated/grammar.ts -",
+    "generate-grammar": "pnpm generate-grammar:base -o ./src/keyboard/grammar/generated/grammar.ts",
+    "generate-railroad": "mkdir -p out && nearley-railroad ./src/keyboard/grammar/grammar.ne -o out/railroad.html",
     "test": "pnpm ensure-grammar-up-to-date",
     "typecheck": "tsc",
     "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build"
@@ -1336,6 +1336,7 @@
     "esbuild": "^0.27.4",
     "fast-xml-parser": "^5.5.5",
     "fs-extra": "^11.3.4",
-    "sinon": "^21.0.2"
+    "sinon": "^21.0.2",
+    "tsx": "^4.21.0"
   }
 }

packages/cursorless-vscode/package.json

@@ -13,25 +13,25 @@
     }
   },
   "scripts": {
-    "test": "my-ts-node src/scripts/runUnitTestsOnly.ts",
-    "test:subset": "my-ts-node src/scripts/runUnitTestsOnly.ts --subset",
-    "test:update": "my-ts-node src/scripts/runUnitTestsOnly.ts --update",
-    "test:update:subset": "my-ts-node src/scripts/runUnitTestsOnly.ts --update --subset",
+    "test": "c-tsx ./src/scripts/runUnitTestsOnly.ts",
+    "test:subset": "c-tsx ./src/scripts/runUnitTestsOnly.ts --subset",
+    "test:update": "c-tsx ./src/scripts/runUnitTestsOnly.ts --update",
+    "test:update:subset": "c-tsx ./src/scripts/runUnitTestsOnly.ts --update --subset",
     "pretest:vscode": "pnpm run bundle:runner:vscode && pnpm run bundle:tests",
-    "test:vscode": "my-ts-node src/scripts/runVscodeTestsCI.ts",
+    "test:vscode": "c-tsx ./src/scripts/runVscodeTestsCI.ts",
     "pretest:neovim": "pnpm run bundle:runner:neovim && pnpm run bundle:tests",
-    "test:neovim": "my-ts-node src/scripts/runNeovimTestsCI.ts",
+    "test:neovim": "c-tsx ./src/scripts/runNeovimTestsCI.ts",
     "pretest:talonJs": "pnpm run bundle:tests",
-    "test:talonJs": "my-ts-node src/scripts/runTalonJsTests.ts",
+    "test:talonJs": "c-tsx ./src/scripts/runTalonJsTests.ts",
     "bundle:base": "bash ./scripts/compile-esbuild.sh",
     "bundle": "pnpm run bundle:runner:vscode && pnpm run bundle:runner:neovim && pnpm run bundle:tests",
     "bundle:runner:vscode": "pnpm run bundle:base ./src/runners/extensionTestsVscode.ts --outfile=dist/extensionTestsVscode.cjs",
     "bundle:runner:neovim": "pnpm run bundle:base ./src/runners/extensionTestsNeovim.ts --outfile=out/runners/extensionTestsNeovim.cjs",
     "bundle:tests": "bash ./scripts/build-tests.sh",
     "typecheck": "tsc",
     "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build",
-    "generate-test-subset-file": "my-ts-node ./src/scripts/generateTestSubsetFile.ts --always-open",
-    "generate-test-subset-file-strict": "my-ts-node ./src/scripts/generateTestSubsetFile.ts --fail-if-not-exists"
+    "generate-test-subset-file": "c-tsx ./src/scripts/generateTestSubsetFile.ts --always-open",
+    "generate-test-subset-file-strict": "c-tsx ./src/scripts/generateTestSubsetFile.ts --fail-if-not-exists"
   },
   "dependencies": {
     "@cursorless/common": "workspace:*",
@@ -50,6 +50,7 @@
     "@vscode/test-electron": "^2.5.2",
     "cross-spawn": "^7.0.6",
     "mocha": "^11.7.5",
+    "tsx": "^4.21.0",
     "web-tree-sitter": "^0.26.7"
   }
 }