@wevu/compiler 0.1.1 → 0.1.2

package/dist/index.d.mts

@@ -249,7 +249,7 @@ type ClassStyleRuntime = 'wxs' | 'js';
  */
 interface ClassStyleBinding {
   name: string;
-  type: 'class' | 'style';
+  type: 'class' | 'style' | 'bind';
   exp: string;
   expAst?: Expression;
   forStack: ForParseResult[];

package/dist/index.mjs

@@ -2212,6 +2212,10 @@ function createValidIdentifier(name, fallback) {
 	return t.identifier(fallback);
 }
 function buildNormalizedExpression(binding, helpers) {
+	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("__wv_expr_err"), t.blockStatement([t.returnStatement(t.identifier("undefined"))])), null)])), []);
+	}
 	const normalizeHelper = binding.type === "class" ? helpers.normalizeClass : helpers.normalizeStyle;
 	const exp = binding.expAst ? t.cloneNode(binding.expAst, true) : t.stringLiteral("");
 	const normalizedCall = t.callExpression(t.cloneNode(normalizeHelper), [exp]);
@@ -2691,7 +2695,7 @@ function normalizeJsxText(value) {
 function printExpression(exp) {
 	return generate(exp).code;
 }
-function unwrapTsExpression$1(exp) {
+function unwrapTsExpression$2(exp) {
 	let current = exp;
 	while (t.isTSAsExpression(current) || t.isTSTypeAssertion(current) || t.isTSNonNullExpression(current) || t.isParenthesizedExpression(current) || t.isTSInstantiationExpression(current)) {
 		if (t.isTSAsExpression(current) || t.isTSTypeAssertion(current) || t.isTSNonNullExpression(current)) {
@@ -2707,7 +2711,7 @@ function unwrapTsExpression$1(exp) {
 	return current;
 }
 function normalizeInterpolationExpression(exp) {
-	return normalizeWxmlExpression(printExpression(unwrapTsExpression$1(exp)));
+	return normalizeWxmlExpression(printExpression(unwrapTsExpression$2(exp)));
 }
 function pushScope$1(context, names) {
 	for (const name of names) {
@@ -2771,20 +2775,20 @@ function toJsxTagName(name, context) {
 }
 function resolveRenderableExpression(node) {
 	if (t.isObjectMethod(node)) {
-		for (const statement of node.body.body) if (t.isReturnStatement(statement) && statement.argument) return unwrapTsExpression$1(statement.argument);
+		for (const statement of node.body.body) if (t.isReturnStatement(statement) && statement.argument) return unwrapTsExpression$2(statement.argument);
 		return null;
 	}
 	if (!node.value) return null;
 	const value = node.value;
 	if (t.isArrowFunctionExpression(value)) {
 		if (t.isBlockStatement(value.body)) {
-			for (const statement of value.body.body) if (t.isReturnStatement(statement) && statement.argument) return unwrapTsExpression$1(statement.argument);
+			for (const statement of value.body.body) if (t.isReturnStatement(statement) && statement.argument) return unwrapTsExpression$2(statement.argument);
 			return null;
 		}
-		return unwrapTsExpression$1(value.body);
+		return unwrapTsExpression$2(value.body);
 	}
 	if (t.isFunctionExpression(value)) {
-		for (const statement of value.body.body) if (t.isReturnStatement(statement) && statement.argument) return unwrapTsExpression$1(statement.argument);
+		for (const statement of value.body.body) if (t.isReturnStatement(statement) && statement.argument) return unwrapTsExpression$2(statement.argument);
 	}
 	return null;
 }
@@ -2913,7 +2917,7 @@ function readJsxAttributeExpression(value) {
 	if (t.isStringLiteral(value)) return value;
 	if (!t.isJSXExpressionContainer(value)) return null;
 	if (t.isJSXEmptyExpression(value.expression)) return null;
-	return unwrapTsExpression$1(value.expression);
+	return unwrapTsExpression$2(value.expression);
 }
 function extractJsxKeyExpression(node) {
 	for (const attr of node.openingElement.attributes) {
@@ -2991,10 +2995,10 @@ function compileMapExpression(exp, context) {
 	let bodyExp = null;
 	if (t.isBlockStatement(callback.body)) {
 		for (const statement of callback.body.body) if (t.isReturnStatement(statement) && statement.argument) {
-			bodyExp = unwrapTsExpression$1(statement.argument);
+			bodyExp = unwrapTsExpression$2(statement.argument);
 			break;
 		}
-	} else bodyExp = unwrapTsExpression$1(callback.body);
+	} else bodyExp = unwrapTsExpression$2(callback.body);
 	const body = bodyExp ? compileRenderableExpression(bodyExp, context) : "";
 	popScope$1(context, addedScope.length);
 	if (!body) return "";
@@ -3027,7 +3031,7 @@ function compileLogicalExpression(exp, context) {
 	return `{{${normalizeInterpolationExpression(exp)}}}`;
 }
 function compileRenderableExpression(exp, context) {
-	const node = unwrapTsExpression$1(exp);
+	const node = unwrapTsExpression$2(exp);
 	if (t.isJSXElement(node)) return compileJsxElement(node, context);
 	if (t.isJSXFragment(node)) return compileJsxFragment(node, context);
 	if (t.isConditionalExpression(node)) return compileConditionalExpression(node, context);
@@ -4516,7 +4520,7 @@ function toWxmlStringLiteral(value) {
 function cloneForStack(context) {
 	return context.forStack.map((info) => ({ ...info }));
 }
-function buildForIndexAccess(context) {
+function buildForIndexAccess$1(context) {
 	if (!context.forStack.length) return "";
 	return context.forStack.map((info) => `[${info.index ?? "index"}]`).join("");
 }
@@ -4529,15 +4533,15 @@ function mergeJsExpressionParts(parts) {
 	if (parts.length === 1) return parts[0];
 	return t.arrayExpression(parts);
 }
-function unwrapTsExpression(node) {
-	if (t.isTSAsExpression(node) || t.isTSNonNullExpression(node) || t.isTSTypeAssertion(node)) return unwrapTsExpression(node.expression);
+function unwrapTsExpression$1(node) {
+	if (t.isTSAsExpression(node) || t.isTSNonNullExpression(node) || t.isTSTypeAssertion(node)) return unwrapTsExpression$1(node.expression);
 	return node;
 }
 function shouldPreferJsClassStyleRuntime(exp) {
 	const ast = parseBabelExpression(exp);
 	if (!ast) return true;
 	const visit = (node) => {
-		const current = unwrapTsExpression(node);
+		const current = unwrapTsExpression$1(node);
 		if (t.isIdentifier(current) || t.isMemberExpression(current) || t.isOptionalMemberExpression(current) || t.isCallExpression(current) || t.isOptionalCallExpression(current) || t.isThisExpression(current) || t.isSuper(current) || t.isAwaitExpression(current) || t.isYieldExpression(current) || t.isNewExpression(current)) return true;
 		if (t.isStringLiteral(current) || t.isNumericLiteral(current) || t.isBooleanLiteral(current) || t.isNullLiteral(current) || t.isBigIntLiteral(current) || t.isRegExpLiteral(current)) return false;
 		if (t.isTemplateLiteral(current)) return current.expressions.some((exp) => visit(exp));
@@ -4560,9 +4564,9 @@ function shouldPreferJsClassStyleRuntime(exp) {
 	return visit(ast);
 }
 function createClassStyleBinding(context, type, exp, expAst) {
-	const index = context.classStyleBindings.length;
+	const sameTypeCount = context.classStyleBindings.filter((binding) => binding.type === type).length;
 	return {
-		name: type === "class" ? `__wv_cls_${index}` : `__wv_style_${index}`,
+		name: type === "class" ? `__wv_cls_${sameTypeCount}` : type === "style" ? `__wv_style_${sameTypeCount}` : `__wv_bind_${sameTypeCount}`,
 		type,
 		exp,
 		expAst,
@@ -4588,7 +4592,7 @@ function renderClassAttribute(staticClass, dynamicClassExp, context) {
 	const expAst = mergeJsExpressionParts(jsParts);
 	const binding = createClassStyleBinding(context, "class", generateExpressionCode(expAst), expAst);
 	context.classStyleBindings.push(binding);
-	const indexAccess = buildForIndexAccess(context);
+	const indexAccess = buildForIndexAccess$1(context);
 	return `class="{{${binding.name}${indexAccess}}}"`;
 }
 function renderStyleAttribute(staticStyle, dynamicStyleExp, vShowExp, context) {
@@ -4622,7 +4626,7 @@ function renderStyleAttribute(staticStyle, dynamicStyleExp, vShowExp, context) {
 	const expAst = mergeJsExpressionParts(jsParts);
 	const binding = createClassStyleBinding(context, "style", generateExpressionCode(expAst), expAst);
 	context.classStyleBindings.push(binding);
-	const indexAccess = buildForIndexAccess(context);
+	const indexAccess = buildForIndexAccess$1(context);
 	return `style="{{${binding.name}${indexAccess}}}"`;
 }
 function transformAttribute(node, _context) {
@@ -4634,6 +4638,33 @@ function transformAttribute(node, _context) {
 
 //#endregion
 //#region src/plugins/vue/compiler/template/directives/bind.ts
+function unwrapTsExpression(node) {
+	if (node.type === "TSAsExpression" || node.type === "TSNonNullExpression" || node.type === "TSTypeAssertion") return unwrapTsExpression(node.expression);
+	return node;
+}
+function isTopLevelObjectLiteral(exp) {
+	const parsed = parseBabelExpression(exp);
+	if (!parsed) return false;
+	return unwrapTsExpression(parsed).type === "ObjectExpression";
+}
+function buildForIndexAccess(context) {
+	if (!context.forStack.length) return "";
+	return context.forStack.map((info) => `[${info.index ?? "index"}]`).join("");
+}
+function createBindRuntimeAttr(argValue, rawExpValue, context) {
+	const expAst = normalizeJsExpressionWithContext(rawExpValue, context, { hint: `:${argValue} 绑定` });
+	if (!expAst) return null;
+	const binding = {
+		name: `__wv_bind_${context.classStyleBindings.filter((item) => item.type === "bind").length}`,
+		type: "bind",
+		exp: rawExpValue,
+		expAst,
+		forStack: context.forStack.map((info) => ({ ...info }))
+	};
+	context.classStyleBindings.push(binding);
+	const indexAccess = buildForIndexAccess(context);
+	return `${argValue}="{{${binding.name}${indexAccess}}}"`;
+}
 const isSimpleIdentifier = (value) => /^[A-Z_$][\w$]*$/i.test(value);
 const isSimpleMemberPath = (value) => /^[A-Z_$][\w$]*(?:\.[A-Z_$][\w$]*)*$/i.test(value);
 function transformBindDirective(node, context, forInfo) {
@@ -4641,8 +4672,10 @@ function transformBindDirective(node, context, forInfo) {
 	if (!arg) return null;
 	const argValue = arg.type === NodeTypes.SIMPLE_EXPRESSION ? arg.content : "";
 	if (!exp) return null;
-	const expValue = normalizeWxmlExpressionWithContext(exp.type === NodeTypes.SIMPLE_EXPRESSION ? exp.content : "", context);
+	const rawExpValue = exp.type === NodeTypes.SIMPLE_EXPRESSION ? exp.content : "";
+	if (!rawExpValue) return null;
 	if (argValue === "key") {
+		const expValue = normalizeWxmlExpressionWithContext(rawExpValue, context);
 		const trimmed = expValue.trim();
 		const warnKeyFallback = (reason) => {
 			if (!forInfo) return;
@@ -4666,7 +4699,8 @@ function transformBindDirective(node, context, forInfo) {
 		}
 		return context.platform.keyAttr(expValue);
 	}
-	return `${argValue}="{{${expValue}}}"`;
+	if (isTopLevelObjectLiteral(rawExpValue)) return createBindRuntimeAttr(argValue, rawExpValue, context);
+	return `${argValue}="{{${normalizeWxmlExpressionWithContext(rawExpValue, context)}}}"`;
 }
 
 //#endregion

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wevu/compiler",
   "type": "module",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "wevu 编译器基础包，面向小程序模板的编译与转换",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -53,8 +53,8 @@
     "merge": "^2.1.1",
     "pathe": "^2.0.3",
     "vue": "^3.5.28",
-    "rolldown-require": "2.0.6",
-    "@weapp-core/shared": "3.0.1"
+    "@weapp-core/shared": "3.0.1",
+    "rolldown-require": "2.0.6"
   },
   "publishConfig": {
     "access": "public",