mac-helper 0.7.0 → 0.8.0

package/lib/dialog.js

@@ -106,3 +106,4 @@ async function chooseMultipleFromList(list, options = {}) {
 //   .then((selected) => {
 //     console.log(selected)
 //   })
+// dialog.prompt('hello', 'world').then(console.log)

package/lib/finder.d.ts

@@ -5,6 +5,7 @@ export declare const PathFinder: {
     allSelected(): Promise<string[]>;
     singleSelected(): Promise<string | undefined>;
     setSelected(filePaths: string[]): Promise<void>;
+    getActiveTabDir: typeof PathFinder_getActiveTabDir;
 };
 export declare const Finder: {
     allSelected(): Promise<string[]>;
@@ -15,6 +16,11 @@ export declare const QSpace: {
     allSelected(): Promise<string[]>;
     singleSelected(): Promise<string | undefined>;
 };
+/**
+ * 获取 activeTab dir, 当没有 selection 时可用,
+ * 要求只能有一个 visible window, 从 jxa 这一层无法区分 window z-index
+ */
+declare function PathFinder_getActiveTabDir(): Promise<string | undefined>;
 export type QSpaceFileItem = {
     id: () => string;
     name: () => string;
@@ -26,3 +32,4 @@ export declare function isRepresentQS(file: string): boolean;
  * 处理 `@pf` `@qs`, ignore case
  */
 export declare function normalizeInputFileList(fileList: string[]): Promise<string[]>;
+export {};

package/lib/finder.js

@@ -7,11 +7,11 @@ exports.QSpace = exports.Finder = exports.PathFinder = void 0;
 exports.isRepresentPF = isRepresentPF;
 exports.isRepresentQS = isRepresentQS;
 exports.normalizeInputFileList = normalizeInputFileList;
-const run_1 = require("@jxa/run");
-const es_toolkit_1 = require("es-toolkit");
 const node_os_1 = require("node:os");
 const node_path_1 = __importDefault(require("node:path"));
 const node_url_1 = require("node:url");
+const run_1 = require("@jxa/run");
+const es_toolkit_1 = require("es-toolkit");
 const promise_map_1 = __importDefault(require("promise.map"));
 const app_1 = require("./app");
 /**
@@ -27,6 +27,7 @@ exports.PathFinder = {
     setSelected(filePaths) {
         return PathFinder_setSelected(filePaths);
     },
+    getActiveTabDir: PathFinder_getActiveTabDir,
 };
 exports.Finder = {
     allSelected() {
@@ -67,8 +68,7 @@ async function PathFinder_singleSelected() {
     }
     const firstFilePath = await (0, run_1.run)(() => {
         const app = Application('Path Finder');
-        const arr = (app.selection() || []).map((x) => x.posixPath());
-        return arr[0];
+        return (app.selection() || [])[0]?.posixPath();
     });
     return firstFilePath;
 }
@@ -78,6 +78,29 @@ async function PathFinder_setSelected(filePaths) {
         app.select(filePaths);
     }, filePaths);
 }
+/**
+ * 获取 activeTab dir, 当没有 selection 时可用,
+ * 要求只能有一个 visible window, 从 jxa 这一层无法区分 window z-index
+ */
+async function PathFinder_getActiveTabDir() {
+    if (!(await (0, app_1.isAppRunning)('Path Finder')))
+        return;
+    const visibleWindowCount = await (0, run_1.run)(() => {
+        const app = Application('Path Finder');
+        return app.finderWindows.whose({ visible: true }).length;
+    });
+    if (!visibleWindowCount)
+        return;
+    if (visibleWindowCount > 1) {
+        throw new Error('Multiple visible PathFinder window not supported in PathFinder_getActiveTabDir');
+    }
+    const dir = await (0, run_1.run)(() => {
+        const app = Application('Path Finder');
+        const w = app.finderWindows.whose({ visible: true })[0];
+        return w.target.posixPath();
+    });
+    return dir;
+}
 /* #endregion */
 /* #region Finder */
 async function Finder_allSelected() {
@@ -129,6 +152,8 @@ async function normalizeInputFileList(fileList) {
     }, (0, node_os_1.availableParallelism)())).flat());
 }
 /* #endregion */
-// ;(async () => {
-//   console.log(await normalizeInputFileList(['@pf']))
-// })()
+;
+(async () => {
+    console.log(await normalizeInputFileList(['@pf']));
+    console.log(await exports.PathFinder.getActiveTabDir());
+})();

package/package.json

@@ -1,29 +1,29 @@
 {
   "name": "mac-helper",
-  "version": "0.7.0",
-  "packageManager": "pnpm@10.32.1+sha512.a706938f0e89ac1456b6563eab4edf1d1faf3368d1191fc5c59790e96dc918e4456ab2e67d613de1043d2e8c81f87303e6b40d4ffeca9df15ef1ad567348f2be",
+  "version": "0.8.0",
+  "packageManager": "pnpm@11.1.3+sha512.c85357fe17ca12dd23dd7071822666dfd7e3cb76fe214e3370b5ea2fb34f2a231185509b63e717f3cd0acb38dd3f8d82bcd5e8172400ae678b70ea4fbed0896d",
   "description": "useful helper for macOS",
-  "keywords": [
-    "mac",
-    "helper",
-    "mac-helper"
-  ],
+  "author": "magicdawn",
   "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",
+  "bugs": {
+    "url": "https://github.com/magicdawn/mac-helper/issues"
+  },
+  "keywords": [
+    "mac",
+    "helper",
+    "mac-helper"
+  ],
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
   "files": [
     "lib/",
     "src/"
   ],
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
@@ -39,38 +39,29 @@
   },
   "dependencies": {
     "@jxa/run": "^1.4.0",
-    "es-toolkit": "^1.45.1",
+    "es-toolkit": "^1.46.1",
     "promise.map": "^1.1.3"
   },
   "devDependencies": {
     "@jxa/global-type": "^1.4.0",
     "@jxa/sdef-to-dts": "^1.4.0",
     "@jxa/types": "^1.4.0",
-    "@magicdawn/eslint-config": "^1.6.2",
+    "@magicdawn/eslint-config": "^1.6.5",
     "@magicdawn/prettier-config": "^0.1.0",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^25.5.0",
-    "@vitest/coverage-v8": "^4.1.0",
+    "@types/node": "^25.8.0",
+    "@vitest/coverage-v8": "^4.1.6",
     "delay": "^7.0.0",
-    "eslint": "^9.39.4",
+    "eslint": "^10.4.0",
     "eslint-config-prettier": "^10.1.8",
-    "fs-extra": "^11.3.4",
+    "fs-extra": "^11.3.5",
     "husky": "^9.1.7",
     "jxa-common-used": "^0.0.3",
-    "lint-staged": "^16.4.0",
-    "prettier": "^3.8.1",
+    "lint-staged": "^17.0.5",
+    "prettier": "^3.8.3",
     "should": "^13.2.3",
-    "typescript": "^5.9.3",
-    "vitest": "^4.1.0"
-  },
-  "pnpm": {
-    "onlyBuiltDependencies": [
-      "@swc/core",
-      "core-js",
-      "es5-ext",
-      "esbuild",
-      "unrs-resolver"
-    ]
+    "typescript": "^6.0.3",
+    "vitest": "^4.1.6"
   },
   "lint-staged": {
     "*.{js,jsx,ts,tsx,less,md}": [

package/src/chrome.ts

@@ -1,6 +1,6 @@
 import { run } from '@jxa/run'
-import type { GoogleChrome } from 'jxa-common-used'
 import { isAppRunning } from './app'
+import type { GoogleChrome } from 'jxa-common-used'
 
 export type ActiveTab = { url: string; title: string }
 

package/src/dialog.ts

@@ -59,7 +59,7 @@ async function chooseFromList(
   })
 
   if (!selected) return
-  const label = selected[0]
+  const label = (selected as any)[0]
 
   if (!usingOption) {
     return label
@@ -129,3 +129,4 @@ async function chooseMultipleFromList(
 //   .then((selected) => {
 //     console.log(selected)
 //   })
+// dialog.prompt('hello', 'world').then(console.log)

package/src/finder.ts

@@ -1,11 +1,11 @@
-import { run as jxaRun } from '@jxa/run'
-import { uniq } from 'es-toolkit'
-import type { PathFinder as PathFinderType } from 'jxa-common-used'
 import { availableParallelism } from 'node:os'
 import path from 'node:path'
 import { fileURLToPath } from 'node:url'
+import { run as jxaRun } from '@jxa/run'
+import { uniq } from 'es-toolkit'
 import pmap from 'promise.map'
 import { isAppRunning } from './app'
+import type { PathFinder as PathFinderType } from 'jxa-common-used'
 
 /**
  * `App` named epxorts
@@ -20,6 +20,7 @@ export const PathFinder = {
   setSelected(filePaths: string[]) {
     return PathFinder_setSelected(filePaths)
   },
+  getActiveTabDir: PathFinder_getActiveTabDir,
 }
 export const Finder = {
   allSelected() {
@@ -62,8 +63,7 @@ async function PathFinder_singleSelected(): Promise<string | undefined> {
   }
   const firstFilePath: string | undefined = await jxaRun(() => {
     const app = Application<PathFinderType>('Path Finder')
-    const arr = (app.selection() || []).map((x) => x.posixPath())
-    return arr[0]
+    return (app.selection() || [])[0]?.posixPath()
   })
   return firstFilePath
 }
@@ -74,6 +74,30 @@ async function PathFinder_setSelected(filePaths: string[]) {
     app.select(filePaths)
   }, filePaths)
 }
+
+/**
+ * 获取 activeTab dir, 当没有 selection 时可用,
+ * 要求只能有一个 visible window, 从 jxa 这一层无法区分 window z-index
+ */
+async function PathFinder_getActiveTabDir(): Promise<string | undefined> {
+  if (!(await isAppRunning('Path Finder'))) return
+
+  const visibleWindowCount: number = await jxaRun(() => {
+    const app = Application<PathFinderType>('Path Finder')
+    return app.finderWindows.whose({ visible: true }).length
+  })
+  if (!visibleWindowCount) return
+  if (visibleWindowCount > 1) {
+    throw new Error('Multiple visible PathFinder window not supported in PathFinder_getActiveTabDir')
+  }
+
+  const dir: string = await jxaRun(() => {
+    const app = Application<PathFinderType>('Path Finder')
+    const w = app.finderWindows.whose({ visible: true })[0]
+    return w.target.posixPath()
+  })
+  return dir
+}
 /* #endregion */
 
 /* #region Finder */
@@ -153,6 +177,7 @@ export async function normalizeInputFileList(fileList: string[]) {
 }
 /* #endregion */
 
-// ;(async () => {
-//   console.log(await normalizeInputFileList(['@pf']))
-// })()
+;(async () => {
+  console.log(await normalizeInputFileList(['@pf']))
+  console.log(await PathFinder.getActiveTabDir())
+})()