@wevu/compiler 6.16.15 → 6.16.16

package/dist/index.d.mts

@@ -257,6 +257,7 @@ interface TemplateCompileResult {
   templateRefs?: TemplateRefBinding[];
   layoutHosts?: LayoutHostBinding[];
   inlineExpressions?: InlineExpressionAsset[];
+  functionPropPaths?: string[];
 }
 /**
  * v-for 解析结果。
@@ -283,6 +284,7 @@ interface TemplateCompileOptions {
   classStyleRuntime?: ClassStyleRuntime | 'auto';
   objectLiteralBindMode?: ObjectLiteralBindMode;
   mustacheInterpolation?: MustacheInterpolationMode;
+  formatWxml?: boolean;
   wxsExtension?: string;
   classStyleWxsSrc?: string;
   wevuComponentTags?: Iterable<string>;
@@ -689,6 +691,10 @@ interface TransformScriptOptions {
    * 内联表达式元数据（用于事件处理）
    */
   inlineExpressions?: InlineExpressionAsset[];
+  /**
+   * 模板中作为组件 prop 传递的函数候选路径。
+   */
+  functionPropPaths?: string[];
   /**
    * 对 `<script setup>` 类型声明生成的结构化 props（如 Array/Object）放宽小程序运行时类型约束，
    * 以避免小程序属性校验对复杂表达式/代理值产生误报。

package/dist/index.mjs

@@ -13,7 +13,7 @@ import os from "node:os";
 import process from "node:process";
 import { collectFeatureFlagsFromCode, collectJsxImportedComponentsAndDefaultExportFromBabelAst, collectJsxTemplateTagsFromBabelExpression, getRenderPropertyFromComponentOptions, parseJsLikeWithEngine, resolveRenderExpressionFromComponentOptions, toStaticObjectKey, unwrapTypeScriptExpression } from "@weapp-vite/ast";
 import { LRUCache } from "lru-cache";
-import { WEVU_CLASS_STYLE_RUNTIME_FILE, WEVU_CLASS_STYLE_RUNTIME_MODULE, WEVU_EXPRESSION_ERROR_IDENTIFIER, WEVU_INLINE_HANDLER, WEVU_INLINE_MAP_KEY, WEVU_IS_PAGE_KEY, WEVU_LAYOUT_HOSTS_KEY, WEVU_LAYOUT_HOST_ID_PREFIX, WEVU_LAYOUT_HOST_REF_PREFIX, WEVU_MODEL_HANDLER, WEVU_OWNER_HANDLER, WEVU_PROPS_KEY, WEVU_SLOT_NAMES_ATTR, WEVU_SLOT_NAMES_PROP, WEVU_SLOT_OWNER_ID_ATTR, WEVU_SLOT_OWNER_ID_KEY, WEVU_SLOT_OWNER_ID_PROP, WEVU_SLOT_OWNER_KEY, WEVU_SLOT_OWNER_PROXY_KEY, WEVU_SLOT_PROPS_ATTR, WEVU_SLOT_PROPS_DATA_KEY, WEVU_SLOT_PROPS_KEY, WEVU_SLOT_SCOPE_ATTR, WEVU_SLOT_SCOPE_KEY, WEVU_TEMPLATE_REFS_KEY } from "@weapp-core/constants";
+import { WEVU_CLASS_STYLE_RUNTIME_FILE, WEVU_CLASS_STYLE_RUNTIME_MODULE, WEVU_EXPRESSION_ERROR_IDENTIFIER, WEVU_FUNCTION_PROP_PATHS_KEY, WEVU_INLINE_HANDLER, WEVU_INLINE_MAP_KEY, WEVU_IS_PAGE_KEY, WEVU_LAYOUT_HOSTS_KEY, WEVU_LAYOUT_HOST_ID_PREFIX, WEVU_LAYOUT_HOST_REF_PREFIX, WEVU_MODEL_HANDLER, WEVU_OWNER_HANDLER, WEVU_PROPS_KEY, WEVU_SLOT_NAMES_ATTR, WEVU_SLOT_NAMES_PROP, WEVU_SLOT_OWNER_ID_ATTR, WEVU_SLOT_OWNER_ID_KEY, WEVU_SLOT_OWNER_ID_PROP, WEVU_SLOT_OWNER_KEY, WEVU_SLOT_OWNER_PROXY_KEY, WEVU_SLOT_PROPS_ATTR, WEVU_SLOT_PROPS_DATA_KEY, WEVU_SLOT_PROPS_KEY, WEVU_SLOT_SCOPE_ATTR, WEVU_SLOT_SCOPE_KEY, WEVU_TEMPLATE_REFS_KEY } from "@weapp-core/constants";
 import { compileScript, parse } from "vue/compiler-sfc";
 import { fileURLToPath } from "node:url";
 import { parse as parse$1 } from "@vue/compiler-dom";
@@ -2812,6 +2812,13 @@ function hasStaticProperty(target, keyName) {
 	}
 	return false;
 }
+function injectFunctionPropPaths(componentOptionsObject, paths) {
+	const uniquePaths = [...new Set(paths)].filter(Boolean);
+	if (!uniquePaths.length) return false;
+	if (hasStaticProperty(componentOptionsObject, WEVU_FUNCTION_PROP_PATHS_KEY)) return false;
+	componentOptionsObject.properties.push(t.objectProperty(t.identifier(WEVU_FUNCTION_PROP_PATHS_KEY), t.arrayExpression(uniquePaths.map((path) => t.stringLiteral(path)))));
+	return true;
+}
 function unwrapTypeLikeExpression(node) {
 	if (t.isTSAsExpression(node) || t.isTSSatisfiesExpression(node) || t.isTSNonNullExpression(node) || t.isTypeCastExpression(node)) return unwrapTypeLikeExpression(node.expression);
 	if (t.isParenthesizedExpression(node)) return unwrapTypeLikeExpression(node.expression);
@@ -2935,6 +2942,9 @@ function rewriteDefaultExport(ast, state, options, enabledPageFeatures, serializ
 		if (!injected) warn("无法自动注入内联表达式元数据：methods 不是对象字面量。");
 		transformed = injected || transformed;
 	} else warn("无法自动注入内联表达式元数据：组件选项不是对象字面量。");
+	const functionPropPaths = options?.functionPropPaths ?? [];
+	if (functionPropPaths.length) if (componentOptionsObject) transformed = injectFunctionPropPaths(componentOptionsObject, functionPropPaths) || transformed;
+	else warn("无法自动注入函数 prop 元数据：组件选项不是对象字面量。");
 	if (componentExpr) {
 		if (options?.isApp) transformed = injectWevuDefaultsForApp({
 			astProgram: ast.program,
@@ -3277,6 +3287,114 @@ function stripRenderOptionFromScript(source, filename, warn) {
 	return generate(ast).code;
 }
 //#endregion
+//#region src/plugins/vue/compiler/template/format.ts
+const TOKEN_RE = /<[^>]+>/g;
+function tokenizeWxml(source) {
+	const tokens = [];
+	let index = 0;
+	for (const match of source.matchAll(TOKEN_RE)) {
+		const start = match.index ?? 0;
+		if (start > index) tokens.push({
+			type: "text",
+			value: source.slice(index, start)
+		});
+		tokens.push({
+			type: "tag",
+			value: match[0]
+		});
+		index = start + match[0].length;
+	}
+	if (index < source.length) tokens.push({
+		type: "text",
+		value: source.slice(index)
+	});
+	return tokens.filter((token) => token.value.length > 0);
+}
+function isClosingTag(value) {
+	return /^<\//.test(value);
+}
+function isSelfClosingTag(value) {
+	return /\/>$/.test(value) || /^<(?:import|include|wxs|sjs)\b/i.test(value);
+}
+function isOpeningTag(value) {
+	return /^<[^/!][\s\S]*>$/.test(value) && !isSelfClosingTag(value);
+}
+function isWhitespaceText(token) {
+	return token.type === "text" && token.value.trim().length === 0;
+}
+function shouldKeepInline(tokens, openIndex, closeIndex) {
+	const inner = tokens.slice(openIndex + 1, closeIndex);
+	return inner.some((token) => token.type === "text" && token.value.trim().length > 0) && inner.every((token) => token.type !== "tag" || isSelfClosingTag(token.value));
+}
+function findMatchingClosingTag(tokens, openIndex) {
+	const openTag = tokens[openIndex]?.value;
+	const match = /^<([^\s>/]+)/.exec(openTag ?? "");
+	if (!match) return -1;
+	const tagName = match[1];
+	let depth = 0;
+	for (let index = openIndex; index < tokens.length; index++) {
+		const token = tokens[index];
+		if (token?.type !== "tag") continue;
+		if (new RegExp(`^<${tagName}(?:\\s|>|/)`).test(token.value) && !isSelfClosingTag(token.value)) {
+			depth += 1;
+			continue;
+		}
+		if (new RegExp(`^</${tagName}>`).test(token.value)) {
+			depth -= 1;
+			if (depth === 0) return index;
+		}
+	}
+	return -1;
+}
+function appendLine(lines, level, value, indent) {
+	lines.push(`${indent.repeat(Math.max(level, 0))}${value}`);
+}
+/**
+* 轻量格式化 WXML，只调整标签层级缩进，不重排文本内容。
+*/
+function formatWxml(source, options = {}) {
+	const tokens = tokenizeWxml(source).filter((token) => !isWhitespaceText(token));
+	const indent = options.indent ?? "  ";
+	const lines = [];
+	let level = 0;
+	let index = 0;
+	while (index < tokens.length) {
+		const token = tokens[index];
+		if (!token) {
+			index += 1;
+			continue;
+		}
+		if (token.type === "text") {
+			const value = token.value.trim();
+			if (value) appendLine(lines, level, value, indent);
+			index += 1;
+			continue;
+		}
+		if (isClosingTag(token.value)) {
+			level -= 1;
+			appendLine(lines, level, token.value, indent);
+			index += 1;
+			continue;
+		}
+		if (isOpeningTag(token.value)) {
+			const closeIndex = findMatchingClosingTag(tokens, index);
+			if (closeIndex > index && shouldKeepInline(tokens, index, closeIndex)) {
+				const inline = tokens.slice(index, closeIndex + 1).map((item) => item.value).join("");
+				appendLine(lines, level, inline, indent);
+				index = closeIndex + 1;
+				continue;
+			}
+			appendLine(lines, level, token.value, indent);
+			level += 1;
+			index += 1;
+			continue;
+		}
+		appendLine(lines, level, token.value, indent);
+		index += 1;
+	}
+	return `${lines.join("\n")}\n`;
+}
+//#endregion
 //#region src/plugins/vue/compiler/template/platform.ts
 /**
 * 创建结构指令属性名。
@@ -3898,6 +4016,7 @@ function createJsxCompileContext(options) {
 	return {
 		platform: options?.template?.platform ?? getMiniProgramTemplatePlatform(),
 		mustacheInterpolation: options?.template?.mustacheInterpolation ?? "compact",
+		formatWxml: options?.template?.formatWxml ?? false,
 		warnings: [],
 		inlineExpressions: [],
 		inlineExpressionSeed: 0,
@@ -3912,8 +4031,10 @@ function compileJsxTemplateAndCollectComponents(source, filename, options) {
 	const context = createJsxCompileContext(options);
 	const { renderExpression, autoComponentContext } = analyzeJsxAst(ast, context);
 	let template;
-	if (renderExpression) template = compileRenderableExpression(renderExpression, context);
-	else context.warnings = context.warnings.map((message) => message === "未识别到默认导出组件。" ? `未在 ${filename} 中识别到默认导出组件。` : message);
+	if (renderExpression) {
+		template = compileRenderableExpression(renderExpression, context);
+		if (context.formatWxml) template = formatWxml(template);
+	} else context.warnings = context.warnings.map((message) => message === "未识别到默认导出组件。" ? `未在 ${filename} 中识别到默认导出组件。` : message);
 	return {
 		template,
 		warnings: context.warnings,
@@ -5851,12 +5972,60 @@ const SIMPLE_IDENTIFIER_RE$1 = /^[A-Z_$][\w$]*$/i;
 const SIMPLE_MEMBER_PATH_RE = /^[A-Z_$][\w$]*(?:\.[A-Z_$][\w$]*)*$/i;
 const isSimpleIdentifier = (value) => SIMPLE_IDENTIFIER_RE$1.test(value);
 const isSimpleMemberPath = (value) => SIMPLE_MEMBER_PATH_RE.test(value);
-function transformBindDirective(node, context, forInfo) {
+const COMPONENT_NON_PROP_BINDINGS = new Set([
+	"class",
+	"style",
+	"id",
+	"key",
+	"ref",
+	"is",
+	"slot",
+	"layout-host"
+]);
+function collectFunctionPropPath(rawExpValue) {
+	const parsed = parseBabelExpression(rawExpValue);
+	if (!parsed) return null;
+	const normalized = unwrapTsExpression(parsed);
+	if (normalized.type === "Identifier") return normalized.name;
+	if (normalized.type !== "MemberExpression" || normalized.computed) return null;
+	const parts = [];
+	let current = normalized;
+	while (current.type === "MemberExpression" && !current.computed) {
+		if (current.property.type !== "Identifier") return null;
+		parts.unshift(current.property.name);
+		current = unwrapTsExpression(current.object);
+	}
+	if (current.type !== "Identifier") return null;
+	parts.unshift(current.name);
+	return parts.join(".");
+}
+function isComputedMemberExpression(rawExpValue) {
+	const parsed = parseBabelExpression(rawExpValue);
+	if (!parsed) return false;
+	const normalized = unwrapTsExpression(parsed);
+	return normalized.type === "MemberExpression" && normalized.computed;
+}
+function transformBindDirective(node, context, forInfo, options) {
 	const { arg } = node;
 	if (!arg) return null;
 	const argValue = arg.type === NodeTypes.SIMPLE_EXPRESSION ? arg.content : "";
 	const rawExpValue = getBindDirectiveExpression(node);
 	if (!rawExpValue) return null;
+	if (options?.isComponent && !COMPONENT_NON_PROP_BINDINGS.has(argValue)) {
+		const path = collectFunctionPropPath(rawExpValue);
+		if (path) if (path.includes(".")) {
+			const bindingRef = registerRuntimeBindingExpression(rawExpValue, context, { hint: `:${argValue} 函数 prop 绑定` });
+			if (bindingRef) {
+				const bindingName = bindingRef.split("[")[0] || bindingRef;
+				context.functionPropPaths.add(bindingName);
+				return `${argValue}="${renderMustache(bindingRef, context)}"`;
+			}
+		} else context.functionPropPaths.add(path);
+		else if (isComputedMemberExpression(rawExpValue)) {
+			const runtimeAttr = createBindRuntimeAttr(argValue, rawExpValue, context);
+			if (runtimeAttr) return runtimeAttr;
+		}
+	}
 	if (argValue === "key") {
 		const expValue = normalizeWxmlExpressionWithContext(rawExpValue, context);
 		const trimmed = expValue.trim();
@@ -6118,7 +6287,7 @@ function transformShowDirective(node, context) {
 //#region src/plugins/vue/compiler/template/directives/index.ts
 function transformDirective(node, context, elementNode, forInfo, options) {
 	const { name, exp, arg } = node;
-	if (name === "bind") return transformBindDirective(node, context, forInfo);
+	if (name === "bind") return transformBindDirective(node, context, forInfo, options);
 	if (name === "on") return transformOnDirective(node, context, options);
 	if (name === "model") return transformModelDirective(node, context, elementNode, options);
 	if (name === "show") return transformShowDirective(node, context);
@@ -6453,7 +6622,8 @@ function createScopedSlotComponent(context, slotKey, props, children, transformN
 		forStack: [],
 		forIndexSeed: 0,
 		inlineExpressions: [],
-		inlineExpressionSeed: 0
+		inlineExpressionSeed: 0,
+		functionPropPaths: /* @__PURE__ */ new Set()
 	};
 	let template = withSlotProps(scopedContext, {
 		...collectScopePropMapping(context),
@@ -7163,6 +7333,7 @@ function compileVueTemplateToWxml(template, filename, options) {
 			classStyleRuntime: resolvedRuntime === "wxs" ? "wxs" : "js",
 			objectLiteralBindMode: options?.objectLiteralBindMode ?? "runtime",
 			mustacheInterpolation: options?.mustacheInterpolation ?? "compact",
+			formatWxml: options?.formatWxml ?? false,
 			classStyleBindings: [],
 			classStyleWxs: false,
 			classStyleWxsExtension: wxsExtension,
@@ -7175,10 +7346,12 @@ function compileVueTemplateToWxml(template, filename, options) {
 			layoutHostIndexSeed: 0,
 			inlineExpressions: [],
 			inlineExpressionSeed: 0,
+			functionPropPaths: /* @__PURE__ */ new Set(),
 			wevuComponentTags: options?.wevuComponentTags ? new Set(options.wevuComponentTags) : void 0
 		};
 		let wxml = ast.children.map((child) => transformNode(child, context)).join("");
 		if (context.classStyleWxs) wxml = `${buildClassStyleWxsTag(context.classStyleWxsExtension || "wxs", context.classStyleWxsSrc)}\n${wxml}`;
+		if (context.formatWxml) wxml = formatWxml(wxml);
 		const result = {
 			code: wxml,
 			warnings
@@ -7193,6 +7366,7 @@ function compileVueTemplateToWxml(template, filename, options) {
 		if (context.templateRefs.length) result.templateRefs = context.templateRefs;
 		if (context.layoutHosts.length) result.layoutHosts = context.layoutHosts;
 		if (context.inlineExpressions.length) result.inlineExpressions = context.inlineExpressions;
+		if (context.functionPropPaths.size) result.functionPropPaths = [...context.functionPropPaths];
 		return result;
 	} catch (error) {
 		warnings.push(`模板编译失败：${error}`);
@@ -8031,6 +8205,7 @@ async function compileScriptPhase(descriptor, descriptorForCompile, filename, op
 			templateRefs: templateCompiled?.templateRefs,
 			layoutHosts: templateCompiled?.layoutHosts,
 			inlineExpressions: templateCompiled?.inlineExpressions,
+			functionPropPaths: templateCompiled?.functionPropPaths,
 			relaxStructuredTypeOnlyProps
 		});
 		return {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wevu/compiler",
   "type": "module",
-  "version": "6.16.15",
+  "version": "6.16.16",
   "description": "wevu 编译器基础包，面向小程序模板的编译与转换",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -45,14 +45,14 @@
     "@vue/compiler-core": "^3.5.34",
     "@vue/compiler-dom": "^3.5.34",
     "comment-json": "^5.0.0",
-    "lru-cache": "^11.3.6",
+    "lru-cache": "^11.4.0",
     "magic-string": "^0.30.21",
     "merge": "^2.1.1",
     "pathe": "^2.0.3",
     "vue": "^3.5.34",
     "@weapp-core/constants": "^0.1.7",
     "@weapp-core/shared": "3.0.4",
-    "@weapp-vite/ast": "6.16.15",
+    "@weapp-vite/ast": "6.16.16",
     "rolldown-require": "2.0.16"
   },
   "publishConfig": {