@barefootjs/test 0.5.0 → 0.5.2

package/dist/index.js

@@ -187862,6 +187862,24 @@ function getSourceLocation(node, sourceFile, filePath) {
     }
   };
 }
+function membersToProperties(members, sourceFile) {
+  return members.filter(import_typescript6.default.isPropertySignature).map((member) => ({
+    name: propertyNameText(member.name, sourceFile),
+    type: typeNodeToTypeInfo(member.type, sourceFile) ?? {
+      kind: "unknown",
+      raw: "unknown"
+    },
+    optional: !!member.questionToken,
+    readonly: !!member.modifiers?.some((m) => m.kind === import_typescript6.default.SyntaxKind.ReadonlyKeyword)
+  }));
+}
+function propertyNameText(name, sourceFile) {
+  if (!name)
+    return "";
+  if (import_typescript6.default.isStringLiteral(name) || import_typescript6.default.isNumericLiteral(name))
+    return name.text;
+  return name.getText(sourceFile);
+}
 function typeNodeToTypeInfo(typeNode, sourceFile) {
   if (!typeNode)
     return null;
@@ -187899,18 +187917,21 @@ function typeNodeToTypeInfo(typeNode, sourceFile) {
     return {
       kind: "object",
       raw,
-      properties: typeNode.members.filter(import_typescript6.default.isPropertySignature).map((member) => ({
-        name: member.name?.getText(sourceFile) ?? "",
-        type: typeNodeToTypeInfo(member.type, sourceFile) ?? {
-          kind: "unknown",
-          raw: "unknown"
-        },
-        optional: !!member.questionToken,
-        readonly: !!member.modifiers?.some((m) => m.kind === import_typescript6.default.SyntaxKind.ReadonlyKeyword)
-      }))
+      properties: membersToProperties(typeNode.members, sourceFile)
     };
   }
   if (import_typescript6.default.isTypeReferenceNode(typeNode)) {
+    const refName = import_typescript6.default.isIdentifier(typeNode.typeName) ? typeNode.typeName.text : "";
+    if ((refName === "Array" || refName === "ReadonlyArray") && typeNode.typeArguments?.length === 1) {
+      return {
+        kind: "array",
+        raw,
+        elementType: typeNodeToTypeInfo(typeNode.typeArguments[0], sourceFile) ?? {
+          kind: "unknown",
+          raw: "unknown"
+        }
+      };
+    }
     return {
       kind: "interface",
       raw
@@ -189052,14 +189073,17 @@ function collectInterfaceDefinition(node, ctx) {
     kind: "interface",
     name: node.name.text,
     definition: node.getText(ctx.sourceFile),
+    properties: membersToProperties(node.members, ctx.sourceFile),
     loc: getSourceLocation(node, ctx.sourceFile, ctx.filePath)
   });
 }
 function collectTypeAliasDefinition(node, ctx) {
+  const properties = import_typescript7.default.isTypeLiteralNode(node.type) ? membersToProperties(node.type.members, ctx.sourceFile) : undefined;
   ctx.typeDefinitions.push({
     kind: "type",
     name: node.name.text,
     definition: node.getText(ctx.sourceFile),
+    properties,
     loc: getSourceLocation(node, ctx.sourceFile, ctx.filePath)
   });
 }
@@ -190435,7 +190459,24 @@ var UNSUPPORTED_METHODS = new Set([
   "some",
   "forEach",
   "flatMap",
-  "flat"
+  "flat",
+  "split",
+  "startsWith",
+  "endsWith",
+  "replace",
+  "replaceAll",
+  "repeat",
+  "padStart",
+  "padEnd",
+  "charAt",
+  "charCodeAt",
+  "codePointAt",
+  "normalize",
+  "substring",
+  "substr",
+  "match",
+  "matchAll",
+  "search"
 ]);
 function parseExpression(expr) {
   const trimmed = expr.trim();
@@ -191297,7 +191338,7 @@ function checkSupport(expr) {
           return {
             supported: false,
             level: "L5_UNSUPPORTED",
-            reason: `Higher-order method '${methodName}()' requires client-side evaluation. Use @client directive or pre-compute in Go.`
+            reason: `Method '${methodName}()' has no template lowering and requires client-side evaluation. Wrap the expression in /* @client */ to defer it to hydration, or pre-compute the value before rendering.`
           };
         }
       }
@@ -192681,6 +192722,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 +192818,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 +193275,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 +193314,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 +193508,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 +193543,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 +193593,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 +193611,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 +193652,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.2",
   "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.2"
   },
   "devDependencies": {
     "typescript": "^5.0.0"