olova 2.0.71 → 2.0.73

package/dist/index.js

@@ -2,7 +2,7 @@ import fs from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
 import { normalizePath } from 'vite';
-import { parse } from '@babel/parser';
+import { parse, parseExpression } from '@babel/parser';
 import generatorModule from '@babel/generator';
 import traverseModule from '@babel/traverse';
 import * as t from '@babel/types';
@@ -659,6 +659,33 @@ function parseModule(code) {
     plugins: ["typescript", "jsx"]
   });
 }
+function parseStandaloneExpression(code) {
+  return parseExpression(code, {
+    plugins: ["typescript", "jsx"]
+  });
+}
+function createExpressionFile(expression) {
+  return t.file(
+    t.program([
+      t.expressionStatement(t.cloneNode(expression, true))
+    ])
+  );
+}
+function nodeHasJsx(node) {
+  if (!node) {
+    return false;
+  }
+  let found = false;
+  t.traverseFast(node, (child) => {
+    if (found) {
+      return;
+    }
+    if (t.isJSXElement(child) || t.isJSXFragment(child)) {
+      found = true;
+    }
+  });
+  return found;
+}
 function runCompilePhase(phase, fn) {
   try {
     return fn();
@@ -1026,19 +1053,7 @@ function collectScriptInfo(script) {
   });
   addNestedMutationNotify(ast, stateNames);
   const nodeContainsJsx = (node) => {
-    if (!node) {
-      return false;
-    }
-    let found = false;
-    traverse(parseModule(`(${generate2(node).code})`), {
-      JSXElement() {
-        found = true;
-      },
-      JSXFragment() {
-        found = true;
-      }
-    });
-    return found;
+    return nodeHasJsx(node);
   };
   traverse(ast, {
     FunctionDeclaration(path2) {
@@ -1060,12 +1075,8 @@ function collectScriptInfo(script) {
         allSignalNames,
         jsxFunctionNames
       );
-      const parsed = parseModule(`(${transformed.code})`);
-      const statement = parsed.program.body[0];
-      if (statement && t.isExpressionStatement(statement)) {
-        path2.replaceWith(statement.expression);
-        path2.skip();
-      }
+      path2.replaceWith(parseStandaloneExpression(transformed.code));
+      path2.skip();
     },
     JSXFragment(path2) {
       const transformed = transformExpression(
@@ -1074,12 +1085,8 @@ function collectScriptInfo(script) {
         allSignalNames,
         jsxFunctionNames
       );
-      const parsed = parseModule(`(${transformed.code})`);
-      const statement = parsed.program.body[0];
-      if (statement && t.isExpressionStatement(statement)) {
-        path2.replaceWith(statement.expression);
-        path2.skip();
-      }
+      path2.replaceWith(parseStandaloneExpression(transformed.code));
+      path2.skip();
     }
   });
   if (needsGlobalRuntime) {
@@ -1113,7 +1120,7 @@ function collectScriptInfo(script) {
   };
 }
 function transformExpression(expr, stateNames, allSignalNames, jsxFunctionNames = /* @__PURE__ */ new Set(), scopeId) {
-  const ast = parseModule(`(${expr})`);
+  const ast = createExpressionFile(parseStandaloneExpression(expr));
   let containsJsx = false;
   const jsxScopeAttr = createScopeAttr(scopeId);
   traverse(ast, {
@@ -1175,16 +1182,7 @@ function transformExpression(expr, stateNames, allSignalNames, jsxFunctionNames
   const toStringCall = (input) => t.callExpression(t.identifier("__olovaToString"), [input]);
   const escapeCall = (input) => t.callExpression(t.identifier("__olovaEscape"), [input]);
   const expressionContainsJsx = (input) => {
-    let found = false;
-    traverse(parseModule(`(${generate2(input).code})`), {
-      JSXElement() {
-        found = true;
-      },
-      JSXFragment() {
-        found = true;
-      }
-    });
-    return found;
+    return nodeHasJsx(input);
   };
   const expressionProducesHtml = (input) => {
     if (!input) {
@@ -1194,19 +1192,18 @@ function transformExpression(expr, stateNames, allSignalNames, jsxFunctionNames
       return true;
     }
     let found = false;
-    traverse(parseModule(`(${generate2(input).code})`), {
-      CallExpression(path2) {
-        if (t.isIdentifier(path2.node.callee) && jsxFunctionNames.has(path2.node.callee.name)) {
+    t.traverseFast(input, (child) => {
+      if (found || !t.isCallExpression(child)) {
+        return;
+      }
+      if (t.isIdentifier(child.callee) && jsxFunctionNames.has(child.callee.name)) {
+        found = true;
+        return;
+      }
+      if (t.isMemberExpression(child.callee) && t.isIdentifier(child.callee.property) && (child.callee.property.name === "map" || child.callee.property.name === "flatMap")) {
+        const [firstArg] = child.arguments;
+        if (t.isIdentifier(firstArg) && jsxFunctionNames.has(firstArg.name) || nodeContainsRenderableFunction(firstArg, jsxFunctionNames)) {
           found = true;
-          path2.stop();
-          return;
-        }
-        if (t.isMemberExpression(path2.node.callee) && t.isIdentifier(path2.node.callee.property) && (path2.node.callee.property.name === "map" || path2.node.callee.property.name === "flatMap")) {
-          const [firstArg] = path2.node.arguments;
-          if (t.isIdentifier(firstArg) && jsxFunctionNames.has(firstArg.name) || nodeContainsRenderableFunction(firstArg, jsxFunctionNames)) {
-            found = true;
-            path2.stop();
-          }
         }
       }
     });
@@ -1249,7 +1246,7 @@ function transformExpression(expr, stateNames, allSignalNames, jsxFunctionNames
     return walkMember(name);
   };
   const transformEmbeddedJsxExpression = (input) => {
-    const wrapped = parseModule(`(${generate2(input).code})`);
+    const wrapped = createExpressionFile(input);
     let containsNestedJsx = false;
     traverse(wrapped, {
       JSXElement(path2) {
@@ -1432,17 +1429,16 @@ function transformExpression(expr, stateNames, allSignalNames, jsxFunctionNames
     }
   });
   const statement = ast.program.body[0];
-  if (!statement || !t.isExpressionStatement(statement)) {
+  const expression = statement && t.isExpressionStatement(statement) ? statement.expression : null;
+  if (!expression) {
     return { code: expr.trim(), containsJsx };
   }
-  containsJsx = containsJsx || expressionProducesHtml(statement.expression);
-  return { code: generate2(statement.expression).code, containsJsx };
+  containsJsx = containsJsx || expressionProducesHtml(expression);
+  return { code: generate2(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;
+    return parseStandaloneExpression(expr);
   } catch {
     return null;
   }
@@ -1630,90 +1626,75 @@ function transformTemplate(template, stateNames, allSignalNames, jsxFunctionName
   const ifBindings = [];
   html = replaceTemplateExpressions(html, (expr) => {
     try {
-      const ast = parseModule(`(${expr})`);
-      const exprNode = ast.program.body[0];
-      if (t.isExpressionStatement(exprNode)) {
-        const node = exprNode.expression;
-        const containsJsxNode = (n) => {
-          let found = false;
-          traverse(parseModule(`(${generate2(n).code})`), {
-            JSXElement() {
-              found = true;
-            },
-            JSXFragment() {
-              found = true;
-            }
+      const node = parseStandaloneExpression(expr);
+      const containsJsxNode = (n) => nodeHasJsx(n);
+      if (t.isLogicalExpression(node) && node.operator === "&&") {
+        if (containsJsxNode(node.right)) {
+          const id = `i${counters.if++}`;
+          const condition = generate2(node.left).code;
+          const trueBranchHtml = jsxToTemplateHtml(node.right);
+          ifBindings.push({
+            id,
+            expr: transformExpression(
+              condition,
+              stateNames,
+              allSignalNames,
+              jsxFunctionNames,
+              scopeId
+            ).code,
+            trueBranch: transformTemplate(
+              trueBranchHtml,
+              stateNames,
+              allSignalNames,
+              jsxFunctionNames,
+              componentNames,
+              counters,
+              scopeId,
+              devWarnings,
+              filename
+            )
           });
-          return found;
-        };
-        if (t.isLogicalExpression(node) && node.operator === "&&") {
-          if (containsJsxNode(node.right)) {
-            const id = `i${counters.if++}`;
-            const condition = generate2(node.left).code;
-            const trueBranchHtml = jsxToTemplateHtml(node.right);
-            ifBindings.push({
-              id,
-              expr: transformExpression(
-                condition,
-                stateNames,
-                allSignalNames,
-                jsxFunctionNames,
-                scopeId
-              ).code,
-              trueBranch: transformTemplate(
-                trueBranchHtml,
-                stateNames,
-                allSignalNames,
-                jsxFunctionNames,
-                componentNames,
-                counters,
-                scopeId,
-                devWarnings,
-                filename
-              )
-            });
-            return `__O_IF_${id}__`;
-          }
-        } else if (t.isConditionalExpression(node)) {
-          if (containsJsxNode(node.consequent) || containsJsxNode(node.alternate)) {
-            const id = `i${counters.if++}`;
-            const condition = generate2(node.test).code;
-            const trueBranchHtml = containsJsxNode(node.consequent) ? jsxToTemplateHtml(node.consequent) : `{${generate2(node.consequent).code}}`;
-            const falseBranchHtml = containsJsxNode(node.alternate) ? jsxToTemplateHtml(node.alternate) : `{${generate2(node.alternate).code}}`;
-            ifBindings.push({
-              id,
-              expr: transformExpression(
-                condition,
-                stateNames,
-                allSignalNames,
-                jsxFunctionNames,
-                scopeId
-              ).code,
-              trueBranch: transformTemplate(
-                trueBranchHtml,
-                stateNames,
-                allSignalNames,
-                jsxFunctionNames,
-                componentNames,
-                counters,
-                scopeId,
-                devWarnings,
-                filename
-              ),
-              falseBranch: transformTemplate(
-                falseBranchHtml,
-                stateNames,
-                allSignalNames,
-                jsxFunctionNames,
-                componentNames,
-                counters,
-                scopeId,
-                devWarnings,
-                filename
-              )
-            });
-            return `__O_IF_${id}__`;
-          }
+          return `__O_IF_${id}__`;
+        }
+      } else if (t.isConditionalExpression(node)) {
+        if (containsJsxNode(node.consequent) || containsJsxNode(node.alternate)) {
+          const id = `i${counters.if++}`;
+          const condition = generate2(node.test).code;
+          const trueBranchHtml = containsJsxNode(node.consequent) ? jsxToTemplateHtml(node.consequent) : `{${generate2(node.consequent).code}}`;
+          const falseBranchHtml = containsJsxNode(node.alternate) ? jsxToTemplateHtml(node.alternate) : `{${generate2(node.alternate).code}}`;
+          ifBindings.push({
+            id,
+            expr: transformExpression(
+              condition,
+              stateNames,
+              allSignalNames,
+              jsxFunctionNames,
+              scopeId
+            ).code,
+            trueBranch: transformTemplate(
+              trueBranchHtml,
+              stateNames,
+              allSignalNames,
+              jsxFunctionNames,
+              componentNames,
+              counters,
+              scopeId,
+              devWarnings,
+              filename
+            ),
+            falseBranch: transformTemplate(
+              falseBranchHtml,
+              stateNames,
+              allSignalNames,
+              jsxFunctionNames,
+              componentNames,
+              counters,
+              scopeId,
+              devWarnings,
+              filename
+            )
+          });
+          return `__O_IF_${id}__`;
         }
       }
     } catch {
@@ -1859,9 +1840,7 @@ function transformTemplate(template, stateNames, allSignalNames, jsxFunctionName
         const rawValue = node.attrs.fallback;
         if (rawValue.startsWith("{") && rawValue.endsWith("}")) {
           const fallbackExpression = rawValue.slice(1, -1).trim();
-          const fallbackAst = parseModule(`(${fallbackExpression})`);
-          const fallbackStatement = fallbackAst.program.body[0];
-          const fallbackNode = fallbackStatement && t.isExpressionStatement(fallbackStatement) ? fallbackStatement.expression : null;
+          const fallbackNode = parseExpressionNode(fallbackExpression);
           if (fallbackNode && (t.isJSXElement(fallbackNode) || t.isJSXFragment(fallbackNode))) {
             slotFactories.push({
               varName: `__slot_${id}_fallback`,