olova 2.0.70 → 2.0.72

package/dist/compiler.js

@@ -1026,14 +1026,20 @@ function collectScriptInfo(script) {
       return false;
     }
     let found = false;
-    traverse(parseModule(`(${generate2(node).code})`), {
-      JSXElement() {
-        found = true;
-      },
-      JSXFragment() {
-        found = true;
-      }
-    });
+    try {
+      const generated = generate2(node).code;
+      const code = t.isBlockStatement(node) ? `(() => ${generated})` : `(${generated})`;
+      traverse(parseModule(code), {
+        JSXElement() {
+          found = true;
+        },
+        JSXFragment() {
+          found = true;
+        }
+      });
+    } catch {
+      found = false;
+    }
     return found;
   };
   traverse(ast, {
@@ -1434,6 +1440,31 @@ function transformExpression(expr, stateNames, allSignalNames, jsxFunctionNames
   containsJsx = containsJsx || expressionProducesHtml(statement.expression);
   return { code: generate2(statement.expression).code, containsJsx };
 }
+function parseExpressionNode(expr) {
+  try {
+    const ast = parseModule(`(${expr})`);
+    const statement = ast.program.body[0];
+    return statement && t.isExpressionStatement(statement) ? statement.expression : null;
+  } catch {
+    return null;
+  }
+}
+function isDirectEventHandlerExpression(node) {
+  return !!(node && (t.isIdentifier(node) || t.isMemberExpression(node) || t.isOptionalMemberExpression(node) || t.isArrowFunctionExpression(node) || t.isFunctionExpression(node)));
+}
+function transformEventHandlerExpression(expr, stateNames, allSignalNames, jsxFunctionNames) {
+  const expressionNode = parseExpressionNode(expr);
+  const transformed = transformExpression(
+    expr,
+    stateNames,
+    allSignalNames,
+    jsxFunctionNames
+  ).code;
+  if (isDirectEventHandlerExpression(expressionNode)) {
+    return transformed;
+  }
+  return `($event) => (${transformed})`;
+}
 function jsxToTemplateHtml(node) {
   if (t.isJSXElement(node)) {
     const opening = node.openingElement;
@@ -1749,12 +1780,12 @@ function transformTemplate(template, stateNames, allSignalNames, jsxFunctionName
           eventBindings.push({
             id: id2,
             event,
-            expr: transformExpression(
+            expr: transformEventHandlerExpression(
               expr,
               stateNames,
               allSignalNames,
               jsxFunctionNames
-            ).code
+            )
           });
           output += ` data-o-on-${event}="${id2}"`;
           continue;