@dimina-kit/electron-deck 0.1.0-dev.20260702175315 → 0.1.0-dev.20260703051110

package/dist/dock-react/split-view.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"split-view.d.ts","sourceRoot":"","sources":["../../src/dock-react/split-view.tsx"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAkC,KAAK,SAAS,EAAE,MAAM,OAAO,CAAA;AAGtE,OAAO,KAAK,EAAc,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAU/D,OAAO,EAAc,KAAK,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAW/D,MAAM,WAAW,cAAc;IAC9B,IAAI,EAAE,SAAS,CAAA;IACf,GAAG,EAAE,aAAa,CAAA;CAClB;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,cAAc,GAAG,SAAS,CAmR1D"}

package/dist/{electron-deck-B9fun93z.js → electron-deck-Bi-u-Aze.js}

@@ -1,7 +1,7 @@
 import { n as DeckRemoteError, r as EventNotBoundError } from "./errors-NE2ig7L5.js";
 import { i as DeckChannel, t as BRIDGE_PROTOCOL_VERSION } from "./protocol-B6TOT9AP.js";
-import { i as createScope, r as createCompositor, t as createViewHandle } from "./view-handle-DDhpBuW-.js";
-import { i as reconcile, n as dispatchOps, r as createInitialState, t as cleanSnapshot } from "./layout-ByOiOdnc.js";
+import { i as createScope, r as createCompositor, t as createViewHandle } from "./view-handle-zav25k3-.js";
+import { i as reconcile, n as dispatchOps, r as createInitialState, t as cleanSnapshot } from "./layout-D-LYJIpM.js";
 import { randomUUID } from "node:crypto";
 //#region src/events.ts
 var internals = /* @__PURE__ */ new WeakMap();
@@ -33,6 +33,7 @@ var HostEventImpl = class {
 		} };
 	}
 };
+/** @experimental No production consumer yet — see the note on {@link HostEvent}. */
 function defineEvent(name) {
 	if (typeof name !== "string" || name.length === 0) throw new TypeError("defineEvent(name): name must be a non-empty string");
 	return new HostEventImpl(name);
@@ -62,6 +63,37 @@ function unbindHostEvent(event) {
 	}
 }
 //#endregion
+//#region src/internal/deck-app-view-move.ts
+/**
+* `DeckViewHandle.moveTo` failure cleanup. `inner.moveTo` does the atomic
+* native Compositor migration + Scope adopt/rollback; when it rejects, the
+* Compositor's own rollback only reverts state it TRACKED (`order`) — a
+* native `addChildView` that throws MID-APPLY can leave the WCV attached to
+* the dest window's `contentView` with no tracked record to remove it. This
+* balances that leak with an explicit dest detach, then undoes the dest
+* substrate registration made before the move attempt.
+*
+* Each step is independently guarded (its own try/catch) so a cleanup
+* failure in one step never masks the other step or the ORIGINAL move
+* error — `originalErr` is always rethrown, never shadowed.
+*/
+function cleanupDestOnMoveToFailure(destWin, destSub, wcv, viewId, originalErr) {
+	try {
+		if (!destWin.isDestroyed()) {
+			const destChildren = destWin.contentView.children;
+			if (destChildren == null || destChildren.includes(wcv)) destWin.contentView.removeChildView(wcv);
+		}
+	} catch (cleanupErr) {
+		console.error("[electron-deck] moveTo dest detach failed (original error rethrown):", cleanupErr);
+	}
+	try {
+		destSub.unregisterView(viewId);
+	} catch (cleanupErr) {
+		console.error("[electron-deck] moveTo dest unregister failed (original error rethrown):", cleanupErr);
+	}
+	throw originalErr;
+}
+//#endregion
 //#region src/internal/event-bus.ts
 /**
 * Framework-internal event bus。
@@ -949,42 +981,76 @@ var DeckApp = class {
 		if (this.startCalled) throw new Error("DeckApp.start() already called");
 		this.startCalled = true;
 		validateConfig(this.config);
-		const hasWebviewContent = !!(this.config.toolbar || this.config.windows);
-		if (this.options.electron && hasWebviewContent && !this.options.wireTransport) throw new Error("DeckAppOptions: wireTransport.ipcMain is required when config has toolbar or windows");
+		this.assertWireTransportPresentForWebviewContent();
 		const app = this.options.electron?.app;
 		if (app) {
-			if (this.config.app?.singleInstance && typeof app.requestSingleInstanceLock === "function") {
-				if (!app.requestSingleInstanceLock()) {
-					try {
-						app.quit();
-					} catch {}
-					return;
-				}
-			}
-			if (this.options.backend?.beforeReady) await this.options.backend.beforeReady(app);
-			else if (this.config.app?.name) try {
-				app.setName(this.config.app.name);
-			} catch {}
-			await app.whenReady();
-			this.bindAppLifecycle(app);
+			if (!await this.runPreReadyGate(app)) return;
 		}
 		try {
-			this.lifecycle.enter("bind");
-			this.bindDeclarativeFields();
-			this.assembleElectron();
-			this.bindWireTransport();
-			this.loadAssembledSources();
-			this.lifecycle.enter("setup");
-			this._runtime = this.buildRuntime();
-			if (this.options.backend) await this.options.backend.assemble(this._runtime);
-			if (this.config.setup) await this.config.setup(this._runtime);
-			this.lifecycle.enter("ready");
+			await this.runBindAndSetupPhases();
 		} catch (err) {
 			await this.cleanupOnError();
 			throw err;
 		}
 	}
 	/**
+	* half-state guard: electron + (toolbar | windows) without wireTransport
+	* would leave the host with webviews that can never reach back via
+	* __electron-deck:invoke. Reject early with a clear msg.
+	*/
+	assertWireTransportPresentForWebviewContent() {
+		const hasWebviewContent = !!(this.config.toolbar || this.config.windows);
+		if (this.options.electron && hasWebviewContent && !this.options.wireTransport) throw new Error("DeckAppOptions: wireTransport.ipcMain is required when config has toolbar or windows");
+	}
+	/**
+	* Pre-`whenReady` sequencing: single-instance lock (opt-in, must quit
+	* BEFORE any other side effect) → `backend.beforeReady` (or the framework's
+	* best-effort `app.setName`) → `await app.whenReady()` → app-level lifecycle
+	* bindings. Returns `false` when the single-instance lock was lost (the
+	* second instance already called `app.quit()` — `start()` must stop with
+	* phase still `init`), `true` otherwise.
+	*/
+	async runPreReadyGate(app) {
+		if (!this.acquireSingleInstanceLock(app)) return false;
+		if (this.options.backend?.beforeReady) await this.options.backend.beforeReady(app);
+		else if (this.config.app?.name) try {
+			app.setName(this.config.app.name);
+		} catch {}
+		await app.whenReady();
+		this.bindAppLifecycle(app);
+		return true;
+	}
+	/**
+	* Single-instance gate (opt-in): a second instance must quit BEFORE any
+	* side effect (beforeReady bootstrap / whenReady / window). Returns `true`
+	* when the caller should continue (not opted in, or this instance holds the
+	* lock); `false` after the losing instance has called `app.quit()`.
+	*/
+	acquireSingleInstanceLock(app) {
+		if (!this.config.app?.singleInstance || typeof app.requestSingleInstanceLock !== "function") return true;
+		if (app.requestSingleInstanceLock()) return true;
+		try {
+			app.quit();
+		} catch {}
+		return false;
+	}
+	/** Init → Bind → Setup → Ready. Assembly/bind must run AFTER the
+	*  whenReady gate (handled by the caller); loadURL/loadFile must run
+	*  AFTER bindWireTransport (a preload calling the bridge before its
+	*  ipcMain handler is registered would see a "no handler" reject). */
+	async runBindAndSetupPhases() {
+		this.lifecycle.enter("bind");
+		this.bindDeclarativeFields();
+		this.assembleElectron();
+		this.bindWireTransport();
+		this.loadAssembledSources();
+		this.lifecycle.enter("setup");
+		this._runtime = this.buildRuntime();
+		if (this.options.backend) await this.options.backend.assemble(this._runtime);
+		if (this.config.setup) await this.config.setup(this._runtime);
+		this.lifecycle.enter("ready");
+	}
+	/**
 	* Process-level Electron lifecycle bindings (post-whenReady, independent of
 	* `ownsWindows` — these are app events, not window events):
 	* - `will-quit` → framework teardown (idempotent via `shutdownPromise`).
@@ -1180,8 +1246,8 @@ var DeckApp = class {
 	* registration) — windows with no per-window deciders fall through to Electron's
 	* default close (the framework does not preventDefault).
 	*/
-	armSubWindowCloseMachine(win, controlWc) {
-		win.on("close", (e) => {
+	armSubWindowCloseMachine(win, controlWc, windowScope) {
+		const onClose = (e) => {
 			const rec = this.windowRegistrations.get(controlWc);
 			if (!rec || rec.deciders.length === 0) return;
 			e?.preventDefault?.();
@@ -1204,7 +1270,19 @@ var DeckApp = class {
 				rec.closing = null;
 				if (!win.isDestroyed()) win.destroy();
 			});
-		});
+		};
+		win.on("close", onClose);
+		windowScope.own(() => this.removeWindowListener(win, "close", onClose));
+	}
+	/**
+	* Remove a previously-registered window event listener (Electron's
+	* `removeListener`/`off`). Tolerates minimal test fakes that expose neither by
+	* degrading to a no-op — the caller's ownership contract is best-effort cleanup.
+	*/
+	removeWindowListener(win, event, listener) {
+		const w = win;
+		const remove = w.removeListener ?? w.off;
+		if (typeof remove === "function") remove.call(win, event, listener);
 	}
 	/**
 	* @internal Lifetime accessors. The live shadow map mirroring `trackedWindows`,
@@ -1519,6 +1597,16 @@ var DeckApp = class {
 		this.warnedInvalidKeepAliveMax = true;
 		console.warn(`[electron-deck] runtime.view keepAlive.max must be a non-negative integer (got: ${max}); the view is NOT keep-alive-managed (no eviction).`);
 	}
+	/** Drop `viewId` from `groupKey`'s HIDDEN list only (the group's `handles`
+	*  entry stays — the view is still keep-alive-managed, just no longer
+	*  evictable while visible). Idempotent: a no-op when the view isn't on the
+	*  hidden list or the group doesn't exist. */
+	dropViewFromKeepAliveHidden(groupKey, viewId) {
+		const group = this.keepAliveGroups.get(groupKey);
+		if (!group) return;
+		const i = group.hidden.indexOf(viewId);
+		if (i >= 0) group.hidden.splice(i, 1);
+	}
 	constructWindow(opts, autoTrust, deferLoad = false) {
 		const electron = this.options.electron;
 		if (!electron) throw new Error("DeckApp.constructWindow called without electron injection");
@@ -1550,7 +1638,7 @@ var DeckApp = class {
 			this.bindNavigationGrantReset(wc);
 		}
 		this.buildDeckWindow(win, wc, windowScope);
-		this.armSubWindowCloseMachine(win, wc);
+		this.armSubWindowCloseMachine(win, wc, windowScope);
 		if (!deferLoad) this.safeLoad(win.webContents, opts.source);
 		return win;
 	}
@@ -1593,10 +1681,11 @@ var DeckApp = class {
 		};
 		if (typeof win.prependListener === "function") win.prependListener("closed", revoke);
 		else win.on("closed", revoke);
+		windowScope.own(() => this.removeWindowListener(win, "closed", revoke));
 		this.admitTrust(wc, windowScope);
 		this.bindNavigationGrantReset(wc);
 		this.buildDeckWindow(win, wc, windowScope);
-		this.armSubWindowCloseMachine(win, wc);
+		this.armSubWindowCloseMachine(win, wc, windowScope);
 		windowScope.own(() => {
 			this.windowSubstrates.delete(wc);
 			this.adoptedWindows.delete(wc);
@@ -1902,6 +1991,12 @@ var DeckApp = class {
 						this.bindNavigationGrantReset(wc);
 						return lease;
 					}
+					const adopted = this.wcRecords.get(wc);
+					if (adopted) {
+						const lease = this.admitTrust(wc, adopted.windowScope);
+						this.bindNavigationGrantReset(wc);
+						return lease;
+					}
 					return this._trustWebContents(wc);
 				},
 				adopt: (win, opts) => {
@@ -2042,30 +2137,11 @@ var DeckApp = class {
 								rehome: moveOpts.rehome
 							});
 						} catch (e) {
-							try {
-								if (!destWin.isDestroyed()) {
-									const destChildren = destWin.contentView.children;
-									if (destChildren == null || destChildren.includes(wcv)) destWin.contentView.removeChildView(wcv);
-								}
-							} catch (cleanupErr) {
-								console.error("[electron-deck] moveTo dest detach failed (original error rethrown):", cleanupErr);
-							}
-							try {
-								destSub.unregisterView(viewId);
-							} catch (cleanupErr) {
-								console.error("[electron-deck] moveTo dest unregister failed (original error rethrown):", cleanupErr);
-							}
-							throw e;
+							cleanupDestOnMoveToFailure(destWin, destSub, wcv, viewId, e);
 						}
 						if (srcSub && srcSub !== destSub) srcSub.unregisterView(viewId);
 						placedSubstrate = destSub;
-						if (groupKey) {
-							const group = this.keepAliveGroups.get(groupKey);
-							if (group) {
-								const hi = group.hidden.indexOf(viewId);
-								if (hi >= 0) group.hidden.splice(hi, 1);
-							}
-						}
+						if (groupKey) this.dropViewFromKeepAliveHidden(groupKey, viewId);
 						if (slotToken) {
 							this.slotTokens.delete(slotToken);
 							slotToken = void 0;
@@ -2087,7 +2163,9 @@ var DeckApp = class {
 								while (keepAlive && group.hidden.length > keepAlive.max) {
 									const victimId = group.hidden.shift();
 									const victim = group.handles.get(victimId);
-									if (victim) victim.dispose();
+									if (victim) victim.dispose().catch((e) => {
+										console.error("[electron-deck] keepAlive eviction dispose failed:", e);
+									});
 								}
 							}
 						}
@@ -2209,6 +2287,11 @@ async function electronDeck(config, options) {
 *
 * Invalid config throws a `TypeError` synchronously (matching `electronDeck`'s
 * validate-first contract) — the error surfaces, never silently deadlocks.
+*
+* `@experimental` No production consumer yet — the only caller in this repo is
+* `packages/devtools/spike/popout/harness.mjs`; devtools' real entry
+* (`launch.ts`) uses `electronDeck({ backend })` instead. Contract may change
+* until a second real consumer adopts it.
 */
 function startElectronDeck(config, options) {
 	validateConfig(config);
@@ -2280,37 +2363,50 @@ function buildAppOptions(electron, ipcMain, opts) {
 */
 function validateConfig(config) {
 	if (config === null || typeof config !== "object") throw new TypeError("electronDeck(config): config must be an object");
-	if (config.backend !== void 0) {
-		const backend = config.backend;
-		if (backend === null || typeof backend !== "object" || typeof backend.assemble !== "function") throw new TypeError("config.backend must be a RuntimeBackend (an object with an assemble() function)");
-	}
+	validateBackendField(config.backend);
 	if (config.simulatorApis !== void 0) validateHandlerMap("simulatorApis", config.simulatorApis);
 	if (config.hostServices !== void 0) validateHandlerMap("hostServices", config.hostServices);
-	if (config.events !== void 0) {
-		if (!Array.isArray(config.events)) throw new TypeError("events must be an array of HostEvent (from defineEvent())");
-		for (const ev of config.events) if (!isHostEvent(ev)) throw new TypeError("events: every entry must be a HostEvent produced by defineEvent() — duck-typed shapes are rejected to avoid bind-time failures");
-		const names = /* @__PURE__ */ new Set();
-		for (const ev of config.events) {
-			if (names.has(ev.name)) throw new Error(`events: duplicate HostEvent name "${ev.name}"`);
-			names.add(ev.name);
-		}
-	}
-	if (config.toolbar !== void 0) {
-		const { source, preloadPath, height } = config.toolbar;
-		if (source === null || typeof source !== "object") throw new TypeError("toolbar.source must be { url } or { file }");
-		const hasUrl = "url" in source && typeof source.url === "string";
-		const hasFile = "file" in source && typeof source.file === "string";
-		if (hasUrl && hasFile) throw new TypeError("toolbar.source must be either { url } or { file }, not both");
-		if (!hasUrl && !hasFile) throw new TypeError("toolbar.source must be { url } or { file }");
-		if (typeof preloadPath !== "string" || preloadPath.length === 0) throw new TypeError("toolbar.preloadPath is required and must be a non-empty string");
-		if (typeof height !== "number" || !Number.isFinite(height) || height <= 0) throw new TypeError("toolbar.height is required and must be a positive finite number");
-	}
+	if (config.events !== void 0) validateEventsField(config.events);
+	if (config.toolbar !== void 0) validateToolbarField(config.toolbar);
+}
+function validateBackendField(backend) {
+	if (backend === void 0) return;
+	const candidate = backend;
+	if (candidate === null || typeof candidate !== "object" || typeof candidate.assemble !== "function") throw new TypeError("config.backend must be a RuntimeBackend (an object with an assemble() function)");
 }
 function validateHandlerMap(fieldName, value) {
 	if (value === null || typeof value !== "object" || Array.isArray(value)) throw new TypeError(`${fieldName} must be an object of handlers`);
 	for (const [name, handler] of Object.entries(value)) if (typeof handler !== "function") throw new TypeError(`${fieldName}["${name}"] must be a function`);
 }
+function validateEventsField(events) {
+	if (!Array.isArray(events)) throw new TypeError("events must be an array of HostEvent (from defineEvent())");
+	assertAllHostEvents(events);
+	assertUniqueEventNames(events);
+}
+/** duck-typed 事件形状会被拒绝——只接受 `defineEvent()` 产出的真实 HostEvent，避免 bind-time 才炸。 */
+function assertAllHostEvents(events) {
+	for (const ev of events) if (!isHostEvent(ev)) throw new TypeError("events: every entry must be a HostEvent produced by defineEvent() — duck-typed shapes are rejected to avoid bind-time failures");
+}
+function assertUniqueEventNames(events) {
+	const names = /* @__PURE__ */ new Set();
+	for (const ev of events) {
+		if (names.has(ev.name)) throw new Error(`events: duplicate HostEvent name "${ev.name}"`);
+		names.add(ev.name);
+	}
+}
+function validateToolbarField(toolbar) {
+	assertToolbarSourceShape(toolbar.source);
+	if (typeof toolbar.preloadPath !== "string" || toolbar.preloadPath.length === 0) throw new TypeError("toolbar.preloadPath is required and must be a non-empty string");
+	if (typeof toolbar.height !== "number" || !Number.isFinite(toolbar.height) || toolbar.height <= 0) throw new TypeError("toolbar.height is required and must be a positive finite number");
+}
+function assertToolbarSourceShape(source) {
+	if (source === null || typeof source !== "object") throw new TypeError("toolbar.source must be { url } or { file }");
+	const hasUrl = "url" in source && typeof source.url === "string";
+	const hasFile = "file" in source && typeof source.file === "string";
+	if (hasUrl && hasFile) throw new TypeError("toolbar.source must be either { url } or { file }, not both");
+	if (!hasUrl && !hasFile) throw new TypeError("toolbar.source must be { url } or { file }");
+}
 //#endregion
 export { WireTransport as a, InMemoryTypedIpcRegistry as c, createControlBus as i, EventBus as l, startElectronDeck as n, createCapabilityRegistry as o, validateConfig as r, createTrustSet as s, electronDeck as t, defineEvent as u };
 
-//# sourceMappingURL=electron-deck-B9fun93z.js.map
+//# sourceMappingURL=electron-deck-Bi-u-Aze.js.map