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

package/vendor/node_modules/@legendapp/spark-cli/dist/signing.js

@@ -134,7 +134,7 @@ export async function validateApp(root, app, credentials, expected, notarized, e
     app = realpathSync(app);
     if (expected.runner) {
         const runtime = readJson(path.join(app, "Contents/Resources/spark-runtime.json"));
-        if (runtime.mode !== "go" || runtime.platform !== "macos" || runtime.arch !== "arm64")
+        if (runtime.mode !== "go" || runtime.platform !== "macos" || runtime.arch !== expected.arch)
             throw new Error("Distribution app is not a macOS Spark Runner.");
     }
     else if (!existsSync(path.join(app, "Contents/Resources/main.jsbundle")))
@@ -145,8 +145,9 @@ export async function validateApp(root, app, credentials, expected, notarized, e
             throw new Error(`Packaged ${key} does not match the release build.`);
     }
     const arches = (await execute(root, ["lipo", "-archs", path.join(app, "Contents/MacOS", info.CFBundleExecutable)], { capture: true })).trim().split(/\s+/);
-    if (arches.length !== 1 || arches[0] !== "arm64")
-        throw new Error("The prototype package must contain an arm64 app.");
+    const expectedArch = expected.arch === "x64" ? "x86_64" : "arm64";
+    if (arches.length !== 1 || arches[0] !== expectedArch)
+        throw new Error(`The package must contain a ${expectedArch} app.`);
     await execute(root, ["codesign", "--verify", "--deep", "--strict", "--verbose=2", app], { capture: true });
     const order = signingOrder(app);
     const targets = await entitlementTargets(root, app, order, expected.entitlements, expected.byPath, execute);

package/vendor/node_modules/@legendapp/spark-cli/dist/universal.cjs

@@ -2,13 +2,14 @@ const fs = require("node:fs");
 const { readConfig, statePath, supportedPlatforms } = require("@legendapp/spark-desktop-config/config.cjs");
 
 exports.nativeConfig = root => {
+  const patched = require("@legendapp/spark-desktop-config/native-patches.cjs").prepareNativePatches(root);
   const { expo } = readConfig(root);
   const platform = expo.platforms[0];
   const platforms = process.platform === "win32" ? {} : { windows: { npmPackageName: "react-native-windows" } };
   // Expo autolinking and React Native codegen have separate exclusion inputs.
   // An excluded desktop provider must not enter an iOS module registry either.
   const excluded = (expo.autolinking?.exclude ?? []).map(name => [name, { platforms: { ios: null, macos: null, android: null, windows: null } }]);
-  if (!["macos", "windows"].includes(platform)) return { platforms, dependencies: Object.fromEntries(excluded) };
+  if (!["macos", "windows"].includes(platform)) return { platforms, dependencies: { ...patched, ...Object.fromEntries(excluded) } };
   const file = statePath(root, "native-selection.json");
   const selection = fs.existsSync(file) ? JSON.parse(fs.readFileSync(file, "utf8")) : { included: [], excluded: [] };
   return { platforms, dependencies: Object.fromEntries([

package/vendor/node_modules/@legendapp/spark-cli/dist/updates.js

@@ -60,19 +60,56 @@ export function verifyUpdateSignature(archive, signature, publicKey) {
     if (!/^[A-Za-z0-9+/]{86}==$/.test(signature) || !verify(null, readFileSync(archive), key, Buffer.from(signature, "base64")))
         throw new Error("Update signature does not match the app's public key or archive");
 }
+const buildNumberPattern = /^[0-9]+(?:\.[0-9]+){0,2}$/;
+function buildNumberParts(version) { return version.split(".").map(part => part.replace(/^0+(?=\d)/, "")); }
+function canonicalBuildNumber(version) { return buildNumberParts(version).concat(["0", "0"]).slice(0, 3).join("."); }
+function compareBuildNumbers(left, right) {
+    const a = buildNumberParts(left), b = buildNumberParts(right);
+    for (let index = 0; index < 3; index++) {
+        const x = a[index] ?? "0", y = b[index] ?? "0";
+        if (x.length !== y.length)
+            return x.length < y.length ? -1 : 1;
+        if (x !== y)
+            return x < y ? -1 : 1;
+    }
+    return 0;
+}
+export function validateUpdateBuildVersion(buildVersion, records, archiveHash) {
+    if (!buildNumberPattern.test(buildVersion))
+        throw new Error("Updates require a numeric macOS buildNumber, increasing for every release");
+    const seen = new Map();
+    for (const version of Object.keys(records)) {
+        if (!buildNumberPattern.test(version))
+            throw new Error(`Invalid build number in Spark update history: ${version}`);
+        const canonical = canonicalBuildNumber(version);
+        const equivalent = seen.get(canonical);
+        if (equivalent && equivalent !== version)
+            throw new Error(`Spark update history reuses the numeric build number as both ${equivalent} and ${version}.`);
+        seen.set(canonical, version);
+        if (compareBuildNumbers(version, buildVersion) === 0 && version !== buildVersion)
+            throw new Error(`Build ${buildVersion} aliases the recorded build number ${version}; use a new increasing macos.buildNumber spelling.`);
+    }
+    const existing = records[buildVersion];
+    if (existing) {
+        if (existing.sha256 !== archiveHash)
+            throw new Error(`Build ${buildVersion} was already packaged with different bytes. Increase macos.buildNumber before publishing another update.`);
+        return;
+    }
+    for (const version of Object.keys(records)) {
+        if (compareBuildNumbers(buildVersion, version) <= 0)
+            throw new Error(`Build ${buildVersion} must be greater than every published build number. Increase macos.buildNumber before publishing another update.`);
+    }
+}
 export async function prepareUpdate(root, archive, buildVersion, dependencies = { run, tools: sparkleTools }) {
     const expo = readAppConfig(root).expo;
     const updates = updateConfiguration(expo);
     if (!updates)
         return undefined;
-    if (!/^[0-9]+(?:\.[0-9]+){0,2}$/.test(buildVersion))
-        throw new Error("Updates require a numeric macOS buildNumber, increasing for every release");
     const directory = path.join(root, "dist/updates");
     const recordsFile = path.join(directory, "releases.json");
     const records = existsSync(recordsFile) ? readJson(recordsFile) : {};
     const hash = createHash("sha256").update(readFileSync(archive)).digest("hex");
-    if (records[buildVersion] && records[buildVersion].sha256 !== hash)
-        throw new Error(`Build ${buildVersion} was already packaged with different bytes. Increase macos.buildNumber before publishing another update.`);
+    validateUpdateBuildVersion(buildVersion, records, hash);
     const bin = await dependencies.tools(root, dependencies.run);
     const keyArgs = dependencies.keyFile ? ["--ed-key-file", dependencies.keyFile] : ["--account", account(expo)];
     const signature = (await dependencies.run(root, [path.join(bin, "sign_update"), ...keyArgs, "-p", archive], { capture: true })).trim();

package/vendor/node_modules/@legendapp/spark-cli/dist/windows.js

@@ -1,19 +1,13 @@
-import { which } from "./process.js";
+import { which, nodeCommand } from "./process.js";
 import { prepareWindowsGeometry } from "./windows-geometry.js";
 import { copyHelpers } from "./helpers.js";
 import { registerWindowsAssociations } from "./windows-associations.js";
 import { checkExpoDesktopNode } from "./expo-node.js";
 import { cpSync, existsSync, mkdirSync, mkdtempSync, readdirSync, renameSync, rmSync, readFileSync, writeFileSync } from "node:fs";
 import path from "node:path";
-import { createRequire } from "node:module";
 import { run } from "./commands.js";
 import { prepareConfig, nativePackages, runtimeFor, stateFile, readJson, writeJson, validateBuildModules, goConfigurationIssues, readAppConfig } from "./project.js";
-// Windows .cmd shims are shell programs; run the package's actual JS entry.
-export function nodeCommand(root, name, bin, args = []) {
-    const req = createRequire(path.join(root, "package.json"));
-    const file = req.resolve(`${name}/package.json`), pkg = readJson(file);
-    return ["node", path.resolve(path.dirname(file), typeof pkg.bin === "string" ? pkg.bin : pkg.bin[bin]), ...args];
-}
+import { assertNativePatchPreflight } from "./native-patch-preflight.js";
 export async function preserveWindowsBuildOutputs(root, prepare) {
     const windows = path.join(root, "windows");
     const outputs = [];
@@ -54,6 +48,7 @@ export async function preserveWindowsBuildOutputs(root, prepare) {
     }
 }
 export async function prepareWindows(root, mode) {
+    assertNativePatchPreflight(root);
     await checkExpoDesktopNode(root);
     prepareConfig(root);
     prepareWindowsGeometry(root);
@@ -70,7 +65,7 @@ export async function prepareWindows(root, mode) {
     const manifest = readFileSync(path.join(root, "package.json"), "utf8");
     try {
         await preserveWindowsBuildOutputs(root, async () => {
-            await run(root, nodeCommand(root, "expo-desktop", "expo-desktop", ["prebuild", "--platform", "windows", "--template", "expo-desktop-template-bare-minimum@54.81.1-beta.6", "--no-install"]), { env: { CI: "1" }, capture: true });
+            await run(root, nodeCommand(root, "expo-desktop", "expo-desktop", ["prebuild", "--platform", "windows", "--template", "expo-desktop-template-bare-minimum@54.81.1", "--no-install"]), { env: { CI: "1" }, capture: true });
         });
         // The beta template expands all-platform dependencies. Keep the consumer's installed graph.
     }
@@ -82,6 +77,7 @@ export async function prepareWindows(root, mode) {
 export async function buildWindows(root, mode, force) {
     if (mode !== "go" && mode !== "dev")
         throw new Error("Windows currently supports Spark Runner runtimes and development builds. Use spark build --dev; production builds and packaging are not implemented.");
+    assertNativePatchPreflight(root);
     if (process.platform !== "win32")
         throw new Error("Windows native builds require Windows x64 or ARM64. Project generation and Metro bundle checks can run on macOS.");
     for (const tool of ["node", "pwsh.exe", "dotnet.exe"])

package/vendor/node_modules/@legendapp/spark-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legendapp/spark-cli",
-  "version": "0.0.1-next.2",
+  "version": "0.0.1-next.4",
   "license": "MIT",
   "type": "module",
   "files": [
@@ -11,12 +11,13 @@
     "node": ">=24.19.0"
   },
   "dependencies": {
-    "@legendapp/spark-desktop-config": "0.0.1-next.2",
-    "ws": "8.18.3",
-    "expo-desktop": "1.0.0-beta.6",
-    "npm": "11.11.0",
+    "@legendapp/spark-desktop-config": "0.0.1-next.4",
+    "ws": "8.21.0",
+    "expo-desktop": "1.0.0",
+    "npm": "11.21.0",
     "typescript": "5.9.3",
-    "cross-spawn": "7.0.6"
+    "cross-spawn": "7.0.6",
+    "@legendapp/spark-window-options": "0.0.1-next.4"
   },
   "private": true
 }

package/vendor/node_modules/@legendapp/spark-cli/templates/blank-typescript/App.tsx

@@ -1,22 +1,16 @@
-import React, { useEffect, useState } from "react";
+import React, { useState } from "react";
 import { Button, StyleSheet, Text, View } from "react-native";
 import { openFileDialog } from "@legendapp/spark/dialogs";
-import { configureMenus, clearMenus, addNativeMenuActionListener } from "@legendapp/spark/menus";
+import { useMenu, type MenuRootItem } from "@legendapp/spark/menus";
 
-const menus = [{ id: "hello", title: "Hello", items: [{ id: "greet", title: "Say Hello" }] }];
+const menus: MenuRootItem[] = [{ type: "submenu", id: "hello", label: "Hello", items: [{ type: "action", id: "greet", label: "Say Hello" }] }];
 export default function App({ runtime }: { runtime?: { mode: string } }) {
   const [message, setMessage] = useState("Ready");
-  useEffect(() => {
-    configureMenus("hello-world", menus);
-    const subscription = addNativeMenuActionListener(action => {
-      if (action.ownerId === "hello-world" && action.itemId === "greet") setMessage("Hello from the native menu");
-    });
-    return () => { subscription.remove(); clearMenus("hello-world"); };
-  }, []);
+  useMenu({ id: "hello-world", items: menus, onAction: action => { if (action.itemId === "greet") setMessage("Hello from the native menu"); }, onError: error => setMessage(String(error)) });
   async function chooseFile() {
     try {
-      const files = await openFileDialog({ title: "Choose a file", allowsMultipleSelection: false });
-      setMessage(files?.join(", ") || "Dialog cancelled");
+      const files = await openFileDialog({ title: "Choose a file", multiple: false });
+      setMessage(files.canceled ? "Dialog cancelled" : files.paths.join(", "));
     } catch (error) { setMessage(String(error)); }
   }
   return <View style={styles.root}>

package/vendor/node_modules/@legendapp/spark-cli/templates/blank-typescript/desktop.config.json

@@ -3,9 +3,11 @@
   "name": "HelloWorld",
   "version": "0.0.1",
   "window": {
-    "width": 1000,
-    "height": 700,
-    "restoreFrame": true
+    "size": {
+      "width": 1000,
+      "height": 700
+    },
+    "restoreBounds": true
   },
   "macos": {
     "bundleIdentifier": "so.legend.spark.prototype.helloworld"

package/vendor/node_modules/@legendapp/spark-cli/templates/blank-typescript/package.json

@@ -13,13 +13,13 @@
     "postinstall": "node node_modules/@legendapp/spark/init-template.cjs"
   },
   "dependencies": {
-    "@legendapp/spark": "0.0.1-next.2",
+    "@legendapp/spark": "0.0.1-next.4",
     "expo": "54.0.37",
-    "expo-desktop": "1.0.0-beta.6",
-    "expo-desktop-prebuild-config": "1.1.0-beta.1",
-    "expo-desktop-config-plugins": "1.2.0-beta.1",
-    "expo-desktop-metro-config": "54.81.0-beta.3",
-    "expo-desktop-template-bare-minimum": "54.81.1-beta.6",
+    "expo-desktop": "1.0.0",
+    "expo-desktop-prebuild-config": "1.1.0",
+    "expo-desktop-config-plugins": "1.2.0",
+    "expo-desktop-metro-config": "54.81.0",
+    "expo-desktop-template-bare-minimum": "54.81.1",
     "react": "19.1.4",
     "react-native": "0.81.6",
     "react-native-macos": "0.81.7",
@@ -30,7 +30,7 @@
   },
   "overrides": {
     "@expo/cli": "54.0.27",
-    "react-native-nitro-modules": "0.35.7",
+    "react-native-nitro-modules": "0.37.0",
     "react-native-webview": "16.0.0",
     "@op-engineering/op-sqlite": "18.2.1",
     "expo-asset": "12.0.13",
@@ -39,10 +39,12 @@
     "expo-font": "14.0.12",
     "expo-keep-awake": "15.0.8",
     "expo-modules-core": "3.0.30",
-    "expo-desktop-modules-core": "54.0.14-beta.0",
-    "expo-desktop-stubs": "54.0.14-beta.0",
+    "expo-desktop-modules-core": "54.0.14",
+    "expo-desktop-stubs": "54.0.14",
     "react": "19.1.4",
-    "react-native": "0.81.6"
+    "react-native": "0.81.6",
+    "react-native-macos": "0.81.7",
+    "react-native-windows": "0.81.35"
   },
   "expo": {
     "install": {

package/vendor/node_modules/@legendapp/spark-cli/templates/diff-lite/Git.macos.tsx

@@ -5,8 +5,8 @@ import { runCommand } from "@legendapp/spark/processes";
 export function Git({ onResult, onError }: { onResult(text: string): void; onError(message: string): void }) {
   const [busy, setBusy] = useState(false);
   return <Button disabled={busy} onPress={() => { setBusy(true); void (async () => {
-    const paths = await openFileDialog({ canChooseDirectories: true, canChooseFiles: false }); if (!paths?.[0]) return;
-    const result = await runCommand({ executable: "/usr/bin/git", args: ["--no-pager", "diff", "--no-ext-diff", "--no-textconv", "--", "."], cwd: paths[0], timeoutMs: 10_000 });
+    const paths = await openFileDialog({ selection: "directories" }); if (paths.canceled) return;
+    const result = await runCommand({ executable: "/usr/bin/git", args: ["--no-pager", "diff", "--no-ext-diff", "--no-textconv", "--", "."], cwd: paths.paths[0], timeoutMs: 10_000 });
     if (result.timedOut || result.outputTruncated || result.exitCode !== 0) throw new Error(result.stderr || "Git comparison failed or exceeded its output limit");
     onResult(result.stdout || "No unstaged changes.");
   })().catch(error => onError(String(error))).finally(() => setBusy(false)); }}>{busy ? "Reading Git…" : "Open Git changes"}</Button>;

package/vendor/node_modules/@legendapp/spark-cli/templates/document-editor/Integration.macos.tsx

@@ -1,17 +1,30 @@
 import { useEffect, useState } from "react";
 import { Text } from "react-native";
 import { Button } from "@legendapp/spark/ui";
-import { beforeWindowClose, openWindow, setWindowTitle, onWindowEvent } from "@legendapp/spark/windows";
+import { beforeWindowClose, openWindow, setWindowOptions, addWindowListener } from "@legendapp/spark/windows";
 import { beforeQuit } from "@legendapp/spark/app";
-import { configureMenus, clearMenus, addNativeMenuActionListener } from "@legendapp/spark/menus";
+import { useMenu, type MenuItem } from "@legendapp/spark/menus";
 import { registerShortcut } from "@legendapp/spark/shortcuts";
-import { onOpen } from "@legendapp/spark/links";
-import { readTextFile } from "@legendapp/spark/dialogs";
+import { subscribeToOpenRequests } from "@legendapp/spark/app/documents";
+import { readText } from "@legendapp/spark/files";
 import { sessions } from "./sessions";
 import type { DocumentSession } from "./document";
+const items: MenuItem[] = [{ type: "submenu", id: "file", target: { menu: "file" }, label: "File", items: [
+  { type: "action", id: "new", label: "New" }, { type: "action", id: "open", label: "Open…" }, { type: "action", id: "save", label: "Save" }, { type: "action", id: "saveAs", label: "Save As…" },
+] }];
 let nextWindow = 0;
 export function Integration({ session, windowId, documentId, onReady }: { session: DocumentSession; windowId: string; documentId: string; onReady: (ready: boolean) => void }) {
   const [error, setError] = useState<string | null>(null);
+  const menu = useMenu({ id: `editor-${windowId}`, items, onAction: event => {
+    const actions: Record<string, () => unknown> = { new: () => session.newDocument(), open: () => session.open(), save: () => session.save(), saveAs: () => session.save(true) };
+    actions[event.itemId]?.();
+  }, onError: error => setError(String(error)) });
+  useEffect(() => {
+    if (menu.status !== "ready") return;
+    let disposed = false, focus: Awaited<ReturnType<typeof addWindowListener>> | undefined;
+    void addWindowListener(windowId, "focusChanged", event => { if (event.focused) void menu.menu.update({ items }).catch(error => setError(String(error))); }).then(value => { if (disposed) void value.remove(); else focus = value; }).catch(error => setError(String(error)));
+    return () => { disposed = true; void focus?.remove(); };
+  }, [menu, windowId]);
   useEffect(() => {
     let removed = false;
     const cleanups: (() => void | Promise<void>)[] = [];
@@ -19,17 +32,8 @@ export function Integration({ session, windowId, documentId, onReady }: { sessio
       const subscription = await registration;
       if (removed) await subscription.remove(); else cleanups.push(() => subscription.remove());
     };
-    const owner = `editor-${windowId}`;
     const actions: Record<string, () => unknown> = { new: () => session.newDocument(), open: () => session.open(), save: () => session.save(), saveAs: () => session.save(true) };
-    const menus = () => configureMenus(owner, [{ id: "file", title: "File", items: [
-      { id: "new", title: "New" }, { id: "open", title: "Open…" }, { id: "save", title: "Save" }, { id: "saveAs", title: "Save As…" },
-    ] }]);
-    menus(); cleanups.push(() => clearMenus(owner));
-    const menu = addNativeMenuActionListener(event => { if (event.ownerId === owner) actions[event.itemId]?.(); });
-    cleanups.push(() => menu.remove());
-    const focus = onWindowEvent(event => { if (event.type === "focus" && event.windowId === windowId) menus(); });
-    cleanups.push(() => focus.remove());
-    const title = () => { const state = session.getSnapshot(); void setWindowTitle(windowId, `${state.file.name}${session.dirty ? " •" : ""}`).catch(e => setError(String(e))); };
+    const title = () => { const state = session.getSnapshot(); void setWindowOptions(windowId, { title: `${state.file.name}${session.dirty ? " •" : ""}` }).catch(e => setError(String(e))); };
     title(); cleanups.push(session.subscribe(title));
     void (async () => {
       await retain(beforeWindowClose(windowId, session.canClose));
@@ -38,12 +42,10 @@ export function Integration({ session, windowId, documentId, onReady }: { sessio
       }
       if (windowId === "main") {
         await retain(beforeQuit(async () => { for (const document of sessions.values()) if (!await document.canClose()) return false; return true; }));
-        await retain(onOpen(event => {
-          if (event.type !== "openFile") return;
-          const match = /^file:\/\/(?:localhost)?(\/.*)$/.exec(event.url);
-          if (!match) { setError("Unsupported file URL"); return; }
-          const location = decodeURIComponent(match[1]!);
-          void readTextFile(location).then(text => session.load({ location, name: location.split("/").pop()! }, text)).catch(e => setError(String(e)));
+        await retain(subscribeToOpenRequests(event => {
+          if (event.type !== "file") return;
+          const location = event.path;
+          void readText(location).then(text => session.load({ location, name: location.split("/").pop()! }, text)).catch(e => setError(String(e)));
         }));
       }
       if (!removed) onReady(true);
@@ -51,7 +53,7 @@ export function Integration({ session, windowId, documentId, onReady }: { sessio
     return () => { removed = true; for (const cleanup of cleanups.reverse()) void Promise.resolve().then(cleanup).catch(console.error); };
   }, [session, windowId, onReady]);
   return <>
-    <Button onPress={() => { void openWindow({ id: `document-${++nextWindow}`, title: session.getSnapshot().file.name, width: 800, height: 600, props: { documentId } }).catch(e => setError(String(e))); }}>Open another view</Button>
+    <Button onPress={() => { const id = `document-${++nextWindow}`; void openWindow({ id, title: session.getSnapshot().file.name, component: "main", size: { width: 800, height: 600 }, props: { windowId: id, windowProps: { documentId } } }).catch(e => setError(String(e))); }}>Open another view</Button>
     {error ? <Text accessibilityRole="alert">{error}</Text> : null}
   </>;
 }

package/vendor/node_modules/@legendapp/spark-cli/templates/document-editor/Integration.windows.tsx

@@ -1,17 +1,30 @@
 import { useEffect, useState } from "react";
 import { Text } from "react-native";
 import { Button } from "@legendapp/spark/ui";
-import { beforeWindowClose, openWindow, setWindowTitle, onWindowEvent } from "@legendapp/spark/windows";
+import { beforeWindowClose, openWindow, setWindowOptions, addWindowListener } from "@legendapp/spark/windows";
 import { beforeQuit } from "@legendapp/spark/app";
-import { configureMenus, clearMenus, addNativeMenuActionListener } from "@legendapp/spark/menus";
+import { useMenu, type MenuItem } from "@legendapp/spark/menus";
 import { registerShortcut } from "@legendapp/spark/shortcuts";
-import { onOpen } from "@legendapp/spark/links";
-import { readTextFile } from "@legendapp/spark/dialogs";
+import { subscribeToOpenRequests } from "@legendapp/spark/app/documents";
+import { readText } from "@legendapp/spark/files";
 import { sessions } from "./sessions";
 import type { DocumentSession } from "./document";
+const items: MenuItem[] = [{ type: "submenu", id: "file", target: { menu: "file" }, label: "File", items: [
+  { type: "action", id: "new", label: "New" }, { type: "action", id: "open", label: "Open…" }, { type: "action", id: "save", label: "Save" }, { type: "action", id: "saveAs", label: "Save As…" },
+] }];
 let nextWindow = 0;
 export function Integration({ session, windowId, documentId, onReady }: { session: DocumentSession; windowId: string; documentId: string; onReady: (ready: boolean) => void }) {
   const [error, setError] = useState<string | null>(null);
+  const menu = useMenu({ id: `editor-${windowId}`, items, onAction: event => {
+    const actions: Record<string, () => unknown> = { new: () => session.newDocument(), open: () => session.open(), save: () => session.save(), saveAs: () => session.save(true) };
+    actions[event.itemId]?.();
+  }, onError: error => setError(String(error)) });
+  useEffect(() => {
+    if (menu.status !== "ready") return;
+    let disposed = false, focus: Awaited<ReturnType<typeof addWindowListener>> | undefined;
+    void addWindowListener(windowId, "focusChanged", event => { if (event.focused) void menu.menu.update({ items }).catch(error => setError(String(error))); }).then(value => { if (disposed) void value.remove(); else focus = value; }).catch(error => setError(String(error)));
+    return () => { disposed = true; void focus?.remove(); };
+  }, [menu, windowId]);
   useEffect(() => {
     let removed = false;
     const cleanups: (() => void | Promise<void>)[] = [];
@@ -19,17 +32,8 @@ export function Integration({ session, windowId, documentId, onReady }: { sessio
       const subscription = await registration;
       if (removed) await subscription.remove(); else cleanups.push(() => subscription.remove());
     };
-    const owner = `editor-${windowId}`;
     const actions: Record<string, () => unknown> = { new: () => session.newDocument(), open: () => session.open(), save: () => session.save(), saveAs: () => session.save(true) };
-    const menus = () => configureMenus(owner, [{ id: "file", title: "File", items: [
-      { id: "new", title: "New" }, { id: "open", title: "Open…" }, { id: "save", title: "Save" }, { id: "saveAs", title: "Save As…" },
-    ] }]);
-    menus(); cleanups.push(() => clearMenus(owner));
-    const menu = addNativeMenuActionListener(event => { if (event.ownerId === owner) actions[event.itemId]?.(); });
-    cleanups.push(() => menu.remove());
-    const focus = onWindowEvent(event => { if (event.type === "focus" && event.windowId === windowId) menus(); });
-    cleanups.push(() => focus.remove());
-    const title = () => { const state = session.getSnapshot(); void setWindowTitle(windowId, `${state.file.name}${session.dirty ? " •" : ""}`).catch(e => setError(String(e))); };
+    const title = () => { const state = session.getSnapshot(); void setWindowOptions(windowId, { title: `${state.file.name}${session.dirty ? " •" : ""}` }).catch(e => setError(String(e))); };
     title(); cleanups.push(session.subscribe(title));
     void (async () => {
       await retain(beforeWindowClose(windowId, session.canClose));
@@ -38,12 +42,10 @@ export function Integration({ session, windowId, documentId, onReady }: { sessio
       }
       if (windowId === "main") {
         await retain(beforeQuit(async () => { for (const document of sessions.values()) if (!await document.canClose()) return false; return true; }));
-        await retain(onOpen(event => {
-          if (event.type !== "openFile") return;
-          const match = /^file:\/\/(?:localhost)?(\/.*)$/.exec(event.url);
-          if (!match) { setError("Unsupported file URL"); return; }
-          const location = decodeURIComponent(match[1]!).replace(/^\/([A-Za-z]:)/, "$1").replace(/\//g, "\\");
-          void readTextFile(location).then(text => session.load({ location, name: location.split("/").pop()! }, text)).catch(e => setError(String(e)));
+        await retain(subscribeToOpenRequests(event => {
+          if (event.type !== "file") return;
+          const location = event.path;
+          void readText(location).then(text => session.load({ location, name: location.split("/").pop()! }, text)).catch(e => setError(String(e)));
         }));
       }
       if (!removed) onReady(true);
@@ -51,7 +53,7 @@ export function Integration({ session, windowId, documentId, onReady }: { sessio
     return () => { removed = true; for (const cleanup of cleanups.reverse()) void Promise.resolve().then(cleanup).catch(console.error); };
   }, [session, windowId, onReady]);
   return <>
-    <Button onPress={() => { void openWindow({ id: `document-${++nextWindow}`, title: session.getSnapshot().file.name, width: 800, height: 600, props: { documentId } }).catch(e => setError(String(e))); }}>Open another view</Button>
+    <Button onPress={() => { const id = `document-${++nextWindow}`; void openWindow({ id, title: session.getSnapshot().file.name, component: "main", size: { width: 800, height: 600 }, props: { windowId: id, windowProps: { documentId } } }).catch(e => setError(String(e))); }}>Open another view</Button>
     {error ? <Text accessibilityRole="alert">{error}</Text> : null}
   </>;
 }

package/vendor/node_modules/@legendapp/spark-cli/templates/document-editor/io.desktop.ts

@@ -1,19 +1,22 @@
-import { openFileDialog, saveFileDialog, readTextFile, writeTextFile, writeTextFileIfUnchanged } from "@legendapp/spark/dialogs";
+import { openFileDialog, saveFileDialog } from "@legendapp/spark/dialogs";
+import { readText, writeText, writeTextIfUnchanged } from "@legendapp/spark/files";
 import { Alert } from "react-native";
 import type { DocumentIO } from "./document";
 export const io: DocumentIO = {
   async open() {
-    const paths = await openFileDialog({ allowedFileTypes: ["txt", "md", "json"], allowsMultipleSelection: false });
-    if (!paths?.[0]) return null;
-    const location = paths[0];
-    return { file: { location, name: location.split(/[\\/]/).pop()! }, text: await readTextFile(location) };
+    const paths = await openFileDialog({ filters: [{ extensions: ["txt", "md", "json"] }], multiple: false });
+    if (paths.canceled) return null;
+    const location = paths.paths[0];
+    return { file: { location, name: location.split(/[\\/]/).pop()! }, text: await readText(location) };
   },
   async save(file, text, expected, saveAs) {
-    const location = saveAs || !file.location ? await saveFileDialog({ defaultName: file.name, allowedFileTypes: ["txt", "md", "json"] }) : file.location;
+    const result = saveAs || !file.location ? await saveFileDialog({ defaultName: file.name, filters: [{ extensions: ["txt", "md", "json"] }] }) : { canceled: false as const, path: file.location };
+    if (result.canceled) return null;
+    const location = result.path;
     if (!location) return null;
     if (location === file.location) {
-      if (!await writeTextFileIfUnchanged(location, expected, text)) throw new Error("The file changed outside the editor. Use Save As to keep your edits in another file.");
-    } else await writeTextFile(location, text);
+      if (!(await writeTextIfUnchanged(location, expected, text)).written) throw new Error("The file changed outside the editor. Use Save As to keep your edits in another file.");
+    } else await writeText(location, text);
     return { location, name: location.split(/[\\/]/).pop()! };
   },
   confirmDiscard: name => new Promise(resolve => Alert.alert("Unsaved changes", `Save changes to ${name}?`, [

package/vendor/node_modules/@legendapp/spark-cli/templates/document-editor/io.macos.ts

@@ -1,7 +1,7 @@
 import { io as desktop } from "./io.desktop";
-import { showMessage } from "@legendapp/spark/message-dialog";
+import { showMessage } from "@legendapp/spark/dialogs";
 import type { DocumentIO } from "./document";
 export const io: DocumentIO = { ...desktop, async confirmDiscard(name) {
-  const { button } = await showMessage({ title: "Unsaved changes", message: `Save changes to ${name}?`, buttons: ["Cancel", "Discard", "Save"], cancelButton: 0, defaultButton: 2 });
-  return (["cancel", "discard", "save"] as const)[button] ?? "cancel";
+  const { buttonId } = await showMessage({ title: "Unsaved changes", message: `Save changes to ${name}?`, buttons: [{ id: "cancel", label: "Cancel" }, { id: "discard", label: "Discard" }, { id: "save", label: "Save" }], cancelButtonId: "cancel", defaultButtonId: "save" });
+  return buttonId === "save" ? "save" : buttonId === "discard" ? "discard" : "cancel";
 } };

package/vendor/node_modules/@legendapp/spark-cli/templates/example-shared/Lifecycle.desktop.tsx

@@ -1,25 +1,19 @@
 import { useEffect } from "react";
 import { Platform } from "react-native";
-import { beforeWindowClose, setWindowTitle, onWindowEvent } from "@legendapp/spark/windows";
+import { beforeWindowClose, setWindowOptions, addWindowListener } from "@legendapp/spark/windows";
 import { beforeQuit } from "@legendapp/spark/app";
-import { configureMenus, clearMenus, addNativeMenuActionListener } from "@legendapp/spark/menus";
-import { registerShortcut, parseAccelerator } from "@legendapp/spark/shortcuts";
+import { createMenu, type MenuItem } from "@legendapp/spark/menus";
+import { registerShortcut } from "@legendapp/spark/shortcuts";
 import { mountSerial } from "./lifetime";
 import type { LifecycleProps } from "./lifecycle-types";
-let activeMenuOwner: string | undefined;
 export function Lifecycle({ title, windowId = "main", flush, quit, commands, onError }: LifecycleProps) {
-  useEffect(() => { void setWindowTitle(windowId, title).catch(error => onError(String(error))); }, [title, windowId, onError]);
+  useEffect(() => { void setWindowOptions(windowId, { title: title }).catch(error => onError(String(error))); }, [title, windowId, onError]);
   useEffect(() => mountSerial(`window-${windowId}`, async retain => {
     const owner = `example-${windowId}`;
-    const menu = () => {
-      if (activeMenuOwner && activeMenuOwner !== owner) clearMenus(activeMenuOwner);
-      configureMenus(owner, [{ id: "file", title: "File", items: commands.map(({ id, title, key }) => ({ id, title, shortcut: parseAccelerator(`${Platform.OS === "windows" ? "Control" : "Command"}+${key}`) })) }]);
-      activeMenuOwner = owner;
-    };
-    menu();
-    await retain(Promise.resolve({ remove: () => { clearMenus(owner); if (activeMenuOwner === owner) activeMenuOwner = undefined; } }));
-    await retain(Promise.resolve(addNativeMenuActionListener(event => { if (event.ownerId === owner) commands.find(command => command.id === event.itemId)?.run(); })));
-    await retain(Promise.resolve(onWindowEvent(event => { if (event.windowId === windowId && event.type === "focus") menu(); })));
+    const items: MenuItem[] = [{ type: "submenu", id: "file", target: { menu: "file" }, label: "File", items: commands.map(({ id, title, key }) => ({ type: "action", id, label: title, shortcut: `CmdOrCtrl+${key}` })) }];
+    const menu = await createMenu({ id: owner, items, onAction: event => { commands.find(command => command.id === event.itemId)?.run(); } });
+    await retain(Promise.resolve(menu));
+    await retain(addWindowListener(windowId, "focusChanged", event => { if (event.focused) void menu.update({ items }).catch(error => onError(String(error))); }));
     const guarded = (save: () => Promise<boolean>) => async () => {
       try { return await save(); } catch (error) { onError(String(error)); return false; }
     };

package/vendor/node_modules/@legendapp/spark-cli/templates/example-shared/OpenFiles.desktop.tsx

@@ -1,24 +1,19 @@
 import { useEffect } from "react";
-import { Platform } from "react-native";
-import { onOpen } from "@legendapp/spark/links";
+import { subscribeToOpenRequests } from "@legendapp/spark/app/documents";
 import { mountSerial } from "./lifetime";
 import type { OpenFilesProps } from "./OpenFiles";
-// onOpen replays queued launches to each subscription. Remounts must not import twice.
+// Each subscription replays queued launches to each subscription. Remounts must not import twice.
 const imported = new Set<string>();
 const importing = new Set<string>();
 export function OpenFiles({ windowId = "main", onFile, onError }: OpenFilesProps) {
   useEffect(() => {
     if (windowId !== "main") return;
-    return mountSerial("file-activation", async retain => { await retain(onOpen(event => {
-      if (event.type !== "openFile") return;
+    return mountSerial("file-activation", async retain => { await retain(subscribeToOpenRequests(event => {
+      if (event.type !== "file") return;
       if (imported.has(event.id) || importing.has(event.id)) return;
-      const match = /^file:\/\/(?:localhost)?(\/.*)$/.exec(event.url);
-      if (!match) { onError("Unsupported file URL"); return; }
       importing.add(event.id);
       void (async () => {
-        let path = decodeURIComponent(match[1]!);
-        if (Platform.OS === "windows") path = path.replace(/^\/([a-z]:)/i, "$1").replace(/\//g, "\\");
-        await onFile(path);
+        await onFile(event.path);
         imported.add(event.id);
         if (imported.size > 200) imported.delete(imported.values().next().value!);
       })().catch(error => onError(String(error))).finally(() => importing.delete(event.id));

package/vendor/node_modules/@legendapp/spark-cli/templates/example-shared/io.desktop.ts

@@ -1,19 +1,22 @@
-import { openFileDialog, saveFileDialog, readTextFile, writeTextFile, writeTextFileIfUnchanged } from "@legendapp/spark/dialogs";
+import { openFileDialog, saveFileDialog } from "@legendapp/spark/dialogs";
+import { readText, writeText, writeTextIfUnchanged } from "@legendapp/spark/files";
 import { Alert } from "react-native";
 import type { DocumentIO } from "./document";
 export const io: DocumentIO = {
   async open() {
-    const paths = await openFileDialog({ allowedFileTypes: ["txt", "md", "json"], allowsMultipleSelection: false });
-    if (!paths?.[0]) return null;
-    const location = paths[0];
-    return { file: { location, name: location.split(/[\\/]/).pop()! }, text: await readTextFile(location) };
+    const paths = await openFileDialog({ filters: [{ extensions: ["txt", "md", "json"] }], multiple: false });
+    if (paths.canceled) return null;
+    const location = paths.paths[0];
+    return { file: { location, name: location.split(/[\\/]/).pop()! }, text: await readText(location) };
   },
   async save(file, text, expected, saveAs) {
-    const location = saveAs || !file.location ? await saveFileDialog({ defaultName: file.name, allowedFileTypes: ["txt", "md", "json"] }) : file.location;
+    const result = saveAs || !file.location ? await saveFileDialog({ defaultName: file.name, filters: [{ extensions: ["txt", "md", "json"] }] }) : { canceled: false as const, path: file.location };
+    if (result.canceled) return null;
+    const location = result.path;
     if (!location) return null;
     if (location === file.location) {
-      if (!await writeTextFileIfUnchanged(location, expected, text)) throw new Error("The file changed outside the editor. Use Save As to keep your edits in another file.");
-    } else await writeTextFile(location, text);
+      if (!(await writeTextIfUnchanged(location, expected, text)).written) throw new Error("The file changed outside the editor. Use Save As to keep your edits in another file.");
+    } else await writeText(location, text);
     return { location, name: location.split(/[\\/]/).pop()! };
   },
   confirmDiscard: name => new Promise(resolve => Alert.alert("Unsaved changes", `Save changes to ${name}?`, [

package/vendor/node_modules/@legendapp/spark-cli/templates/example-shared/io.macos.ts

@@ -1,7 +1,7 @@
 import { io as desktop } from "./io.desktop";
-import { showMessage } from "@legendapp/spark/message-dialog";
+import { showMessage } from "@legendapp/spark/dialogs";
 import type { DocumentIO } from "./document";
 export const io: DocumentIO = { ...desktop, async confirmDiscard(name) {
-  const { button } = await showMessage({ title: "Unsaved changes", message: `Save changes to ${name}?`, buttons: ["Cancel", "Discard", "Save"], cancelButton: 0, defaultButton: 2 });
-  return (["cancel", "discard", "save"] as const)[button] ?? "cancel";
+  const { buttonId } = await showMessage({ title: "Unsaved changes", message: `Save changes to ${name}?`, buttons: [{ id: "cancel", label: "Cancel" }, { id: "discard", label: "Discard" }, { id: "save", label: "Save" }], cancelButtonId: "cancel", defaultButtonId: "save" });
+  return buttonId === "save" ? "save" : buttonId === "discard" ? "discard" : "cancel";
 } };