@take-out/scripts 0.1.27 → 0.1.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@take-out/scripts",
-  "version": "0.1.27",
+  "version": "0.1.29",
   "type": "module",
   "main": "./src/run.ts",
   "sideEffects": false,
@@ -30,11 +30,11 @@
   "dependencies": {
     "@clack/prompts": "^0.8.2",
     "@lydell/node-pty": "^1.2.0-beta.3",
-    "@take-out/helpers": "0.1.27",
+    "@take-out/helpers": "0.1.29",
     "picocolors": "^1.1.1"
   },
   "peerDependencies": {
-    "vxrn": "^1.6.16"
+    "vxrn": "^1.9.5"
   },
   "peerDependenciesMeta": {
     "vxrn": {
@@ -42,6 +42,6 @@
     }
   },
   "devDependencies": {
-    "vxrn": "1.6.16"
+    "vxrn": "1.9.5"
   }
 }

package/src/cmd.ts

@@ -26,6 +26,7 @@ export function setInterceptCmd(
 
 function createCmd(description: string) {
   let argsSpec: string | undefined
+  let envVars: Record<string, string> = {}
 
   function makeRun<S extends string>(spec: S): RunFn<S> {
     return async (fn) => {
@@ -50,6 +51,11 @@ function createCmd(description: string) {
         process.exit(0)
       }
 
+      // apply env vars before running
+      for (const [key, value] of Object.entries(envVars)) {
+        process.env[key] = value
+      }
+
       const [{ $ }, prompt, { run }, { args: parseArgs }, fs, path, os] =
         await Promise.all([
           import(`bun`),
@@ -68,10 +74,24 @@ function createCmd(description: string) {
     }
   }
 
+  function makeChainable<S extends string>(spec: S) {
+    return {
+      env(vars: Record<string, string>) {
+        Object.assign(envVars, vars)
+        return this
+      },
+      run: makeRun(spec),
+    }
+  }
+
   return {
+    env(vars: Record<string, string>) {
+      Object.assign(envVars, vars)
+      return this
+    },
     args<const S extends string>(spec: S) {
       argsSpec = spec
-      return { run: makeRun(spec) }
+      return makeChainable(spec)
     },
     run: makeRun(`` as ``),
   }

package/src/helpers/handleProcessExit.ts

@@ -5,6 +5,18 @@ import {
   type ProcessType,
 } from './run'
 
+// reset terminal to sane state
+function resetTerminal() {
+  try {
+    // restore cooked mode if we have a TTY
+    if (process.stdin.isTTY && process.stdin.setRawMode) {
+      process.stdin.setRawMode(false)
+    }
+  } catch {}
+  // reset ANSI attributes
+  process.stdout.write('\x1b[0m')
+}
+
 type ExitCallback = (info: { signal: NodeJS.Signals | string }) => void | Promise<void>
 
 interface HandleProcessExitReturn {
@@ -128,6 +140,8 @@ export function handleProcessExit({
   }
 
   const sigintHandler = () => {
+    // restore terminal to sane state
+    resetTerminal()
     // immediately print newline and reset cursor for clean terminal
     process.stdout.write('\n')
     // reset terminal attributes