@barefootjs/test 0.33.3 → 0.33.4

package/dist/index.js

@@ -196461,6 +196461,10 @@ function extractLoopKey(node) {
       return null;
     return normalizeKeyExpr(a) === normalizeKeyExpr(b) ? a : null;
   }
+  if (node.type === "fragment") {
+    const first = node.children.find((c) => !(c.type === "text" && typeof c.value === "string" && !c.value.trim()));
+    return first ? extractLoopKey(first) : null;
+  }
   return null;
 }
 function keyAttrValueToExpr(v) {
@@ -196651,7 +196655,7 @@ function leafIsWirelessElement(el) {
         }
         if (import_typescript13.default.isJsxAttribute(attr)) {
           const name = attr.name.getText();
-          if (/^on[A-Z]/.test(name)) {
+          if (isEventHandlerAttrName(name)) {
             ok = false;
             return;
           }
@@ -196707,6 +196711,12 @@ function applyLoopKeyAttr(node, name, value) {
   if (node.type === "conditional") {
     applyLoopKeyAttr(node.whenTrue, name, value);
     applyLoopKeyAttr(node.whenFalse, name, value);
+    return;
+  }
+  if (node.type === "fragment") {
+    const first = node.children.find((c) => !(c.type === "text" && typeof c.value === "string" && !c.value.trim()));
+    if (first)
+      applyLoopKeyAttr(first, name, value);
   }
 }
 function loopBodyItemConditional(children) {
@@ -196939,7 +196949,7 @@ function transformMapCall(node, ctx, isClientOnly = false, method = "map") {
         children = [foldMultiReturnBranches(multiReturn, ctx, loc, ctx.getJS)];
         const pre = multiReturn.preamble ?? [];
         if (pre.length > 0) {
-          preamble = preambleFromValueStatements(pre, ctx);
+          preamble = preambleFromValueStatements(pre, ctx, body.statements);
           if (!preamble.declarations && !isClientOnly && !(ctx.analyzer.acceptsCallbackBody?.("map") ?? false)) {
             ctx.analyzer.errors.push(createError(ErrorCodes.UNSUPPORTED_JSX_PATTERN, loc, {
               message: "A .map() callback body with a preamble before its branches cannot be " + "lowered to a template: the preamble is not a sequence of value " + "declarations, so this backend has no per-row local to carry into the " + "branches.",
@@ -197026,7 +197036,7 @@ function transformMapCall(node, ctx, isClientOnly = false, method = "map") {
             valueStmts.push(stmt);
           }
           if (valueStmts.length > 0) {
-            preamble = preambleFromValueStatements(valueStmts, ctx);
+            preamble = preambleFromValueStatements(valueStmts, ctx, body.statements);
             if (!preamble.declarations && !isClientOnly && !(ctx.analyzer.acceptsCallbackBody?.("map") ?? false)) {
               ctx.analyzer.errors.push(createError(ErrorCodes.UNSUPPORTED_JSX_PATTERN, getSourceLocation(body, ctx.sourceFile, ctx.filePath), {
                 message: "A .map() callback preamble that is not a sequence of value " + "declarations cannot be lowered to a template: this backend can " + "declare a per-row local, but cannot run arbitrary statements per row.",
@@ -197489,7 +197499,7 @@ function computePreambleReactiveNames(statements, ctx) {
   }
   return reactiveNames;
 }
-function preambleFromValueStatements(statements, ctx) {
+function preambleFromValueStatements(statements, ctx, bodyStatements) {
   const segments = [];
   const typedParts = [];
   const declared = new Set;
@@ -197509,11 +197519,11 @@ function preambleFromValueStatements(statements, ctx) {
     ssrText: tsxSourceText(typedParts.join(" ")),
     declaredNames: [...declared],
     builderNames: [],
-    declarations: neutralPreambleDeclarations(statements, ctx) ?? undefined,
+    declarations: neutralPreambleDeclarations(statements, ctx, bodyStatements) ?? undefined,
     reactiveNames: reactiveNames.size > 0 ? [...reactiveNames] : undefined
   };
 }
-function neutralPreambleDeclarations(statements, ctx) {
+function neutralPreambleDeclarations(statements, ctx, bodyStatements) {
   const out = [];
   for (const stmt of statements) {
     if (!import_typescript13.default.isVariableStatement(stmt))
@@ -197523,6 +197533,11 @@ function neutralPreambleDeclarations(statements, ctx) {
         return null;
       if (!decl.initializer)
         return null;
+      if (isFunctionLiteral(decl.initializer)) {
+        if (everyReadIsEventHandlerPropValue(decl.name.text, bodyStatements))
+          continue;
+        return null;
+      }
       const valueParsed = tsNodeToParsedExpr(decl.initializer);
       if (!isSupported(valueParsed).supported)
         return null;
@@ -197533,7 +197548,30 @@ function neutralPreambleDeclarations(statements, ctx) {
       });
     }
   }
-  return out.length > 0 ? out : null;
+  return out;
+}
+function isFunctionLiteral(node) {
+  return import_typescript13.default.isArrowFunction(node) || import_typescript13.default.isFunctionExpression(node);
+}
+function everyReadIsEventHandlerPropValue(name, bodyStatements) {
+  const findDisallowedRead = (node) => {
+    if (import_typescript13.default.isIdentifier(node) && node.text === name) {
+      const isBindingName = import_typescript13.default.isVariableDeclaration(node.parent) && node.parent.name === node;
+      const isPropertyName = import_typescript13.default.isPropertyAccessExpression(node.parent) && node.parent.name === node;
+      if (!isBindingName && !isPropertyName) {
+        const jsxExpr = node.parent;
+        const attr = jsxExpr.parent;
+        const isEventHandlerAttrValue = import_typescript13.default.isJsxExpression(jsxExpr) && import_typescript13.default.isJsxAttribute(attr) && attr.initializer === jsxExpr && import_typescript13.default.isIdentifier(attr.name) && isEventHandlerAttrName(attr.name.text);
+        if (!isEventHandlerAttrValue)
+          return true;
+      }
+    }
+    return import_typescript13.default.forEachChild(node, findDisallowedRead);
+  };
+  return !bodyStatements.some(findDisallowedRead);
+}
+function isEventHandlerAttrName(name) {
+  return /^on[A-Z]/.test(name);
 }
 function trimPreambleSegments(segments) {
   const last = segments[segments.length - 1];
@@ -197730,7 +197768,7 @@ function processAttributes(attributes, ctx) {
       }
       continue;
     }
-    if (/^on[A-Z]/.test(rawName)) {
+    if (isEventHandlerAttrName(rawName)) {
       if (attr.initializer && import_typescript13.default.isJsxExpression(attr.initializer) && attr.initializer.expression) {
         const eventName = rawName.slice(2).toLowerCase();
         reportJsxBranchLocalInCallback(attr.initializer.expression, ctx);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barefootjs/test",
-  "version": "0.33.3",
+  "version": "0.33.4",
   "description": "Test utilities for BarefootJS - IR-based component testing without a browser",
   "type": "module",
   "main": "./dist/index.js",
@@ -39,7 +39,7 @@
     "directory": "packages/test"
   },
   "dependencies": {
-    "@barefootjs/jsx": "0.33.3"
+    "@barefootjs/jsx": "0.33.4"
   },
   "devDependencies": {
     "typescript": "^5.0.0"