mac-helper 0.10.0 → 0.11.0

package/lib/app.js

@@ -19,4 +19,3 @@ export function isAppRunning(appName) {
         });
     });
 }
-// isAppRunning('Visual Studio Code').then(console.log)

package/lib/dialog.js

@@ -1,4 +1,5 @@
 import { runJxa } from 'run-jxa';
+import { runOnCurrentApp } from './utils.js';
 export const dialog = {
     prompt,
     chooseFromList,
@@ -18,14 +19,6 @@ async function prompt(label, defaultValue = '', signal) {
         return defaultValue;
     }
 }
-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 || [])], { signal });
-}
 async function chooseFromList(list, options = {}, signal) {
     let usingOption = false;
     let showList = [];
@@ -69,32 +62,3 @@ async function chooseMultipleFromList(list, options = {}, signal) {
         return valArr;
     }
 }
-// dialog.chooseFromList(['hello', 'world']).then((selected) => {
-//   console.log(selected)
-// })
-// dialog
-//   .chooseFromList([
-//     { value: 'yes', label: '是吧~~~' },
-//     { value: 'halo', label: 'Halo 啊洒洒' },
-//   ])
-//   .then((selected) => {
-//     console.log(selected)
-//   })
-// dialog
-//   .chooseMultipleFromList(
-//     [
-//       { value: 'yes', label: '是吧~~~' },
-//       { value: 'halo', label: 'Halo 啊洒洒' },
-//     ],
-//     {
-//       withTitle: 'title',
-//       withPrompt: 'prompt',
-//       cancelButtonName: '取消!',
-//       // @ts-ignore
-//       okButtonName: '酱紫吧~',
-//     }
-//   )
-//   .then((selected) => {
-//     console.log(selected)
-//   })
-// dialog.prompt('hello', 'world').then(console.log)

package/lib/index.d.ts

@@ -3,3 +3,5 @@ export * from './chrome.js';
 export * from './dialog.js';
 export * from './finder.js';
 export * from './iterm.js';
+export * from './notification.js';
+export * from './system-events.js';

package/lib/index.js

@@ -5,3 +5,5 @@ export * from './chrome.js';
 export * from './dialog.js';
 export * from './finder.js';
 export * from './iterm.js';
+export * from './notification.js';
+export * from './system-events.js';

package/lib/notification.d.ts

@@ -0,0 +1,15 @@
+/**
+ * https://developer.apple.com/library/archive/documentation/LanguagesUtilities/Conceptual/MacAutomationScriptingGuide/DisplayNotifications.html#//apple_ref/doc/uid/TP40016239-CH61-SW1
+ */
+/**
+ * 视觉从上到下 title-subtitle-message
+ */
+export type NotificationOptions = {
+    /** fallback 到 "脚本编辑器" */
+    title?: string;
+    /** 通常来说很少见, 写上很诡异 */
+    subtitle?: string;
+    /** 提示：这些声音文件物理存放在 Mac 系统的 /System/Library/Sounds/ 目录下 */
+    soundName?: 'Basso' | 'Blow' | 'Bottle' | 'Frog' | 'Funk' | 'Glass' | 'Hero' | 'Morse' | 'Ping' | 'Pop' | 'Purr' | 'Sosumi' | 'Submarine' | 'Tink' | (string & {});
+};
+export declare function displayNotification(message: string, options?: NotificationOptions): Promise<void>;

package/lib/notification.js

@@ -0,0 +1,18 @@
+/**
+ * https://developer.apple.com/library/archive/documentation/LanguagesUtilities/Conceptual/MacAutomationScriptingGuide/DisplayNotifications.html#//apple_ref/doc/uid/TP40016239-CH61-SW1
+ */
+import { runJxa } from 'run-jxa';
+export async function displayNotification(message, options) {
+    // jxa 直接传 options 报错: execution error: Error: Error: 不能转换类型。 (-1700)
+    // 只能拆开喽
+    // undefined 更好, 但 jxa 更期望 null 或 空字符串
+    const title = options?.title || ''; // null 会变成 msgr
+    const subtitle = options?.subtitle || '';
+    const soundName = options?.soundName || '';
+    await runJxa((message, title, subtitle, soundName) => {
+        const app = Application.currentApplication();
+        app.includeStandardAdditions = true;
+        app.displayNotification(message, { withTitle: title, subtitle, soundName });
+        return null;
+    }, [message, title, subtitle, soundName]);
+}

package/lib/system-events.d.ts

@@ -1 +1,11 @@
-export {};
+export type AppInfo = {
+    name: string;
+    bundleId: string;
+    path?: string;
+};
+export declare function getRunningAppInfos(signal?: AbortSignal): Promise<AppInfo[]>;
+export declare function getForegroundAppInfo(signal?: AbortSignal): Promise<{
+    foregroundAppName: string | undefined;
+    foregroundAppBundleId: string | undefined;
+    foregroundAppPath: string | undefined;
+}>;

package/lib/system-events.js

@@ -10,11 +10,29 @@ async function isAppRunning(appName, signal) {
         return runningAppNames.includes(appName);
     }, [appName], { signal });
 }
-async function getRunningAppNames(signal) {
+export async function getRunningAppInfos(signal) {
     return await runJxa(() => {
         const app = Application('System Events');
         app.includeStandardAdditions = true;
-        const runningAppNames = app.processes().map((p) => p.name());
+        const runningAppNames = app.applicationProcesses().map((p) => {
+            return {
+                name: p.name(),
+                bundleId: p.bundleIdentifier(),
+                path: p.applicationFile()?.posixPath(),
+            };
+        });
         return runningAppNames;
     }, undefined, { signal });
 }
+export async function getForegroundAppInfo(signal) {
+    return await runJxa(function () {
+        const app = Application('System Events');
+        app.includeStandardAdditions = true;
+        const foregroundApp = app.applicationProcesses.whose({ frontmost: true })?.[0];
+        return {
+            foregroundAppName: foregroundApp?.name(),
+            foregroundAppBundleId: foregroundApp?.bundleIdentifier(),
+            foregroundAppPath: foregroundApp?.applicationFile()?.posixPath(),
+        };
+    }, undefined, { signal });
+}

package/lib/utils.d.ts

@@ -0,0 +1,2 @@
+export type AppMethod = 'chooseFromList';
+export declare function runOnCurrentApp(method: AppMethod, args: any[] | undefined, signal?: AbortSignal): Promise<any>;

package/lib/utils.js

@@ -0,0 +1,9 @@
+import { runJxa } from 'run-jxa';
+export 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 || [])], { signal });
+}

package/package.json

@@ -1,8 +1,7 @@
 {
   "name": "mac-helper",
   "type": "module",
-  "version": "0.10.0",
-  "packageManager": "pnpm@11.8.0+sha512.c1f5e7c4cb241c8f174b743851d82f42b802324afc8b0f116b96adb15aa06664948dde36960a3ba1079ba5b4b29dd0140135b94b5b5f5263592249d68e555f26",
+  "version": "0.11.0",
   "description": "useful helper for macOS",
   "author": "magicdawn",
   "license": "MIT",
@@ -31,19 +30,9 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "scripts": {
-    "prepare": "husky",
-    "test": "vitest run --globals --testTimeout=30000",
-    "test:dev": "vitest --globals --testTimeout=30000",
-    "test-cover": "vitest run --globals --coverage --testTimeout=30000",
-    "dev": "tsgo -w --incremental",
-    "typecheck": "tsgo --noEmit",
-    "build": "rm -rf lib; tsgo",
-    "prepublishOnly": "pnpm test && pnpm build"
-  },
   "dependencies": {
     "dedent": "^1.7.2",
-    "es-toolkit": "^1.47.1",
+    "es-toolkit": "^1.52.0",
     "promise.map": "^1.2.0",
     "run-applescript": "^7.1.0",
     "run-jxa": "^4.0.0"
@@ -52,23 +41,24 @@
     "@jxa/global-type": "^1.4.0",
     "@jxa/sdef-to-dts": "^1.4.0",
     "@jxa/types": "^1.4.0",
-    "@magicdawn/eslint-config": "^1.6.8",
+    "@magicdawn/eslint-config": "^1.6.18",
     "@magicdawn/prettier-config": "^0.1.0",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^25.9.4",
-    "@typescript/native-preview": "7.0.0-dev.20260620.1",
-    "@vitest/coverage-v8": "^4.1.9",
+    "@types/node": "^26.6.3",
+    "@typescript/native-preview": "7.0.0-dev.20260707.2",
+    "@vitest/coverage-v8": "^5.0.3",
     "delay": "^7.0.0",
-    "eslint": "^10.5.0",
+    "eslint": "^10.11.0",
     "eslint-config-prettier": "^10.1.8",
-    "fs-extra": "^11.3.5",
+    "fs-extra": "^11.4.1",
     "husky": "^9.1.7",
     "jxa-common-used": "^0.0.3",
-    "lint-staged": "^17.0.7",
-    "prettier": "^3.8.4",
+    "lint-staged": "^17.6.0",
+    "prettier": "^3.9.9",
     "should": "^13.2.3",
     "typescript": "^6.0.3",
-    "vitest": "^4.1.9"
+    "vite": "^8.3.1",
+    "vitest": "^5.0.3"
   },
   "lint-staged": {
     "*.{?(c|m)(j|t)s?(x),json,y?(a)ml}": [
@@ -78,5 +68,13 @@
     "!*.{?(c|m)(j|t)s?(x),json,y?(a)ml}": [
       "prettier --write --ignore-unknown"
     ]
+  },
+  "scripts": {
+    "test": "vitest run --globals --testTimeout=30000",
+    "test:dev": "vitest --globals --testTimeout=30000",
+    "test-cover": "vitest run --globals --coverage --testTimeout=30000",
+    "dev": "tsgo -w --incremental",
+    "typecheck": "tsgo --noEmit",
+    "build": "rm -rf lib; tsgo"
   }
-}
+}