@barefootjs/test 0.5.0 → 0.5.1

package/dist/index.js

@@ -192681,6 +192681,23 @@ function containsJsxInExpression(node) {
   }
   return import_typescript11.default.forEachChild(node, containsJsxInExpression) ?? false;
 }
+function callsJsxHelper(node, ctx) {
+  let found = false;
+  const visit2 = (n) => {
+    if (found)
+      return;
+    if (import_typescript11.default.isCallExpression(n) && import_typescript11.default.isIdentifier(n.expression)) {
+      const name = n.expression.text;
+      if (ctx.analyzer.jsxFunctions.has(name) || ctx.analyzer.jsxMultiReturnFunctions.has(name)) {
+        found = true;
+        return;
+      }
+    }
+    import_typescript11.default.forEachChild(n, visit2);
+  };
+  visit2(node);
+  return found;
+}
 function containsAwaitExpression(node) {
   if (import_typescript11.default.isAwaitExpression(node))
     return true;
@@ -192760,7 +192777,7 @@ function transformJsxExpression(expr, ctx, isClientOnly = false) {
       if (node.operatorToken.kind === import_typescript11.default.SyntaxKind.AmpersandAmpersandToken) {
         return transformLogicalAnd(node, ctx);
       }
-      if ((node.operatorToken.kind === import_typescript11.default.SyntaxKind.QuestionQuestionToken || node.operatorToken.kind === import_typescript11.default.SyntaxKind.BarBarToken) && containsJsxInExpression(node.right)) {
+      if ((node.operatorToken.kind === import_typescript11.default.SyntaxKind.QuestionQuestionToken || node.operatorToken.kind === import_typescript11.default.SyntaxKind.BarBarToken) && (containsJsxInExpression(node.right) || callsJsxHelper(node.right, ctx))) {
         return transformNullishCoalescing(node, ctx);
       }
       return null;
@@ -193217,23 +193234,23 @@ function checkLoopKey(callback, ctx, isNested) {
   }
   while (import_typescript11.default.isParenthesizedExpression(body))
     body = body.expression;
+  function checkJsxOperand(node) {
+    let n = node;
+    while (import_typescript11.default.isParenthesizedExpression(n))
+      n = n.expression;
+    if (import_typescript11.default.isJsxElement(n))
+      checkOpening(n.openingElement);
+    else if (import_typescript11.default.isJsxSelfClosingElement(n))
+      checkOpening(n);
+  }
   if (import_typescript11.default.isConditionalExpression(body)) {
-    const whenTrue = body.whenTrue;
-    const whenFalse = body.whenFalse;
-    let wt = whenTrue;
-    let wf = whenFalse;
-    while (import_typescript11.default.isParenthesizedExpression(wt))
-      wt = wt.expression;
-    while (import_typescript11.default.isParenthesizedExpression(wf))
-      wf = wf.expression;
-    if (import_typescript11.default.isJsxElement(wt))
-      checkOpening(wt.openingElement);
-    else if (import_typescript11.default.isJsxSelfClosingElement(wt))
-      checkOpening(wt);
-    if (import_typescript11.default.isJsxElement(wf))
-      checkOpening(wf.openingElement);
-    else if (import_typescript11.default.isJsxSelfClosingElement(wf))
-      checkOpening(wf);
+    checkJsxOperand(body.whenTrue);
+    checkJsxOperand(body.whenFalse);
+    return;
+  }
+  if (import_typescript11.default.isBinaryExpression(body) && (body.operatorToken.kind === import_typescript11.default.SyntaxKind.AmpersandAmpersandToken || body.operatorToken.kind === import_typescript11.default.SyntaxKind.BarBarToken || body.operatorToken.kind === import_typescript11.default.SyntaxKind.QuestionQuestionToken)) {
+    checkJsxOperand(body.left);
+    checkJsxOperand(body.right);
     return;
   }
   if (import_typescript11.default.isJsxElement(body)) {
@@ -193256,6 +193273,38 @@ function loopBodyIsMultiRoot(children) {
     return false;
   return loopBodyIsMultiRoot(only.children);
 }
+function branchHasNoElement(node) {
+  if (node.type === "element" || node.type === "component")
+    return false;
+  if (node.type === "conditional") {
+    return branchHasNoElement(node.whenTrue) || branchHasNoElement(node.whenFalse);
+  }
+  if (node.type === "fragment") {
+    const real = node.children.filter((c) => !(c.type === "text" && typeof c.value === "string" && !c.value.trim()));
+    return real.length !== 1 || branchHasNoElement(real[0]);
+  }
+  return true;
+}
+function loopBodyItemConditional(children) {
+  const real = children.filter((c) => !(c.type === "text" && typeof c.value === "string" && !c.value.trim()));
+  if (real.length !== 1)
+    return null;
+  const only = real[0];
+  if (only.type !== "conditional")
+    return null;
+  if (branchHasNoElement(only.whenTrue) || branchHasNoElement(only.whenFalse)) {
+    return only;
+  }
+  return null;
+}
+function extractItemConditionalKey(cond) {
+  const a = branchHasNoElement(cond.whenTrue) ? null : extractLoopKey(cond.whenTrue);
+  const b = branchHasNoElement(cond.whenFalse) ? null : extractLoopKey(cond.whenFalse);
+  if (a !== null && b !== null) {
+    return normalizeKeyExpr(a) === normalizeKeyExpr(b) ? a : null;
+  }
+  return a ?? b;
+}
 function transformMapCall(node, ctx, isClientOnly = false, method = "map") {
   const isNested = ctx.loopParams.size > 0;
   const propAccess = node.expression;
@@ -193418,6 +193467,19 @@ function transformMapCall(node, ctx, isClientOnly = false, method = "map") {
     }
     if (index)
       ctx.loopParams.add(index);
+    const tryTransformRenderableBody = (expr) => {
+      if (!import_typescript11.default.isBinaryExpression(expr))
+        return;
+      const op = expr.operatorToken.kind;
+      if (op !== import_typescript11.default.SyntaxKind.AmpersandAmpersandToken && op !== import_typescript11.default.SyntaxKind.BarBarToken && op !== import_typescript11.default.SyntaxKind.QuestionQuestionToken) {
+        return;
+      }
+      if (!containsJsxInExpression(expr) && !callsJsxHelper(expr, ctx))
+        return;
+      const transformed = transformJsxExpression(expr, ctx, isClientOnly);
+      if (transformed)
+        children = [transformed];
+    };
     const body = callback.body;
     if (import_typescript11.default.isJsxElement(body) || import_typescript11.default.isJsxSelfClosingElement(body) || import_typescript11.default.isJsxFragment(body)) {
       const transformed = transformNode(body, ctx);
@@ -193440,6 +193502,8 @@ function transformMapCall(node, ctx, isClientOnly = false, method = "map") {
         children = [transformConditional(inner, ctx)];
       } else if (method === "flatMap" && import_typescript11.default.isArrayLiteralExpression(inner)) {
         children = transformArrayLiteralChildren(inner, ctx);
+      } else {
+        tryTransformRenderableBody(inner);
       }
     } else if (method === "flatMap" && import_typescript11.default.isArrayLiteralExpression(body)) {
       children = transformArrayLiteralChildren(body, ctx);
@@ -193488,6 +193552,8 @@ function transformMapCall(node, ctx, isClientOnly = false, method = "map") {
       if (method === "flatMap" && children.length === 0) {
         flatMapCallback = buildFlatMapCallback(callback, body, ctx);
       }
+    } else {
+      tryTransformRenderableBody(body);
     }
     if (paramBindings) {
       for (const b of paramBindings)
@@ -193504,7 +193570,9 @@ function transformMapCall(node, ctx, isClientOnly = false, method = "map") {
   if (import_typescript11.default.isArrowFunction(node.arguments[0]) && children.length > 0) {
     checkLoopKey(node.arguments[0], ctx, isNested);
   }
-  const key = children.length > 0 ? extractLoopKey(children[0]) : null;
+  const itemConditional = children.length > 0 ? loopBodyItemConditional(children) : null;
+  const bodyIsItemConditional = itemConditional !== null;
+  const key = bodyIsItemConditional ? extractItemConditionalKey(itemConditional) : children.length > 0 ? extractLoopKey(children[0]) : null;
   let childComponent;
   if (children.length === 1 && children[0].type === "component") {
     const comp = children[0];
@@ -193543,6 +193611,7 @@ function transformMapCall(node, ctx, isClientOnly = false, method = "map") {
     callsReactiveGetters: callsReactive || undefined,
     hasFunctionCalls: hasCalls || undefined,
     bodyIsMultiRoot: bodyIsMultiRoot || undefined,
+    bodyIsItemConditional: bodyIsItemConditional || undefined,
     childComponent,
     nestedComponents,
     filterPredicate,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barefootjs/test",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "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.5.0"
+    "@barefootjs/jsx": "0.5.1"
   },
   "devDependencies": {
     "typescript": "^5.0.0"