mac-helper 0.0.4 → 0.1.0

package/lib/iterm.d.ts

@@ -1,4 +1,4 @@
-export declare function runInIterm(command: string): Promise<void>;
+export declare function runInIterm(command: string, reuse?: boolean): Promise<void>;
 export declare const iTerm: {
     run: typeof runInIterm;
     runInIterm: typeof runInIterm;

package/lib/iterm.js

@@ -2,15 +2,30 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.iTerm = exports.runInIterm = void 0;
 const run_1 = require("@jxa/run");
-async function runInIterm(command) {
-    await (0, run_1.run)((command) => {
+async function runInIterm(command, reuse = true) {
+    await (0, run_1.run)((command, reuse) => {
         const app = Application('iTerm');
         app.includeStandardAdditions = true;
         app.activate();
-        const tab = app.createTabWithDefaultProfile(app.currentWindow);
-        const sess = tab.currentSession;
-        app.write(sess, { text: command });
-    }, command);
+        let usingSession;
+        // reuse when possible
+        if (reuse) {
+            const session = app.currentWindow().currentSession();
+            const isIdle = session.isAtShellPrompt();
+            if (isIdle) {
+                usingSession = session;
+            }
+        }
+        // create new tab when necessary
+        if (!usingSession) {
+            const tab = app.createTabWithDefaultProfile(app.currentWindow);
+            usingSession = tab.currentSession();
+        }
+        if (!usingSession) {
+            return;
+        }
+        app.write(usingSession, { text: command });
+    }, command, reuse);
 }
 exports.runInIterm = runInIterm;
 exports.iTerm = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mac-helper",
-  "version": "0.0.4",
+  "version": "0.1.0",
   "description": "useful helper for macOS",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/iterm.ts

@@ -1,16 +1,39 @@
 import { run } from '@jxa/run'
 import { iTerm2 } from 'jxa-common-used'
 
-export async function runInIterm(command: string) {
-  await run((command) => {
-    const app = Application<iTerm2>('iTerm')
-    app.includeStandardAdditions = true
-    app.activate()
+export async function runInIterm(command: string, reuse = true) {
+  await run(
+    (command, reuse) => {
+      const app = Application<iTerm2>('iTerm')
+      app.includeStandardAdditions = true
+      app.activate()
 
-    const tab = app.createTabWithDefaultProfile(app.currentWindow)
-    const sess = tab.currentSession
-    app.write(sess, { text: command })
-  }, command)
+      let usingSession: iTerm2.Session | undefined
+
+      // reuse when possible
+      if (reuse) {
+        const session: iTerm2.Session = app.currentWindow().currentSession()
+        const isIdle = session.isAtShellPrompt()
+        if (isIdle) {
+          usingSession = session
+        }
+      }
+
+      // create new tab when necessary
+      if (!usingSession) {
+        const tab = app.createTabWithDefaultProfile(app.currentWindow)
+        usingSession = tab.currentSession()
+      }
+
+      if (!usingSession) {
+        return
+      }
+
+      app.write(usingSession, { text: command })
+    },
+    command,
+    reuse
+  )
 }
 
 export const iTerm = {