mac-helper 0.0.3 → 0.0.4

package/lib/dialog.d.ts

@@ -0,0 +1,12 @@
+import { StandardAdditions } from '@jxa/types';
+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[]>;
+export declare const dialog: {
+    chooseFromList: typeof chooseFromList;
+    chooseMultipleFromList: typeof chooseMultipleFromList;
+};
+export {};

package/lib/dialog.js

@@ -0,0 +1,93 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.dialog = void 0;
+const run_1 = require("@jxa/run");
+async function runOnCurrentApp(method, ...args) {
+    return await (0, run_1.run)((method, ...args) => {
+        const app = Application.currentApplication();
+        app.includeStandardAdditions = true;
+        // @ts-ignore
+        return app[method]?.(...args);
+    }, method, ...args);
+}
+async function chooseFromList(list, options = {}) {
+    let usingOption = false;
+    let showList = [];
+    if (typeof list[0] === 'object') {
+        usingOption = true;
+        showList = list.map((l) => l.label);
+    }
+    else {
+        showList = list;
+    }
+    const selected = await runOnCurrentApp('chooseFromList', showList, {
+        multipleSelectionsAllowed: false,
+        ...options,
+    });
+    if (!selected)
+        return;
+    const label = selected[0];
+    if (!usingOption) {
+        return label;
+    }
+    else {
+        const val = list.find((item) => item.label === label)?.value;
+        return val;
+    }
+}
+async function chooseMultipleFromList(list, options = {}) {
+    let usingOption = false;
+    let showList = [];
+    if (typeof list[0] === 'object') {
+        usingOption = true;
+        showList = list.map((l) => l.label);
+    }
+    else {
+        showList = list;
+    }
+    const selected = await runOnCurrentApp('chooseFromList', showList, {
+        multipleSelectionsAllowed: true,
+        ...options,
+    });
+    if (!selected)
+        return [];
+    if (!usingOption) {
+        return selected;
+    }
+    else {
+        const valArr = selected.map((label) => list.find((item) => item.label === label).value);
+        return valArr;
+    }
+}
+exports.dialog = {
+    chooseFromList,
+    chooseMultipleFromList,
+};
+// 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)
+//   })

package/lib/finder.d.ts

@@ -0,0 +1,10 @@
+export declare function getPathFinderSelected(): Promise<string[]>;
+export declare function getFinderSelected(): Promise<string[]>;
+export declare const PathFinder: {
+    allSelected(): Promise<string[]>;
+    singleSelected(): Promise<string | undefined>;
+};
+export declare const Finder: {
+    allSelected(): Promise<string[]>;
+    singleSelected(): Promise<string | undefined>;
+};

package/lib/finder.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Finder = exports.PathFinder = exports.getFinderSelected = exports.getPathFinderSelected = void 0;
+const run_1 = require("@jxa/run");
+const url_1 = require("url");
+async function getPathFinderSelected() {
+    const filePaths = await (0, run_1.run)(() => {
+        const app = Application('Path Finder');
+        return (app.selection() || []).map((x) => x.posixPath());
+    });
+    return filePaths;
+}
+exports.getPathFinderSelected = getPathFinderSelected;
+async function getFinderSelected() {
+    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));
+}
+exports.getFinderSelected = getFinderSelected;
+exports.PathFinder = {
+    async allSelected() {
+        return getPathFinderSelected();
+    },
+    async singleSelected() {
+        return (await getPathFinderSelected())[0];
+    },
+};
+exports.Finder = {
+    async allSelected() {
+        return getFinderSelected();
+    },
+    async singleSelected() {
+        return (await getFinderSelected())[0];
+    },
+};
+// ;(async () => {
+//   console.log(await getPathFinderSelect())
+//   console.log(await getPathFinderSelects())
+// })()

package/lib/index.d.ts

@@ -1,6 +1,3 @@
-export declare function getPathFinderSelect(): Promise<string | null>;
-export declare function getPathFinderSelects(): Promise<string[]>;
-export declare const PathFinder: {
-    singleSelected(): Promise<string | null>;
-    allSelected(): Promise<string[]>;
-};
+export * from './finder';
+export * from './iterm';
+export * from './dialog';

package/lib/index.js

@@ -1,32 +1,21 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PathFinder = exports.getPathFinderSelects = exports.getPathFinderSelect = void 0;
-const run_1 = require("@jxa/run");
-async function getPathFinderSelect() {
-    const filePath = await (0, run_1.run)(() => {
-        const app = Application('Path Finder');
-        return app.selection()?.[0]?.posixPath() ?? null;
-    });
-    return filePath;
-}
-exports.getPathFinderSelect = getPathFinderSelect;
-async function getPathFinderSelects() {
-    const filePaths = await (0, run_1.run)(() => {
-        const app = Application('Path Finder');
-        return (app.selection() || []).map((x) => x.posixPath());
-    });
-    return filePaths;
-}
-exports.getPathFinderSelects = getPathFinderSelects;
-exports.PathFinder = {
-    singleSelected() {
-        return getPathFinderSelect();
-    },
-    allSelected() {
-        return getPathFinderSelects();
-    },
+/// <reference types='@jxa/global-type' />
+/// <reference types='@jxa/types' />
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
-// ;(async () => {
-//   console.log(await getPathFinderSelect())
-//   console.log(await getPathFinderSelects())
-// })()
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./finder"), exports);
+__exportStar(require("./iterm"), exports);
+__exportStar(require("./dialog"), exports);

package/lib/iterm.d.ts

@@ -0,0 +1,5 @@
+export declare function runInIterm(command: string): Promise<void>;
+export declare const iTerm: {
+    run: typeof runInIterm;
+    runInIterm: typeof runInIterm;
+};

package/lib/iterm.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.iTerm = exports.runInIterm = void 0;
+const run_1 = require("@jxa/run");
+async function runInIterm(command) {
+    await (0, run_1.run)((command) => {
+        const app = Application('iTerm');
+        app.includeStandardAdditions = true;
+        app.activate();
+        const tab = app.createTabWithDefaultProfile(app.currentWindow);
+        const sess = tab.currentSession;
+        app.write(sess, { text: command });
+    }, command);
+}
+exports.runInIterm = runInIterm;
+exports.iTerm = {
+    run: runInIterm,
+    runInIterm,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mac-helper",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "useful helper for macOS",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -14,7 +14,7 @@
     "test-cover": "nyc --reporter=lcov --reporter=text mocha",
     "dev": "tsc -w --incremental",
     "build": "rm -rf lib; rm tsconfig.tsbuildinfo; tsc",
-    "prepublishOnly": "pnpm build"
+    "prepublishOnly": "pnpm test && pnpm build"
   },
   "repository": {
     "type": "git",
@@ -39,20 +39,22 @@
     "@jxa/sdef-to-dts": "^1.3.6",
     "@jxa/types": "^1.3.6",
     "@magicdawn/prettier-config": "^0.0.2",
-    "@swc/core": "^1.3.19",
+    "@swc/core": "^1.3.40",
     "@types/fs-extra": "^11.0.1",
-    "@types/node": "^18.11.9",
-    "@typescript-eslint/eslint-plugin": "^5.44.0",
-    "@typescript-eslint/parser": "^5.44.0",
-    "eslint": "^8.28.0",
-    "eslint-config-prettier": "^8.5.0",
+    "@types/mocha": "^10.0.1",
+    "@types/node": "^18.15.3",
+    "@typescript-eslint/eslint-plugin": "^5.55.0",
+    "@typescript-eslint/parser": "^5.55.0",
+    "delay": "^5.0.0",
+    "eslint": "^8.36.0",
+    "eslint-config-prettier": "^8.7.0",
     "fs-extra": "^11.1.0",
-    "husky": "^8.0.2",
+    "husky": "^8.0.3",
     "jxa-common-used": "^0.0.2",
-    "lint-staged": "^13.0.3",
-    "mocha": "^10.1.0",
+    "lint-staged": "^13.2.0",
+    "mocha": "^10.2.0",
     "nyc": "^15.1.0",
-    "prettier": "^2.7.1",
+    "prettier": "^2.8.4",
     "should": "^13.2.3",
     "typescript": "^4.9.5"
   },

package/src/dialog.ts

@@ -0,0 +1,114 @@
+import { run } from '@jxa/run'
+import { StandardAdditions } from '@jxa/types'
+
+type AppMethod = 'chooseFromList'
+
+async function runOnCurrentApp(method: AppMethod, ...args: any[]) {
+  return await run(
+    (method: AppMethod, ...args: any[]) => {
+      const app = Application.currentApplication()
+      app.includeStandardAdditions = true
+      // @ts-ignore
+      return app[method]?.(...args)
+    },
+    method,
+    ...args
+  )
+}
+
+type ChooseOption = { label: string; value: string }
+
+async function chooseFromList(
+  list: string[] | ChooseOption[],
+  options: StandardAdditions.StandardAdditions.ChooseFromListOptionalParameter = {}
+): Promise<string | undefined> {
+  let usingOption = false
+  let showList: string[] = []
+  if (typeof list[0] === 'object') {
+    usingOption = true
+    showList = (list as ChooseOption[]).map((l) => l.label)
+  } else {
+    showList = list as string[]
+  }
+
+  const selected = await runOnCurrentApp('chooseFromList', showList, {
+    multipleSelectionsAllowed: false,
+    ...options,
+  })
+
+  if (!selected) return
+  const label = selected[0]
+
+  if (!usingOption) {
+    return label
+  } else {
+    const val = (list as ChooseOption[]).find((item) => item.label === label)?.value
+    return val
+  }
+}
+
+async function chooseMultipleFromList(
+  list: string[] | ChooseOption[],
+  options: StandardAdditions.StandardAdditions.ChooseFromListOptionalParameter = {}
+): Promise<string[]> {
+  let usingOption = false
+  let showList: string[] = []
+  if (typeof list[0] === 'object') {
+    usingOption = true
+    showList = (list as ChooseOption[]).map((l) => l.label)
+  } else {
+    showList = list as string[]
+  }
+
+  const selected = await runOnCurrentApp('chooseFromList', showList, {
+    multipleSelectionsAllowed: true,
+    ...options,
+  })
+
+  if (!selected) return []
+
+  if (!usingOption) {
+    return selected as string[]
+  } else {
+    const valArr = (selected as string[]).map(
+      (label) => (list as ChooseOption[]).find((item) => item.label === label)!.value
+    )
+    return valArr
+  }
+}
+
+export const dialog = {
+  chooseFromList,
+  chooseMultipleFromList,
+}
+
+// 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)
+//   })

package/src/finder.ts

@@ -0,0 +1,43 @@
+import { run as jxaRun } from '@jxa/run'
+import { type PathFinder as PathFinderType } from 'jxa-common-used'
+import { fileURLToPath } from 'url'
+
+export async function getPathFinderSelected() {
+  const filePaths: string[] = await jxaRun(() => {
+    const app = Application<PathFinderType>('Path Finder')
+    return (app.selection() || []).map((x) => x.posixPath())
+  })
+  return filePaths
+}
+
+export async function getFinderSelected() {
+  const urls: string[] = await jxaRun(() => {
+    const app = Application('Finder')
+    const selection = app.selection()
+    return (selection || []).map((x) => x.url())
+  })
+  return urls.map((u) => fileURLToPath(u))
+}
+
+export const PathFinder = {
+  async allSelected() {
+    return getPathFinderSelected()
+  },
+  async singleSelected(): Promise<string | undefined> {
+    return (await getPathFinderSelected())[0]
+  },
+}
+
+export const Finder = {
+  async allSelected() {
+    return getFinderSelected()
+  },
+  async singleSelected(): Promise<string | undefined> {
+    return (await getFinderSelected())[0]
+  },
+}
+
+// ;(async () => {
+//   console.log(await getPathFinderSelect())
+//   console.log(await getPathFinderSelects())
+// })()

package/src/index.ts

@@ -1,31 +1,6 @@
-import { run as jxaRun } from '@jxa/run'
-import { type PathFinder as PathFinderType } from 'jxa-common-used'
+/// <reference types='@jxa/global-type' />
+/// <reference types='@jxa/types' />
 
-export async function getPathFinderSelect() {
-  const filePath: string | null = await jxaRun(() => {
-    const app = Application<PathFinderType>('Path Finder')
-    return app.selection()?.[0]?.posixPath() ?? null
-  })
-  return filePath
-}
-
-export async function getPathFinderSelects() {
-  const filePaths: string[] = await jxaRun(() => {
-    const app = Application<PathFinderType>('Path Finder')
-    return (app.selection() || []).map((x) => x.posixPath())
-  })
-  return filePaths
-}
-
-export const PathFinder = {
-  singleSelected() {
-    return getPathFinderSelect()
-  },
-  allSelected() {
-    return getPathFinderSelects()
-  },
-}
-// ;(async () => {
-//   console.log(await getPathFinderSelect())
-//   console.log(await getPathFinderSelects())
-// })()
+export * from './finder'
+export * from './iterm'
+export * from './dialog'

package/src/iterm.ts

@@ -0,0 +1,19 @@
+import { run } from '@jxa/run'
+import { iTerm2 } from 'jxa-common-used'
+
+export async function runInIterm(command: string) {
+  await run((command) => {
+    const app = Application<iTerm2>('iTerm')
+    app.includeStandardAdditions = true
+    app.activate()
+
+    const tab = app.createTabWithDefaultProfile(app.currentWindow)
+    const sess = tab.currentSession
+    app.write(sess, { text: command })
+  }, command)
+}
+
+export const iTerm = {
+  run: runInIterm,
+  runInIterm,
+}