mac-helper 0.6.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;
@@ -23,6 +29,7 @@ export type QSpaceFileItem = {
 export declare function isRepresentPF(file: string): boolean;
 export declare function isRepresentQS(file: string): boolean;
 /**
- * 处理 $PF $QS, ignore case
+ * 处理 `@pf` `@qs`, ignore case
  */
 export declare function normalizeInputFileList(fileList: string[]): Promise<string[]>;
+export {};

package/lib/finder.js

@@ -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() {
@@ -109,13 +132,13 @@ async function QSpace_allSelected() {
 /* #endregion */
 /* #region Top Level Helper */
 function isRepresentPF(file) {
-    return /^\$?pf$/i.test(file);
+    return /^[@$]?pf$/i.test(file);
 }
 function isRepresentQS(file) {
-    return /^\$?qs$/i.test(file);
+    return /^[@$]?qs$/i.test(file);
 }
 /**
- * 处理 $PF $QS, ignore case
+ * 处理 `@pf` `@qs`, ignore case
  */
 async function normalizeInputFileList(fileList) {
     return (0, es_toolkit_1.uniq)((await (0, promise_map_1.default)(fileList, async (f) => {
@@ -129,6 +152,8 @@ async function normalizeInputFileList(fileList) {
     }, (0, node_os_1.availableParallelism)())).flat());
 }
 /* #endregion */
-// ;(async () => {
-//   console.log(await getQSpaceSelected())
-// })()
+;
+(async () => {
+    console.log(await normalizeInputFileList(['@pf']));
+    console.log(await exports.PathFinder.getActiveTabDir());
+})();

package/package.json

@@ -1,29 +1,29 @@
 {
   "name": "mac-helper",
-  "version": "0.6.0",
-  "packageManager": "pnpm@10.28.2+sha512.41872f037ad22f7348e3b1debbaf7e867cfd448f2726d9cf74c08f19507c31d2c8e7a11525b983febc2df640b5438dee6023ebb1f84ed43cc2d654d2bc326264",
+  "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.44.0",
+    "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.1",
+    "@magicdawn/eslint-config": "^1.6.5",
     "@magicdawn/prettier-config": "^0.1.0",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^25.2.0",
-    "@vitest/coverage-v8": "^4.0.18",
+    "@types/node": "^25.8.0",
+    "@vitest/coverage-v8": "^4.1.6",
     "delay": "^7.0.0",
-    "eslint": "^9.39.2",
+    "eslint": "^10.4.0",
     "eslint-config-prettier": "^10.1.8",
-    "fs-extra": "^11.3.3",
+    "fs-extra": "^11.3.5",
     "husky": "^9.1.7",
     "jxa-common-used": "^0.0.3",
-    "lint-staged": "^16.2.7",
-    "prettier": "^3.8.1",
+    "lint-staged": "^17.0.5",
+    "prettier": "^3.8.3",
     "should": "^13.2.3",
-    "typescript": "^5.9.3",
-    "vitest": "^4.0.18"
-  },
-  "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

@@ -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 */
@@ -124,15 +148,15 @@ async function QSpace_allSelected() {
 
 /* #region Top Level Helper */
 export function isRepresentPF(file: string) {
-  return /^\$?pf$/i.test(file)
+  return /^[@$]?pf$/i.test(file)
 }
 
 export function isRepresentQS(file: string) {
-  return /^\$?qs$/i.test(file)
+  return /^[@$]?qs$/i.test(file)
 }
 
 /**
- * 处理 $PF $QS, ignore case
+ * 处理 `@pf` `@qs`, ignore case
  */
 export async function normalizeInputFileList(fileList: string[]) {
   return uniq(
@@ -153,6 +177,7 @@ export async function normalizeInputFileList(fileList: string[]) {
 }
 /* #endregion */
 
-// ;(async () => {
-//   console.log(await getQSpaceSelected())
-// })()
+;(async () => {
+  console.log(await normalizeInputFileList(['@pf']))
+  console.log(await PathFinder.getActiveTabDir())
+})()