@weapp-vite/miniprogram-automator 1.0.2 → 1.0.3

package/dist/index.d.mts

@@ -247,7 +247,6 @@ declare class MiniProgram extends EventEmitter {
 }
 //#endregion
 //#region src/Launcher.d.ts
-/** IConnectOptions 的类型定义。 */
 interface IConnectOptions {
   wsEndpoint: string;
 }

package/dist/index.mjs

@@ -577,11 +577,11 @@ var Connection = class Connection extends EventEmitter {
 //#endregion
 //#region src/headless.ts
 async function launchHeadlessAutomator(options) {
-	return await (await import("./launch-Bd3TZy1I.mjs")).launch({ projectPath: options.projectPath });
+	return await (await import("./launch-Didv0lMX.mjs")).launch({ projectPath: options.projectPath });
 }
 //#endregion
 //#region package.json
-var version = "1.0.2";
+var version = "1.0.3";
 //#endregion
 //#region src/Native.ts
 /** Native 的实现。 */
@@ -770,6 +770,8 @@ function extractPluginId(p) {
 //#endregion
 //#region src/MiniProgram.ts
 const CLOSE_STEP_TIMEOUT = 2e3;
+const CURRENT_PAGE_RETRIES = 3;
+const CURRENT_PAGE_RETRY_DELAY = 400;
 function sleep(ms) {
 	return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -792,6 +794,9 @@ function isFnStr(value) {
 	const trimmed = trim(value);
 	return startWith(trimmed, "function") || startWith(trimmed, "() =>");
 }
+function isCurrentPageProtocolTimeout(error) {
+	return error instanceof Error && "code" in error && error.code === "DEVTOOLS_PROTOCOL_TIMEOUT" && "method" in error && error.method === "App.getCurrentPage";
+}
 /** MiniProgram 的实现。 */
 var MiniProgram = class extends EventEmitter {
 	appBindings = /* @__PURE__ */ new Map();
@@ -830,12 +835,20 @@ var MiniProgram = class extends EventEmitter {
 		return await this.changeRoute("switchTab", url);
 	}
 	async currentPage() {
-		const { pageId, path, query } = await this.send("App.getCurrentPage");
-		return Page.create(this.connection, {
-			id: pageId,
-			path,
-			query
-		}, this.pageMap);
+		let lastError;
+		for (let attempt = 1; attempt <= CURRENT_PAGE_RETRIES; attempt += 1) try {
+			const { pageId, path, query } = await this.send("App.getCurrentPage");
+			return Page.create(this.connection, {
+				id: pageId,
+				path,
+				query
+			}, this.pageMap);
+		} catch (error) {
+			lastError = error;
+			if (!isCurrentPageProtocolTimeout(error) || attempt >= CURRENT_PAGE_RETRIES) throw error;
+			await sleep(CURRENT_PAGE_RETRY_DELAY);
+		}
+		throw lastError;
 	}
 	async systemInfo() {
 		return await this.callWxMethod("getSystemInfoSync");
@@ -1005,6 +1018,7 @@ const DEFAULT_TIMEOUT = 3e4;
 const DEFAULT_RUNTIME_PROVIDER_ENV = "WEAPP_VITE_AUTOMATOR_RUNTIME_PROVIDER";
 const LEGACY_RUNTIME_PROVIDER_ENV = "WEAPP_VITE_E2E_RUNTIME_PROVIDER";
 const EXTENSION_CONTEXT_INVALIDATED_RE = /Extension context invalidated/i;
+const WINDOWS_BATCH_CLI_RE = /\.(?:bat|cmd)$/i;
 let localhostListenPatched = false;
 function isExtensionContextInvalidatedError(error) {
 	return error instanceof Error && EXTENSION_CONTEXT_INVALIDATED_RE.test(error.message);
@@ -1026,6 +1040,25 @@ function patchNetListenToLoopback() {
 		return rawListen.apply(this, args);
 	};
 }
+/** IConnectOptions 的类型定义。 */
+function shouldUseWindowsCommandShell(cliPath) {
+	return isWindows && WINDOWS_BATCH_CLI_RE.test(cliPath);
+}
+function escapeWindowsCmdArg(arg) {
+	const escaped = arg.replace(/"/g, "\"\"").replace(/%/g, "%%");
+	return /[\s"&<>^|()]/.test(arg) ? `"${escaped}"` : escaped;
+}
+function resolveWindowsBatchSpawn(cliPath, args) {
+	return {
+		file: process.env.ComSpec || "cmd.exe",
+		args: [
+			"/d",
+			"/s",
+			"/c",
+			`"${[cliPath, ...args].map(escapeWindowsCmdArg).join(" ")}"`
+		]
+	};
+}
 function resolveRuntimeProvider(options) {
 	return options.runtimeProvider || process.env[DEFAULT_RUNTIME_PROVIDER_ENV] || process.env[LEGACY_RUNTIME_PROVIDER_ENV] || "devtools";
 }
@@ -1045,7 +1078,8 @@ var Launcher = class {
 		if (!await import("node:fs/promises").then((fs) => fs.access(projectPath).then(() => true).catch(() => false))) throw new Error(`Project path ${projectPath} doesn't exist`);
 		if (!isEmpty(projectConfig)) await this.extendProjectConfig(projectConfig, projectPath);
 		let processError = null;
-		let exited = false;
+		let processExitCode = null;
+		let processSignal = null;
 		args = [
 			...args,
 			"auto",
@@ -1058,17 +1092,25 @@ var Launcher = class {
 		else if (ticket) args.push("--ticket", ticket);
 		if (trustProject) args.push("--trust-project");
 		try {
-			const child = spawn(cliPath, args, {
+			const spawnTarget = shouldUseWindowsCommandShell(cliPath) ? resolveWindowsBatchSpawn(cliPath, args) : {
+				file: cliPath,
+				args
+			};
+			const child = spawn(spawnTarget.file, spawnTarget.args, {
 				stdio: "ignore",
-				cwd: cwd || void 0
+				cwd: cwd || void 0,
+				...shouldUseWindowsCommandShell(cliPath) ? {
+					windowsHide: true,
+					windowsVerbatimArguments: true
+				} : {}
 			});
 			child.on("error", (error) => {
 				processError = error;
 			});
-			child.on("exit", () => {
-				setTimeout(() => {
-					exited = true;
-				}, 15e3);
+			child.on("exit", (code, signal) => {
+				processExitCode = code;
+				processSignal = signal;
+				if (code !== 0 || signal) processError = /* @__PURE__ */ new Error(`DevTools cli exited unexpectedly with code ${code ?? "null"}${signal ? ` and signal ${signal}` : ""}`);
 			});
 			child.unref();
 		} catch (error) {
@@ -1078,7 +1120,7 @@ var Launcher = class {
 		let lastConnectError = null;
 		await waitUntil(async () => {
 			try {
-				if (processError || exited) return true;
+				if (processError) return true;
 				const candidate = await this.connectTool({ wsEndpoint: `ws://127.0.0.1:${port}` });
 				try {
 					await candidate.checkVersion();
@@ -1098,7 +1140,7 @@ var Launcher = class {
 		if (!miniProgram) {
 			if (processError) throw new Error("Failed to launch wechat web devTools, please make sure cliPath is correctly specified");
 			if (lastConnectError) throw lastConnectError;
-			if (exited) throw new Error("Failed to launch wechat web devTools, please make sure http port is open");
+			if (processExitCode !== null || processSignal) throw new Error("Failed to launch wechat web devTools, please make sure http port is open");
 			throw new Error("Failed connecting to devtools websocket endpoint");
 		}
 		const resolvedMiniProgram = miniProgram;

package/dist/{launch-Bd3TZy1I.mjs → launch-Didv0lMX.mjs}

@@ -27,9 +27,12 @@ function createAppInstance(definition) {
 	return instance;
 }
 //#endregion
-//#region ../../mpcore/packages/simulator/src/runtime/componentInstance.ts
+//#region ../../mpcore/packages/simulator/src/runtime/componentInstance/shared.ts
 const ARRAY_INDEX_PATH_RE$1 = /\[(\d+)\]/g;
 const ARRAY_INDEX_SEGMENT_RE$1 = /^\d+$/;
+function cloneObject$1(value) {
+	return JSON.parse(JSON.stringify(value));
+}
 function bindFunction$1(target, key, value) {
 	if (typeof value !== "function") {
 		target[key] = value;
@@ -37,14 +40,14 @@ function bindFunction$1(target, key, value) {
 	}
 	target[key] = (...args) => value.apply(target, args);
 }
-function cloneObject$1(value) {
-	return JSON.parse(JSON.stringify(value));
-}
 function cloneValue$1(value) {
 	if (Array.isArray(value)) return JSON.parse(JSON.stringify(value));
 	if (value && typeof value === "object") return cloneObject$1(value);
 	return value;
 }
+function cloneRecord(value) {
+	return cloneObject$1(value);
+}
 function parseDataPath$1(path) {
 	return path.replace(ARRAY_INDEX_PATH_RE$1, ".$1").split(".").map((segment) => segment.trim()).filter(Boolean);
 }
@@ -70,13 +73,70 @@ function assignByPath$1(target, path, value) {
 	const normalizedLeafSegment = isArrayIndexSegment$1(leafSegment) ? Number(leafSegment) : leafSegment;
 	current[normalizedLeafSegment] = value;
 }
+function mergeRecord(...records) {
+	return Object.assign({}, ...records.filter(Boolean));
+}
+//#endregion
+//#region ../../mpcore/packages/simulator/src/runtime/componentInstance/observers.ts
+function runPropertyObservers(definition, instance, changedKeys, previousProperties) {
+	const propOptions = definition.properties;
+	if (!propOptions || typeof propOptions !== "object" || Array.isArray(propOptions)) return;
+	for (const changedKey of changedKeys) {
+		const option = propOptions[changedKey];
+		if (!option || typeof option !== "object" || Array.isArray(option)) continue;
+		const observer = option.observer;
+		if (typeof observer !== "function") continue;
+		observer.call(instance, instance.properties[changedKey], previousProperties[changedKey]);
+	}
+}
+function normalizeObserverPattern(pattern) {
+	return pattern.split(",").map((item) => item.trim()).filter(Boolean);
+}
+function resolveObservedValue(instance, pattern) {
+	if (pattern === "**") return {
+		...instance.properties,
+		...instance.data
+	};
+	const segments = parseDataPath$1(pattern);
+	if (segments.length === 0) return;
+	const [rootSegment, ...restSegments] = segments;
+	let current = (Object.hasOwn(instance.properties, rootSegment) ? instance.properties : instance.data)?.[rootSegment];
+	for (const segment of restSegments) {
+		const normalizedSegment = isArrayIndexSegment$1(segment) ? Number(segment) : segment;
+		current = current?.[normalizedSegment];
+	}
+	return current;
+}
+function matchObserverPattern(pattern, changedKeys) {
+	if (pattern === "**") return changedKeys.length > 0;
+	const patterns = normalizeObserverPattern(pattern);
+	return changedKeys.some((changedKey) => {
+		return patterns.some((item) => {
+			if (item === "**") return true;
+			if (changedKey === item) return true;
+			return changedKey.startsWith(`${item}.`) || changedKey.startsWith(`${item}[`);
+		});
+	});
+}
+function runComponentObservers(definition, instance, changedKeys, previousProperties = {}) {
+	if (changedKeys.length === 0) return;
+	runPropertyObservers(definition, instance, changedKeys, previousProperties);
+	const observers = definition.observers;
+	if (observers && typeof observers === "object" && !Array.isArray(observers)) for (const [pattern, handler] of Object.entries(observers)) {
+		if (typeof handler !== "function" || !matchObserverPattern(pattern, changedKeys)) continue;
+		const args = normalizeObserverPattern(pattern).map((item) => resolveObservedValue(instance, item));
+		handler.call(instance, ...args);
+	}
+}
+//#endregion
+//#region ../../mpcore/packages/simulator/src/runtime/componentInstance/properties.ts
 function resolveInitialData$1(definition) {
 	const rawData = definition.data;
 	if (typeof rawData === "function") {
 		const next = rawData.call(definition);
-		return next && typeof next === "object" && !Array.isArray(next) ? cloneObject$1(next) : {};
+		return next && typeof next === "object" && !Array.isArray(next) ? cloneRecord(next) : {};
 	}
-	return rawData && typeof rawData === "object" && !Array.isArray(rawData) ? cloneObject$1(rawData) : {};
+	return rawData && typeof rawData === "object" && !Array.isArray(rawData) ? cloneRecord(rawData) : {};
 }
 function isBehaviorDefinition(value) {
 	return !!value && typeof value === "object" && !Array.isArray(value) && value.__isHeadlessBehavior__ === true;
@@ -91,9 +151,6 @@ function flattenBehaviors(definition) {
 	}
 	return flattened;
 }
-function mergeRecord(...records) {
-	return Object.assign({}, ...records.filter(Boolean));
-}
 function normalizeComponentDefinition(definition) {
 	const behaviors = flattenBehaviors(definition);
 	if (behaviors.length === 0) return definition;
@@ -200,61 +257,13 @@ function resolvePropertyDefaultValue(option) {
 	if (!option || typeof option !== "object" || Array.isArray(option) || !("value" in option)) return;
 	return cloneValue$1(option.value);
 }
-function runPropertyObservers(definition, instance, changedKeys, previousProperties) {
-	const propOptions = definition.properties;
-	if (!propOptions || typeof propOptions !== "object" || Array.isArray(propOptions)) return;
-	for (const changedKey of changedKeys) {
-		const option = propOptions[changedKey];
-		if (!option || typeof option !== "object" || Array.isArray(option)) continue;
-		const observer = option.observer;
-		if (typeof observer !== "function") continue;
-		observer.call(instance, instance.properties[changedKey], previousProperties[changedKey]);
-	}
-}
-function normalizeObserverPattern(pattern) {
-	return pattern.split(",").map((item) => item.trim()).filter(Boolean);
-}
-function resolveObservedValue(instance, pattern) {
-	if (pattern === "**") return {
-		...instance.properties,
-		...instance.data
-	};
-	const segments = parseDataPath$1(pattern);
-	if (segments.length === 0) return;
-	const [rootSegment, ...restSegments] = segments;
-	let current = (Object.hasOwn(instance.properties, rootSegment) ? instance.properties : instance.data)?.[rootSegment];
-	for (const segment of restSegments) {
-		const normalizedSegment = isArrayIndexSegment$1(segment) ? Number(segment) : segment;
-		current = current?.[normalizedSegment];
-	}
-	return current;
-}
-function matchObserverPattern(pattern, changedKeys) {
-	if (pattern === "**") return changedKeys.length > 0;
-	const patterns = normalizeObserverPattern(pattern);
-	return changedKeys.some((changedKey) => {
-		return patterns.some((item) => {
-			if (item === "**") return true;
-			if (changedKey === item) return true;
-			return changedKey.startsWith(`${item}.`) || changedKey.startsWith(`${item}[`);
-		});
-	});
-}
-function runComponentObservers(definition, instance, changedKeys, previousProperties = {}) {
-	if (changedKeys.length === 0) return;
-	runPropertyObservers(definition, instance, changedKeys, previousProperties);
-	const observers = definition.observers;
-	if (observers && typeof observers === "object" && !Array.isArray(observers)) for (const [pattern, handler] of Object.entries(observers)) {
-		if (typeof handler !== "function" || !matchObserverPattern(pattern, changedKeys)) continue;
-		const args = normalizeObserverPattern(pattern).map((item) => resolveObservedValue(instance, item));
-		handler.call(instance, ...args);
-	}
-}
 function normalizeComponentPropertyValue(definition, key, rawValue) {
 	const option = definition.properties?.[key];
 	if (rawValue == null) return resolvePropertyDefaultValue(option);
 	return coerceComponentPropertyValue(rawValue, option);
 }
+//#endregion
+//#region ../../mpcore/packages/simulator/src/runtime/componentInstance/index.ts
 function createComponentInstance(options) {
 	const definition = normalizeComponentDefinition(options.definition);
 	const instance = {
@@ -2830,9 +2839,11 @@ function parseDocument(data, options) {
 	return handler.root;
 }
 //#endregion
-//#region ../../mpcore/packages/simulator/src/runtime/render.ts
-const LEADING_SLASH_RE$4 = /^\/+/;
+//#region ../../mpcore/packages/simulator/src/runtime/render/shared.ts
 const TEMPLATE_INTERPOLATION_RE$1 = /\{\{([^{}]+)\}\}/g;
+const DATASET_NAME_RE$3 = /-([a-z])/g;
+const BRACKET_INDEX_RE = /\[(\d+)\]/g;
+const LEADING_SLASH_RE$4 = /^\/+/;
 const EVENT_BINDING_ATTRS = [
 	"bindtap",
 	"bind:tap",
@@ -2855,8 +2866,6 @@ const STRUCTURAL_ATTRS = [
 	"wx:key"
 ];
 const WX_ELSE_ATTRS = new Set(["wx:elif", "wx:else"]);
-const DATASET_NAME_RE$3 = /-([a-z])/g;
-const BRACKET_INDEX_RE = /\[(\d+)\]/g;
 const CLASS_SPLIT_RE = /\s+/;
 const JS_FILE_RE = /\.js$/;
 function isMustacheOnly(value) {
@@ -2964,21 +2973,46 @@ function resolveComponentAttributeValue(value, scope) {
 	}
 	return interpolateTemplate$1(value, scope.data);
 }
-function resolveUsingComponents(ownerJsonPath, ownerFilePath) {
-	try {
-		const usingComponents = JSON.parse(fs.readFileSync(ownerJsonPath, "utf8")).usingComponents;
-		if (!usingComponents || typeof usingComponents !== "object" || Array.isArray(usingComponents)) return /* @__PURE__ */ new Map();
-		const resolved = /* @__PURE__ */ new Map();
-		for (const [alias, rawPath] of Object.entries(usingComponents)) {
-			if (typeof rawPath !== "string") continue;
-			const basePath = rawPath.startsWith("/") ? rawPath.replace(LEADING_SLASH_RE$4, "") : path.posix.normalize(path.posix.join(path.posix.dirname(ownerFilePath), rawPath));
-			resolved.set(alias, basePath.replace(LEADING_SLASH_RE$4, ""));
+function applyNodeBindings(node, scope) {
+	if (!isTagNode(node)) {
+		if (node.type === "text" && typeof node.data === "string") node.data = interpolateTemplate$1(node.data, scope.data);
+		return;
+	}
+	node.attribs ??= {};
+	node.attribs["data-sim-scope"] = scope.getScopeId();
+	for (const key of STRUCTURAL_ATTRS) delete node.attribs[key];
+	for (const [key, value] of Object.entries({ ...node.attribs })) {
+		if (EVENT_BINDING_ATTRS.includes(key)) {
+			node.attribs["data-sim-tap"] = value;
+			continue;
 		}
-		return resolved;
-	} catch {
-		return /* @__PURE__ */ new Map();
+		node.attribs[key] = typeof value === "string" ? String(resolveAttributeValue(value, scope)) : String(value);
 	}
 }
+function createMergedScopeData(pageData, componentProperties, componentData) {
+	return {
+		...pageData,
+		...componentProperties,
+		...componentData
+	};
+}
+function evaluateConditionalBranch(node, scope) {
+	const condition = node.attribs?.["wx:if"] ?? node.attribs?.["wx:elif"];
+	if (condition == null) return true;
+	return Boolean(resolveRawValueByPath(scope.data, condition));
+}
+function createLoopScope(scope, itemName, indexName, item, index) {
+	return {
+		...scope,
+		data: {
+			...scope.data,
+			[indexName]: index,
+			[itemName]: item
+		}
+	};
+}
+//#endregion
+//#region ../../mpcore/packages/simulator/src/runtime/render/component.ts
 function resolveComponentRegistryEntry(context, ownerJsonPath, ownerFilePath, alias) {
 	const componentBasePath = resolveUsingComponents(ownerJsonPath, ownerFilePath).get(alias);
 	if (!componentBasePath) return null;
@@ -2993,6 +3027,21 @@ function resolveComponentRegistryEntry(context, ownerJsonPath, ownerFilePath, al
 		absoluteTemplatePath
 	};
 }
+function resolveUsingComponents(ownerJsonPath, ownerFilePath) {
+	try {
+		const usingComponents = JSON.parse(fs.readFileSync(ownerJsonPath, "utf8")).usingComponents;
+		if (!usingComponents || typeof usingComponents !== "object" || Array.isArray(usingComponents)) return /* @__PURE__ */ new Map();
+		const resolved = /* @__PURE__ */ new Map();
+		for (const [alias, rawPath] of Object.entries(usingComponents)) {
+			if (typeof rawPath !== "string") continue;
+			const basePath = rawPath.startsWith("/") ? rawPath.replace(LEADING_SLASH_RE$4, "") : path.posix.normalize(path.posix.join(path.posix.dirname(ownerFilePath), rawPath));
+			resolved.set(alias, basePath.replace(LEADING_SLASH_RE$4, ""));
+		}
+		return resolved;
+	} catch {
+		return /* @__PURE__ */ new Map();
+	}
+}
 function collectComponentEventBindings(hostNode) {
 	const eventBindings = /* @__PURE__ */ new Map();
 	for (const [key, value] of Object.entries(hostNode.attribs ?? {})) {
@@ -3043,22 +3092,6 @@ function buildComponentTrigger(componentScopeId, context, hostNode) {
 		}
 	};
 }
-function applyNodeBindings(node, scope) {
-	if (!isTagNode(node)) {
-		if (node.type === "text" && typeof node.data === "string") node.data = interpolateTemplate$1(node.data, scope.data);
-		return;
-	}
-	node.attribs ??= {};
-	node.attribs["data-sim-scope"] = scope.getScopeId();
-	for (const key of STRUCTURAL_ATTRS) delete node.attribs[key];
-	for (const [key, value] of Object.entries({ ...node.attribs })) {
-		if (EVENT_BINDING_ATTRS.includes(key)) {
-			node.attribs["data-sim-tap"] = value;
-			continue;
-		}
-		node.attribs[key] = typeof value === "string" ? String(resolveAttributeValue(value, scope)) : String(value);
-	}
-}
 function syncComponentProperties(instance, definition, nextProperties, bindingExpressions, changedPageKeys) {
 	const changedRootKeys = [];
 	const previousProperties = {};
@@ -3081,31 +3114,62 @@ function syncComponentProperties(instance, definition, nextProperties, bindingEx
 	if (changedRootKeys.length === 0) return;
 	runComponentObservers(definition, instance, changedRootKeys, previousProperties);
 }
-function createMergedScopeData(pageData, componentProperties, componentData) {
+function createComponentScope(clonedNode, scope, componentScopeId, componentInstance) {
+	const ownerScopeId = scope.getScopeId().includes("/") ? scope.getScopeId() : void 0;
 	return {
-		...pageData,
-		...componentProperties,
-		...componentData
+		alias: clonedNode.name,
+		classList: String(clonedNode.attribs?.class ?? "").split(CLASS_SPLIT_RE).map((item) => item.trim()).filter(Boolean),
+		data: createMergedScopeData(scope.data, componentInstance.properties, componentInstance.data),
+		dataset: collectDataset$3(clonedNode),
+		eventBindings: collectComponentEventBindings(clonedNode),
+		getMethod: (methodName) => {
+			const method = componentInstance?.[methodName];
+			return typeof method === "function" ? method : void 0;
+		},
+		getScopeId: () => componentScopeId,
+		hostId: typeof clonedNode.attribs?.id === "string" ? clonedNode.attribs.id : void 0,
+		id: typeof clonedNode.attribs?.id === "string" ? clonedNode.attribs.id : void 0,
+		listenerScopeId: scope.getScopeId(),
+		ownerScopeId
 	};
 }
-function isTruthy(value) {
-	return Boolean(value);
-}
-function createLoopScope(scope, itemName, indexName, item, index) {
+function resolveComponentProperties(clonedNode, scope) {
+	const nextProperties = {};
+	const bindingExpressions = {};
+	for (const [key, value] of Object.entries(clonedNode.attribs ?? {})) {
+		if (key.startsWith("bind")) continue;
+		if (isMustacheOnly(String(value))) bindingExpressions[key] = String(value).trim().slice(2, -2).trim();
+		nextProperties[key] = resolveComponentAttributeValue(String(value), scope);
+	}
 	return {
-		...scope,
-		data: {
-			...scope.data,
-			[indexName]: index,
-			[itemName]: item
-		}
+		nextProperties,
+		bindingExpressions
 	};
 }
-function evaluateConditionalBranch(node, scope) {
-	const condition = node.attribs?.["wx:if"] ?? node.attribs?.["wx:elif"];
-	if (condition == null) return true;
-	return isTruthy(resolveRawValueByPath(scope.data, condition));
+function createRuntimeComponentInstance(componentScopeId, context, clonedNode, componentEntry, nextProperties, ownerScopeId) {
+	const componentInstance = createComponentInstance({
+		definition: componentEntry.definition,
+		properties: nextProperties,
+		triggerEvent: buildComponentTrigger(componentScopeId, context, clonedNode)
+	});
+	componentInstance.createIntersectionObserver = (options) => context.session.createIntersectionObserver(componentInstance, options);
+	componentInstance.createMediaQueryObserver = () => context.session.createMediaQueryObserver(componentInstance);
+	componentInstance.selectComponent = (selector) => context.session.selectComponentWithin(componentScopeId, selector);
+	componentInstance.selectAllComponents = (selector) => context.session.selectAllComponentsWithin(componentScopeId, selector);
+	componentInstance.selectOwnerComponent = () => ownerScopeId ? context.session.selectOwnerComponent(componentScopeId) : null;
+	runComponentLifecycle(componentInstance, "created");
+	runComponentObservers(componentInstance.__definition__ ?? componentEntry.definition, componentInstance, Object.keys(nextProperties), {});
+	componentInstance.__propertySnapshots = Object.fromEntries(Object.entries(componentInstance.properties).map(([key, propertyValue]) => [key, cloneValue$1(propertyValue)]));
+	runComponentLifecycle(componentInstance, "attached");
+	context.componentCache.set(componentScopeId, componentInstance);
+	return componentInstance;
+}
+function renderRuntimeComponentTemplate(context, componentEntry, renderNodeTree, componentScope, componentScopeId, seenComponentScopes) {
+	const componentDocument = parseTemplateDocument(readTemplateSource(componentEntry.absoluteTemplatePath));
+	return renderNodeTree((componentDocument.children ?? [])[0] ?? componentDocument, componentScope, context, path.resolve(context.project.miniprogramRootPath, `${componentEntry.filePath.replace(JS_FILE_RE, "")}.json`), componentEntry.filePath, componentScopeId, seenComponentScopes);
 }
+//#endregion
+//#region ../../mpcore/packages/simulator/src/runtime/render/index.ts
 function expandNodeByFor(node, scope) {
 	const forExpression = node.attribs?.["wx:for"];
 	if (!forExpression) return [{
@@ -3175,51 +3239,14 @@ function renderNodeTree(node, scope, context, ownerJsonPath, ownerFilePath, inst
 	if (componentEntry) {
 		const componentScopeId = `${instancePath}/${clonedNode.name}`;
 		const ownerScopeId = scope.getScopeId().includes("/") ? scope.getScopeId() : void 0;
-		const nextProperties = {};
-		const bindingExpressions = {};
-		for (const [key, value] of Object.entries(clonedNode.attribs ?? {})) {
-			if (key.startsWith("bind")) continue;
-			if (isMustacheOnly(String(value))) bindingExpressions[key] = String(value).trim().slice(2, -2).trim();
-			nextProperties[key] = resolveComponentAttributeValue(String(value), scope);
-		}
+		const { nextProperties, bindingExpressions } = resolveComponentProperties(clonedNode, scope);
 		let componentInstance = context.componentCache.get(componentScopeId);
-		if (!componentInstance) {
-			componentInstance = createComponentInstance({
-				definition: componentEntry.definition,
-				properties: nextProperties,
-				triggerEvent: buildComponentTrigger(componentScopeId, context, clonedNode)
-			});
-			componentInstance.createIntersectionObserver = (options) => context.session.createIntersectionObserver(componentInstance, options);
-			componentInstance.createMediaQueryObserver = () => context.session.createMediaQueryObserver(componentInstance);
-			componentInstance.selectComponent = (selector) => context.session.selectComponentWithin(componentScopeId, selector);
-			componentInstance.selectAllComponents = (selector) => context.session.selectAllComponentsWithin(componentScopeId, selector);
-			componentInstance.selectOwnerComponent = () => ownerScopeId ? context.session.selectOwnerComponent(componentScopeId) : null;
-			runComponentLifecycle(componentInstance, "created");
-			runComponentObservers(componentInstance.__definition__ ?? componentEntry.definition, componentInstance, Object.keys(nextProperties), {});
-			componentInstance.__propertySnapshots = Object.fromEntries(Object.entries(componentInstance.properties).map(([key, propertyValue]) => [key, cloneValue$1(propertyValue)]));
-			runComponentLifecycle(componentInstance, "attached");
-			context.componentCache.set(componentScopeId, componentInstance);
-		} else syncComponentProperties(componentInstance, componentInstance.__definition__ ?? componentEntry.definition, nextProperties, bindingExpressions, context.changedPageKeys);
+		if (!componentInstance) componentInstance = createRuntimeComponentInstance(componentScopeId, context, clonedNode, componentEntry, nextProperties, ownerScopeId);
+		else syncComponentProperties(componentInstance, componentInstance.__definition__ ?? componentEntry.definition, nextProperties, bindingExpressions, context.changedPageKeys);
 		seenComponentScopes.add(componentScopeId);
-		const componentScope = {
-			alias: clonedNode.name,
-			classList: String(clonedNode.attribs?.class ?? "").split(CLASS_SPLIT_RE).map((item) => item.trim()).filter(Boolean),
-			data: createMergedScopeData(scope.data, componentInstance.properties, componentInstance.data),
-			dataset: collectDataset$3(clonedNode),
-			eventBindings: collectComponentEventBindings(clonedNode),
-			getMethod: (methodName) => {
-				const method = componentInstance?.[methodName];
-				return typeof method === "function" ? method : void 0;
-			},
-			getScopeId: () => componentScopeId,
-			hostId: typeof clonedNode.attribs?.id === "string" ? clonedNode.attribs.id : void 0,
-			id: typeof clonedNode.attribs?.id === "string" ? clonedNode.attribs.id : void 0,
-			listenerScopeId: scope.getScopeId(),
-			ownerScopeId
-		};
+		const componentScope = createComponentScope(clonedNode, scope, componentScopeId, componentInstance);
 		context.componentScopes.set(componentScopeId, componentScope);
-		const componentDocument = parseTemplateDocument(readTemplateSource(componentEntry.absoluteTemplatePath));
-		const renderedComponentRoot = renderNodeTree((componentDocument.children ?? [])[0] ?? componentDocument, componentScope, context, path.resolve(context.project.miniprogramRootPath, `${componentEntry.filePath.replace(JS_FILE_RE, "")}.json`), componentEntry.filePath, componentScopeId, seenComponentScopes);
+		const renderedComponentRoot = renderRuntimeComponentTemplate(context, componentEntry, renderNodeTree, componentScope, componentScopeId, seenComponentScopes);
 		if (renderedComponentRoot.attribs) renderedComponentRoot.attribs["data-sim-component"] = clonedNode.name;
 		if (!componentInstance.__ready__) {
 			runComponentLifecycle(componentInstance, "ready");
@@ -3291,7 +3318,7 @@ function registerComponentDefinition(registries, definition) {
 	return definition;
 }
 //#endregion
-//#region ../../mpcore/packages/simulator/src/host/wx.ts
+//#region ../../mpcore/packages/simulator/src/host/wx/index.ts
 function invokeWxApi(operation, option) {
 	try {
 		const result = operation();
@@ -3534,10 +3561,7 @@ function createHeadlessWx(driver) {
 		chooseMedia: (option) => invokeWxApi(() => driver.chooseMedia(option ?? {}), option),
 		chooseVideo: (option) => invokeWxApi(() => driver.chooseVideo(option ?? {}), option),
 		compressImage: (option) => invokeWxApi(() => driver.compressImage(option), option),
-		clearStorage: (option) => invokeWxApi(() => {
-			driver.clearStorageSync();
-			return { errMsg: "clearStorage:ok" };
-		}, option),
+		clearStorage: (option) => invokeWxApi(() => ({ errMsg: (driver.clearStorageSync(), "clearStorage:ok") }), option),
 		clearStorageSync: () => driver.clearStorageSync(),
 		createAnimation: (option) => driver.createAnimation(option),
 		createCanvasContext: (canvasId, component) => driver.createCanvasContext(canvasId, component),
@@ -5515,10 +5539,12 @@ function inferImageType(filePath, fileContent) {
 }
 function inferImageSize(fileContent) {
 	try {
-		const payload = JSON.parse(fileContent);
+		const config = JSON.parse(fileContent)?.config;
+		const destHeight = config && "destHeight" in config ? config.destHeight : void 0;
+		const destWidth = config && "destWidth" in config ? config.destWidth : void 0;
 		return {
-			height: payload?.config?.destHeight ?? payload?.config?.height ?? 0,
-			width: payload?.config?.destWidth ?? payload?.config?.width ?? 0
+			height: destHeight ?? config?.height ?? 0,
+			width: destWidth ?? config?.width ?? 0
 		};
 	} catch {
 		return {
@@ -6299,7 +6325,7 @@ function createHeadlessWxState() {
 						width
 					};
 				}),
-				type: mediaTypes.length > 1 ? "mix" : mediaTypes[0]
+				type: mediaTypes.length > 1 ? "mix" : mediaTypes[0] ?? "image"
 			};
 		},
 		chooseVideo(option) {
@@ -7826,7 +7852,7 @@ var HeadlessTestingPageHandle = class {
 	}
 };
 //#endregion
-//#region ../../mpcore/packages/simulator/src/testing/sessionHandle.ts
+//#region ../../mpcore/packages/simulator/src/testing/sessionHandle/shared.ts
 const LEADING_SLASH_RE = /^\/+/;
 const DEFAULT_WAIT_TIMEOUT = 1e3;
 const DEFAULT_WAIT_INTERVAL = 10;
@@ -7837,6 +7863,28 @@ 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 {
 	constructor(scopeId, project, session) {
 		this.scopeId = scopeId;
@@ -7848,8 +7896,7 @@ var HeadlessTestingScopeHandle = class HeadlessTestingScopeHandle {
 		return scopeId ? new HeadlessTestingScopeHandle(scopeId, this.project, this.session) : null;
 	}
 	async callMethod(methodName, ...args) {
-		const normalizedMethodName = methodName.trim();
-		if (!normalizedMethodName) throw new Error("Method name must be a non-empty string in headless testing runtime.");
+		const normalizedMethodName = normalizeNonEmptyInput(methodName, "Method name");
 		return this.session.callScopeMethodDirect(this.scopeId, normalizedMethodName, ...args);
 	}
 	async snapshot() {
@@ -7866,75 +7913,37 @@ var HeadlessTestingScopeHandle = class HeadlessTestingScopeHandle {
 		return this.createScopeHandle(this.session.selectOwnerComponent(this.scopeId));
 	}
 	async waitForOwnerComponent(options = {}) {
-		const timeout = Number.isFinite(options.timeout) ? Math.max(0, Math.trunc(options.timeout ?? 1e3)) : 1e3;
-		const interval = Number.isFinite(options.interval) ? Math.max(1, Math.trunc(options.interval ?? 10)) : 10;
-		const deadline = Date.now() + timeout;
-		while (true) {
-			const owner = await this.ownerComponent();
-			if (owner) return owner;
-			if (Date.now() >= deadline) throw new Error("Timed out waiting for owner component in headless testing runtime.");
-			await new Promise((resolve) => setTimeout(resolve, interval));
-		}
+		return await pollUntil(async () => await this.ownerComponent(), "Timed out waiting for owner component in headless testing runtime.", options);
 	}
 	async selectComponent(selector) {
-		const normalizedSelector = selector.trim();
-		if (!normalizedSelector) throw new Error("Selector must be a non-empty string in headless testing runtime.");
+		const normalizedSelector = normalizeNonEmptyInput(selector, "Selector");
 		const component = this.session.selectComponentWithin(this.scopeId, normalizedSelector);
 		return this.createScopeHandle(component);
 	}
 	async selectAllComponents(selector) {
-		const normalizedSelector = selector.trim();
-		if (!normalizedSelector) throw new Error("Selector must be a non-empty string in headless testing runtime.");
+		const normalizedSelector = normalizeNonEmptyInput(selector, "Selector");
 		return this.session.selectAllComponentsWithin(this.scopeId, normalizedSelector).map((component) => this.createScopeHandle(component)).filter((handle) => Boolean(handle));
 	}
 	async waitForComponent(selector, options = {}) {
-		const normalizedSelector = selector.trim();
-		if (!normalizedSelector) throw new Error("Selector must be a non-empty string in headless testing runtime.");
-		const timeout = Number.isFinite(options.timeout) ? Math.max(0, Math.trunc(options.timeout ?? 1e3)) : 1e3;
-		const interval = Number.isFinite(options.interval) ? Math.max(1, Math.trunc(options.interval ?? 10)) : 10;
-		const deadline = Date.now() + timeout;
-		while (true) {
-			const component = await this.selectComponent(normalizedSelector);
-			if (component) return component;
-			if (Date.now() >= deadline) throw new Error(`Timed out waiting for component "${normalizedSelector}" in headless testing runtime.`);
-			await new Promise((resolve) => setTimeout(resolve, interval));
-		}
+		const normalizedSelector = normalizeNonEmptyInput(selector, "Selector");
+		return await pollUntil(async () => await this.selectComponent(normalizedSelector), `Timed out waiting for component "${normalizedSelector}" in headless testing runtime.`, options);
 	}
 	async waitForComponents(selector, count = 1, options = {}) {
-		const normalizedSelector = selector.trim();
-		if (!normalizedSelector) throw new Error("Selector must be a non-empty string in headless testing runtime.");
+		const normalizedSelector = normalizeNonEmptyInput(selector, "Selector");
 		const normalizedCount = Number.isFinite(count) ? Math.max(1, Math.trunc(count)) : 1;
-		const timeout = Number.isFinite(options.timeout) ? Math.max(0, Math.trunc(options.timeout ?? 1e3)) : 1e3;
-		const interval = Number.isFinite(options.interval) ? Math.max(1, Math.trunc(options.interval ?? 10)) : 10;
-		const deadline = Date.now() + timeout;
-		while (true) {
+		return await pollUntil(async () => {
 			const components = await this.selectAllComponents(normalizedSelector);
-			if (components.length >= normalizedCount) return components;
-			if (Date.now() >= deadline) throw new Error(`Timed out waiting for ${normalizedCount} component(s) matching "${normalizedSelector}" in headless testing runtime.`);
-			await new Promise((resolve) => setTimeout(resolve, interval));
-		}
+			return components.length >= normalizedCount ? components : null;
+		}, `Timed out waiting for ${normalizedCount} component(s) matching "${normalizedSelector}" in headless testing runtime.`, options);
 	}
 };
+//#endregion
+//#region ../../mpcore/packages/simulator/src/testing/sessionHandle/index.ts
 var HeadlessTestingSessionHandle = class {
 	constructor(project, session) {
 		this.project = project;
 		this.session = session;
 	}
-	async waitFor(ms = 0) {
-		if (ms <= 0) return;
-		await new Promise((resolve) => setTimeout(resolve, ms));
-	}
-	async 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 this.waitFor(interval);
-		}
-	}
 	async close() {}
 	async currentPage() {
 		const current = this.session.getCurrentPages().at(-1);
@@ -7944,32 +7953,27 @@ var HeadlessTestingSessionHandle = class {
 		return this.session.getCurrentPages().map((page) => new HeadlessTestingPageHandle(this.project, page, this.session));
 	}
 	async scopeSnapshot(scopeId) {
-		const normalizedScopeId = scopeId.trim();
-		if (!normalizedScopeId) throw new Error("Scope id must be a non-empty string in headless testing runtime.");
+		const normalizedScopeId = normalizeNonEmptyInput(scopeId, "Scope id");
 		return this.session.getScopeSnapshot(normalizedScopeId);
 	}
 	async selectComponent(selector) {
-		const normalizedSelector = selector.trim();
-		if (!normalizedSelector) throw new Error("Selector must be a non-empty string in headless testing runtime.");
+		const normalizedSelector = normalizeNonEmptyInput(selector, "Selector");
 		const component = this.session.selectComponent(normalizedSelector);
 		const scopeId = this.session.getScopeIdForComponent(component);
 		return scopeId ? new HeadlessTestingScopeHandle(scopeId, this.project, this.session) : null;
 	}
 	async selectAllComponents(selector) {
-		const normalizedSelector = selector.trim();
-		if (!normalizedSelector) throw new Error("Selector must be a non-empty string in headless testing runtime.");
+		const normalizedSelector = normalizeNonEmptyInput(selector, "Selector");
 		return this.session.selectAllComponents(normalizedSelector).map((component) => this.session.getScopeIdForComponent(component)).filter((scopeId) => Boolean(scopeId)).map((scopeId) => new HeadlessTestingScopeHandle(scopeId, this.project, this.session));
 	}
 	async waitForComponent(selector, options = {}) {
-		const normalizedSelector = selector.trim();
-		if (!normalizedSelector) throw new Error("Selector must be a non-empty string in headless testing runtime.");
-		return await this.pollUntil(async () => await this.selectComponent(normalizedSelector), `Timed out waiting for component "${normalizedSelector}" in headless testing runtime.`, options);
+		const normalizedSelector = normalizeNonEmptyInput(selector, "Selector");
+		return await pollUntil(async () => await this.selectComponent(normalizedSelector), `Timed out waiting for component "${normalizedSelector}" in headless testing runtime.`, options);
 	}
 	async waitForComponents(selector, count = 1, options = {}) {
-		const normalizedSelector = selector.trim();
-		if (!normalizedSelector) throw new Error("Selector must be a non-empty string in headless testing runtime.");
+		const normalizedSelector = normalizeNonEmptyInput(selector, "Selector");
 		const normalizedCount = Number.isFinite(count) ? Math.max(1, Math.trunc(count)) : 1;
-		return await this.pollUntil(async () => {
+		return await pollUntil(async () => {
 			const components = await this.selectAllComponents(normalizedSelector);
 			return components.length >= normalizedCount ? components : null;
 		}, `Timed out waiting for ${normalizedCount} component(s) matching "${normalizedSelector}" in headless testing runtime.`, options);
@@ -7981,7 +7985,7 @@ var HeadlessTestingSessionHandle = class {
 	async waitForCurrentPage(route, options = {}) {
 		const normalizedRoute = route?.trim();
 		if (normalizedRoute != null && !normalizedRoute) throw new Error("Route must be a non-empty string in headless testing runtime.");
-		return await this.pollUntil(async () => {
+		return await pollUntil(async () => {
 			const currentPageInstance = this.session.getCurrentPages().at(-1);
 			if (!currentPageInstance) return null;
 			const current = new HeadlessTestingPageHandle(this.project, currentPageInstance, this.session);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@weapp-vite/miniprogram-automator",
   "type": "module",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "完全兼容微信 miniprogram-automator 的现代化替代实现",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",