mac-helper 0.2.0 → 0.3.1

package/lib/dialog.d.ts

@@ -1,12 +1,14 @@
-import { StandardAdditions } from '@jxa/types';
+import type { StandardAdditions } from '@jxa/types';
+export declare const dialog: {
+    prompt: typeof prompt;
+    chooseFromList: typeof chooseFromList;
+    chooseMultipleFromList: typeof chooseMultipleFromList;
+};
+declare function prompt(label: string, defaultValue?: string): Promise<string>;
 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

@@ -2,6 +2,25 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dialog = void 0;
 const run_1 = require("@jxa/run");
+exports.dialog = {
+    prompt,
+    chooseFromList,
+    chooseMultipleFromList,
+};
+async function prompt(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) => {
         const app = Application.currentApplication();
@@ -59,10 +78,6 @@ async function chooseMultipleFromList(list, options = {}) {
         return valArr;
     }
 }
-exports.dialog = {
-    chooseFromList,
-    chooseMultipleFromList,
-};
 // dialog.chooseFromList(['hello', 'world']).then((selected) => {
 //   console.log(selected)
 // })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mac-helper",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "description": "useful helper for macOS",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -14,6 +14,7 @@
     "test:dev": "vitest --globals --testTimeout=30000",
     "test-cover": "vitest run --globals --coverage --testTimeout=30000",
     "dev": "tsc -w --incremental",
+    "typecheck": "tsc --noEmit",
     "build": "rm -rf lib; rm tsconfig.tsbuildinfo; tsc",
     "prepublishOnly": "pnpm test && pnpm build"
   },

package/src/dialog.ts

@@ -1,5 +1,27 @@
 import { run } from '@jxa/run'
-import { StandardAdditions } from '@jxa/types'
+import type { StandardAdditions } from '@jxa/types'
+
+export const dialog = {
+  prompt,
+  chooseFromList,
+  chooseMultipleFromList,
+}
+
+async function prompt(label: string, defaultValue = ''): Promise<string> {
+  // 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'
 
@@ -12,7 +34,7 @@ async function runOnCurrentApp(method: AppMethod, ...args: any[]) {
       return app[method]?.(...args)
     },
     method,
-    ...args
+    ...args,
   )
 }
 
@@ -20,7 +42,7 @@ type ChooseOption = { label: string; value: string }
 
 async function chooseFromList(
   list: string[] | ChooseOption[],
-  options: StandardAdditions.StandardAdditions.ChooseFromListOptionalParameter = {}
+  options: StandardAdditions.StandardAdditions.ChooseFromListOptionalParameter = {},
 ): Promise<string | undefined> {
   let usingOption = false
   let showList: string[] = []
@@ -49,7 +71,7 @@ async function chooseFromList(
 
 async function chooseMultipleFromList(
   list: string[] | ChooseOption[],
-  options: StandardAdditions.StandardAdditions.ChooseFromListOptionalParameter = {}
+  options: StandardAdditions.StandardAdditions.ChooseFromListOptionalParameter = {},
 ): Promise<string[]> {
   let usingOption = false
   let showList: string[] = []
@@ -71,17 +93,12 @@ async function chooseMultipleFromList(
     return selected as string[]
   } else {
     const valArr = (selected as string[]).map(
-      (label) => (list as ChooseOption[]).find((item) => item.label === label)!.value
+      (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)
 // })