@weapp-vite/miniprogram-automator 1.2.19 → 1.2.21

package/dist/index.mjs

@@ -943,7 +943,7 @@ var Connection = class Connection extends EventEmitter {
 //#endregion
 //#region src/headless.ts
 async function launchHeadlessAutomator(options) {
-	return await (await import("./launch-CMN_emd-.mjs")).launch({ projectPath: options.projectPath });
+	return await (await import("./launch-BNQZTcKo.mjs")).launch({ projectPath: options.projectPath });
 }
 //#endregion
 //#region src/launcher/portLease.ts
@@ -1098,7 +1098,7 @@ function resolveWechatDevtoolsBootstrapArgs(args) {
 }
 //#endregion
 //#region package.json
-var version = "1.2.19";
+var version = "1.2.21";
 //#endregion
 //#region src/Native.ts
 /** Native 的实现。 */

package/dist/{launch-CMN_emd-.mjs → launch-BNQZTcKo.mjs}

@@ -1194,7 +1194,7 @@ function linkRenderedParents(root, parent = null) {
 	for (const child of root.children ?? []) linkRenderedParents(child, root);
 }
 //#endregion
-//#region ../../node_modules/.pnpm/@babel+parser@8.0.5/node_modules/@babel/parser/lib/index.js
+//#region ../../node_modules/.pnpm/@babel+parser@8.0.6/node_modules/@babel/parser/lib/index.js
 var Position = class {
 	constructor(line, col, index) {
 		this.line = void 0;
@@ -2209,16 +2209,30 @@ const types = {
 	j_cTag: new TokContext("</tag"),
 	j_expr: new TokContext("<tag>...</tag>", true)
 };
-const bmpIdentifierStart = /[\p{ID_Start}\u088f\u0c5c\u0cdc\ua7ce\ua7cf\ua7d2\ua7d4\ua7f1]/u;
-const bmpIdentifier = /[\p{ID_Continue}\u088f\u0c5c\u0cdc\ua7ce\ua7cf\ua7d2\ua7d4\ua7f1\u1acf-\u1add\u1ae0-\u1aeb]/u;
+const bmpIdentifierStart = /[\p{ID_Start}\u0558\u058b\u058c\u088f\u0c5c\u0cdc\u208f\u209d-\u209f\ua7ce\ua7cf\ua7d2\ua7d4\ua7dd\ua7e2\ua7f1\uab6c\uab6d]/u;
+const bmpIdentifier = /[\p{ID_Continue}\u0558\u058b\u058c\u088f\u0c5c\u0cdc\u208f\u209d-\u209f\ua7ce\ua7cf\ua7d2\ua7d4\ua7dd\ua7e2\ua7f1\uab6c\uab6d\u05c8\u05c9\u0b53\u0b54\u1acf-\u1af0]/u;
 const supplementaryIdentifierStartCodes = [
-	2368,
+	1979,
+	4,
+	385,
 	25,
 	1388,
 	2,
-	3817,
+	18,
+	21,
+	3100,
+	0,
+	678,
 	43,
-	20677,
+	22,
+	0,
+	1662,
+	0,
+	6,
+	10,
+	209,
+	310,
+	18458,
 	24,
 	3,
 	24,
@@ -2226,11 +2240,31 @@ const supplementaryIdentifierStartCodes = [
 	4,
 	6146,
 	7,
-	1290,
-	21,
-	98,
+	1239,
+	4,
+	47,
+	23,
+	96,
 	114,
-	22734,
+	14,
+	913,
+	15,
+	50,
+	8017,
+	5,
+	64,
+	0,
+	9534,
+	0,
+	2169,
+	5,
+	7,
+	86,
+	15,
+	6,
+	55,
+	50,
+	1729,
 	30,
 	2,
 	2,
@@ -2244,19 +2278,37 @@ const supplementaryIdentifierStartCodes = [
 	1,
 	53307,
 	5,
-	5987,
+	223,
+	0,
+	5764,
 	11,
 	21763,
-	4297
+	4297,
+	39815,
+	11327
 ];
 const supplementaryIdentifierCodes = [
-	3834,
-	1,
+	3787,
+	4,
+	33,
+	11,
 	3173,
 	7,
 	633,
 	9,
-	51450,
+	7,
+	0,
+	45879,
+	1,
+	296,
+	2,
+	9,
+	1,
+	3,
+	0,
+	33,
+	1,
+	5218,
 	0,
 	3,
 	0,
@@ -3649,10 +3701,10 @@ const flow = (superClass) => class FlowParserMixin extends superClass {
 		const arrows = [];
 		while (stack.length !== 0) {
 			const node = stack.pop();
-			if (node.type === "ArrowFunctionExpression" && node.body.type !== "BlockStatement") {
+			if (node.type === "ArrowFunctionExpression") {
 				if (node.typeParameters || !node.returnType) this.finishArrowValidation(node);
 				else arrows.push(node);
-				stack.push(node.body);
+				if (node.body.type !== "BlockStatement") stack.push(node.body);
 			} else if (node.type === "ConditionalExpression") {
 				stack.push(node.consequent);
 				stack.push(node.alternate);
@@ -4720,7 +4772,7 @@ const entities = {
 	hearts: "♥",
 	diams: "♦"
 };
-const lineBreakG = new RegExp(/\r\n|[\r\n\u2028\u2029]/.source, "g");
+const lineBreakG = /\r\n|[\r\n\u2028\u2029]/g;
 function isNewLine(code) {
 	switch (code) {
 		case 10:
@@ -5685,12 +5737,14 @@ function readInt(input, pos, lineStart, curLine, radix, len, forceLen, allowNumS
 		else if (_isDigit(code)) val = code - 48;
 		else val = Infinity;
 		if (val >= radix) {
-			if (val <= 9 && bailOnError) return {
-				n: null,
-				pos
-			};
-			else if (val <= 9 && errors.invalidDigit(pos, lineStart, curLine, radix)) val = 0;
-			else if (forceLen) {
+			if (val <= 9) {
+				if (bailOnError) return {
+					n: null,
+					pos
+				};
+				errors.invalidDigit(pos, lineStart, curLine, radix);
+				val = 0;
+			} else if (forceLen) {
 				val = 0;
 				invalid = true;
 			} else break;
@@ -6520,9 +6574,7 @@ var Tokenizer$1 = class extends CommentsParser {
 	}
 	errorHandlers_readInt = {
 		invalidDigit: (pos, lineStart, curLine, radix) => {
-			if (!(this.optionFlags & 4096)) return false;
 			this.raise(Errors.InvalidDigit, buildPosition(pos, lineStart, curLine), { radix });
-			return true;
 		},
 		numericSeparatorInEscapeSequence: this.errorBuilder(Errors.NumericSeparatorInEscapeSequence),
 		unexpectedNumericSeparator: this.errorBuilder(Errors.UnexpectedNumericSeparator)
@@ -12103,6 +12155,9 @@ const typescript = (superClass) => class TypeScriptParserMixin extends superClas
 	}
 	fillOptionalPropertiesForTSESLint(node) {
 		switch (node.type) {
+			case "ImportDeclaration":
+				node.phase ??= null;
+				return;
 			case "ExpressionStatement":
 				node.directive ??= void 0;
 				return;
@@ -17698,6 +17753,57 @@ function createHeadlessLogManager(runtimeConsole) {
 	};
 }
 //#endregion
+//#region ../../mpcore/packages/simulator/src/host/wx/startupNavigation.ts
+const queues = /* @__PURE__ */ new WeakMap();
+/** 冷启动先完成 App 与首屏装载，再顺序提交启动钩子请求的导航。 */
+var StartupNavigationQueue = class {
+	scheduler;
+	collecting = false;
+	pending = [];
+	constructor(scheduler) {
+		this.scheduler = scheduler;
+	}
+	capture(operation) {
+		this.collecting = true;
+		try {
+			operation();
+		} catch (error) {
+			this.pending.length = 0;
+			throw error;
+		} finally {
+			this.collecting = false;
+		}
+	}
+	run(option, operation) {
+		if (!this.collecting) return operation(option);
+		const defer = (callback) => callback ? (...args) => {
+			this.scheduler.setTimeout(() => callback(...args), 0);
+		} : void 0;
+		const deferred = option && {
+			...option,
+			success: defer(option.success),
+			fail: defer(option.fail),
+			complete: defer(option.complete)
+		};
+		this.pending.push(() => {
+			operation(deferred);
+		});
+	}
+	flush() {
+		const pending = this.pending.splice(0);
+		for (const operation of pending) operation();
+	}
+};
+/** 内部绑定保持 driver 的公开形状不变，两种 runtime 共享启动调度。 */
+function bindStartupNavigation(driver, queue) {
+	queues.set(driver, queue);
+	return driver;
+}
+function runNavigationApi(driver, option, operation) {
+	const queue = queues.get(driver);
+	return queue ? queue.run(option, operation) : operation(option);
+}
+//#endregion
 //#region ../../mpcore/packages/simulator/src/host/wx/index.ts
 function invokeWxApi(operation, option) {
 	try {
@@ -18095,12 +18201,12 @@ function createHeadlessWx(driver, runtimeConsole = console) {
 		hideLoading: (option) => invokeWxApi(() => driver.hideLoading(), option),
 		hideToast: () => driver.hideToast(),
 		downloadFile: (option) => driver.downloadFile(option),
-		navigateBack: (option) => invokeWxApi(() => {
-			driver.navigateBack(option);
-		}, option),
-		navigateTo: (option) => invokeWxApi(() => {
-			driver.navigateTo(option);
-		}, option),
+		navigateBack: (option) => runNavigationApi(driver, option, (deferred) => invokeWxApi(() => {
+			driver.navigateBack(deferred);
+		}, deferred)),
+		navigateTo: (option) => runNavigationApi(driver, option, (deferred) => invokeWxApi(() => {
+			driver.navigateTo(deferred);
+		}, deferred)),
 		nextTick: (callback) => driver.nextTick(callback),
 		offAppHide: (callback) => driver.offAppHide(callback),
 		offAppShow: (callback) => driver.offAppShow(callback),
@@ -18113,12 +18219,12 @@ function createHeadlessWx(driver, runtimeConsole = console) {
 			driver.pageScrollTo(option);
 		}, option),
 		previewImage: (option) => invokeWxApi(() => driver.previewImage(option), option),
-		reLaunch: (option) => invokeWxApi(() => {
-			driver.reLaunch(option);
-		}, option),
-		redirectTo: (option) => invokeWxApi(() => {
-			driver.redirectTo(option);
-		}, option),
+		reLaunch: (option) => runNavigationApi(driver, option, (deferred) => invokeWxApi(() => {
+			driver.reLaunch(deferred);
+		}, deferred)),
+		redirectTo: (option) => runNavigationApi(driver, option, (deferred) => invokeWxApi(() => {
+			driver.redirectTo(deferred);
+		}, deferred)),
 		removeSavedFile: (option) => invokeWxApi(() => driver.removeSavedFile(option), option),
 		saveImageToPhotosAlbum: (option) => invokeWxApi(() => driver.saveImageToPhotosAlbum(option), option),
 		saveVideoToPhotosAlbum: (option) => invokeWxApi(() => driver.saveVideoToPhotosAlbum(option), option),
@@ -18154,7 +18260,7 @@ function createHeadlessWx(driver, runtimeConsole = console) {
 		showToast: (option) => invokeWxApi(() => driver.showToast(option), option),
 		startPullDownRefresh: (option) => invokeWxApi(() => driver.startPullDownRefresh(), option),
 		stopPullDownRefresh: () => driver.stopPullDownRefresh(),
-		switchTab: (option) => driver.switchTab(option),
+		switchTab: (option) => runNavigationApi(driver, option, (deferred) => driver.switchTab(deferred)),
 		uploadFile: (option) => driver.uploadFile(option),
 		removeTabBarBadge: (option) => invokeWxApi(() => driver.removeTabBarBadge(option), option),
 		setTabBarBadge: (option) => invokeWxApi(() => driver.setTabBarBadge(option), option),
@@ -18412,6 +18518,40 @@ function createProjectDescriptor(options) {
 	};
 }
 //#endregion
+//#region ../../mpcore/packages/simulator/src/project/hostConfig.ts
+/**
+* @description 根据构建后的 app.json 创建模拟器提供给小程序脚本读取的宿主配置。
+* 微信开发者工具的 tabBar 页面路径通常带有 `.html` 后缀，保留该形态以覆盖路由归一化边界。
+*/
+function createMiniProgramHostConfig(appConfig, override) {
+	const appTabBar = appConfig.tabBar && typeof appConfig.tabBar === "object" ? appConfig.tabBar : void 0;
+	const tabBar = appTabBar ? {
+		...appTabBar,
+		...Array.isArray(appTabBar.list) ? { list: appTabBar.list.map((item) => {
+			if (!item || typeof item !== "object") return item;
+			const pagePath = typeof item.pagePath === "string" ? item.pagePath.replace(/^\/+/, "").replace(/\.html$/, "") : void 0;
+			return pagePath ? {
+				...item,
+				pagePath: `${pagePath}.html`
+			} : { ...item };
+		}) } : {}
+	} : void 0;
+	const generated = {
+		...appConfig,
+		...tabBar ? { tabBar } : {}
+	};
+	if (!override || typeof override !== "object" || Array.isArray(override)) return generated;
+	const overrideRecord = override;
+	return {
+		...generated,
+		...overrideRecord,
+		...generated.tabBar || overrideRecord.tabBar ? { tabBar: {
+			...generated.tabBar ?? {},
+			...overrideRecord.tabBar ?? {}
+		} } : {}
+	};
+}
+//#endregion
 //#region ../../mpcore/packages/simulator/src/project/loadProject.ts
 function readJsonObject$1(filePath) {
 	try {
@@ -41056,6 +41196,7 @@ function resolveNavigationPath(targetPath, baseRoute) {
 var HeadlessSession = class {
 	project;
 	kernel = new RuntimeKernel();
+	startupNavigation = new StartupNavigationQueue(this.kernel.scheduler);
 	appDefinition = null;
 	appInstance = null;
 	appLifecycle = new HeadlessAppLifecycle();
@@ -41110,7 +41251,7 @@ var HeadlessSession = class {
 			});
 		});
 		this.tabBarVisible = this.tabBarRoutes.size > 0;
-		this.moduleLoader = createModuleLoader(this.registries, () => this.pages.slice(), () => this.getApp(), {
+		this.moduleLoader = createModuleLoader(this.registries, () => this.pages.slice(), () => this.getApp(), bindStartupNavigation({
 			chooseImage: (option) => this.wxState.chooseImage(option ?? {}),
 			chooseMessageFile: (option) => this.wxState.chooseMessageFile(option ?? {}),
 			chooseMedia: (option) => this.wxState.chooseMedia(option ?? {}),
@@ -41189,9 +41330,12 @@ var HeadlessSession = class {
 			removeTabBarBadge: (option) => this.removeTabBarBadge(option.index),
 			setTabBarBadge: (option) => this.setTabBarBadge(option.index, option.text),
 			updateShareMenu: (option) => this.wxState.updateShareMenu(option)
-		}, {
+		}, this.startupNavigation), {
 			artifactSource: this.project.artifactSource,
-			globals: options.globals,
+			globals: {
+				...options.globals,
+				__wxConfig: createMiniProgramHostConfig(this.project.appConfig, options.globals?.__wxConfig)
+			},
 			kernel: this.kernel,
 			miniprogramRootPath: this.project.miniprogramRootPath,
 			onConsole: (entry) => this.emit("console", entry),
@@ -41645,9 +41789,16 @@ var HeadlessSession = class {
 		if (Object.hasOwn(runtimeApp, "routes")) this.appInstance.routes = runtimeApp.routes;
 	}
 	bootstrapNavigation(launchOptions = createAppLaunchOptions("", {})) {
-		const isLaunching = !this.appInstance;
-		this.bootstrap(launchOptions);
-		return isLaunching ? this.currentPageInstance : null;
+		if (this.appInstance) return null;
+		this.startupNavigation.capture(() => {
+			this.bootstrap(launchOptions);
+		});
+		if (launchOptions.path) {
+			const query = new URLSearchParams(launchOptions.query).toString();
+			this.reLaunch(`/${launchOptions.path}${query ? `?${query}` : ""}`);
+		}
+		this.startupNavigation.flush();
+		return this.currentPageInstance;
 	}
 	reLaunch(url) {
 		const target = this.resolveNavigationTarget(url);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@weapp-vite/miniprogram-automator",
   "type": "module",
-  "version": "1.2.19",
+  "version": "1.2.21",
   "description": "完全兼容微信 miniprogram-automator 的现代化替代实现",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -44,7 +44,7 @@
     "node": "^20.19.0 || >=22.12.0"
   },
   "dependencies": {
-    "@weapp-vite/qr": "1.1.4",
+    "@weapp-vite/qr": "1.1.6",
     "obug": "^3.0.0",
     "ws": "^8.21.3"
   },