@wevu/compiler 6.16.17 → 6.16.19

package/dist/index.d.mts

@@ -205,6 +205,7 @@ interface MiniProgramPlatform {
 }
 //#endregion
 //#region src/plugins/vue/compiler/template/types.d.ts
+type FunctionPropNameMatcher = string | RegExp;
 /**
  * 作用域插槽组件资源描述。
  */
@@ -287,6 +288,7 @@ interface TemplateCompileOptions {
   formatWxml?: boolean;
   wxsExtension?: string;
   classStyleWxsSrc?: string;
+  functionPropNames?: Iterable<FunctionPropNameMatcher>;
   wevuComponentTags?: Iterable<string>;
 }
 /**
@@ -447,6 +449,10 @@ interface CompileVueFileOptions {
   astEngine?: AstEngineName$1;
   isPage?: boolean;
   isApp?: boolean;
+  /**
+   * 是否压缩生成的 wevu 脚本输出。
+   */
+  minify?: boolean;
   warn?: (message: string) => void;
   autoUsingComponents?: AutoUsingComponentsOptions;
   autoImportTags?: AutoImportTagsOptions;
@@ -667,6 +673,10 @@ interface TransformScriptOptions {
    * wevu 默认值（仅用于 app.vue 注入）
    */
   wevuDefaults?: WevuDefaults;
+  /**
+   * 是否压缩生成的脚本代码。
+   */
+  minify?: boolean;
   /**
    * 编译期警告回调
    */
@@ -802,6 +812,7 @@ declare function injectWevuPageFeatureFlagsIntoOptionsObject(optionsObject: t.Ob
  */
 declare function injectWevuPageFeaturesInJs(source: string, options?: {
   astEngine?: AstEngineName$1;
+  minify?: boolean;
 }): {
   code: string;
   transformed: boolean;
@@ -814,6 +825,7 @@ declare function injectWevuPageFeaturesInJsWithResolver(source: string, options:
   id: string;
   resolver: ModuleResolver;
   astEngine?: AstEngineName$1;
+  minify?: boolean;
 }): Promise<{
   code: string;
   transformed: boolean;

package/dist/index.mjs

@@ -1615,7 +1615,9 @@ function injectWevuPageFeaturesInJs(source, options) {
 		transformed: false
 	};
 	const generated = generate(ast, {
-		retainLines: true,
+		compact: options?.minify === true,
+		minified: options?.minify === true,
+		retainLines: options?.minify !== true,
 		sourceMaps: true,
 		sourceFileName: "inline.js"
 	}, source);
@@ -1661,7 +1663,9 @@ async function injectWevuPageFeaturesInJsWithResolver(source, options) {
 		transformed: false
 	};
 	const generated = generate(ast, {
-		retainLines: true,
+		compact: options?.minify === true,
+		minified: options?.minify === true,
+		retainLines: options?.minify !== true,
 		sourceMaps: true,
 		sourceFileName: "inline.js"
 	}, source);
@@ -2231,16 +2235,23 @@ function createValidIdentifier(name, fallback) {
 	if (name && t.isValidIdentifier(name)) return t.identifier(name);
 	return t.identifier(fallback);
 }
+function buildConsoleErrorGuard(message, errorId) {
+	return t.ifStatement(t.logicalExpression("&&", t.binaryExpression("!==", t.unaryExpression("typeof", t.identifier("console")), t.stringLiteral("undefined")), t.binaryExpression("===", t.unaryExpression("typeof", t.memberExpression(t.identifier("console"), t.identifier("error"))), t.stringLiteral("function"))), t.blockStatement([t.expressionStatement(t.callExpression(t.memberExpression(t.identifier("console"), t.identifier("error")), [t.stringLiteral(message), t.cloneNode(errorId)]))]));
+}
+function buildRuntimeExpressionErrorGuard(binding, errorId) {
+	return buildConsoleErrorGuard(`[wevu] 模板运行时表达式执行失败: ${binding.name} = ${binding.exp}`, errorId);
+}
 function buildNormalizedExpression(binding, helpers) {
+	const errorId = t.identifier(WEVU_EXPRESSION_ERROR_IDENTIFIER);
 	if (binding.type === "bind") {
 		const exp = binding.expAst ? t.cloneNode(binding.expAst, true) : t.identifier("undefined");
-		return t.callExpression(t.arrowFunctionExpression([], t.blockStatement([t.tryStatement(t.blockStatement([t.returnStatement(exp)]), t.catchClause(t.identifier(WEVU_EXPRESSION_ERROR_IDENTIFIER), t.blockStatement([t.returnStatement(t.identifier("undefined"))])), null)])), []);
+		return t.callExpression(t.arrowFunctionExpression([], t.blockStatement([t.tryStatement(t.blockStatement([t.returnStatement(exp)]), t.catchClause(t.cloneNode(errorId), t.blockStatement([buildRuntimeExpressionErrorGuard(binding, errorId), t.returnStatement(t.identifier("undefined"))])), null)])), []);
 	}
 	const normalizeHelper = binding.type === "class" ? helpers.normalizeClass : helpers.normalizeStyle;
 	const errorFallback = binding.errorFallback ?? "";
 	const exp = binding.expAst ? t.cloneNode(binding.expAst, true) : t.stringLiteral("");
 	const normalizedCall = t.callExpression(t.cloneNode(normalizeHelper), [exp]);
-	return t.callExpression(t.arrowFunctionExpression([], t.blockStatement([t.tryStatement(t.blockStatement([t.returnStatement(normalizedCall)]), t.catchClause(t.identifier(WEVU_EXPRESSION_ERROR_IDENTIFIER), t.blockStatement([t.returnStatement(t.stringLiteral(errorFallback))])), null)])), []);
+	return t.callExpression(t.arrowFunctionExpression([], t.blockStatement([t.tryStatement(t.blockStatement([t.returnStatement(normalizedCall)]), t.catchClause(t.cloneNode(errorId), t.blockStatement([buildRuntimeExpressionErrorGuard(binding, errorId), t.returnStatement(t.stringLiteral(errorFallback))])), null)])), []);
 }
 function buildArrayMapExpression(binding, forStack, level, listId, helpers) {
 	const itemParam = createValidIdentifier(forStack[level].item, `__wv_item_${level}`);
@@ -2288,7 +2299,7 @@ function buildForExpression(binding, forStack, level, helpers) {
 	const unrefHelper = helpers.unref ? t.cloneNode(helpers.unref) : t.identifier("unref");
 	const listUnrefExp = t.callExpression(unrefHelper, [listExp]);
 	const listDecl = t.variableDeclaration("let", [t.variableDeclarator(listId, t.arrayExpression([]))]);
-	const listSafeAssign = t.tryStatement(t.blockStatement([t.expressionStatement(t.assignmentExpression("=", listId, listUnrefExp))]), t.catchClause(t.identifier(`__wv_err_${level}`), t.blockStatement([t.expressionStatement(t.assignmentExpression("=", listId, t.arrayExpression([])))])), null);
+	const listSafeAssign = t.tryStatement(t.blockStatement([t.expressionStatement(t.assignmentExpression("=", listId, listUnrefExp))]), t.catchClause(t.identifier(`__wv_err_${level}`), t.blockStatement([buildConsoleErrorGuard(`[wevu] 模板 v-for 数据源表达式执行失败: ${info.listExp}`, t.identifier(`__wv_err_${level}`)), t.expressionStatement(t.assignmentExpression("=", listId, t.arrayExpression([])))])), null);
 	const arrayCheck = t.callExpression(t.memberExpression(t.identifier("Array"), t.identifier("isArray")), [listId]);
 	const arrayMap = buildArrayMapExpression(binding, forStack, level, listId, helpers);
 	const objectCheck = t.logicalExpression("&&", t.binaryExpression("!=", listId, t.nullLiteral()), t.binaryExpression("===", t.unaryExpression("typeof", listId), t.stringLiteral("object")));
@@ -2991,7 +3002,9 @@ function transformScript(source, options) {
 		transformed: false
 	};
 	const generated = generate(ast, {
-		retainLines: true,
+		compact: options?.minify === true,
+		minified: options?.minify === true,
+		retainLines: options?.minify !== true,
 		sourceMaps: true,
 		sourceFileName: "inline.ts"
 	}, source);
@@ -3288,26 +3301,49 @@ function stripRenderOptionFromScript(source, filename, warn) {
 }
 //#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;
+	while (index < source.length) {
+		const start = source.indexOf("<", index);
+		if (start < 0) {
+			tokens.push({
+				type: "text",
+				value: source.slice(index)
+			});
+			break;
+		}
 		if (start > index) tokens.push({
 			type: "text",
 			value: source.slice(index, start)
 		});
+		let quote;
+		let end = start + 1;
+		for (; end < source.length; end++) {
+			const char = source[end];
+			if (quote) {
+				if (char === quote) quote = void 0;
+				continue;
+			}
+			if (char === "\"" || char === "'") {
+				quote = char;
+				continue;
+			}
+			if (char === ">") break;
+		}
+		if (end >= source.length) {
+			tokens.push({
+				type: "text",
+				value: source.slice(start)
+			});
+			break;
+		}
 		tokens.push({
 			type: "tag",
-			value: match[0]
+			value: source.slice(start, end + 1)
 		});
-		index = start + match[0].length;
+		index = end + 1;
 	}
-	if (index < source.length) tokens.push({
-		type: "text",
-		value: source.slice(index)
-	});
 	return tokens.filter((token) => token.value.length > 0);
 }
 function isClosingTag(value) {
@@ -4103,6 +4139,7 @@ async function compileJsxFile(source, filename, options) {
 		skipComponentTransform: options?.isApp,
 		isApp: options?.isApp,
 		isPage: options?.isPage,
+		minify: options?.minify,
 		warn: options?.warn,
 		wevuDefaults: options?.wevuDefaults,
 		inlineExpressions
@@ -6005,6 +6042,23 @@ function isComputedMemberExpression(rawExpValue) {
 	const normalized = unwrapTsExpression(parsed);
 	return normalized.type === "MemberExpression" && normalized.computed;
 }
+function shouldUseRuntimeFunctionPropBinding(argValue, context) {
+	return context.functionPropNames.some((matcher) => {
+		if (typeof matcher === "string") return matcher === argValue;
+		matcher.lastIndex = 0;
+		return matcher.test(argValue);
+	});
+}
+function shouldWrapStaticMemberFunctionProp(argValue, path, context) {
+	return path.includes(".") && shouldUseRuntimeFunctionPropBinding(argValue, context);
+}
+function createFunctionPropRuntimeAttr(argValue, rawExpValue, context) {
+	const bindingRef = registerRuntimeBindingExpression(rawExpValue, context, { hint: `:${argValue} 函数 prop 绑定` });
+	if (!bindingRef) return null;
+	const bindingName = bindingRef.split("[")[0] || bindingRef;
+	context.functionPropPaths.add(bindingName);
+	return `${argValue}="${renderMustache(bindingRef, context)}"`;
+}
 function transformBindDirective(node, context, forInfo, options) {
 	const { arg } = node;
 	if (!arg) return null;
@@ -6013,16 +6067,12 @@ function transformBindDirective(node, context, forInfo, options) {
 	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)}"`;
-			}
+		if (path) if (shouldWrapStaticMemberFunctionProp(argValue, path, context)) {
+			const runtimeAttr = createFunctionPropRuntimeAttr(argValue, rawExpValue, context);
+			if (runtimeAttr) return runtimeAttr;
 		} else context.functionPropPaths.add(path);
-		else if (isComputedMemberExpression(rawExpValue)) {
-			const runtimeAttr = createBindRuntimeAttr(argValue, rawExpValue, context);
+		else if (shouldUseRuntimeFunctionPropBinding(argValue, context) && isComputedMemberExpression(rawExpValue)) {
+			const runtimeAttr = createFunctionPropRuntimeAttr(argValue, rawExpValue, context);
 			if (runtimeAttr) return runtimeAttr;
 		}
 	}
@@ -6623,7 +6673,8 @@ function createScopedSlotComponent(context, slotKey, props, children, transformN
 		forIndexSeed: 0,
 		inlineExpressions: [],
 		inlineExpressionSeed: 0,
-		functionPropPaths: /* @__PURE__ */ new Set()
+		functionPropPaths: /* @__PURE__ */ new Set(),
+		functionPropNames: context.functionPropNames
 	};
 	let template = withSlotProps(scopedContext, {
 		...collectScopePropMapping(context),
@@ -7347,6 +7398,7 @@ function compileVueTemplateToWxml(template, filename, options) {
 			inlineExpressions: [],
 			inlineExpressionSeed: 0,
 			functionPropPaths: /* @__PURE__ */ new Set(),
+			functionPropNames: Array.from(options?.functionPropNames ?? []),
 			wevuComponentTags: options?.wevuComponentTags ? new Set(options.wevuComponentTags) : void 0
 		};
 		let wxml = ast.children.map((child) => transformNode(child, context)).join("");
@@ -8197,6 +8249,7 @@ async function compileScriptPhase(descriptor, descriptorForCompile, filename, op
 			skipComponentTransform: isAppFile,
 			isApp: isAppFile,
 			isPage: options?.isPage === true,
+			minify: options?.minify,
 			warn: options?.warn,
 			templateComponentMeta: Object.keys(autoComponentMeta).length ? autoComponentMeta : void 0,
 			wevuDefaults: options?.wevuDefaults,

package/package.json

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