mac-helper 0.9.0 → 0.10.0

package/lib/chrome.d.ts

@@ -10,11 +10,11 @@ export declare class ChromiumBrowserHelper {
     appName: string;
     constructor(appName: string);
     isRunning: () => Promise<boolean>;
-    isFrontmost: () => Promise<boolean>;
-    getActiveTab: () => Promise<ActiveTab | undefined>;
+    isFrontmost: (signal?: AbortSignal) => Promise<boolean>;
+    getActiveTab: (signal?: AbortSignal) => Promise<ActiveTab | undefined>;
 }
 export declare const Chrome: ChromiumBrowserHelper;
 export declare const Brave: ChromiumBrowserHelper;
 export declare function isChromiumAppRunning(appName?: string): Promise<boolean>;
-export declare function getChromiumActiveTab(appName?: string): Promise<ActiveTab | undefined>;
-export declare function getChromiumIsFrontmost(appName?: string): Promise<boolean>;
+export declare function getChromiumActiveTab(appName?: string, signal?: AbortSignal): Promise<ActiveTab | undefined>;
+export declare function getChromiumIsFrontmost(appName?: string, signal?: AbortSignal): Promise<boolean>;

package/lib/chrome.js

@@ -1,4 +1,4 @@
-import { run } from '@jxa/run';
+import { runJxa } from 'run-jxa';
 import { isAppRunning } from './app.js';
 export var BrowserAppName;
 (function (BrowserAppName) {
@@ -11,8 +11,8 @@ export class ChromiumBrowserHelper {
         this.appName = appName;
     }
     isRunning = () => isChromiumAppRunning(this.appName);
-    isFrontmost = () => getChromiumIsFrontmost(this.appName);
-    getActiveTab = () => getChromiumActiveTab(this.appName);
+    isFrontmost = (signal) => getChromiumIsFrontmost(this.appName, signal);
+    getActiveTab = (signal) => getChromiumActiveTab(this.appName, signal);
 }
 export const Chrome = new ChromiumBrowserHelper(BrowserAppName.Chrome);
 export const Brave = new ChromiumBrowserHelper(BrowserAppName.Brave);
@@ -20,10 +20,10 @@ export const Brave = new ChromiumBrowserHelper(BrowserAppName.Brave);
 export function isChromiumAppRunning(appName = BrowserAppName.Chrome) {
     return isAppRunning(appName);
 }
-export async function getChromiumActiveTab(appName = BrowserAppName.Chrome) {
+export async function getChromiumActiveTab(appName = BrowserAppName.Chrome, signal) {
     if (!(await isChromiumAppRunning(appName)))
         return;
-    return await run((appName) => {
+    return await runJxa((appName) => {
         const app = Application(appName);
         app.includeStandardAdditions = true;
         const win = (app.windows() || []).find((w) => !w.minimized());
@@ -32,15 +32,15 @@ export async function getChromiumActiveTab(appName = BrowserAppName.Chrome) {
             url: tab?.url(),
             title: tab?.title(),
         };
-    }, appName);
+    }, [appName], { signal });
 }
-export async function getChromiumIsFrontmost(appName = BrowserAppName.Chrome) {
+export async function getChromiumIsFrontmost(appName = BrowserAppName.Chrome, signal) {
     if (!isChromiumAppRunning(appName))
         return false;
-    return await run((appName) => {
+    return await runJxa((appName) => {
         const app = Application(appName);
         app.includeStandardAdditions = true;
         return app.frontmost();
-    }, appName);
+    }, [appName], { signal });
 }
 /* #endregion */

package/lib/dialog.d.ts

@@ -4,11 +4,11 @@ export declare const dialog: {
     chooseFromList: typeof chooseFromList;
     chooseMultipleFromList: typeof chooseMultipleFromList;
 };
-declare function prompt(label: string, defaultValue?: string): Promise<string>;
+declare function prompt(label: string, defaultValue?: string, signal?: AbortSignal): Promise<string>;
 type ChooseOption = {
     label: string;
     value: string;
 };
-declare function chooseFromList(list: string[] | ChooseOption[], options?: StandardAdditions.StandardAdditions.ChooseFromListOptionalParameter): Promise<string | undefined>;
-declare function chooseMultipleFromList(list: string[] | ChooseOption[], options?: StandardAdditions.StandardAdditions.ChooseFromListOptionalParameter): Promise<string[]>;
+declare function chooseFromList(list: string[] | ChooseOption[], options?: StandardAdditions.StandardAdditions.ChooseFromListOptionalParameter, signal?: AbortSignal): Promise<string | undefined>;
+declare function chooseMultipleFromList(list: string[] | ChooseOption[], options?: StandardAdditions.StandardAdditions.ChooseFromListOptionalParameter, signal?: AbortSignal): Promise<string[]>;
 export {};

package/lib/dialog.js

@@ -1,32 +1,32 @@
-import { run } from '@jxa/run';
+import { runJxa } from 'run-jxa';
 export const dialog = {
     prompt,
     chooseFromList,
     chooseMultipleFromList,
 };
-async function prompt(label, defaultValue = '') {
+async function prompt(label, defaultValue = '', signal) {
     // if cancel dialog, will throw error
     try {
-        return ((await run((label) => {
+        return ((await runJxa((label) => {
             const app = Application.currentApplication();
             app.includeStandardAdditions = true;
             const response = app.displayDialog(label, { defaultAnswer: '' });
             return response.textReturned;
-        }, label)) || defaultValue);
+        }, [label], { signal })) || defaultValue);
     }
     catch {
         return defaultValue;
     }
 }
-async function runOnCurrentApp(method, ...args) {
-    return await run((method, ...args) => {
+async function runOnCurrentApp(method, args, signal) {
+    return await runJxa((method, ...args) => {
         const app = Application.currentApplication();
         app.includeStandardAdditions = true;
         // @ts-ignore
         return app[method]?.(...args);
-    }, method, ...args);
+    }, [method, ...(args || [])], { signal });
 }
-async function chooseFromList(list, options = {}) {
+async function chooseFromList(list, options = {}, signal) {
     let usingOption = false;
     let showList = [];
     if (typeof list[0] === 'object') {
@@ -36,10 +36,7 @@ async function chooseFromList(list, options = {}) {
     else {
         showList = list;
     }
-    const selected = await runOnCurrentApp('chooseFromList', showList, {
-        multipleSelectionsAllowed: false,
-        ...options,
-    });
+    const selected = await runOnCurrentApp('chooseFromList', [showList, { multipleSelectionsAllowed: false, ...options }], signal);
     if (!selected)
         return;
     const label = selected[0];
@@ -51,7 +48,7 @@ async function chooseFromList(list, options = {}) {
         return val;
     }
 }
-async function chooseMultipleFromList(list, options = {}) {
+async function chooseMultipleFromList(list, options = {}, signal) {
     let usingOption = false;
     let showList = [];
     if (typeof list[0] === 'object') {
@@ -61,10 +58,7 @@ async function chooseMultipleFromList(list, options = {}) {
     else {
         showList = list;
     }
-    const selected = await runOnCurrentApp('chooseFromList', showList, {
-        multipleSelectionsAllowed: true,
-        ...options,
-    });
+    const selected = await runOnCurrentApp('chooseFromList', [showList, { multipleSelectionsAllowed: true, ...options }], signal);
     if (!selected)
         return [];
     if (!usingOption) {

package/lib/finder.d.ts

@@ -2,32 +2,45 @@
  * `App` named epxorts
  */
 export declare const PathFinder: {
-    allSelected(): Promise<string[]>;
-    singleSelected(): Promise<string | undefined>;
-    setSelected(filePaths: string[]): Promise<void>;
+    allSelected: typeof PathFinder_allSelected;
+    singleSelected: typeof PathFinder_singleSelected;
+    setSelected: typeof PathFinder_setSelected;
     getActiveTabDir: typeof PathFinder_getActiveTabDir;
 };
 export declare const Finder: {
-    allSelected(): Promise<string[]>;
-    singleSelected(): Promise<string | undefined>;
-    setSelected(filePaths: string[]): Promise<void>;
+    allSelected: typeof Finder_allSelected;
+    singleSelected(signal?: AbortSignal): Promise<string | undefined>;
+    setSelected: typeof Finder_setSelected;
+    showInfoWindow: typeof Finder_showInfoWindow;
 };
 export declare const QSpace: {
-    allSelected(): Promise<string[]>;
-    singleSelected(): Promise<string | undefined>;
+    allSelected: typeof QSpace_allSelected;
+    singleSelected(signal?: AbortSignal): Promise<string | undefined>;
 };
+/**
+ * impls
+ */
+declare function PathFinder_allSelected(signal?: AbortSignal): Promise<string[]>;
+declare function PathFinder_singleSelected(signal?: AbortSignal): Promise<string | undefined>;
+declare function PathFinder_setSelected(filePaths: string[], signal?: AbortSignal): Promise<void>;
 /**
  * 获取 activeTab dir, 当没有 selection 时可用,
  * 要求只能有一个 visible window, 从 jxa 这一层无法区分 window z-index
  */
-declare function PathFinder_getActiveTabDir(): Promise<string | undefined>;
+declare function PathFinder_getActiveTabDir(signal?: AbortSignal): Promise<string | undefined>;
+declare function Finder_allSelected(signal?: AbortSignal): Promise<string[]>;
+declare function Finder_setSelected(filePaths: string[], signal?: AbortSignal): Promise<void>;
+declare function Finder_showInfoWindow(filePaths: string | string[], signal?: AbortSignal): Promise<void>;
 export type QSpaceFileItem = {
     id: () => string;
     name: () => string;
     urlstr: () => string;
 };
+declare function QSpace_allSelected(signal?: AbortSignal): Promise<string[]>;
 export declare function isRepresentPF(file: string): boolean;
 export declare function isRepresentQS(file: string): boolean;
+export declare const isRepresentPFDescription = "@pf or $pf or pf, ignore case";
+export declare const isRepresentQSDescription = "@qs or $qs or qs, ignore case";
 /**
  * 处理 `@pf` `@qs`, ignore case
  */

package/lib/finder.js

@@ -1,123 +1,130 @@
 import { availableParallelism } from 'node:os';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { run as jxaRun } from '@jxa/run';
+import dedent from 'dedent';
 import { uniq } from 'es-toolkit';
 import pmap from 'promise.map';
+import { runAppleScript } from 'run-applescript';
+import { runJxa } from 'run-jxa';
 import { isAppRunning } from './app.js';
 /**
  * `App` named epxorts
  */
 export const PathFinder = {
-    allSelected() {
-        return PathFinder_allSelected();
-    },
-    singleSelected() {
-        return PathFinder_singleSelected();
-    },
-    setSelected(filePaths) {
-        return PathFinder_setSelected(filePaths);
-    },
+    allSelected: PathFinder_allSelected,
+    singleSelected: PathFinder_singleSelected,
+    setSelected: PathFinder_setSelected,
     getActiveTabDir: PathFinder_getActiveTabDir,
 };
 export const Finder = {
-    allSelected() {
-        return Finder_allSelected();
-    },
-    async singleSelected() {
-        return (await Finder_allSelected())[0];
-    },
-    setSelected(filePaths) {
-        return Finder_setSelected(filePaths);
+    allSelected: Finder_allSelected,
+    async singleSelected(signal) {
+        return (await Finder_allSelected(signal))[0];
     },
+    setSelected: Finder_setSelected,
+    showInfoWindow: Finder_showInfoWindow,
 };
 export const QSpace = {
-    allSelected() {
-        return QSpace_allSelected();
-    },
-    async singleSelected() {
-        return (await QSpace_allSelected())[0];
+    allSelected: QSpace_allSelected,
+    async singleSelected(signal) {
+        return (await QSpace_allSelected(signal))[0];
     },
 };
 /**
  * impls
  */
 /* #region PathFinder */
-async function PathFinder_allSelected() {
+async function PathFinder_allSelected(signal) {
     if (!(await isAppRunning('Path Finder'))) {
         return [];
     }
-    const filePaths = await jxaRun(() => {
+    const filePaths = await runJxa(() => {
         const app = Application('Path Finder');
         return (app.selection() || []).map((x) => x.posixPath());
-    });
+    }, undefined, { signal });
     return filePaths;
 }
-async function PathFinder_singleSelected() {
+async function PathFinder_singleSelected(signal) {
     if (!(await isAppRunning('Path Finder'))) {
         return;
     }
-    const firstFilePath = await jxaRun(() => {
+    const firstFilePath = await runJxa(() => {
         const app = Application('Path Finder');
         return (app.selection() || [])[0]?.posixPath();
-    });
+    }, undefined, { signal });
     return firstFilePath;
 }
-async function PathFinder_setSelected(filePaths) {
-    await jxaRun((filePaths) => {
+async function PathFinder_setSelected(filePaths, signal) {
+    await runJxa((filePaths) => {
         const app = Application('Path Finder');
         app.select(filePaths);
-    }, filePaths);
+        return null;
+    }, [filePaths], { signal });
 }
 /**
  * 获取 activeTab dir, 当没有 selection 时可用,
  * 要求只能有一个 visible window, 从 jxa 这一层无法区分 window z-index
  */
-async function PathFinder_getActiveTabDir() {
+async function PathFinder_getActiveTabDir(signal) {
     if (!(await isAppRunning('Path Finder')))
         return;
-    const visibleWindowCount = await jxaRun(() => {
+    const visibleWindowCount = await runJxa(() => {
         const app = Application('Path Finder');
         return app.finderWindows.whose({ visible: true }).length;
-    });
+    }, undefined, { signal });
     if (!visibleWindowCount)
         return;
     if (visibleWindowCount > 1) {
         throw new Error('Multiple visible PathFinder window not supported in PathFinder_getActiveTabDir');
     }
-    const dir = await jxaRun(() => {
+    const dir = await runJxa(() => {
         const app = Application('Path Finder');
         const w = app.finderWindows.whose({ visible: true })[0];
         return w.target.posixPath();
-    });
+    }, undefined, { signal });
     return dir;
 }
 /* #endregion */
 /* #region Finder */
-async function Finder_allSelected() {
-    const urls = await jxaRun(() => {
+async function Finder_allSelected(signal) {
+    const urls = await runJxa(() => {
         const app = Application('Finder');
         const selection = app.selection();
         return (selection || []).map((x) => x.url());
-    });
+    }, undefined, { signal });
     return urls.map((u) => fileURLToPath(u));
 }
-async function Finder_setSelected(filePaths) {
-    await jxaRun((filePaths) => {
+async function Finder_setSelected(filePaths, signal) {
+    await runJxa((filePaths) => {
         const app = Application('Finder');
         app.select(filePaths.map((f) => Path(f)));
         app.activate();
-    }, filePaths);
+        return null;
+    }, [filePaths], { signal });
+}
+async function Finder_showInfoWindow(filePaths, signal) {
+    const inputPaths = [filePaths].flat().map((x) => path.resolve(x));
+    if (!inputPaths.length)
+        return;
+    // https://apple.stackexchange.com/questions/409243/use-the-finder-to-act-on-a-path-via-jxa
+    // no easy way to write this in JXA
+    const applescriptContent = dedent `
+    tell application "Finder"
+      ${inputPaths.map((p) => `open information window of (POSIX file "${p}" as alias)`).join('\n')}
+      activate
+    end tell
+  `;
+    await runAppleScript(applescriptContent, { signal });
 }
-async function QSpace_allSelected() {
+async function QSpace_allSelected(signal) {
     if (!(await isAppRunning('QSpace Pro'))) {
         return [];
     }
-    const urls = await jxaRun(() => {
+    const urls = await runJxa(() => {
         const app = Application('QSpace Pro');
         const selection = (app.selectedItems() || []).map((x) => x.urlstr());
         return selection;
-    });
+    }, undefined, { signal });
     return urls.map((u) => fileURLToPath(u));
 }
 /* #endregion */
@@ -128,6 +135,8 @@ export function isRepresentPF(file) {
 export function isRepresentQS(file) {
     return /^[@$]?qs$/i.test(file);
 }
+export const isRepresentPFDescription = '@pf or $pf or pf, ignore case';
+export const isRepresentQSDescription = '@qs or $qs or qs, ignore case';
 /**
  * 处理 `@pf` `@qs`, ignore case
  */

package/lib/iterm.js

@@ -1,6 +1,6 @@
-import { run } from '@jxa/run';
+import { runJxa } from 'run-jxa';
 export async function runInIterm(command, reuse = true) {
-    const result = await run((command, reuse) => {
+    const result = await runJxa((command, reuse) => {
         const app = Application('iTerm');
         app.includeStandardAdditions = true;
         app.activate();
@@ -21,7 +21,8 @@ export async function runInIterm(command, reuse = true) {
         if (!usingSession)
             return 'no-session';
         app.write(usingSession, { text: command });
-    }, command, reuse);
+        return null;
+    }, [command, reuse]);
     if (result === 'no-session') {
         console.error('No iTerm session found');
     }

package/lib/system-events.js

@@ -1,20 +1,20 @@
-import { run } from '@jxa/run';
+import { runJxa } from 'run-jxa';
 /**
  * 不太准确, 比如 vscode 进程 `Code` 在运行, 检测不到
  */
-async function isAppRunning(appName) {
-    return await run((appName) => {
+async function isAppRunning(appName, signal) {
+    return await runJxa((appName) => {
         const app = Application('System Events');
         app.includeStandardAdditions = true;
         const runningAppNames = app.processes().map((p) => p.name());
         return runningAppNames.includes(appName);
-    }, appName);
+    }, [appName], { signal });
 }
-async function getRunningAppNames() {
-    return await run(() => {
+async function getRunningAppNames(signal) {
+    return await runJxa(() => {
         const app = Application('System Events');
         app.includeStandardAdditions = true;
         const runningAppNames = app.processes().map((p) => p.name());
         return runningAppNames;
-    });
+    }, undefined, { signal });
 }

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "mac-helper",
   "type": "module",
-  "version": "0.9.0",
-  "packageManager": "pnpm@11.5.0+sha512.dbfcc4f81cf48597afd4bc391ffdf12c11f1a9fb83a395bfa6b0a2d9cc2fd8ffebafdb1ccbd529632153f793904c2615b7f09fe1a345473fd1c35845172a8eb1",
+  "version": "0.10.0",
+  "packageManager": "pnpm@11.8.0+sha512.c1f5e7c4cb241c8f174b743851d82f42b802324afc8b0f116b96adb15aa06664948dde36960a3ba1079ba5b4b29dd0140135b94b5b5f5263592249d68e555f26",
   "description": "useful helper for macOS",
   "author": "magicdawn",
   "license": "MIT",
@@ -42,35 +42,41 @@
     "prepublishOnly": "pnpm test && pnpm build"
   },
   "dependencies": {
-    "@jxa/run": "^1.4.0",
-    "es-toolkit": "^1.47.0",
-    "promise.map": "^1.2.0"
+    "dedent": "^1.7.2",
+    "es-toolkit": "^1.47.1",
+    "promise.map": "^1.2.0",
+    "run-applescript": "^7.1.0",
+    "run-jxa": "^4.0.0"
   },
   "devDependencies": {
     "@jxa/global-type": "^1.4.0",
     "@jxa/sdef-to-dts": "^1.4.0",
     "@jxa/types": "^1.4.0",
-    "@magicdawn/eslint-config": "github:magicdawn/eslint-config#dist",
+    "@magicdawn/eslint-config": "^1.6.8",
     "@magicdawn/prettier-config": "^0.1.0",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^25.9.1",
-    "@typescript/native-preview": "7.0.0-dev.20260527.2",
-    "@vitest/coverage-v8": "^4.1.7",
+    "@types/node": "^25.9.4",
+    "@typescript/native-preview": "7.0.0-dev.20260620.1",
+    "@vitest/coverage-v8": "^4.1.9",
     "delay": "^7.0.0",
-    "eslint": "^10.4.1",
+    "eslint": "^10.5.0",
     "eslint-config-prettier": "^10.1.8",
     "fs-extra": "^11.3.5",
     "husky": "^9.1.7",
     "jxa-common-used": "^0.0.3",
-    "lint-staged": "^17.0.5",
-    "prettier": "^3.8.3",
+    "lint-staged": "^17.0.7",
+    "prettier": "^3.8.4",
     "should": "^13.2.3",
     "typescript": "^6.0.3",
-    "vitest": "^4.1.7"
+    "vitest": "^4.1.9"
   },
   "lint-staged": {
-    "*.{js,jsx,ts,tsx,less,md}": [
-      "prettier --write"
+    "*.{?(c|m)(j|t)s?(x),json,y?(a)ml}": [
+      "eslint --fix --no-warn-ignored",
+      "prettier --write --ignore-unknown"
+    ],
+    "!*.{?(c|m)(j|t)s?(x),json,y?(a)ml}": [
+      "prettier --write --ignore-unknown"
     ]
   }
 }