@barefootjs/test 0.35.2 → 0.35.4

package/dist/index.js

@@ -189624,6 +189624,8 @@ function isNonValuePosition(n, parent) {
     return true;
   if ((import_typescript7.default.isParameter(parent) || import_typescript7.default.isVariableDeclaration(parent) || import_typescript7.default.isBindingElement(parent)) && parent.name === n)
     return true;
+  if (import_typescript7.default.isBindingElement(parent) && parent.propertyName === n)
+    return true;
   if (import_typescript7.default.isTypeReferenceNode(parent))
     return true;
   return false;
@@ -189637,25 +189639,32 @@ function collectAstPropRefs(node, propNames, out) {
     out.add(n.text);
   });
 }
-function applyScopedPropRefRewrite(text, propRefs, propAliases, replacementFor) {
+function rewriteScopedValueRefs(text, names, replacementFor, opts) {
   const prefix = "(";
-  const sf = import_typescript7.default.createSourceFile("__bf_prop_rewrite.ts", `${prefix}${text}
+  let sf = import_typescript7.default.createSourceFile("__bf_scoped_rewrite.ts", `${prefix}${text}
 )`, import_typescript7.default.ScriptTarget.Latest, true);
-  const parseDiagnostics = sf.parseDiagnostics;
-  if (parseDiagnostics && parseDiagnostics.length > 0)
-    return null;
+  let parseDiagnostics = sf.parseDiagnostics;
+  let usedPrefix = prefix;
+  if (parseDiagnostics && parseDiagnostics.length > 0) {
+    if (!opts?.allowStatements)
+      return null;
+    sf = import_typescript7.default.createSourceFile("__bf_scoped_rewrite.ts", text, import_typescript7.default.ScriptTarget.Latest, true);
+    parseDiagnostics = sf.parseDiagnostics;
+    if (parseDiagnostics && parseDiagnostics.length > 0)
+      return null;
+    usedPrefix = "";
+  }
   const edits = [];
   walkWithScope(sf, (n, parent, shadowed) => {
-    if (shadowed || !propRefs.has(n.text))
+    if (shadowed || !names.has(n.text))
       return;
     if (isNonValuePosition(n, parent))
       return;
-    const start = n.getStart(sf) - prefix.length;
-    const end = n.getEnd() - prefix.length;
+    const start = n.getStart(sf) - usedPrefix.length;
+    const end = n.getEnd() - usedPrefix.length;
     if (start < 0 || end > text.length)
       return;
-    const callerKey = propAliases?.get(n.text) ?? n.text;
-    const value = replacementFor ? replacementFor(n.text, callerKey) : `${PROPS_PARAM}.${callerKey}`;
+    const value = replacementFor(n.text);
     if (parent && import_typescript7.default.isShorthandPropertyAssignment(parent) && parent.name === n) {
       edits.push({ start, end, replacement: `${n.text}: ${value}` });
       return;
@@ -189670,6 +189679,12 @@ function applyScopedPropRefRewrite(text, propRefs, propAliases, replacementFor)
   }
   return result;
 }
+function applyScopedPropRefRewrite(text, propRefs, propAliases, replacementFor) {
+  return rewriteScopedValueRefs(text, propRefs, (name) => {
+    const callerKey = propAliases?.get(name) ?? name;
+    return replacementFor ? replacementFor(name, callerKey) : `${PROPS_PARAM}.${callerKey}`;
+  });
+}
 function applyRegexPropRefRewrite(text, propRefs, propAliases, replacementFor) {
   const { protect, restore } = createTemplateAwareStringProtector();
   let result = protect(text);
@@ -198919,6 +198934,9 @@ function inferExpressionType(_node, _ctx) {
 function replaceBranchLocalRefs(text, branchNames, resolve2) {
   if (branchNames.length === 0)
     return text;
+  const astResult = rewriteScopedValueRefs(text, new Set(branchNames), resolve2, { allowStatements: true });
+  if (astResult !== null)
+    return astResult;
   const pattern = new RegExp(`(?<![\\w$])(${branchNames.join("|")})(?![\\w$])`, "g");
   return replaceInExprContexts(text, pattern, (_match, name) => resolve2(name));
 }
@@ -199362,8 +199380,11 @@ function formatDateLocalNames(metadata) {
 // ../jsx/src/ir-to-client-js/prune-unused-prop-extractions.ts
 var import_typescript19 = __toESM(require_typescript(), 1);
 
-// ../jsx/src/ir-to-client-js/control-flow/plan/lazy-preamble.ts
+// ../jsx/src/ir-to-client-js/emit-reactive.ts
 var import_typescript20 = __toESM(require_typescript(), 1);
+
+// ../jsx/src/ir-to-client-js/control-flow/plan/lazy-preamble.ts
+var import_typescript21 = __toESM(require_typescript(), 1);
 var NO_PREAMBLE = {
   lazySafe: true,
   facts: { declaredNames: new Set, freeNames: new Set }
@@ -199412,9 +199433,6 @@ var INERT_BINDING_GLOBALS = new Set([
   "decodeURI"
 ]);
 
-// ../jsx/src/ir-to-client-js/emit-reactive.ts
-var import_typescript21 = __toESM(require_typescript(), 1);
-
 // ../jsx/src/ir-to-client-js/control-flow/stringify/event-delegation.ts
 var NON_BUBBLING_EVENTS = new Set([
   "blur",

package/package.json

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