mac-helper 0.3.0 → 0.4.0

package/lib/app.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isAppRunning = isAppRunning;
-const child_process_1 = require("child_process");
+const node_child_process_1 = require("node:child_process");
 /**
  * file path based process running detect.
  * for vscode, process name = `Code`, file is `Visual Studio Code.app`, the `Visual Studio Code` should be passed
  */
-async function isAppRunning(appName) {
+function isAppRunning(appName) {
     return new Promise((resolve, reject) => {
-        (0, child_process_1.exec)(`ps -ax -o command`, (err, stdout, stderr) => {
+        (0, node_child_process_1.exec)(`ps -ax -o command`, (err, stdout, stderr) => {
             if (err)
                 return reject(err);
             const lines = stdout

package/lib/chrome.js

@@ -12,8 +12,8 @@ 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();
+        const win = (app.windows() || []).find((w) => !w.minimized());
+        const tab = win?.activeTab();
         return {
             url: tab?.url(),
             title: tab?.title(),

package/lib/dialog.js

@@ -8,12 +8,18 @@ exports.dialog = {
     chooseMultipleFromList,
 };
 async function prompt(label, defaultValue = '') {
-    return ((await (0, run_1.run)((label) => {
-        const app = Application.currentApplication();
-        app.includeStandardAdditions = true;
-        const response = app.displayDialog(label, { defaultAnswer: '' });
-        return response.textReturned;
-    }, label)) || defaultValue);
+    // if cancel dialog, will throw error
+    try {
+        return ((await (0, run_1.run)((label) => {
+            const app = Application.currentApplication();
+            app.includeStandardAdditions = true;
+            const response = app.displayDialog(label, { defaultAnswer: '' });
+            return response.textReturned;
+        }, label)) || defaultValue);
+    }
+    catch {
+        return defaultValue;
+    }
 }
 async function runOnCurrentApp(method, ...args) {
     return await (0, run_1.run)((method, ...args) => {

package/lib/finder.d.ts

@@ -15,16 +15,8 @@ export declare const QSpace: {
     allSelected(): Promise<string[]>;
     singleSelected(): Promise<string | undefined>;
 };
-/**
- * impls
- */
-export declare function getPathFinderSelected(): Promise<string[]>;
-export declare function setPathFinderSelected(filePaths: string[]): Promise<void>;
-export declare function getFinderSelected(): Promise<string[]>;
-export declare function setFinderSelected(filePaths: string[]): Promise<void>;
 export type QSpaceFileItem = {
     id: () => string;
     name: () => string;
     urlstr: () => string;
 };
-export declare function getQSpaceSelected(): Promise<string[]>;

package/lib/finder.js

@@ -1,51 +1,47 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QSpace = exports.Finder = exports.PathFinder = void 0;
-exports.getPathFinderSelected = getPathFinderSelected;
-exports.setPathFinderSelected = setPathFinderSelected;
-exports.getFinderSelected = getFinderSelected;
-exports.setFinderSelected = setFinderSelected;
-exports.getQSpaceSelected = getQSpaceSelected;
+const node_url_1 = require("node:url");
 const run_1 = require("@jxa/run");
-const url_1 = require("url");
 const app_1 = require("./app");
 /**
  * `App` named epxorts
  */
 exports.PathFinder = {
-    async allSelected() {
-        return getPathFinderSelected();
+    allSelected() {
+        return PathFinder_allSelected();
     },
-    async singleSelected() {
-        return (await getPathFinderSelected())[0];
+    singleSelected() {
+        return PathFinder_singleSelected();
     },
-    async setSelected(filePaths) {
-        await setPathFinderSelected(filePaths);
+    setSelected(filePaths) {
+        return PathFinder_setSelected(filePaths);
     },
 };
 exports.Finder = {
-    async allSelected() {
-        return getFinderSelected();
+    allSelected() {
+        return Finder_allSelected();
     },
     async singleSelected() {
-        return (await getFinderSelected())[0];
+        return (await Finder_allSelected())[0];
     },
-    async setSelected(filePaths) {
-        await setFinderSelected(filePaths);
+    setSelected(filePaths) {
+        return Finder_setSelected(filePaths);
     },
 };
 exports.QSpace = {
-    async allSelected() {
-        return getQSpaceSelected();
+    allSelected() {
+        return QSpace_allSelected();
     },
     async singleSelected() {
-        return (await getQSpaceSelected())[0];
+        return (await QSpace_allSelected())[0];
     },
 };
 /**
  * impls
  */
-async function getPathFinderSelected() {
+/* #region PathFinder */
+async function PathFinder_allSelected() {
     if (!(await (0, app_1.isAppRunning)('Path Finder'))) {
         return [];
     }
@@ -55,28 +51,41 @@ async function getPathFinderSelected() {
     });
     return filePaths;
 }
-async function setPathFinderSelected(filePaths) {
+async function PathFinder_singleSelected() {
+    if (!(await (0, app_1.isAppRunning)('Path Finder'))) {
+        return;
+    }
+    const firstFilePath = await (0, run_1.run)(() => {
+        const app = Application('Path Finder');
+        const arr = (app.selection() || []).map((x) => x.posixPath());
+        return arr[0];
+    });
+    return firstFilePath;
+}
+async function PathFinder_setSelected(filePaths) {
     await (0, run_1.run)((filePaths) => {
         const app = Application('Path Finder');
         app.select(filePaths);
     }, filePaths);
 }
-async function getFinderSelected() {
+/* #endregion */
+/* #region Finder */
+async function Finder_allSelected() {
     const urls = await (0, run_1.run)(() => {
         const app = Application('Finder');
         const selection = app.selection();
         return (selection || []).map((x) => x.url());
     });
-    return urls.map((u) => (0, url_1.fileURLToPath)(u));
+    return urls.map((u) => (0, node_url_1.fileURLToPath)(u));
 }
-async function setFinderSelected(filePaths) {
+async function Finder_setSelected(filePaths) {
     await (0, run_1.run)((filePaths) => {
         const app = Application('Finder');
         app.select(filePaths.map((f) => Path(f)));
         app.activate();
     }, filePaths);
 }
-async function getQSpaceSelected() {
+async function QSpace_allSelected() {
     if (!(await (0, app_1.isAppRunning)('QSpace Pro'))) {
         return [];
     }
@@ -85,8 +94,9 @@ async function getQSpaceSelected() {
         const selection = (app.selectedItems() || []).map((x) => x.urlstr());
         return selection;
     });
-    return urls.map((u) => (0, url_1.fileURLToPath)(u));
+    return urls.map((u) => (0, node_url_1.fileURLToPath)(u));
 }
+/* #endregion */
 // ;(async () => {
 //   console.log(await getQSpaceSelected())
 // })()

package/lib/system-events.js

@@ -8,9 +8,7 @@ async function isAppRunning(appName) {
     return await (0, run_1.run)((appName) => {
         const app = Application('System Events');
         app.includeStandardAdditions = true;
-        const runningAppNames = app
-            .processes()
-            .map((p) => p.name());
+        const runningAppNames = app.processes().map((p) => p.name());
         return runningAppNames.includes(appName);
     }, appName);
 }
@@ -18,9 +16,7 @@ async function getRunningAppNames() {
     return await (0, run_1.run)(() => {
         const app = Application('System Events');
         app.includeStandardAdditions = true;
-        const runningAppNames = app
-            .processes()
-            .map((p) => p.name());
+        const runningAppNames = app.processes().map((p) => p.name());
         return runningAppNames;
     });
 }

package/package.json

@@ -1,13 +1,32 @@
 {
   "name": "mac-helper",
-  "version": "0.3.0",
+  "version": "0.4.0",
+  "packageManager": "pnpm@10.12.1+sha512.f0dda8580f0ee9481c5c79a1d927b9164f2c478e90992ad268bbb2465a736984391d6333d2c327913578b2804af33474ca554ba29c04a8b13060a717675ae3ac",
   "description": "useful helper for macOS",
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
+  "keywords": [
+    "mac",
+    "helper",
+    "mac-helper"
+  ],
+  "license": "MIT",
+  "homepage": "https://github.com/magicdawn/mac-helper#readme",
+  "bugs": {
+    "url": "https://github.com/magicdawn/mac-helper/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/magicdawn/mac-helper.git"
+  },
+  "author": "magicdawn",
   "files": [
     "lib/",
     "src/"
   ],
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org"
+  },
   "scripts": {
     "prepare": "husky",
     "test": "vitest run --globals --testTimeout=30000",
@@ -18,21 +37,6 @@
     "build": "rm -rf lib; rm tsconfig.tsbuildinfo; tsc",
     "prepublishOnly": "pnpm test && pnpm build"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@github.com/magicdawn/mac-helper.git"
-  },
-  "keywords": [
-    "mac",
-    "helper",
-    "mac-helper"
-  ],
-  "author": "magicdawn",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/magicdawn/mac-helper/issues"
-  },
-  "homepage": "https://github.com/magicdawn/mac-helper#readme",
   "dependencies": {
     "@jxa/run": "^1.4.0"
   },
@@ -40,41 +44,35 @@
     "@jxa/global-type": "^1.4.0",
     "@jxa/sdef-to-dts": "^1.4.0",
     "@jxa/types": "^1.4.0",
+    "@magicdawn/eslint-config": "^1.5.4",
     "@magicdawn/prettier-config": "^0.1.0",
-    "@swc/core": "1.11.24",
     "@types/fs-extra": "^11.0.4",
-    "@types/mocha": "^10.0.10",
-    "@types/node": "^22.15.17",
-    "@typescript-eslint/eslint-plugin": "^8.32.0",
-    "@typescript-eslint/parser": "^8.32.0",
-    "@vitest/coverage-v8": "^3.1.3",
+    "@types/node": "^24.0.1",
+    "@vitest/coverage-v8": "^3.2.3",
     "delay": "^6.0.0",
-    "eslint": "^9.26.0",
+    "eslint": "^9.28.0",
     "eslint-config-prettier": "^10.1.5",
     "fs-extra": "^11.3.0",
     "husky": "^9.1.7",
     "jxa-common-used": "^0.0.3",
-    "lint-staged": "^16.0.0",
+    "lint-staged": "^16.1.0",
     "prettier": "^3.5.3",
     "should": "^13.2.3",
     "typescript": "^5.8.3",
-    "vitest": "^3.1.3"
+    "vitest": "^3.2.3"
   },
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org"
-  },
-  "lint-staged": {
-    "*.{js,jsx,ts,tsx,less,md}": [
-      "prettier --write"
-    ]
-  },
-  "packageManager": "pnpm@10.10.0+sha512.d615db246fe70f25dcfea6d8d73dee782ce23e2245e3c4f6f888249fb568149318637dca73c2c5c8ef2a4ca0d5657fb9567188bfab47f566d1ee6ce987815c39",
   "pnpm": {
     "onlyBuiltDependencies": [
       "@swc/core",
       "core-js",
       "es5-ext",
-      "esbuild"
+      "esbuild",
+      "unrs-resolver"
+    ]
+  },
+  "lint-staged": {
+    "*.{js,jsx,ts,tsx,less,md}": [
+      "prettier --write"
     ]
   }
 }

package/src/app.ts

@@ -1,11 +1,11 @@
-import { exec } from 'child_process'
+import { exec } from 'node:child_process'
 
 /**
  * file path based process running detect.
  * for vscode, process name = `Code`, file is `Visual Studio Code.app`, the `Visual Studio Code` should be passed
  */
 
-export async function isAppRunning(appName: string): Promise<boolean> {
+export function isAppRunning(appName: string): Promise<boolean> {
   return new Promise((resolve, reject) => {
     exec(`ps -ax -o command`, (err, stdout, stderr) => {
       if (err) return reject(err)

package/src/chrome.ts

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

package/src/dialog.ts

@@ -8,14 +8,19 @@ export const dialog = {
 }
 
 async function prompt(label: string, defaultValue = ''): Promise<string> {
-  return (
-    (await run((label) => {
-      const app = Application.currentApplication()
-      app.includeStandardAdditions = true
-      const response = app.displayDialog(label, { defaultAnswer: '' })
-      return response.textReturned
-    }, label)) || defaultValue
-  )
+  // if cancel dialog, will throw error
+  try {
+    return (
+      (await run((label) => {
+        const app = Application.currentApplication()
+        app.includeStandardAdditions = true
+        const response = app.displayDialog(label, { defaultAnswer: '' })
+        return response.textReturned
+      }, label)) || defaultValue
+    )
+  } catch {
+    return defaultValue
+  }
 }
 
 type AppMethod = 'chooseFromList'

package/src/finder.ts

@@ -1,47 +1,47 @@
+import { fileURLToPath } from 'node:url'
 import { run as jxaRun } from '@jxa/run'
-import { type PathFinder as PathFinderType } from 'jxa-common-used'
-import { fileURLToPath } from 'url'
 import { isAppRunning } from './app'
+import type { PathFinder as PathFinderType } from 'jxa-common-used'
 
 /**
  * `App` named epxorts
  */
 export const PathFinder = {
-  async allSelected() {
-    return getPathFinderSelected()
+  allSelected() {
+    return PathFinder_allSelected()
   },
-  async singleSelected(): Promise<string | undefined> {
-    return (await getPathFinderSelected())[0]
+  singleSelected() {
+    return PathFinder_singleSelected()
   },
-  async setSelected(filePaths: string[]) {
-    await setPathFinderSelected(filePaths)
+  setSelected(filePaths: string[]) {
+    return PathFinder_setSelected(filePaths)
   },
 }
 export const Finder = {
-  async allSelected() {
-    return getFinderSelected()
+  allSelected() {
+    return Finder_allSelected()
   },
   async singleSelected(): Promise<string | undefined> {
-    return (await getFinderSelected())[0]
+    return (await Finder_allSelected())[0]
   },
-  async setSelected(filePaths: string[]) {
-    await setFinderSelected(filePaths)
+  setSelected(filePaths: string[]) {
+    return Finder_setSelected(filePaths)
   },
 }
 export const QSpace = {
-  async allSelected() {
-    return getQSpaceSelected()
+  allSelected() {
+    return QSpace_allSelected()
   },
   async singleSelected(): Promise<string | undefined> {
-    return (await getQSpaceSelected())[0]
+    return (await QSpace_allSelected())[0]
   },
 }
 
 /**
  * impls
  */
-
-export async function getPathFinderSelected() {
+/* #region PathFinder */
+async function PathFinder_allSelected() {
   if (!(await isAppRunning('Path Finder'))) {
     return []
   }
@@ -52,14 +52,28 @@ export async function getPathFinderSelected() {
   return filePaths
 }
 
-export async function setPathFinderSelected(filePaths: string[]) {
+async function PathFinder_singleSelected(): Promise<string | undefined> {
+  if (!(await isAppRunning('Path Finder'))) {
+    return
+  }
+  const firstFilePath: string | undefined = await jxaRun(() => {
+    const app = Application<PathFinderType>('Path Finder')
+    const arr = (app.selection() || []).map((x) => x.posixPath())
+    return arr[0]
+  })
+  return firstFilePath
+}
+
+async function PathFinder_setSelected(filePaths: string[]) {
   await jxaRun((filePaths: string[]) => {
     const app = Application<PathFinderType>('Path Finder')
     app.select(filePaths)
   }, filePaths)
 }
+/* #endregion */
 
-export async function getFinderSelected() {
+/* #region Finder */
+async function Finder_allSelected() {
   const urls: string[] = await jxaRun(() => {
     const app = Application('Finder')
     const selection = app.selection()
@@ -67,16 +81,17 @@ export async function getFinderSelected() {
   })
   return urls.map((u) => fileURLToPath(u))
 }
-
-export async function setFinderSelected(filePaths: string[]) {
+async function Finder_setSelected(filePaths: string[]) {
   await jxaRun((filePaths: string[]) => {
     const app = Application('Finder')
     app.select(filePaths.map((f) => Path(f)))
     app.activate()
   }, filePaths)
 }
+/* #endregion */
 
-// file item n [inh. item] : A file item.
+/* #region QSpace */
+// file item n [inh. item] : A file item.
 // properties
 //  - id (text, r/o) : The unique identifier of the item.
 //  - name (text, r/o) : The name of the file.
@@ -90,7 +105,7 @@ export type QSpaceFileItem = {
   urlstr: () => string
 }
 
-export async function getQSpaceSelected() {
+async function QSpace_allSelected() {
   if (!(await isAppRunning('QSpace Pro'))) {
     return []
   }
@@ -101,6 +116,7 @@ export async function getQSpaceSelected() {
   })
   return urls.map((u) => fileURLToPath(u))
 }
+/* #endregion */
 
 // ;(async () => {
 //   console.log(await getQSpaceSelected())

package/src/iterm.ts

@@ -1,5 +1,5 @@
 import { run } from '@jxa/run'
-import { iTerm2 } from 'jxa-common-used'
+import type { iTerm2 } from 'jxa-common-used'
 
 export async function runInIterm(command: string, reuse = true) {
   await run(

package/src/system-events.ts

@@ -9,9 +9,7 @@ async function isAppRunning(appName: string): Promise<boolean> {
   return await run((appName) => {
     const app = Application<SystemEvents.SystemEvents.Application>('System Events')
     app.includeStandardAdditions = true
-    const runningAppNames: string[] = app
-      .processes()
-      .map((p: SystemEvents.SystemEvents.Process) => p.name())
+    const runningAppNames: string[] = app.processes().map((p: SystemEvents.SystemEvents.Process) => p.name())
     return runningAppNames.includes(appName)
   }, appName)
 }
@@ -20,9 +18,7 @@ async function getRunningAppNames(): Promise<string[]> {
   return await run(() => {
     const app = Application<SystemEvents.SystemEvents.Application>('System Events')
     app.includeStandardAdditions = true
-    const runningAppNames: string[] = app
-      .processes()
-      .map((p: SystemEvents.SystemEvents.Process) => p.name())
+    const runningAppNames: string[] = app.processes().map((p: SystemEvents.SystemEvents.Process) => p.name())
     return runningAppNames
   })
 }