mac-helper 0.0.4 → 0.1.1

package/lib/chrome.d.ts

@@ -0,0 +1,8 @@
+export type ActiveTab = {
+    url: string;
+    title: string;
+};
+export declare const Chrome: {
+    getActiveTab(): Promise<ActiveTab>;
+};
+export declare function getChromeActiveTab(): Promise<ActiveTab>;

package/lib/chrome.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getChromeActiveTab = exports.Chrome = void 0;
+const run_1 = require("@jxa/run");
+exports.Chrome = {
+    async getActiveTab() {
+        return await getChromeActiveTab();
+    },
+};
+async function getChromeActiveTab() {
+    return await (0, run_1.run)(() => {
+        const app = Application('Google Chrome');
+        app.includeStandardAdditions = true;
+        const wins = (app.windows() || []).filter((w) => !w.minimized());
+        const tab = wins[0]?.activeTab();
+        return {
+            url: tab?.url(),
+            title: tab?.title(),
+        };
+    });
+}
+exports.getChromeActiveTab = getChromeActiveTab;
+// getChromeActiveTab().then(console.log)

package/lib/index.d.ts

@@ -1,3 +1,4 @@
+export * from './chrome';
+export * from './dialog';
 export * from './finder';
 export * from './iterm';
-export * from './dialog';

package/lib/index.js

@@ -16,6 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./chrome"), exports);
+__exportStar(require("./dialog"), exports);
 __exportStar(require("./finder"), exports);
 __exportStar(require("./iterm"), exports);
-__exportStar(require("./dialog"), exports);

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.1",
   "description": "useful helper for macOS",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -39,24 +39,24 @@
     "@jxa/sdef-to-dts": "^1.3.6",
     "@jxa/types": "^1.3.6",
     "@magicdawn/prettier-config": "^0.0.2",
-    "@swc/core": "^1.3.40",
+    "@swc/core": "^1.3.55",
     "@types/fs-extra": "^11.0.1",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^18.15.3",
-    "@typescript-eslint/eslint-plugin": "^5.55.0",
-    "@typescript-eslint/parser": "^5.55.0",
+    "@types/node": "^18.16.1",
+    "@typescript-eslint/eslint-plugin": "^5.59.1",
+    "@typescript-eslint/parser": "^5.59.1",
     "delay": "^5.0.0",
-    "eslint": "^8.36.0",
-    "eslint-config-prettier": "^8.7.0",
-    "fs-extra": "^11.1.0",
+    "eslint": "^8.39.0",
+    "eslint-config-prettier": "^8.8.0",
+    "fs-extra": "^11.1.1",
     "husky": "^8.0.3",
-    "jxa-common-used": "^0.0.2",
-    "lint-staged": "^13.2.0",
+    "jxa-common-used": "^0.0.3",
+    "lint-staged": "^13.2.2",
     "mocha": "^10.2.0",
     "nyc": "^15.1.0",
-    "prettier": "^2.8.4",
+    "prettier": "^2.8.8",
     "should": "^13.2.3",
-    "typescript": "^4.9.5"
+    "typescript": "^5.0.4"
   },
   "packageManager": "pnpm@7.17.0",
   "publishConfig": {

package/src/chrome.ts

@@ -0,0 +1,26 @@
+import { run } from '@jxa/run'
+import { type GoogleChrome } from 'jxa-common-used'
+
+export type ActiveTab = { url: string; title: string }
+
+export const Chrome = {
+  async getActiveTab(): Promise<ActiveTab> {
+    return await getChromeActiveTab()
+  },
+}
+
+export async function getChromeActiveTab(): Promise<ActiveTab> {
+  return await run(() => {
+    const app = Application<GoogleChrome>('Google Chrome')
+    app.includeStandardAdditions = true
+
+    const wins = (app.windows() || []).filter((w) => !w.minimized())
+    const tab = wins[0]?.activeTab()
+    return {
+      url: tab?.url(),
+      title: tab?.title(),
+    }
+  })
+}
+
+// getChromeActiveTab().then(console.log)

package/src/index.ts

@@ -1,6 +1,7 @@
 /// <reference types='@jxa/global-type' />
 /// <reference types='@jxa/types' />
 
+export * from './chrome'
+export * from './dialog'
 export * from './finder'
 export * from './iterm'
-export * from './dialog'

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 = {