@geajs/vite-plugin 1.2.0 → 1.2.1

package/dist/index.mjs

@@ -1126,6 +1126,7 @@ function buildComponentPropsExpression(jsxElement, imports, componentInstances,
 		else if (t.isJSXExpressionContainer(attr.value) && !t.isJSXEmptyExpression(attr.value.expression)) {
 			const expr = attr.value.expression;
 			propValue = transformExpression(expr);
+			if (propValue && t.isTemplateLiteral(propValue) && propValue.quasis.length === 2 && propValue.quasis[0].value.raw === "" && propValue.quasis[1].value.raw === "" && propValue.expressions.length === 1) propValue = propValue.expressions[0];
 			if (propValue && (/^on[A-Z]/.test(propName) || DOM_EVENT_RE.test(propName)) && t.isMemberExpression(propValue)) {
 				const argsId = t.identifier("args");
 				propValue = t.arrowFunctionExpression([t.restElement(argsId)], t.callExpression(t.cloneNode(propValue, true), [t.spreadElement(argsId)]));
@@ -1734,6 +1735,12 @@ function collectComponentTags(node, imports, instanceTags, inMapCallback = false
 		if (tag && isComponentTag(tag) && imports.has(tag)) {
 			if (!inMapCallback) instanceTags.push(tag);
 		}
+		for (const attr of node.openingElement.attributes) {
+			if (!t.isJSXAttribute(attr) || !attr.value || !t.isJSXExpressionContainer(attr.value)) continue;
+			if (t.isJSXEmptyExpression(attr.value.expression)) continue;
+			const attrExpr = attr.value.expression;
+			visitExpr(attrExpr, inMapCallback);
+		}
 		node.children.forEach((c) => {
 			if (t.isJSXElement(c)) collectComponentTags(c, imports, instanceTags, inMapCallback);
 			else if (t.isJSXFragment(c)) collectComponentTags(c, imports, instanceTags, inMapCallback);
@@ -2276,7 +2283,7 @@ function processChildren(children, parts, ctx, elementPath, dcCursor, directChil
 					pushString(parts, "");
 				}
 				if (expressionMayBeFalsy(rawExpr)) expr = t.logicalExpression("||", expr, t.stringLiteral(""));
-				const safeExpr = childCallInfo || isChildrenPropAccess(rawExpr) || expressionContainsJSX(rawExpr) || ctx.inMapCallback || callsJSXReturningProperty(rawExpr, ctx.classBody) ? expr : jsExpr`geaEscapeHtml(String(${expr}))`;
+				const safeExpr = childCallInfo || isChildrenPropAccess(rawExpr) || expressionContainsJSX(rawExpr) || ctx.inMapCallback || callsJSXReturningProperty(rawExpr, ctx.classBody) ? expr : jsExpr`geaEscapeHtml(${expr})`;
 				parts.push({
 					type: "expression",
 					value: safeExpr
@@ -9687,7 +9694,9 @@ function transformRemainingJSX(ast, imports) {
 			const classMethod = path.findParent((p) => t.isClassMethod(p.node));
 			if (classMethod && t.isClassMethod(classMethod.node) && t.isIdentifier(classMethod.node.key) && classMethod.node.key.name === "template") return;
 			try {
-				path.replaceWith(transformJSXToTemplate(path.node, { imports }));
+				let result = transformJSXToTemplate(path.node, { imports });
+				if (t.isTemplateLiteral(result) && result.quasis.length === 2 && result.quasis[0].value.raw === "" && result.quasis[1].value.raw === "" && result.expressions.length === 1 && path.parent && t.isArrowFunctionExpression(path.parent) && path.parent.body === path.node) result = result.expressions[0];
+				path.replaceWith(result);
 			} catch (err) {
 				console.warn("[gea] Failed to transform JSX element:", err instanceof Error ? err.message : err);
 			}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geajs/vite-plugin",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Vite plugin for Gea framework - JSX/TSX transform, reactivity, HMR",
   "type": "module",
   "main": "./dist/index.mjs",