@barefootjs/test 0.30.0 → 0.30.3

package/dist/index.js

@@ -189319,20 +189319,115 @@ var SKELETON_PATH_FORCE_CLOSE_GROUPS = [
 ];
 
 // ../jsx/src/prop-rewrite.ts
+function collectBindingNames(name, out) {
+  if (import_typescript5.default.isIdentifier(name)) {
+    out.add(name.text);
+    return;
+  }
+  for (const el of name.elements) {
+    if (import_typescript5.default.isBindingElement(el))
+      collectBindingNames(el.name, out);
+  }
+}
+function scopeFrameOf(n) {
+  if (import_typescript5.default.isFunctionLike(n)) {
+    const frame = new Set;
+    for (const p of n.parameters)
+      collectBindingNames(p.name, frame);
+    if ((import_typescript5.default.isFunctionExpression(n) || import_typescript5.default.isFunctionDeclaration(n)) && n.name)
+      frame.add(n.name.text);
+    return frame.size > 0 ? frame : null;
+  }
+  if (import_typescript5.default.isBlock(n)) {
+    const frame = new Set;
+    for (const st of n.statements) {
+      if (import_typescript5.default.isVariableStatement(st)) {
+        for (const d of st.declarationList.declarations)
+          collectBindingNames(d.name, frame);
+      } else if (import_typescript5.default.isFunctionDeclaration(st) && st.name) {
+        frame.add(st.name.text);
+      }
+    }
+    return frame.size > 0 ? frame : null;
+  }
+  if (import_typescript5.default.isCatchClause(n) && n.variableDeclaration) {
+    const frame = new Set;
+    collectBindingNames(n.variableDeclaration.name, frame);
+    return frame.size > 0 ? frame : null;
+  }
+  return null;
+}
+function walkWithScope(root, visit) {
+  const scopeStack = [];
+  const isShadowed = (name) => scopeStack.some((frame) => frame.has(name));
+  function rec(n, parent) {
+    const frame = scopeFrameOf(n);
+    if (frame)
+      scopeStack.push(frame);
+    if (import_typescript5.default.isIdentifier(n))
+      visit(n, parent, isShadowed(n.text));
+    import_typescript5.default.forEachChild(n, (child) => rec(child, n));
+    if (frame)
+      scopeStack.pop();
+  }
+  rec(root);
+}
+function isNonValuePosition(n, parent) {
+  if (!parent)
+    return false;
+  if (import_typescript5.default.isPropertyAssignment(parent) && parent.name === n)
+    return true;
+  if (import_typescript5.default.isPropertyAccessExpression(parent) && parent.name === n)
+    return true;
+  if (import_typescript5.default.isQualifiedName(parent) && parent.right === n)
+    return true;
+  if ((import_typescript5.default.isParameter(parent) || import_typescript5.default.isVariableDeclaration(parent) || import_typescript5.default.isBindingElement(parent)) && parent.name === n)
+    return true;
+  if (import_typescript5.default.isTypeReferenceNode(parent))
+    return true;
+  return false;
+}
 function collectAstPropRefs(node, propNames, out) {
-  function visit(n, parent) {
-    if (import_typescript5.default.isIdentifier(n) && propNames.has(n.text)) {
-      if (parent && import_typescript5.default.isPropertyAssignment(parent) && parent.name === n)
-        return;
-      if (parent && import_typescript5.default.isShorthandPropertyAssignment(parent) && parent.name === n)
-        return;
-      if (parent && import_typescript5.default.isPropertyAccessExpression(parent) && parent.name === n)
-        return;
-      out.add(n.text);
+  walkWithScope(node, (n, parent, shadowed) => {
+    if (shadowed || !propNames.has(n.text))
+      return;
+    if (parent && import_typescript5.default.isShorthandPropertyAssignment(parent) && parent.name === n)
+      return;
+    if (isNonValuePosition(n, parent))
+      return;
+    out.add(n.text);
+  });
+}
+function applyScopedPropRefRewrite(text, propRefs) {
+  const prefix = "(";
+  const sf = import_typescript5.default.createSourceFile("__bf_prop_rewrite.ts", `${prefix}${text}
+)`, import_typescript5.default.ScriptTarget.Latest, true);
+  const parseDiagnostics = sf.parseDiagnostics;
+  if (parseDiagnostics && parseDiagnostics.length > 0)
+    return null;
+  const edits = [];
+  walkWithScope(sf, (n, parent, shadowed) => {
+    if (shadowed || !propRefs.has(n.text))
+      return;
+    if (isNonValuePosition(n, parent))
+      return;
+    const start = n.getStart(sf) - prefix.length;
+    const end = n.getEnd() - prefix.length;
+    if (start < 0 || end > text.length)
+      return;
+    if (parent && import_typescript5.default.isShorthandPropertyAssignment(parent) && parent.name === n) {
+      edits.push({ start, end, replacement: `${n.text}: ${PROPS_PARAM}.${n.text}` });
+      return;
     }
-    import_typescript5.default.forEachChild(n, (child) => visit(child, n));
+    edits.push({ start, end, replacement: `${PROPS_PARAM}.${n.text}` });
+  });
+  if (edits.length === 0)
+    return text;
+  let result = text;
+  for (const edit of edits.sort((a, b) => b.start - a.start)) {
+    result = result.slice(0, edit.start) + edit.replacement + result.slice(edit.end);
   }
-  visit(node);
+  return result;
 }
 function applyRegexPropRefRewrite(text, propRefs) {
   const { protect, restore } = createTemplateAwareStringProtector();
@@ -189362,7 +189457,7 @@ function rewriteBarePropRefs(text, node, propNames, extraPropRefs) {
   }
   if (foundPropRefs.size === 0)
     return;
-  return applyRegexPropRefRewrite(text, foundPropRefs);
+  return applyScopedPropRefRewrite(text, foundPropRefs) ?? applyRegexPropRefRewrite(text, foundPropRefs);
 }
 
 // ../jsx/src/instrumentation.ts
@@ -196903,20 +196998,20 @@ function attrValueText(value) {
   }
   return out.join(" ");
 }
-function collectBindingNames(name, out) {
+function collectBindingNames2(name, out) {
   if (import_typescript11.default.isIdentifier(name)) {
     out.add(name.text);
     return;
   }
   for (const el of name.elements) {
     if (import_typescript11.default.isBindingElement(el))
-      collectBindingNames(el.name, out);
+      collectBindingNames2(el.name, out);
   }
 }
 function collectPreambleDeclaredNames(stmt, out) {
   if (import_typescript11.default.isVariableStatement(stmt)) {
     for (const decl of stmt.declarationList.declarations) {
-      collectBindingNames(decl.name, out);
+      collectBindingNames2(decl.name, out);
     }
   } else if (import_typescript11.default.isFunctionDeclaration(stmt) && stmt.name) {
     out.add(stmt.name.text);
@@ -197309,6 +197404,8 @@ function parseTemplateLiteral(expr, ctx) {
 }
 function tryResolveTemplateSpanFromConst(expr, ctx) {
   if (import_typescript11.default.isIdentifier(expr)) {
+    if (ctx.loopParams.has(expr.text))
+      return null;
     const constInfo = findLocalConst(expr.text, ctx.analyzer);
     if (!constInfo)
       return null;
@@ -197323,6 +197420,8 @@ function tryResolveTemplateSpanFromConst(expr, ctx) {
   if (import_typescript11.default.isElementAccessExpression(expr)) {
     if (!import_typescript11.default.isIdentifier(expr.expression))
       return null;
+    if (ctx.loopParams.has(expr.expression.text))
+      return null;
     const constInfo = findLocalConst(expr.expression.text, ctx.analyzer);
     if (!constInfo)
       return null;

package/package.json

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