@legendapp/spark 0.0.1-next.2 → 0.0.1-next.3

package/vendor/node_modules/@legendapp/spark-message-dialog/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legendapp/spark-message-dialog",
-  "version": "0.0.1-next.2",
+  "version": "0.0.1-next.3",
   "license": "MIT",
   "main": "src/index.ts",
   "react-native": "src/index.ts",
@@ -40,7 +40,7 @@
     ]
   },
   "dependencies": {
-    "@legendapp/spark-desktop-app": "0.0.1-next.2"
+    "@legendapp/spark-desktop-app": "0.0.1-next.3"
   },
   "private": true
 }

package/vendor/node_modules/@legendapp/spark-message-dialog/src/NativeDesktopMessageDialog.ts

@@ -1,3 +1,3 @@
 import { TurboModuleRegistry, type TurboModule } from "react-native";
 export interface Spec extends TurboModule { call(method: string, args: string): Promise<string>; }
-export default TurboModuleRegistry.getEnforcing<Spec>("NativeDesktopMessageDialog");
+export default TurboModuleRegistry.get<Spec>("NativeDesktopMessageDialog");

package/vendor/node_modules/@legendapp/spark-message-dialog/src/index.ts

@@ -1,13 +1,50 @@
+import { Platform } from "react-native";
+import { SparkError, parseNativeResult, invokeNative, type Availability } from "@legendapp/spark-desktop-app/src/contracts";
 import Native from "./NativeDesktopMessageDialog";
-export type MessageOptions = { title: string; message?: string; kind?: "info" | "warning" | "error"; buttons?: string[]; defaultButton?: number; cancelButton?: number; windowId?: string; checkbox?: { label: string; checked?: boolean } };
-export async function showMessage(options: MessageOptions): Promise<{ button: number; checked: boolean }> {
-  const buttons = options.buttons ?? ["OK"];
-  if (!options.title || !buttons.length || buttons.length > 4 || buttons.some(value => typeof value !== "string" || !value)) throw new Error("Dialog needs a title and 1–4 named buttons");
-  for (const index of [options.defaultButton, options.cancelButton]) if (index !== undefined && (!Number.isInteger(index) || index < 0 || index >= buttons.length)) throw new Error("Dialog button index is out of bounds");
-  if (options.kind && !["info", "warning", "error"].includes(options.kind)) throw new Error("Invalid dialog kind");
-  return JSON.parse(await Native.call("show", JSON.stringify({ ...options, buttons })));
-}
-export async function confirm(message: string, options: { title?: string; windowId?: string } = {}) {
-  const result = await showMessage({ title: options.title ?? "Confirm", message, windowId: options.windowId, buttons: ["Cancel", "Continue"], defaultButton: 1, cancelButton: 0 });
-  return result.button === 1;
+export interface MessageDialogButton { id: string; label: string }
+export interface MessageDialogOptions {
+  title: string;
+  message?: string;
+  kind?: "info" | "warning" | "error";
+  buttons?: readonly MessageDialogButton[];
+  defaultButtonId?: string;
+  cancelButtonId?: string;
+  windowId?: string;
+  checkbox?: { label: string; checked?: boolean };
+}
+export interface MessageDialogResult {
+  /** null means the host dismissed the dialog without selecting a button. */
+  buttonId: string | null;
+  /** The checkbox's final state; present only when options.checkbox was supplied. */
+  checked?: boolean;
+}
+export interface ConfirmOptions { title?: string; windowId?: string }
+export function getMessageDialogAvailability(): Availability {
+  if (Platform.OS !== "macos" && Platform.OS !== "windows") return { available: false, reason: "unsupported-platform" };
+  return Native ? { available: true } : { available: false, reason: "missing-module" };
+}
+export async function showMessage(options: MessageDialogOptions): Promise<MessageDialogResult> {
+  if (!options || typeof options !== "object") throw new SparkError("E_INVALID_ARGUMENT", "Expected message dialog options");
+  for (const key of Object.keys(options)) if (!["title", "message", "kind", "buttons", "defaultButtonId", "cancelButtonId", "windowId", "checkbox"].includes(key)) throw new SparkError("E_UNSUPPORTED_OPTION", `Unsupported dialog option: ${key}`);
+  const buttons = options.buttons ?? [{ id: "ok", label: "OK" }];
+  const validString = (value: unknown): value is string => typeof value === "string" && !!value && !value.includes("\0");
+  if (!validString(options.title) || !Array.isArray(buttons) || !buttons.length || buttons.length > 4 || buttons.some(value => !value || !validString(value.id) || !validString(value.label))) throw new SparkError("E_INVALID_ARGUMENT", "Dialog needs a title and 1–4 buttons with IDs and labels");
+  const ids = buttons.map(button => button.id);
+  if (new Set(ids).size !== ids.length) throw new SparkError("E_INVALID_ARGUMENT", "Dialog button IDs must be unique");
+  for (const id of [options.defaultButtonId, options.cancelButtonId]) if (id !== undefined && !ids.includes(id)) throw new SparkError("E_INVALID_ARGUMENT", "Dialog button ID must identify a button");
+  if (options.kind !== undefined && !["info", "warning", "error"].includes(options.kind)) throw new SparkError("E_INVALID_ARGUMENT", "Invalid dialog kind");
+  if (options.windowId !== undefined && (typeof options.windowId !== "string" || !/^[a-zA-Z0-9_-]{1,100}$/.test(options.windowId))) throw new SparkError("E_INVALID_ARGUMENT", "Invalid owner window ID");
+  if (options.message !== undefined && typeof options.message !== "string") throw new SparkError("E_INVALID_ARGUMENT", "message must be a string");
+  if (options.checkbox !== undefined && (!options.checkbox || !validString(options.checkbox.label) || (options.checkbox.checked !== undefined && typeof options.checkbox.checked !== "boolean"))) throw new SparkError("E_INVALID_ARGUMENT", "Invalid checkbox options");
+  const availability = getMessageDialogAvailability();
+  if (!availability.available) throw new SparkError(availability.reason === "unsupported-platform" ? "E_UNSUPPORTED_PLATFORM" : "E_MODULE_UNAVAILABLE", "Message dialogs require a desktop host with NativeDesktopMessageDialog installed");
+  const { defaultButtonId, cancelButtonId, ...rest } = options;
+  const result = parseNativeResult(await invokeNative(() => Native!.call("show", JSON.stringify({ ...rest, buttons: buttons.map(button => button.label), defaultButton: defaultButtonId === undefined ? 0 : ids.indexOf(defaultButtonId), cancelButton: cancelButtonId === undefined ? undefined : ids.indexOf(cancelButtonId) }))), (value): value is { button: number; checked: boolean } => !!value && typeof value === "object" && "button" in value && Number.isInteger(value.button) && (value.button as number) >= -1 && (value.button as number) < buttons.length && "checked" in value && typeof value.checked === "boolean");
+  return { buttonId: result.button === -1 ? null : ids[result.button], ...(options.checkbox ? { checked: result.checked } : {}) };
+}
+export async function confirm(message: string, options: ConfirmOptions = {}): Promise<boolean> {
+  if (!options || typeof options !== "object" || Array.isArray(options)) throw new SparkError("E_INVALID_ARGUMENT", "Expected confirmation options");
+  for (const key of Object.keys(options)) if (!["title", "windowId"].includes(key)) throw new SparkError("E_UNSUPPORTED_OPTION", `Unsupported confirmation option: ${key}`);
+  const result = await showMessage({ title: options.title ?? "Confirm", message, windowId: options.windowId, buttons: [{ id: "cancel", label: "Cancel" }, { id: "continue", label: "Continue" }], defaultButtonId: "continue", cancelButtonId: "cancel" });
+  return result.buttonId === "continue";
 }