@weapp-vite/miniprogram-automator 1.2.7 → 1.2.8

package/dist/index.mjs

@@ -612,7 +612,7 @@ var Connection = class Connection extends EventEmitter {
 //#endregion
 //#region src/headless.ts
 async function launchHeadlessAutomator(options) {
-	return await (await import("./launch-mRKloPOa.mjs")).launch({ projectPath: options.projectPath });
+	return await (await import("./launch-DpCZfswN.mjs")).launch({ projectPath: options.projectPath });
 }
 //#endregion
 //#region src/launcher/portLease.ts
@@ -711,7 +711,7 @@ async function acquireAutomatorPortLease(preferredPort) {
 }
 //#endregion
 //#region package.json
-var version = "1.2.7";
+var version = "1.2.8";
 //#endregion
 //#region src/Native.ts
 /** Native 的实现。 */

package/dist/{launch-mRKloPOa.mjs → launch-DpCZfswN.mjs}

@@ -3291,6 +3291,48 @@ function renderRuntimePageTree(context, page) {
 function createDuplicateRegistrationError(kind, id) {
 	return /* @__PURE__ */ new Error(`Duplicate ${kind} registration in headless runtime: ${id}`);
 }
+function callDefinitionMethod(instance, method, args) {
+	if (typeof method === "function") return method.apply(instance, args);
+}
+function normalizeComponentPageDefinition(definition) {
+	const { lifetimes = {}, methods = {}, pageLifetimes = {}, ...rest } = definition;
+	const created = lifetimes.created ?? rest.created;
+	const attached = lifetimes.attached ?? rest.attached;
+	const ready = lifetimes.ready ?? rest.ready ?? methods.onReady ?? rest.onReady;
+	const detached = lifetimes.detached ?? rest.detached ?? methods.onUnload ?? rest.onUnload;
+	const load = methods.onLoad ?? rest.onLoad;
+	const show = pageLifetimes.show ?? methods.onShow ?? rest.onShow;
+	const hide = pageLifetimes.hide ?? methods.onHide ?? rest.onHide;
+	const resize = pageLifetimes.resize ?? methods.onResize ?? rest.onResize;
+	const routeDone = pageLifetimes.routeDone ?? methods.onRouteDone ?? rest.onRouteDone;
+	return {
+		...rest,
+		...methods,
+		onLoad(...args) {
+			callDefinitionMethod(this, created, []);
+			callDefinitionMethod(this, attached, []);
+			return callDefinitionMethod(this, load, args);
+		},
+		onShow(...args) {
+			return callDefinitionMethod(this, show, args);
+		},
+		onHide(...args) {
+			return callDefinitionMethod(this, hide, args);
+		},
+		onReady(...args) {
+			return callDefinitionMethod(this, ready, args);
+		},
+		onUnload(...args) {
+			return callDefinitionMethod(this, detached, args);
+		},
+		onResize(...args) {
+			return callDefinitionMethod(this, resize, args);
+		},
+		onRouteDone(...args) {
+			return callDefinitionMethod(this, routeDone, args);
+		}
+	};
+}
 function createHostRegistries() {
 	return {
 		appDefinition: null,
@@ -3312,6 +3354,7 @@ function registerPageDefinition(registries, definition) {
 	return definition;
 }
 function registerComponentDefinition(registries, definition) {
+	if (registries.currentLoadContext?.kind === "page") return registerPageDefinition(registries, normalizeComponentPageDefinition(definition));
 	const id = registries.currentLoadContext?.route ?? `anonymous:${registries.components.size}`;
 	if (registries.components.has(id)) throw createDuplicateRegistrationError("component", id);
 	registries.components.set(id, definition);
@@ -5181,7 +5224,8 @@ function createModuleLoader(registries, getCurrentPages, getApp, wxDriver) {
 			const definition = registries.components.get(id);
 			if (!definition) throw new Error(`Component() was not registered for id "${id}" while executing ${normalize(filePath)}.`);
 			return definition;
-		}
+		},
+		wx: executionContext.wx
 	};
 }
 //#endregion
@@ -6991,6 +7035,11 @@ var HeadlessSession = class {
 	getCurrentPages() {
 		return this.pages.slice();
 	}
+	callWxMethod(methodName, ...args) {
+		const method = this.moduleLoader.wx[methodName];
+		if (typeof method !== "function") throw new TypeError(`wx.${methodName} is not available in headless runtime.`);
+		return Reflect.apply(method, this.moduleLoader.wx, args);
+	}
 	getCurrentPageNavigationBarTitle() {
 		return this.currentPageInstance?.__navigationBarTitle__ ?? null;
 	}
@@ -7359,6 +7408,7 @@ var HeadlessSession = class {
 		const pageInstance = this.createFreshPage(target);
 		this.pages.push(pageInstance);
 		this.currentPageInstance = pageInstance;
+		this.runInitialPageLifecycles(pageInstance, target.query);
 		return pageInstance;
 	}
 	navigateTo(url) {
@@ -7371,6 +7421,7 @@ var HeadlessSession = class {
 		const pageInstance = this.createFreshPage(target);
 		this.pages.push(pageInstance);
 		this.currentPageInstance = pageInstance;
+		this.runInitialPageLifecycles(pageInstance, target.query);
 		return pageInstance;
 	}
 	redirectTo(url) {
@@ -7385,6 +7436,7 @@ var HeadlessSession = class {
 		const pageInstance = this.createFreshPage(target);
 		this.pages.push(pageInstance);
 		this.currentPageInstance = pageInstance;
+		this.runInitialPageLifecycles(pageInstance, target.query);
 		return pageInstance;
 	}
 	navigateBack(delta = 1) {
@@ -7421,17 +7473,21 @@ var HeadlessSession = class {
 			this.unloadPage(page);
 		}
 		let nextPage = cachedTarget;
+		let shouldRunInitialLifecycles = false;
 		if (!nextPage) {
 			nextPage = this.createFreshPage(target);
 			this.tabPages.set(target.routeRecord.route, nextPage);
-		} else if (current !== nextPage) {
-			nextPage.onShow?.();
-			this.runPageComponentLifetime(nextPage.route, "show");
+			shouldRunInitialLifecycles = true;
 		}
-		nextPage.onTabItemTap?.(tabItem);
 		this.pages.length = 0;
 		this.pages.push(nextPage);
 		this.currentPageInstance = nextPage;
+		if (shouldRunInitialLifecycles) this.runInitialPageLifecycles(nextPage, target.query);
+		else if (current !== nextPage) {
+			nextPage.onShow?.();
+			this.runPageComponentLifetime(nextPage.route, "show");
+		}
+		nextPage.onTabItemTap?.(tabItem);
 		return nextPage;
 	}
 	pageScrollTo(option) {
@@ -7506,12 +7562,14 @@ var HeadlessSession = class {
 		pageInstance.createMediaQueryObserver = () => this.createMediaQueryObserver(pageInstance);
 		pageInstance.selectComponent = (selector) => this.selectComponent(selector);
 		pageInstance.selectAllComponents = (selector) => this.selectAllComponents(selector);
-		pageInstance.onLoad?.(target.query);
-		pageInstance.onShow?.();
-		pageInstance.onReady?.();
 		if (this.isTabBarRoute(target.routeRecord.route)) this.tabPages.set(target.routeRecord.route, pageInstance);
 		return pageInstance;
 	}
+	runInitialPageLifecycles(pageInstance, query) {
+		pageInstance.onLoad?.(query);
+		pageInstance.onShow?.();
+		pageInstance.onReady?.();
+	}
 	isTabBarRoute(route) {
 		return this.tabBarRoutes.has(stripLeadingSlash(route));
 	}
@@ -7717,9 +7775,52 @@ function createHeadlessSession(options) {
 	return new HeadlessSession(options);
 }
 //#endregion
-//#region ../../mpcore/packages/simulator/src/testing/pageHandle.ts
+//#region ../../mpcore/packages/simulator/src/testing/sessionHandle/shared.ts
+const LEADING_SLASH_RE = /^\/+/;
 const DEFAULT_WAIT_TIMEOUT$1 = 1e3;
 const DEFAULT_WAIT_INTERVAL$1 = 10;
+function normalizeRoute(route) {
+	return route.replace(LEADING_SLASH_RE, "");
+}
+function resolvePageScopeId(scopeId) {
+	const pagePathIndex = scopeId.indexOf("/page/");
+	return pagePathIndex >= 0 ? scopeId.slice(0, pagePathIndex) : scopeId;
+}
+function normalizeNonEmptyInput(value, label) {
+	const normalizedValue = value.trim();
+	if (!normalizedValue) throw new Error(`${label} must be a non-empty string in headless testing runtime.`);
+	return normalizedValue;
+}
+async function waitForDelay(ms = 0) {
+	if (ms <= 0) return;
+	await new Promise((resolve) => setTimeout(resolve, ms));
+}
+async function pollUntil(check, errorMessage, options = {}) {
+	const timeout = Number.isFinite(options.timeout) ? Math.max(0, Math.trunc(options.timeout ?? DEFAULT_WAIT_TIMEOUT$1)) : DEFAULT_WAIT_TIMEOUT$1;
+	const interval = Number.isFinite(options.interval) ? Math.max(1, Math.trunc(options.interval ?? DEFAULT_WAIT_INTERVAL$1)) : DEFAULT_WAIT_INTERVAL$1;
+	const deadline = Date.now() + timeout;
+	while (true) {
+		const result = await check();
+		if (result != null) return result;
+		if (Date.now() >= deadline) throw new Error(errorMessage);
+		await waitForDelay(interval);
+	}
+}
+async function runWithTimeout(operation, timeout, message) {
+	if (!Number.isFinite(timeout) || (timeout ?? 0) <= 0) return await operation();
+	let timer;
+	try {
+		return await Promise.race([Promise.resolve().then(operation), new Promise((_resolve, reject) => {
+			timer = setTimeout(() => reject(new Error(message)), Math.trunc(timeout));
+		})]);
+	} finally {
+		if (timer) clearTimeout(timer);
+	}
+}
+//#endregion
+//#region ../../mpcore/packages/simulator/src/testing/pageHandle.ts
+const DEFAULT_WAIT_TIMEOUT = 1e3;
+const DEFAULT_WAIT_INTERVAL = 10;
 var HeadlessTestingPageHandle = class {
 	project;
 	page;
@@ -7729,6 +7830,12 @@ var HeadlessTestingPageHandle = class {
 		this.page = page;
 		this.session = session;
 	}
+	get path() {
+		return this.page.route;
+	}
+	get query() {
+		return { ...this.page.options };
+	}
 	resolveDataByPath(path) {
 		if (!path) return this.page.data;
 		const segments = path.split(".").filter(Boolean);
@@ -7737,8 +7844,8 @@ var HeadlessTestingPageHandle = class {
 		return current;
 	}
 	async pollUntil(check, errorMessage, options = {}) {
-		const timeout = Number.isFinite(options.timeout) ? Math.max(0, Math.trunc(options.timeout ?? DEFAULT_WAIT_TIMEOUT$1)) : DEFAULT_WAIT_TIMEOUT$1;
-		const interval = Number.isFinite(options.interval) ? Math.max(1, Math.trunc(options.interval ?? DEFAULT_WAIT_INTERVAL$1)) : DEFAULT_WAIT_INTERVAL$1;
+		const timeout = Number.isFinite(options.timeout) ? Math.max(0, Math.trunc(options.timeout ?? DEFAULT_WAIT_TIMEOUT)) : DEFAULT_WAIT_TIMEOUT;
+		const interval = Number.isFinite(options.interval) ? Math.max(1, Math.trunc(options.interval ?? DEFAULT_WAIT_INTERVAL)) : DEFAULT_WAIT_INTERVAL;
 		const deadline = Date.now() + timeout;
 		while (true) {
 			const result = await check();
@@ -7752,9 +7859,15 @@ var HeadlessTestingPageHandle = class {
 		return scopeId ? new HeadlessTestingScopeHandle(scopeId, this.project, this.session) : null;
 	}
 	async callMethod(methodName, ...args) {
-		const method = this.page[methodName];
-		if (typeof method !== "function") throw new TypeError(`Method "${methodName}" does not exist on headless page ${this.page.route}.`);
-		return await method.apply(this.page, args);
+		return await this.callMethodWithOptions(methodName, {}, ...args);
+	}
+	async callMethodWithOptions(methodName, options = {}, ...args) {
+		const normalizedMethodName = normalizeNonEmptyInput(methodName, "Page method name");
+		return await runWithTimeout(async () => {
+			const method = this.page[normalizedMethodName];
+			if (typeof method !== "function") throw new TypeError(`Method "${normalizedMethodName}" does not exist on headless page ${this.page.route}.`);
+			return await method.apply(this.page, args);
+		}, options.timeout, `Timed out calling page method "${normalizedMethodName}" in headless testing runtime.`);
 	}
 	async data(path) {
 		return this.resolveDataByPath(path);
@@ -7856,38 +7969,6 @@ var HeadlessTestingPageHandle = class {
 	}
 };
 //#endregion
-//#region ../../mpcore/packages/simulator/src/testing/sessionHandle/shared.ts
-const LEADING_SLASH_RE = /^\/+/;
-const DEFAULT_WAIT_TIMEOUT = 1e3;
-const DEFAULT_WAIT_INTERVAL = 10;
-function normalizeRoute(route) {
-	return route.replace(LEADING_SLASH_RE, "");
-}
-function resolvePageScopeId(scopeId) {
-	const pagePathIndex = scopeId.indexOf("/page/");
-	return pagePathIndex >= 0 ? scopeId.slice(0, pagePathIndex) : scopeId;
-}
-function normalizeNonEmptyInput(value, label) {
-	const normalizedValue = value.trim();
-	if (!normalizedValue) throw new Error(`${label} must be a non-empty string in headless testing runtime.`);
-	return normalizedValue;
-}
-async function waitForDelay(ms = 0) {
-	if (ms <= 0) return;
-	await new Promise((resolve) => setTimeout(resolve, ms));
-}
-async function pollUntil(check, errorMessage, options = {}) {
-	const timeout = Number.isFinite(options.timeout) ? Math.max(0, Math.trunc(options.timeout ?? DEFAULT_WAIT_TIMEOUT)) : DEFAULT_WAIT_TIMEOUT;
-	const interval = Number.isFinite(options.interval) ? Math.max(1, Math.trunc(options.interval ?? DEFAULT_WAIT_INTERVAL)) : DEFAULT_WAIT_INTERVAL;
-	const deadline = Date.now() + timeout;
-	while (true) {
-		const result = await check();
-		if (result != null) return result;
-		if (Date.now() >= deadline) throw new Error(errorMessage);
-		await waitForDelay(interval);
-	}
-}
-//#endregion
 //#region ../../mpcore/packages/simulator/src/testing/sessionHandle/scope.ts
 var HeadlessTestingScopeHandle = class HeadlessTestingScopeHandle {
 	scopeId;
@@ -7961,6 +8042,13 @@ var HeadlessTestingSessionHandle = class {
 	async getCurrentPages() {
 		return this.session.getCurrentPages().map((page) => new HeadlessTestingPageHandle(this.project, page, this.session));
 	}
+	async callWxMethod(methodName, ...args) {
+		return await this.callWxMethodWithOptions(methodName, {}, ...args);
+	}
+	async callWxMethodWithOptions(methodName, options = {}, ...args) {
+		const normalizedMethodName = normalizeNonEmptyInput(methodName, "wx method name");
+		return await runWithTimeout(() => this.session.callWxMethod(normalizedMethodName, ...args), options.timeout, `Timed out calling wx.${normalizedMethodName} in headless testing runtime.`);
+	}
 	async scopeSnapshot(scopeId) {
 		const normalizedScopeId = normalizeNonEmptyInput(scopeId, "Scope id");
 		return this.session.getScopeSnapshot(normalizedScopeId);
@@ -7988,7 +8076,9 @@ var HeadlessTestingSessionHandle = class {
 		}, `Timed out waiting for ${normalizedCount} component(s) matching "${normalizedSelector}" in headless testing runtime.`, options);
 	}
 	async reLaunch(route) {
-		const page = this.session.reLaunch(route);
+		this.session.callWxMethod("reLaunch", { url: route });
+		const page = this.session.getCurrentPages().at(-1);
+		if (!page) throw new Error(`Failed to reLaunch route "${route}" through the headless wx runtime.`);
 		return new HeadlessTestingPageHandle(this.project, page, this.session);
 	}
 	async waitForCurrentPage(route, options = {}) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@weapp-vite/miniprogram-automator",
   "type": "module",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "description": "完全兼容微信 miniprogram-automator 的现代化替代实现",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -41,8 +41,8 @@
     "node": "^20.19.0 || >=22.12.0"
   },
   "dependencies": {
-    "obug": "^2.1.3",
-    "ws": "^8.21.0",
+    "obug": "^2.1.4",
+    "ws": "^8.21.1",
     "@weapp-vite/qr": "1.1.1"
   },
   "publishConfig": {