@dimina-kit/devtools 0.4.0-dev.20260718143821 → 0.4.0-dev.20260728063215

package/dist/main/windows/internal-devtools-window/index.js

@@ -0,0 +1,160 @@
+import { BrowserWindow, View, WebContentsView } from 'electron';
+export function createInternalDevtoolsWindow(target, opts) {
+    let win = null;
+    // The host WebContentsView, kept so open()/close paths can push the host
+    // transition themselves (see notifyHostChanged's dedup comment).
+    let hostView = null;
+    const hostChangedHandlers = new Set();
+    // The host wc subscribers currently see (non-null only while the window is
+    // visible) — the single value the late-subscriber catch-up replays.
+    let currentHost = null;
+    // A throwing handler must never stop the fan-out — console-forward's own
+    // `sink(entry)` broadcast (console-forward/index.ts) uses the same
+    // isolation for exactly this reason.
+    //
+    // Dedups on the TRANSITION, not the event count: this controller pushes
+    // the transition explicitly at every point it performs one (open(), the
+    // intercepted close, dispose/'closed'), AND the native 'show'/'hide'
+    // handlers below may report the same transition again. The explicit push
+    // is the authority — on real macOS the native events were observed
+    // (instrumented-bundle trace against the live app) to fire for NEITHER
+    // `show()`/`showInactive()` NOR `hide()`, which left every subscriber
+    // permanently believing the window never opened; the events are kept only
+    // as belt-and-suspenders for external show/hide paths.
+    function notifyHostChanged(hostWc) {
+        if (hostWc === currentHost)
+            return;
+        currentHost = hostWc;
+        for (const handler of [...hostChangedHandlers]) {
+            try {
+                handler(hostWc);
+            }
+            catch (err) {
+                console.warn('[internal-devtools-window] onHostChanged handler threw, other handlers still ran:', err instanceof Error ? err.message : String(err));
+            }
+        }
+    }
+    function resizeHostView(hostWindow, view) {
+        try {
+            const [width, height] = hostWindow.getContentSize();
+            view.setBounds({ x: 0, y: 0, width, height });
+        }
+        catch { /* window mid-construction / torn down — next resize event re-fires */ }
+    }
+    // Builds the window + host + DevTools attachment exactly once. A second
+    // call (win already alive) is a no-op — see module doc for why this
+    // attachment is never rebuilt.
+    function buildOnce() {
+        if (win)
+            return;
+        const hostWindow = new BrowserWindow({
+            width: 1000,
+            height: 700,
+            title: '全局调试',
+            show: false,
+        });
+        win = hostWindow;
+        // The window's default `contentView` is a bare WebContentsView tied to
+        // its own (never-loaded) webContents, not a container that accepts
+        // children — mirror main-window/create.ts's pattern: wrap it in a fresh
+        // `View` so the host can be added as a child.
+        const view = new WebContentsView();
+        hostView = view;
+        const container = new View();
+        container.addChildView(view);
+        hostWindow.contentView = container;
+        resizeHostView(hostWindow, view);
+        hostWindow.on('resize', () => resizeHostView(hostWindow, view));
+        // Intercept the user-initiated close (title-bar button, Cmd+W) and hide
+        // instead of destroy — see module doc for why destroying and rebuilding
+        // this attachment cannot be made reliable. `dispose()` bypasses this via
+        // `win.destroy()`, which Electron guarantees does NOT emit 'close'.
+        // EXCEPT during a real app quit: preventDefault() on 'close' while the
+        // app is quitting CANCELS the quit itself (Electron closes every window
+        // as part of quit and aborts if any refuses), stranding the process with
+        // a hidden window — let the native close proceed instead.
+        hostWindow.on('close', (event) => {
+            if (opts?.isAppQuitting?.())
+                return;
+            event.preventDefault();
+            hostWindow.hide();
+            // Push the transition ourselves — the native 'hide' event is not
+            // reliable (see notifyHostChanged's dedup comment).
+            notifyHostChanged(null);
+        });
+        // Any real destruction (quit-time close above, or dispose()'s destroy())
+        // must both release the controller's handle and tell subscribers the
+        // host is gone.
+        hostWindow.on('closed', () => {
+            if (win !== hostWindow)
+                return;
+            win = null;
+            notifyHostChanged(null);
+        });
+        hostWindow.on('hide', () => notifyHostChanged(null));
+        hostWindow.on('show', () => notifyHostChanged(view.webContents));
+        if (!target.webContents.isDestroyed()) {
+            target.webContents.setDevToolsWebContents(view.webContents);
+            target.webContents.openDevTools({ mode: 'detach', activate: false });
+        }
+    }
+    return {
+        open() {
+            buildOnce();
+            // Mirrors main-window/create.ts's exact test-mode rule: `showInactive()`
+            // makes the window visible without activating it (and thus never gives
+            // it OS-level focus), so e2e runs opening this window never steal
+            // foreground focus from whatever the developer running the suite has
+            // open. Production always wants a real show()+focus() — this is the
+            // one button click that's supposed to bring the debug window forward.
+            if (process.env.NODE_ENV === 'test') {
+                win.showInactive();
+            }
+            else {
+                win.show();
+                win.focus();
+            }
+            // Push the transition ourselves — the native 'show' event is not
+            // reliable (see notifyHostChanged's dedup comment); relying on it left
+            // the mirrors permanently unsubscribed on real macOS.
+            if (hostView)
+                notifyHostChanged(hostView.webContents);
+        },
+        dispose() {
+            if (!win)
+                return;
+            const hostWindow = win;
+            // destroy() emits 'closed', whose handler above nulls `win` and
+            // notifies subscribers — the fallback below only covers a window that
+            // was somehow already destroyed without that handler having run.
+            if (!hostWindow.isDestroyed())
+                hostWindow.destroy();
+            if (win === hostWindow) {
+                win = null;
+                notifyHostChanged(null);
+            }
+        },
+        onHostChanged(handler) {
+            hostChangedHandlers.add(handler);
+            // Late-subscriber catch-up (see the interface doc): replayed a
+            // microtask later, never synchronously, and re-validated at fire time —
+            // an unsubscribe or a hide landing before the microtask must win.
+            if (currentHost) {
+                queueMicrotask(() => {
+                    if (!hostChangedHandlers.has(handler))
+                        return;
+                    if (!currentHost)
+                        return;
+                    try {
+                        handler(currentHost);
+                    }
+                    catch (err) {
+                        console.warn('[internal-devtools-window] onHostChanged catch-up handler threw:', err instanceof Error ? err.message : String(err));
+                    }
+                });
+            }
+            return () => { hostChangedHandlers.delete(handler); };
+        },
+    };
+}
+//# sourceMappingURL=index.js.map

package/dist/native-host/render/render.js

@@ -506,10 +506,16 @@ var Se = new class e {
 		});
 	}
 	createModule(e) {
-		let { path: t, usingComponents: n } = e;
+		let { path: t, usingComponents: n, componentPlaceholder: r = {} } = e;
 		if (!this.staticModules[t]) {
 			this.staticModules[t] = new we(e);
-			for (let e of Object.values(n)) window.modRequire(e);
+			for (let [e, t] of Object.entries(n)) try {
+				window.modRequire(t);
+			} catch (t) {
+				let i = r[e], a = i && n[i];
+				if (!a) throw t;
+				window.modRequire(a);
+			}
 		}
 	}
 	setInitialData(e) {
@@ -5923,10 +5929,10 @@ var Fd = [
 				g();
 				return;
 			}
-			let e = Math.max(Number(t.lazyLoadMargin) || 0, 0);
+			let e = Math.max(Number(t.lazyLoadMargin) || 0, 0), n = e * window.innerHeight, r = e * window.innerWidth;
 			l = new IntersectionObserver((e) => {
 				e.some((e) => e.isIntersecting || e.intersectionRatio > 0) && g();
-			}, { rootMargin: `${e * 100}vh ${e * 100}vw` }), l.observe(s.value);
+			}, { rootMargin: `${n}px ${r}px` }), l.observe(s.value);
 		}
 		H(() => [t.lazyLoad, t.lazyLoadMargin], ([e], [t]) => {
 			e ? !t && c.value ? p = !0 : _() : g();
@@ -11575,10 +11581,10 @@ var t_ = new class {
 		n.add(e);
 		let r = Te.getModuleByPath(e);
 		if (!r?.moduleInfo) return;
-		let { id: i, tplComponents: a = {}, usingComponents: o = {} } = r.moduleInfo, s = this.createComponent(e, t, o);
+		let { id: i, tplComponents: a = {}, usingComponents: o = {}, componentPlaceholder: s = {} } = r.moduleInfo, c = this.createComponent(e, t, o, /* @__PURE__ */ new Map(), s);
 		for (let [e, t] of Object.entries(a)) this.app.component(`dd-${e}`, this.createTplComponent({
 			id: i,
-			components: s,
+			components: c,
 			render: t
 		}));
 		for (let e of Object.values(o)) this.registerTplComponentsByPath(e, t, n);
@@ -11600,19 +11606,19 @@ var t_ = new class {
 		};
 	}
 	makeOptions(e) {
-		let { path: t, bridgeId: n, pageId: r } = e, i = Te.getModuleByPath(t), { id: a, appStyleScopeId: o, sharedStyleScopeIds: s = [], usingComponents: c, tplComponents: l, customTabBar: u } = i.moduleInfo, d = i.moduleInfo.render, f = u?.componentName, p = typeof f == "string" && Object.prototype.hasOwnProperty.call(c || {}, f);
+		let { path: t, bridgeId: n, pageId: r } = e, i = Te.getModuleByPath(t), { id: a, appStyleScopeId: o, sharedStyleScopeIds: s = [], usingComponents: c, componentPlaceholder: l = {}, tplComponents: u, customTabBar: d } = i.moduleInfo, f = i.moduleInfo.render, p = d?.componentName, m = typeof p == "string" && Object.prototype.hasOwnProperty.call(c || {}, p);
 		this.pageId = r;
-		let m = this, h = "dd-page", g = `data-v-${a}`, _ = [
+		let h = this, g = "dd-page", _ = `data-v-${a}`, v = [
 			o ? `data-v-${o}` : null,
-			g,
+			_,
 			...s.map((e) => `data-v-${e}`)
-		].filter(Boolean), v = this.createComponent(t, n, c);
+		].filter(Boolean), y = this.createComponent(t, n, c, /* @__PURE__ */ new Map(), l);
 		return {
 			id: a,
-			tplComponents: l,
+			tplComponents: u,
 			app: {
 				render: () => {
-					let e = Oa(h);
+					let e = Oa(g);
 					return Bc(Ts, { onResolve: () => {
 						Se.invoke({
 							type: "domReady",
@@ -11621,18 +11627,18 @@ var t_ = new class {
 						});
 					} }, { default: () => Bc(e) });
 				},
-				components: { [h]: {
+				components: { [g]: {
 					name: t,
-					__scopeId: g,
+					__scopeId: _,
 					async setup(e, { expose: r }) {
 						r();
 						let i = hc();
-						Mi("bridgeId", n), Mi("path", t), Mi(t, { id: m.pageId }), Mi("info", {
-							id: m.pageId,
-							sId: g
+						Mi("bridgeId", n), Mi("path", t), Mi(t, { id: h.pageId }), Mi("info", {
+							id: h.pageId,
+							sId: _
 						});
 						let a = i.proxy;
-						a.__page__ = !0, m.setModuleInstance(m.pageId, a);
+						a.__page__ = !0, h.setModuleInstance(h.pageId, a);
 						let o = () => {}, s = !1, c = () => {
 							s ||= (window.requestAnimationFrame(() => {
 								Se.send({
@@ -11640,20 +11646,20 @@ var t_ = new class {
 									target: "service",
 									body: {
 										bridgeId: n,
-										moduleId: m.pageId,
+										moduleId: h.pageId,
 										scrollTop: window.scrollY
 									}
 								}), s = !1;
 							}), !0);
 						};
 						_a(() => {
-							o = Bg(zg(i.subTree), _, g), window.addEventListener("scroll", c, { passive: !0 }), Vr(() => {
+							o = Bg(zg(i.subTree), v, _), window.addEventListener("scroll", c, { passive: !0 }), Vr(() => {
 								Se.send({
 									type: "pageReady",
 									target: "service",
 									body: {
 										bridgeId: n,
-										moduleId: m.pageId
+										moduleId: h.pageId
 									}
 								});
 							});
@@ -11661,14 +11667,14 @@ var t_ = new class {
 							o(), window.removeEventListener("scroll", c);
 						});
 						let { data: l, templateData: u } = Og();
-						m.setupData.set(m.pageId, l);
-						let d = await Se.wait(m.pageId);
-						return m.applyInitialData(m.pageId, l, d), u;
+						h.setupData.set(h.pageId, l);
+						let d = await Se.wait(h.pageId);
+						return h.applyInitialData(h.pageId, l, d), u;
 					},
-					components: v,
-					render: p ? function(...e) {
-						return Bc(Ls, null, [d.apply(this, e), Bc(Oa(`dd-${f}`))]);
-					} : d
+					components: y,
+					render: m ? function(...e) {
+						return Bc(Ls, null, [f.apply(this, e), Bc(Oa(`dd-${p}`))]);
+					} : f
 				} }
 			}
 		};
@@ -11759,58 +11765,68 @@ var t_ = new class {
 		}
 		return n;
 	}
-	createComponent(e, t, r, i = /* @__PURE__ */ new Map()) {
+	createComponent(e, t, r, i = /* @__PURE__ */ new Map(), a = {}) {
 		if (!r || Object.keys(r).length === 0) return;
-		let a = {}, o = this;
-		for (let [s, c] of Object.entries(r)) {
-			let r = `${e}\0${c}`, l = i.get(r);
-			if (l) {
-				a[`dd-${s}`] = l;
+		let o = {}, s = this;
+		for (let [c, l] of Object.entries(r)) {
+			let u = l, d = `${e}\0${u}`, f = i.get(d);
+			if (f) {
+				o[`dd-${c}`] = f;
 				continue;
 			}
-			let u = Te.getModuleByPath(c);
-			if (!u?.moduleInfo) continue;
-			let { id: d, usingComponents: f, customTabBar: p } = u.moduleInfo, m = `data-v-${d}`, h = kg(u.moduleInfo.styleIsolation), g = {
-				name: c,
-				__scopeId: m,
+			let p = Te.getModuleByPath(u);
+			if (!p?.moduleInfo) {
+				let t = a[c], n = t && r[t];
+				if (n) {
+					if (u = n, d = `${e}\0${u}`, f = i.get(d), f) {
+						o[`dd-${c}`] = f;
+						continue;
+					}
+					p = Te.getModuleByPath(u);
+				}
+			}
+			if (!p?.moduleInfo) continue;
+			let { id: m, usingComponents: h, componentPlaceholder: g = {}, customTabBar: _ } = p.moduleInfo, v = `data-v-${m}`, b = kg(p.moduleInfo.styleIsolation), S = {
+				name: u,
+				__scopeId: v,
 				components: void 0,
 				props: {
-					...u.props,
+					...p.props,
 					[Dg]: { type: null }
 				},
 				async setup(r, { attrs: i, expose: a }) {
-					let s = V("info"), l = V("path"), f = hc();
+					let o = V("info"), c = V("path"), l = hc();
 					a({
 						props: r,
-						sId: f.vnode.scopeId || s.sId
+						sId: l.vnode.scopeId || o.sId
 					});
-					let g = o.getParentModuleId(f) || s.id, _ = V(e, null), v = _?.id || g, b = _ ? e : l, S = `${d}_${y()}`;
+					let d = s.getParentModuleId(l) || o.id, f = V(e, null), h = f?.id || d, g = f ? e : c, S = `${m}_${y()}`;
 					Mi("info", {
 						id: S,
-						sId: m
-					}), Mi("path", c), Mi(c, {
+						sId: v
+					}), Mi("path", u), Mi(u, {
 						id: S,
-						pagePath: b,
-						pageId: v
+						pagePath: g,
+						pageId: h
 					});
-					let C = f.proxy;
-					o.setModuleInstance(S, C);
-					let ee = () => _e(u.propertySchemas, Wg(u.propertySchemas, Ug(u.propertySchemas, ju(r), f.vnode), f.vnode), {
-						isAbsent: (e) => !Vg(f.vnode.props, e) && !(e === "style" && Vg(f.vnode.props, Dg)),
+					let C = l.proxy;
+					s.setModuleInstance(S, C);
+					let ee = () => _e(p.propertySchemas, Wg(p.propertySchemas, Ug(p.propertySchemas, ju(r), l.vnode), l.vnode), {
+						isAbsent: (e) => !Vg(l.vnode.props, e) && !(e === "style" && Vg(l.vnode.props, Dg)),
 						warn: (e) => console.warn("[system]", "[render]", e)
 					}), w = [];
-					for (let [e, t] of Object.entries(u.props ?? {})) t.cls && w.push(e);
+					for (let [e, t] of Object.entries(p.props ?? {})) t.cls && w.push(e);
 					Mi("externalClasses", w);
-					let te = Ng(i), ne = ee(), T = Object.keys(u.propertySchemas || {}).filter((e) => Vg(f.vnode.props, e) || e === "style" && Vg(f.vnode.props, Dg)), re = Se.waitAndSend(S, {
+					let te = Ng(i), ne = ee(), T = Object.keys(p.propertySchemas || {}).filter((e) => Vg(l.vnode.props, e) || e === "style" && Vg(l.vnode.props, Dg)), re = Se.waitAndSend(S, {
 						type: "mC",
 						target: "service",
 						body: {
 							bridgeId: t,
 							moduleId: S,
-							path: c,
-							isCustomTabBar: p === !0,
-							pageId: v,
-							parentId: g,
+							path: u,
+							isCustomTabBar: _ === !0,
+							pageId: h,
+							parentId: d,
 							eventAttr: te,
 							targetInfo: {
 								dataset: x(i, ju),
@@ -11824,22 +11840,22 @@ var t_ = new class {
 					}), ie = !1, E, D = () => {
 						ie || (ie = !0, E?.());
 					};
-					o._pendingSetups.set(S, new Promise((e) => E = e)), _a(() => {
-						let e = zg(f.subTree);
-						o.registerModuleRoots(S, e);
-						for (let t of e) t.setAttribute(wg, ""), t.setAttribute(Tg, h), Mg(t, d);
+					s._pendingSetups.set(S, new Promise((e) => E = e)), _a(() => {
+						let e = zg(l.subTree);
+						s.registerModuleRoots(S, e);
+						for (let t of e) t.setAttribute(wg, ""), t.setAttribute(Tg, b), Mg(t, m);
 						Vr(() => {
-							let n = o.getRenderParentModuleId(e, S);
+							let n = s.getRenderParentModuleId(e, S);
 							Se.send({
 								type: "mA",
 								target: "service",
 								body: {
 									bridgeId: t,
 									moduleId: S,
-									parentId: n || g
+									parentId: n || d
 								}
 							});
-							let r = C.$el?._propBindings, i = o.collectCustomEventPath(C.$el, S);
+							let r = C.$el?._propBindings, i = s.collectCustomEventPath(C.$el, S);
 							Se.send({
 								type: "mR",
 								target: "service",
@@ -11856,7 +11872,7 @@ var t_ = new class {
 								info: {
 									attrs: i,
 									bridgeId: t,
-									moduleId: v
+									moduleId: h
 								}
 							});
 						});
@@ -11864,18 +11880,18 @@ var t_ = new class {
 					let ae;
 					xa(() => {
 						ae?.();
-						let e = zg(f.subTree);
-						o.unregisterModuleRoots(S, e), Se.send({
+						let e = zg(l.subTree);
+						s.unregisterModuleRoots(S, e), Se.send({
 							type: "mU",
 							target: "service",
 							body: {
 								bridgeId: t,
 								moduleId: S
 							}
-						}), o.deleteModuleInstance(S), o.setupData.delete(S), o.initializedModules.delete(S), o.preInitUpdates.delete(S), o._pendingSetups.delete(S), D();
+						}), s.deleteModuleInstance(S), s.setupData.delete(S), s.initializedModules.delete(S), s.preInitUpdates.delete(S), s._pendingSetups.delete(S), D();
 					});
 					let { data: oe, templateData: se } = Og();
-					o.setupData.set(S, oe), u.builtinBehaviors?.has("wx://form-field") && (ae = V("registerFormControl", void 0)?.({
+					s.setupData.set(S, oe), p.builtinBehaviors?.has("wx://form-field") && (ae = V("registerFormControl", void 0)?.({
 						getName: () => Object.prototype.hasOwnProperty.call(oe, "name") ? oe.name : r.name,
 						getValue: () => Object.prototype.hasOwnProperty.call(oe, "value") ? oe.value : r.value
 					}));
@@ -11899,15 +11915,15 @@ var t_ = new class {
 						});
 					}, { immediate: !0 });
 					let le = await re;
-					return o._pendingSetups.delete(S), D(), o.applyInitialData(S, oe, le), se;
+					return s._pendingSetups.delete(S), D(), s.applyInitialData(S, oe, le), se;
 				},
 				render(...e) {
-					return jg(u.moduleInfo.render.apply(this, e), h, d);
+					return jg(p.moduleInfo.render.apply(this, e), b, m);
 				}
 			};
-			i.set(r, g), g.components = this.createComponent(c, t, f, i), a[`dd-${s}`] = g;
+			i.set(d, S), S.components = this.createComponent(u, t, h, i, g), o[`dd-${c}`] = S;
 		}
-		return a;
+		return o;
 	}
 	updateModule(e) {
 		let { moduleId: t, data: n, changes: r = [] } = e, i = this.setupData.get(t);