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

package/vendor/node_modules/@legendapp/spark-drag-drop/windows/SparkDragDrop/SparkDragDrop.h

@@ -78,7 +78,11 @@ struct DragView : implements<DragView, Windows::Foundation::IInspectable> {
     }
     return Operation::None;
   }
-  void Fail(hresult_error const &error) { failure = to_string(error.message()); Json::JsonObject value; value.SetNamedValue(L"message", Json::JsonValue::CreateStringValue(error.message())); Emit(L"unavailable", value); }
+  void Fail(hresult_error const &error, bool unavailable = false) {
+    if (unavailable) failure = to_string(error.message());
+    Json::JsonObject value; value.SetNamedValue(L"message", Json::JsonValue::CreateStringValue(error.message()));
+    value.SetNamedValue(L"unavailable", Json::JsonValue::CreateBooleanValue(unavailable)); Emit(L"error", value);
+  }
   fire_and_forget Start(Microsoft::UI::Input::PointerPoint point, Composition::Input::Pointer pointer) {
     auto keepAlive = get_strong();
     Operation resultOperation = Operation::None;
@@ -103,7 +107,7 @@ struct DragView : implements<DragView, Windows::Foundation::IInspectable> {
         data.SetStorageItems(items);
       }
       if (mounted && !disabled && root == session) resultOperation = co_await operation.StartAsync(session->manager, point);
-    } catch (hresult_error const &error) { /* Failed or cancelled sources report accepted=false. */ }
+    } catch (hresult_error const &error) { if (error.code() != E_ABORT && error.code() != HRESULT_FROM_WIN32(ERROR_CANCELLED)) Fail(error); }
     if (auto strong = view.get()) strong.ReleasePointerCapture(pointer);
     if (operation) { try { operation.Close(); } catch (...) {} operation = nullptr; }
     dragging = false; Json::JsonObject result; result.SetNamedValue(L"accepted", Json::JsonValue::CreateBooleanValue(resultOperation != Operation::None)); result.SetNamedValue(L"operation", Json::JsonValue::CreateStringValue(OperationName(resultOperation))); Emit(L"dragEnd", result);
@@ -146,8 +150,9 @@ struct DropTarget : implements<DropTarget, Drag::IDropOperationTarget> {
   DropTarget(std::shared_ptr<RootState> value) : root(std::move(value)) {}
   IAsyncOperation<Operation> OverAsync(Drag::DragInfo info, Drag::DragUIOverride) {
     auto keepAlive = get_strong(); co_await root->ui;
+    com_ptr<DragView> target;
     try {
-      auto target = root->Target(info.Position());
+      target = root->Target(info.Position());
       auto operation = target ? target->Accept(info) : Operation::None;
       if (operation == Operation::None) target = nullptr;
       auto previous = current.get();
@@ -160,19 +165,20 @@ struct DropTarget : implements<DropTarget, Drag::IDropOperationTarget> {
       over.SetNamedValue(L"x", Json::JsonValue::CreateNumberValue(point.X)); over.SetNamedValue(L"y", Json::JsonValue::CreateNumberValue(point.Y));
       over.SetNamedValue(L"operation", Json::JsonValue::CreateStringValue(OperationName(operation))); target->Emit(L"dragOver", over);
       co_return operation;
-    } catch (...) { co_return Operation::None; }
+    } catch (hresult_error const &error) { if (target) target->Fail(error); co_return Operation::None; }
   }
   IAsyncOperation<Operation> EnterAsync(Drag::DragInfo info, Drag::DragUIOverride ui) { return OverAsync(info, ui); }
   IAsyncAction LeaveAsync(Drag::DragInfo) { auto keepAlive = get_strong(); co_await root->ui; if (auto previous = current.get()) previous->Emit(L"dragLeave"); current = {}; co_return; }
   IAsyncOperation<Operation> DropAsync(Drag::DragInfo info) {
     auto keepAlive = get_strong(); co_await root->ui;
+    com_ptr<DragView> target;
     try {
-      auto target = root->Target(info.Position());
+      target = root->Target(info.Position());
       auto operation = target ? target->Accept(info) : Operation::None; if (operation == Operation::None) co_return operation;
       auto payload = co_await Payload(info, target->Local(info.Position()), target->Types(), operation);
       if (target->Accept(info) != operation) co_return Operation::None;
       target->Emit(L"drop", payload); current = {}; co_return operation;
-    } catch (...) { co_return Operation::None; }
+    } catch (hresult_error const &error) { if (target) target->Fail(error); co_return Operation::None; }
   }
 };
 inline std::shared_ptr<RootState> ForRoot(Composition::RootComponentView const &root) {
@@ -189,7 +195,7 @@ inline void Register(React::IReactPackageBuilder const &package) {
     builder.SetCreateProps([](React::ViewProps const &view, React::IComponentProps const &previous) { auto props = make_self<Props>(); if (previous) { auto old = get_self<Props>(previous); props->source = old->source; props->options = old->options; props->disabled = old->disabled; } props->view = view; return props.as<React::IComponentProps>(); });
     builder.as<Composition::IReactCompositionViewComponentBuilder>().SetViewComponentViewInitializer([](Composition::ViewComponentView const &view) {
       auto state = make_self<DragView>(); state->view = view; view.UserData(state.as<Windows::Foundation::IInspectable>()); auto weak = state->get_weak();
-      view.Mounted([weak](auto const &, React::ComponentView const &) { if (auto self = weak.get()) try { self->mounted = true; auto view = self->view.get(); self->root = ForRoot(view.Root()); self->root->views[view.Tag()] = self->get_weak(); } catch (hresult_error const &error) { self->Fail(error); } });
+      view.Mounted([weak](auto const &, React::ComponentView const &) { if (auto self = weak.get()) try { self->mounted = true; auto view = self->view.get(); self->root = ForRoot(view.Root()); self->root->views[view.Tag()] = self->get_weak(); } catch (hresult_error const &error) { self->Fail(error, true); } });
       view.Unmounted([weak](auto const &, auto const &) { if (auto self = weak.get()) self->Close(); });
       view.Destroying([weak](auto const &, auto const &) { if (auto self = weak.get()) self->Close(true); });
       view.PointerPressed([weak](auto const &, Composition::Input::PointerRoutedEventArgs const &args) { if (auto self = weak.get(); self && !args.Handled() && !self->disabled && !self->source.empty()) { auto point = args.GetCurrentPoint(self->view.get().Tag()); self->pressed = point.Properties().IsLeftButtonPressed(); self->origin = point.Position(); } });
@@ -203,7 +209,7 @@ inline void Register(React::IReactPackageBuilder const &package) {
       });
     });
     builder.SetUpdatePropsHandler([](React::ComponentView const &view, React::IComponentProps const &props, React::IComponentProps const &) { auto state = get_self<DragView>(view.UserData()); auto value = get_self<Props>(props); state->source = value->source; state->options = value->options; state->disabled = value->disabled; });
-    builder.SetUpdateEventEmitterHandler([](React::ComponentView const &view, React::EventEmitter const &emitter) { auto state = get_self<DragView>(view.UserData()); state->emitter = emitter; if (!state->failure.empty()) { Json::JsonObject error; error.SetNamedValue(L"message", Json::JsonValue::CreateStringValue(to_hstring(state->failure))); state->Emit(L"unavailable", error); } });
+    builder.SetUpdateEventEmitterHandler([](React::ComponentView const &view, React::EventEmitter const &emitter) { auto state = get_self<DragView>(view.UserData()); state->emitter = emitter; if (!state->failure.empty()) { Json::JsonObject error; error.SetNamedValue(L"message", Json::JsonValue::CreateStringValue(to_hstring(state->failure))); error.SetNamedValue(L"unavailable", Json::JsonValue::CreateBooleanValue(true)); state->Emit(L"error", error); } });
   });
 }
 }

package/vendor/node_modules/@legendapp/spark-file-dialog/ios/RNFileDialog.mm

@@ -47,6 +47,12 @@ RCT_EXPORT_MODULE(NativeFileDialog)
   RCTExecuteOnMainQueue(^{
     if (self.activePanel) { reject(@"E_BUSY", @"A file dialog is already open", nil); return; }
     NSDictionary *options = [self parseObjectJSON:optionsJson];
+    NSWindow *parent = nil;
+    if (options[@"windowId"]) {
+      for (NSWindow *candidate in NSApp.windows) if ([candidate.identifier isEqual:options[@"windowId"]] || [candidate.identifier isEqual:[@"spark." stringByAppendingString:options[@"windowId"]]]) { parent = candidate; break; }
+      if (!parent) { reject(@"E_NOT_FOUND", @"Dialog owner does not exist", nil); return; }
+      if (parent.attachedSheet) { reject(@"E_BUSY", @"Dialog owner already has a sheet", nil); return; }
+    }
     NSOpenPanel *panel = [NSOpenPanel openPanel];
     self.activePanel = panel;
     panel.canChooseFiles = options[@"canChooseFiles"] ? [options[@"canChooseFiles"] boolValue] : YES;
@@ -84,13 +90,15 @@ RCT_EXPORT_MODULE(NativeFileDialog)
       }
     }
 
-    [panel beginWithCompletionHandler:^(NSModalResponse result) {
+    void (^complete)(NSModalResponse) = ^(NSModalResponse result) {
       self.activePanel = nil;
       if (result != NSModalResponseOK) { resolve(@"null"); return; }
       NSMutableArray<NSString *> *paths = [NSMutableArray arrayWithCapacity:panel.URLs.count];
       for (NSURL *url in panel.URLs) if (url.path.length > 0) [paths addObject:url.path];
       resolve([self jsonStringFromObject:paths]);
-    }];
+    };
+    if (parent) [panel beginSheetModalForWindow:parent completionHandler:complete];
+    else [panel beginWithCompletionHandler:complete];
   });
 #else
   resolve(@"null");
@@ -103,34 +111,51 @@ RCT_EXPORT_MODULE(NativeFileDialog)
   RCTExecuteOnMainQueue(^{
     if (self.activePanel) { reject(@"E_BUSY", @"A file dialog is already open", nil); return; }
     NSDictionary *options = [self parseObjectJSON:optionsJson];
+    NSWindow *parent = nil;
+    if (options[@"windowId"]) {
+      for (NSWindow *candidate in NSApp.windows) if ([candidate.identifier isEqual:options[@"windowId"]] || [candidate.identifier isEqual:[@"spark." stringByAppendingString:options[@"windowId"]]]) { parent = candidate; break; }
+      if (!parent) { reject(@"E_NOT_FOUND", @"Dialog owner does not exist", nil); return; }
+      if (parent.attachedSheet) { reject(@"E_BUSY", @"Dialog owner already has a sheet", nil); return; }
+    }
     NSSavePanel *panel = [NSSavePanel savePanel];
     self.activePanel = panel;
     panel.canCreateDirectories = YES;
     panel.showsTagField = NO;
 
-    NSString *defaultName = [options[@"defaultName"] isKindOfClass:[NSString class]] ? options[@"defaultName"] : nil;
-    if (defaultName.length > 0) {
-      panel.nameFieldStringValue = defaultName;
-    }
+    NSString *defaultName = [options[@"defaultName"] isKindOfClass:[NSString class]] && [(NSString *)options[@"defaultName"] length] > 0 ? options[@"defaultName"] : nil;
 
     NSArray *allowedFileTypes = [options[@"allowedFileTypes"] isKindOfClass:[NSArray class]] ? options[@"allowedFileTypes"] : nil;
     if (allowedFileTypes.count > 0) {
       panel.allowedFileTypes = allowedFileTypes;
     }
 
+    // defaultPath may name a file: a live directory starts the panel, otherwise the
+    // last component suggests the name (an explicit defaultName wins) and the parent starts it.
     NSString *directory = [options[@"directory"] isKindOfClass:[NSString class]] ? options[@"directory"] : nil;
     if (directory.length > 0) {
-      panel.directoryURL = [NSURL fileURLWithPath:directory isDirectory:YES];
+      BOOL isDirectory = NO;
+      if ([[NSFileManager defaultManager] fileExistsAtPath:directory isDirectory:&isDirectory] && isDirectory) {
+        panel.directoryURL = [NSURL fileURLWithPath:directory isDirectory:YES];
+      } else {
+        NSString *parent = [directory stringByDeletingLastPathComponent];
+        if (defaultName.length == 0) defaultName = [directory lastPathComponent];
+        if (parent.length > 0) panel.directoryURL = [NSURL fileURLWithPath:parent isDirectory:YES];
+      }
+    }
+    if (defaultName.length > 0) {
+      panel.nameFieldStringValue = defaultName;
     }
 
-    [panel beginWithCompletionHandler:^(NSModalResponse result) {
+    void (^complete)(NSModalResponse) = ^(NSModalResponse result) {
       self.activePanel = nil;
       if (result == NSModalResponseOK && panel.URL.path.length > 0) {
         resolve([self jsonStringFromObject:panel.URL.path]);
       } else {
         resolve(@"null");
       }
-    }];
+    };
+    if (parent) [panel beginSheetModalForWindow:parent completionHandler:complete];
+    else [panel beginWithCompletionHandler:complete];
   });
 #else
   resolve(@"null");
@@ -144,116 +169,4 @@ RCT_EXPORT_MODULE(NativeFileDialog)
 #endif
 }
 
-- (void)revealInFinder:(NSString *)path resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject
-{
-#if TARGET_OS_OSX
-  RCTExecuteOnMainQueue(^{
-    if (path.length == 0) {
-      resolve(@NO);
-      return;
-    }
-
-    NSString *expandedPath = [path stringByExpandingTildeInPath];
-    NSURL *inputURL = [NSURL URLWithString:expandedPath];
-    NSURL *fileURL = inputURL.isFileURL ? inputURL : [NSURL fileURLWithPath:expandedPath];
-    if (!fileURL.path.length || ![[NSFileManager defaultManager] fileExistsAtPath:fileURL.path]) {
-      resolve(@NO);
-      return;
-    }
-
-    [[NSWorkspace sharedWorkspace] activateFileViewerSelectingURLs:@[fileURL]];
-    resolve(@YES);
-  });
-#else
-  resolve(@NO);
-#endif
-}
-
-- (void)readTextFile:(NSString *)path resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject
-{
-#if TARGET_OS_OSX
-  RCTExecuteOnMainQueue(^{
-    if (path.length == 0) {
-      reject(@"invalid_path", @"Cannot read file without a path.", nil);
-      return;
-    }
-
-    NSString *expandedPath = [path stringByExpandingTildeInPath];
-    NSError *error = nil;
-    NSString *contents = [NSString stringWithContentsOfFile:expandedPath encoding:NSUTF8StringEncoding error:&error];
-    if (!contents) {
-      reject(@"read_failed", error.localizedDescription ?: @"Failed to read file.", error);
-      return;
-    }
-
-    resolve(contents);
-  });
-#else
-  resolve(@"");
-#endif
-}
-
-- (void)writeTextFile:(NSString *)path contents:(NSString *)contents resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject
-{
-#if TARGET_OS_OSX
-  RCTExecuteOnMainQueue(^{
-    if (path.length == 0) {
-      reject(@"invalid_path", @"Cannot write file without a path.", nil);
-      return;
-    }
-
-    NSString *expandedPath = [path stringByExpandingTildeInPath];
-    NSError *error = nil;
-    BOOL ok = [contents writeToFile:expandedPath atomically:YES encoding:NSUTF8StringEncoding error:&error];
-    if (!ok) {
-      reject(@"write_failed", error.localizedDescription ?: @"Failed to write file.", error);
-      return;
-    }
-
-    resolve(nil);
-  });
-#else
-  resolve(nil);
-#endif
-}
-
-- (void)writeTextFileIfUnchanged:(NSString *)path
-                expectedContents:(NSString *)expectedContents
-                        contents:(NSString *)contents
-                         resolve:(RCTPromiseResolveBlock)resolve
-                          reject:(RCTPromiseRejectBlock)reject
-{
-#if TARGET_OS_OSX
-  RCTExecuteOnMainQueue(^{
-    if (path.length == 0) {
-      reject(@"invalid_path", @"Cannot write file without a path.", nil);
-      return;
-    }
-
-    NSString *expandedPath = [path stringByExpandingTildeInPath];
-    NSError *readError = nil;
-    NSString *currentContents = [NSString stringWithContentsOfFile:expandedPath encoding:NSUTF8StringEncoding error:&readError];
-    if (!currentContents) {
-      reject(@"read_failed", readError.localizedDescription ?: @"Failed to read file.", readError);
-      return;
-    }
-    if (![currentContents isEqualToString:expectedContents ?: @""]) {
-      resolve(@NO);
-      return;
-    }
-
-    NSError *writeError = nil;
-    BOOL ok = [contents writeToFile:expandedPath atomically:YES encoding:NSUTF8StringEncoding error:&writeError];
-    if (!ok) {
-      reject(@"write_failed", writeError.localizedDescription ?: @"Failed to write file.", writeError);
-      return;
-    }
-
-    resolve(@YES);
-  });
-#else
-  resolve(@NO);
-#endif
-}
-
 @end

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

@@ -1,6 +1,6 @@
 {
   "name": "@legendapp/spark-file-dialog",
-  "version": "0.0.1-next.2",
+  "version": "0.0.1-next.4",
   "main": "src/index",
   "react-native": "src/index",
   "codegenConfig": {
@@ -13,7 +13,8 @@
     "ios": {
       "modulesProvider": {
         "NativeFileDialog": "RNFileDialog"
-      }
+      },
+      "componentProvider": {}
     }
   },
   "peerDependencies": {
@@ -25,7 +26,8 @@
     "src",
     "ios",
     "*.podspec",
-    "windows"
+    "windows",
+    "macos"
   ],
   "spark": {
     "sdk": true,
@@ -37,7 +39,12 @@
       "macos",
       "windows"
     ],
-    "requires": []
+    "requires": [
+      "@legendapp/spark-desktop-app"
+    ]
   },
-  "private": true
+  "private": true,
+  "dependencies": {
+    "@legendapp/spark-desktop-app": "0.0.1-next.4"
+  }
 }

package/vendor/node_modules/@legendapp/spark-file-dialog/src/NativeFileDialog.ts

@@ -3,11 +3,7 @@ import { TurboModuleRegistry } from "react-native";
 
 export interface Spec extends TurboModule {
   open(optionsJson: string): Promise<string>;
-  readTextFile(path: string): Promise<string>;
   save(optionsJson: string): Promise<string>;
-  revealInFinder(path: string): Promise<boolean>;
-  writeTextFile(path: string, contents: string): Promise<void>;
-  writeTextFileIfUnchanged(path: string, expectedContents: string, contents: string): Promise<boolean>;
 }
 
-export default TurboModuleRegistry.getEnforcing<Spec>("NativeFileDialog");
+export default TurboModuleRegistry.get<Spec>("NativeFileDialog");

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

@@ -1,89 +1,24 @@
-import { validateDialogOptions } from "./options";
+import { absolutePath } from "@legendapp/spark-desktop-app/src/contracts/path";
 import { Platform } from "react-native";
-import NativeFileDialog from "./NativeFileDialog";
-
-export type FileDialogOpenOptions = {
-  canChooseFiles?: boolean;
-  canChooseDirectories?: boolean;
-  allowsMultipleSelection?: boolean;
-  directoryURL?: string | null;
-  allowedFileTypes?: string[];
-  message?: string;
-  prompt?: string;
-  title?: string;
-};
-
-export type FileDialogSaveOptions = {
-  defaultName?: string;
-  directory?: string;
-  allowedFileTypes?: string[];
-};
-
-function parseJsonResult<T>(value: string, fallback: T): T {
-  if (!value) {
-    return fallback;
-  }
-
-  try {
-    return JSON.parse(value) as T;
-  } catch {
-    return fallback;
-  }
+import { parseNativeResult, invokeNative } from "@legendapp/spark-desktop-app/src/contracts";
+import { dialogOptions } from "./options";
+import { fileDialogNative } from "./native";
+import type { OpenFileDialogOptions, OpenFileDialogResult, SaveFileDialogOptions, SaveFileDialogResult } from "./types";
+export type { FileFilter, FileDialogOptions, OpenFileDialogOptions, OpenFileDialogResult, SaveFileDialogOptions, SaveFileDialogResult } from "./types";
+export { getFileDialogAvailability } from "./native";
+
+function isNativePath(value: unknown): value is string {
+  if (typeof value !== "string" || value.startsWith("file://")) return false;
+  try { absolutePath(value, Platform.OS); return true; } catch { return false; }
 }
 
-export async function openFileDialog(options: FileDialogOpenOptions = {}) {
-  validateDialogOptions(options, false);
-  if (Platform.OS !== "macos") {
-    return null;
-  }
-
-  const result = await NativeFileDialog.open(JSON.stringify(options));
-  return parseJsonResult<string[] | null>(result, null);
+export async function openFileDialog(options: OpenFileDialogOptions = {}): Promise<OpenFileDialogResult> {
+  const args = dialogOptions(options, "open", Platform.OS);
+  const paths = parseNativeResult(await invokeNative(() => fileDialogNative().open(JSON.stringify(args))), (value): value is string[] | null => value === null || (Array.isArray(value) && value.length > 0 && value.every(isNativePath)));
+  return paths === null ? { canceled: true } : { canceled: false, paths };
 }
-
-export async function saveFileDialog(options: FileDialogSaveOptions = {}) {
-  validateDialogOptions(options, false);
-  if (Platform.OS !== "macos") {
-    return null;
-  }
-
-  const result = await NativeFileDialog.save(JSON.stringify(options));
-  return parseJsonResult<string | null>(result, null);
+export async function saveFileDialog(options: SaveFileDialogOptions = {}): Promise<SaveFileDialogResult> {
+  const args = dialogOptions(options, "save", Platform.OS);
+  const path = parseNativeResult(await invokeNative(() => fileDialogNative().save(JSON.stringify(args))), (value): value is string | null => value === null || isNativePath(value));
+  return path === null ? { canceled: true } : { canceled: false, path };
 }
-
-export function revealInFinder(path: string) {
-  if (Platform.OS !== "macos") {
-    return Promise.resolve(false);
-  }
-
-  return NativeFileDialog.revealInFinder(path);
-}
-
-export function readTextFile(path: string) {
-  if (Platform.OS !== "macos") {
-    return Promise.resolve("");
-  }
-
-  return NativeFileDialog.readTextFile(path);
-}
-
-export function writeTextFile(path: string, contents: string) {
-  if (Platform.OS !== "macos") {
-    return Promise.resolve();
-  }
-
-  return NativeFileDialog.writeTextFile(path, contents);
-}
-
-export function writeTextFileIfUnchanged(path: string, expectedContents: string, contents: string) {
-  if (Platform.OS !== "macos") {
-    return Promise.resolve(false);
-  }
-
-  return NativeFileDialog.writeTextFileIfUnchanged(path, expectedContents, contents);
-}
-
-export { default as NativeFileDialog } from "./NativeFileDialog";
-
-/** Reveal a file in the platform file manager (Finder or Explorer). */
-export const revealInFileManager = revealInFinder;

package/vendor/node_modules/@legendapp/spark-file-dialog/src/native.ts

@@ -0,0 +1,12 @@
+import { Platform } from "react-native";
+import { SparkError, type Availability } from "@legendapp/spark-desktop-app/src/contracts";
+import Native from "./NativeFileDialog";
+export function getFileDialogAvailability(): Availability {
+  if (Platform.OS !== "macos" && Platform.OS !== "windows") return { available: false, reason: "unsupported-platform" };
+  return Native ? { available: true } : { available: false, reason: "missing-module" };
+}
+export function fileDialogNative() {
+  const availability = getFileDialogAvailability();
+  if (!availability.available) throw new SparkError(availability.reason === "unsupported-platform" ? "E_UNSUPPORTED_PLATFORM" : "E_MODULE_UNAVAILABLE", "File dialogs require a desktop host with NativeFileDialog installed");
+  return Native!;
+}

package/vendor/node_modules/@legendapp/spark-file-dialog/src/options.ts

@@ -1,16 +1,36 @@
-import type { FileDialogOpenOptions, FileDialogSaveOptions } from "./index";
-function invalid(message: string, code = "E_INVALID_ARGUMENT"): never { throw Object.assign(new Error(message), { code }); }
-export function validateDialogOptions(options: FileDialogOpenOptions | FileDialogSaveOptions, windows: boolean) {
-  for (const [name, value] of Object.entries(options)) {
-    if (value === undefined || value === null) continue;
-    if (["canChooseFiles", "canChooseDirectories", "allowsMultipleSelection"].includes(name)) {
-      if (typeof value !== "boolean") invalid(`${name} must be boolean`);
-    } else if (name === "allowedFileTypes") {
-      if (!Array.isArray(value) || value.some(type => typeof type !== "string" || !type || /[\0*;\\/]/.test(type))) invalid("Invalid file type filter");
-    } else if (!["directoryURL", "directory", "prompt", "message", "title", "defaultName"].includes(name) || typeof value !== "string" || value.includes("\0")) invalid(`Invalid dialog option: ${name}`);
+import { SparkError } from "@legendapp/spark-desktop-app/src/contracts";
+import { nativePath } from "@legendapp/spark-desktop-app/src/contracts/path";
+import type { OpenFileDialogOptions, SaveFileDialogOptions } from "./types";
+
+export function dialogOptions(options: OpenFileDialogOptions | SaveFileDialogOptions, kind: "open" | "save", platform: string) {
+  if (!options || typeof options !== "object" || Array.isArray(options)) throw new SparkError("E_INVALID_ARGUMENT", "Expected dialog options");
+  const allowed = new Set(["windowId", "defaultPath", "filters", ...(kind === "open" ? ["selection", "multiple", "title", "message", "prompt", "macos"] : ["defaultName"])]);
+  for (const [key, value] of Object.entries(options)) {
+    if (!allowed.has(key)) throw new SparkError("E_UNSUPPORTED_OPTION", `Unsupported dialog option: ${key}`);
+    if (value === undefined) continue;
+    if (["defaultPath", "title", "message", "prompt", "defaultName"].includes(key) && (typeof value !== "string" || value.includes("\0"))) throw new SparkError("E_INVALID_ARGUMENT", `${key} must be a string without NUL characters`);
   }
-  const open = options as FileDialogOpenOptions;
-  if (open.canChooseFiles === false && !open.canChooseDirectories) invalid("Choose files or directories");
-  if (windows && open.canChooseDirectories && open.canChooseFiles !== false)
-    invalid("Windows cannot select files and directories together; set canChooseFiles: false for folders", "E_UNSUPPORTED_OPTION");
+  if (options.windowId !== undefined && (typeof options.windowId !== "string" || !/^[a-zA-Z0-9_-]{1,100}$/.test(options.windowId))) throw new SparkError("E_INVALID_ARGUMENT", "Invalid dialog owner window ID");
+  const windowId = options.windowId;
+  // defaultPath may name a file for save dialogs. Only native hosts can tell a
+  // live directory from a proposed filename, so JS forwards the decoded path and
+  // each bridge splits it: the file part suggests defaultName unless one is given.
+  const directory = options.defaultPath === undefined ? undefined : nativePath(options.defaultPath, platform);
+  let filters: { name?: string; extensions: string[] }[] | undefined;
+  if (options.filters !== undefined) {
+    if (!Array.isArray(options.filters)) throw new SparkError("E_INVALID_ARGUMENT", "filters must be an array");
+    filters = [];
+    for (const filter of options.filters) {
+      if (!filter || Object.keys(filter).some(key => key !== "name" && key !== "extensions") || (filter.name !== undefined && (typeof filter.name !== "string" || !filter.name.trim() || filter.name.includes("\0"))) || !Array.isArray(filter.extensions) || !filter.extensions.length || filter.extensions.some((ext: unknown) => typeof ext !== "string" || !/^[a-zA-Z0-9][a-zA-Z0-9_-]*$/.test(ext))) throw new SparkError("E_INVALID_ARGUMENT", "Filters need file extensions without dots, MIME types, or wildcards, and a name without NULs when given");
+      filters.push({ ...(filter.name === undefined ? {} : { name: filter.name }), extensions: [...filter.extensions] });
+    }
+  }
+  const allowedFileTypes = filters?.flatMap(filter => filter.extensions);
+  if (kind === "save") return { windowId, directory, filters, allowedFileTypes, defaultName: (options as SaveFileDialogOptions).defaultName };
+  const open = options as OpenFileDialogOptions;
+  if (open.selection !== undefined && !["files", "directories"].includes(open.selection)) throw new SparkError("E_INVALID_ARGUMENT", "selection must be files or directories");
+  if (open.multiple !== undefined && typeof open.multiple !== "boolean") throw new SparkError("E_INVALID_ARGUMENT", "multiple must be boolean");
+  if (platform === "macos" && open.macos !== undefined && (!open.macos || typeof open.macos !== "object" || Object.keys(open.macos).some(key => key !== "mixedSelection") || (open.macos.mixedSelection !== undefined && typeof open.macos.mixedSelection !== "boolean"))) throw new SparkError("E_INVALID_ARGUMENT", "Invalid macOS dialog options");
+  const mixed = platform === "macos" && open.macos?.mixedSelection === true;
+  return { windowId, directoryURL: directory, filters, allowedFileTypes, canChooseFiles: mixed || open.selection !== "directories", canChooseDirectories: mixed || open.selection === "directories", allowsMultipleSelection: open.multiple ?? false, title: open.title, message: open.message, prompt: open.prompt };
 }

package/vendor/node_modules/@legendapp/spark-file-dialog/src/types.ts

@@ -0,0 +1,26 @@
+/** Filters accept extensions without a dot (for example "txt"). MIME types and UTIs are not supported. */
+export interface FileFilter {
+  /** Display label for the filter group. Windows presents one labeled group per filter; macOS combines all extensions into one allowed set, so the label is ignored there. */
+  name?: string;
+  extensions: readonly string[];
+}
+export interface FileDialogOptions {
+  /** Attach to this live Spark window. Omitted presents an unowned dialog. */
+  windowId?: string;
+  /** Absolute starting path. A directory starts there; for save it may name a file, which also suggests `defaultName`. */
+  defaultPath?: string;
+  /** macOS combines filters into one allowed-extension set; Windows keeps each labeled group. An empty array allows all files. */
+  filters?: readonly FileFilter[];
+}
+export interface OpenFileDialogOptions extends FileDialogOptions {
+  selection?: "files" | "directories";
+  multiple?: boolean;
+  title?: string;
+  message?: string;
+  prompt?: string;
+  /** macOS can select files and directories in the same panel. Ignored on other targets. */
+  macos?: { mixedSelection?: boolean };
+}
+export interface SaveFileDialogOptions extends FileDialogOptions { defaultName?: string }
+export type OpenFileDialogResult = { canceled: true } | { canceled: false; paths: string[] };
+export type SaveFileDialogResult = { canceled: true } | { canceled: false; path: string };