olova 2.0.72 → 2.0.74

package/dist/compiler.js

@@ -1,4 +1,4 @@
-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';
@@ -655,6 +655,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();
@@ -1022,25 +1049,7 @@ function collectScriptInfo(script) {
   });
   addNestedMutationNotify(ast, stateNames);
   const nodeContainsJsx = (node) => {
-    if (!node) {
-      return false;
-    }
-    let found = false;
-    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;
+    return nodeHasJsx(node);
   };
   traverse(ast, {
     FunctionDeclaration(path) {
@@ -1062,12 +1071,8 @@ function collectScriptInfo(script) {
         allSignalNames,
         jsxFunctionNames
       );
-      const parsed = parseModule(`(${transformed.code})`);
-      const statement = parsed.program.body[0];
-      if (statement && t.isExpressionStatement(statement)) {
-        path.replaceWith(statement.expression);
-        path.skip();
-      }
+      path.replaceWith(parseStandaloneExpression(transformed.code));
+      path.skip();
     },
     JSXFragment(path) {
       const transformed = transformExpression(
@@ -1076,12 +1081,8 @@ function collectScriptInfo(script) {
         allSignalNames,
         jsxFunctionNames
       );
-      const parsed = parseModule(`(${transformed.code})`);
-      const statement = parsed.program.body[0];
-      if (statement && t.isExpressionStatement(statement)) {
-        path.replaceWith(statement.expression);
-        path.skip();
-      }
+      path.replaceWith(parseStandaloneExpression(transformed.code));
+      path.skip();
     }
   });
   if (needsGlobalRuntime) {
@@ -1115,7 +1116,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, {
@@ -1177,16 +1178,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) {
@@ -1196,19 +1188,18 @@ function transformExpression(expr, stateNames, allSignalNames, jsxFunctionNames
       return true;
     }
     let found = false;
-    traverse(parseModule(`(${generate2(input).code})`), {
-      CallExpression(path) {
-        if (t.isIdentifier(path.node.callee) && jsxFunctionNames.has(path.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;
-          path.stop();
-          return;
-        }
-        if (t.isMemberExpression(path.node.callee) && t.isIdentifier(path.node.callee.property) && (path.node.callee.property.name === "map" || path.node.callee.property.name === "flatMap")) {
-          const [firstArg] = path.node.arguments;
-          if (t.isIdentifier(firstArg) && jsxFunctionNames.has(firstArg.name) || nodeContainsRenderableFunction(firstArg, jsxFunctionNames)) {
-            found = true;
-            path.stop();
-          }
         }
       }
     });
@@ -1251,7 +1242,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(path) {
@@ -1434,17 +1425,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;
   }
@@ -1514,11 +1504,41 @@ function jsxToTemplateHtml(node) {
   return "";
 }
 function replaceTemplateExpressions(input, replacer) {
+  const rawTextTags = /* @__PURE__ */ new Set(["pre", "code", "textarea", "kbd", "samp"]);
   let output = "";
   let index = 0;
   let inTag = false;
   let tagQuote = null;
   let tagBraceDepth = 0;
+  let tagStart = -1;
+  const rawTextStack = [];
+  const updateRawTextStack = (rawTag) => {
+    const trimmed = rawTag.trim();
+    if (!trimmed || trimmed.startsWith("!") || trimmed.startsWith("?")) {
+      return;
+    }
+    const closing = trimmed.startsWith("/");
+    const content = closing ? trimmed.slice(1).trim() : trimmed;
+    const selfClosing = /\/\s*$/.test(content);
+    const nameMatch = content.match(/^([A-Za-z][A-Za-z0-9:-]*)/);
+    if (!nameMatch) {
+      return;
+    }
+    const tagName = nameMatch[1].toLowerCase();
+    if (!rawTextTags.has(tagName)) {
+      return;
+    }
+    if (closing) {
+      const stackIndex = rawTextStack.lastIndexOf(tagName);
+      if (stackIndex >= 0) {
+        rawTextStack.splice(stackIndex, 1);
+      }
+      return;
+    }
+    if (!selfClosing) {
+      rawTextStack.push(tagName);
+    }
+  };
   while (index < input.length) {
     const char = input[index];
     const prev = index > 0 ? input[index - 1] : "";
@@ -1539,12 +1559,19 @@ function replaceTemplateExpressions(input, replacer) {
         tagBraceDepth -= 1;
       } else if (char === ">" && tagBraceDepth === 0) {
         inTag = false;
+        updateRawTextStack(input.slice(tagStart + 1, index));
       }
       index += 1;
       continue;
     }
     if (char === "<") {
       inTag = true;
+      tagStart = index;
+      output += char;
+      index += 1;
+      continue;
+    }
+    if (rawTextStack.length > 0) {
       output += char;
       index += 1;
       continue;
@@ -1632,90 +1659,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 {
@@ -1861,9 +1873,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`,