@barefootjs/cli 0.30.0 → 0.30.2

package/dist/index.js

@@ -3374,13 +3374,13 @@ function csrSubstituteOnce(value2, env) {
   const recordSubstitution = (start2, end2, sub2) => {
     splices.push({ start: start2 - OFFSET, end: end2 - OFFSET, text: `(${sub2.replacement})` });
   };
-  const collectBindingNames4 = (name2, out) => {
+  const collectBindingNames5 = (name2, out) => {
     if (ts4.isIdentifier(name2)) out.add(name2.text);
     else if (ts4.isObjectBindingPattern(name2)) {
-      for (const el of name2.elements) collectBindingNames4(el.name, out);
+      for (const el of name2.elements) collectBindingNames5(el.name, out);
     } else if (ts4.isArrayBindingPattern(name2)) {
       for (const el of name2.elements) {
-        if (!ts4.isOmittedExpression(el)) collectBindingNames4(el.name, out);
+        if (!ts4.isOmittedExpression(el)) collectBindingNames5(el.name, out);
       }
     }
   };
@@ -3388,7 +3388,7 @@ function csrSubstituteOnce(value2, env) {
     for (const stmt2 of block.statements) {
       if (ts4.isVariableStatement(stmt2)) {
         for (const decl of stmt2.declarationList.declarations) {
-          collectBindingNames4(decl.name, out);
+          collectBindingNames5(decl.name, out);
         }
       } else if (ts4.isFunctionDeclaration(stmt2) && stmt2.name) {
         out.add(stmt2.name.text);
@@ -3431,7 +3431,7 @@ function csrSubstituteOnce(value2, env) {
     }
     if (ts4.isArrowFunction(node) || ts4.isFunctionExpression(node)) {
       const bound = /* @__PURE__ */ new Set();
-      for (const p of node.parameters) collectBindingNames4(p.name, bound);
+      for (const p of node.parameters) collectBindingNames5(p.name, bound);
       if (node.body && ts4.isBlock(node.body)) {
         collectBlockDeclarations(node.body, bound);
       }
@@ -4961,17 +4961,94 @@ var init_html_template = __esm({
 
 // ../jsx/src/prop-rewrite.ts
 import ts5 from "typescript";
+function collectBindingNames(name2, out) {
+  if (ts5.isIdentifier(name2)) {
+    out.add(name2.text);
+    return;
+  }
+  for (const el of name2.elements) {
+    if (ts5.isBindingElement(el)) collectBindingNames(el.name, out);
+  }
+}
+function scopeFrameOf(n) {
+  if (ts5.isFunctionLike(n)) {
+    const frame = /* @__PURE__ */ new Set();
+    for (const p of n.parameters) collectBindingNames(p.name, frame);
+    if ((ts5.isFunctionExpression(n) || ts5.isFunctionDeclaration(n)) && n.name) frame.add(n.name.text);
+    return frame.size > 0 ? frame : null;
+  }
+  if (ts5.isBlock(n)) {
+    const frame = /* @__PURE__ */ new Set();
+    for (const st of n.statements) {
+      if (ts5.isVariableStatement(st)) {
+        for (const d of st.declarationList.declarations) collectBindingNames(d.name, frame);
+      } else if (ts5.isFunctionDeclaration(st) && st.name) {
+        frame.add(st.name.text);
+      }
+    }
+    return frame.size > 0 ? frame : null;
+  }
+  if (ts5.isCatchClause(n) && n.variableDeclaration) {
+    const frame = /* @__PURE__ */ new Set();
+    collectBindingNames(n.variableDeclaration.name, frame);
+    return frame.size > 0 ? frame : null;
+  }
+  return null;
+}
+function walkWithScope(root2, visit3) {
+  const scopeStack = [];
+  const isShadowed = (name2) => scopeStack.some((frame) => frame.has(name2));
+  function rec(n, parent2) {
+    const frame = scopeFrameOf(n);
+    if (frame) scopeStack.push(frame);
+    if (ts5.isIdentifier(n)) visit3(n, parent2, isShadowed(n.text));
+    ts5.forEachChild(n, (child) => rec(child, n));
+    if (frame) scopeStack.pop();
+  }
+  rec(root2);
+}
+function isNonValuePosition(n, parent2) {
+  if (!parent2) return false;
+  if (ts5.isPropertyAssignment(parent2) && parent2.name === n) return true;
+  if (ts5.isPropertyAccessExpression(parent2) && parent2.name === n) return true;
+  if (ts5.isQualifiedName(parent2) && parent2.right === n) return true;
+  if ((ts5.isParameter(parent2) || ts5.isVariableDeclaration(parent2) || ts5.isBindingElement(parent2)) && parent2.name === n) return true;
+  if (ts5.isTypeReferenceNode(parent2)) return true;
+  return false;
+}
 function collectAstPropRefs(node, propNames, out) {
-  function visit3(n, parent2) {
-    if (ts5.isIdentifier(n) && propNames.has(n.text)) {
-      if (parent2 && ts5.isPropertyAssignment(parent2) && parent2.name === n) return;
-      if (parent2 && ts5.isShorthandPropertyAssignment(parent2) && parent2.name === n) return;
-      if (parent2 && ts5.isPropertyAccessExpression(parent2) && parent2.name === n) return;
-      out.add(n.text);
+  walkWithScope(node, (n, parent2, shadowed) => {
+    if (shadowed || !propNames.has(n.text)) return;
+    if (parent2 && ts5.isShorthandPropertyAssignment(parent2) && parent2.name === n) return;
+    if (isNonValuePosition(n, parent2)) return;
+    out.add(n.text);
+  });
+}
+function applyScopedPropRefRewrite(text, propRefs) {
+  const prefix2 = "(";
+  const sf = ts5.createSourceFile("__bf_prop_rewrite.ts", `${prefix2}${text}
+)`, ts5.ScriptTarget.Latest, true);
+  const parseDiagnostics = sf.parseDiagnostics;
+  if (parseDiagnostics && parseDiagnostics.length > 0) return null;
+  const edits = [];
+  walkWithScope(sf, (n, parent2, shadowed) => {
+    if (shadowed || !propRefs.has(n.text)) return;
+    if (isNonValuePosition(n, parent2)) return;
+    const start2 = n.getStart(sf) - prefix2.length;
+    const end2 = n.getEnd() - prefix2.length;
+    if (start2 < 0 || end2 > text.length) return;
+    if (parent2 && ts5.isShorthandPropertyAssignment(parent2) && parent2.name === n) {
+      edits.push({ start: start2, end: end2, replacement: `${n.text}: ${PROPS_PARAM}.${n.text}` });
+      return;
     }
-    ts5.forEachChild(n, (child) => visit3(child, n));
+    edits.push({ start: start2, end: end2, replacement: `${PROPS_PARAM}.${n.text}` });
+  });
+  if (edits.length === 0) return text;
+  let result2 = text;
+  for (const edit of edits.sort((a, b) => b.start - a.start)) {
+    result2 = result2.slice(0, edit.start) + edit.replacement + result2.slice(edit.end);
   }
-  visit3(node);
+  return result2;
 }
 function applyRegexPropRefRewrite(text, propRefs) {
   const { protect, restore } = createTemplateAwareStringProtector();
@@ -4998,7 +5075,7 @@ function rewriteBarePropRefs(text, node, propNames, extraPropRefs) {
     }
   }
   if (foundPropRefs.size === 0) return void 0;
-  return applyRegexPropRefRewrite(text, foundPropRefs);
+  return applyScopedPropRefRewrite(text, foundPropRefs) ?? applyRegexPropRefRewrite(text, foundPropRefs);
 }
 var init_prop_rewrite = __esm({
   "../jsx/src/prop-rewrite.ts"() {
@@ -12630,19 +12707,19 @@ function attrValueText(value2) {
   }
   return out.join(" ");
 }
-function collectBindingNames(name2, out) {
+function collectBindingNames2(name2, out) {
   if (ts11.isIdentifier(name2)) {
     out.add(name2.text);
     return;
   }
   for (const el of name2.elements) {
-    if (ts11.isBindingElement(el)) collectBindingNames(el.name, out);
+    if (ts11.isBindingElement(el)) collectBindingNames2(el.name, out);
   }
 }
 function collectPreambleDeclaredNames(stmt, out) {
   if (ts11.isVariableStatement(stmt)) {
     for (const decl of stmt.declarationList.declarations) {
-      collectBindingNames(decl.name, out);
+      collectBindingNames2(decl.name, out);
     }
   } else if (ts11.isFunctionDeclaration(stmt) && stmt.name) {
     out.add(stmt.name.text);
@@ -13035,6 +13112,7 @@ function parseTemplateLiteral(expr, ctx2) {
 }
 function tryResolveTemplateSpanFromConst(expr, ctx2) {
   if (ts11.isIdentifier(expr)) {
+    if (ctx2.loopParams.has(expr.text)) return null;
     const constInfo = findLocalConst(expr.text, ctx2.analyzer);
     if (!constInfo) return null;
     const ast = parseConstInitializer(constInfo);
@@ -13046,6 +13124,7 @@ function tryResolveTemplateSpanFromConst(expr, ctx2) {
   }
   if (ts11.isElementAccessExpression(expr)) {
     if (!ts11.isIdentifier(expr.expression)) return null;
+    if (ctx2.loopParams.has(expr.expression.text)) return null;
     const constInfo = findLocalConst(expr.expression.text, ctx2.analyzer);
     if (!constInfo) return null;
     const ast = parseConstInitializer(constInfo);
@@ -18938,7 +19017,7 @@ function analyzeLazyPreamble(preamble, indexParam, primableNames) {
     const isConst = (stmt.declarationList.flags & ts15.NodeFlags.Const) !== 0;
     if (!isConst) return NO2("map-callback preamble declares a mutable binding (let/var)");
     for (const decl of stmt.declarationList.declarations) {
-      collectBindingNames2(decl.name, declaredNames);
+      collectBindingNames3(decl.name, declaredNames);
       if (!decl.initializer) {
         return NO2("map-callback preamble has a declaration with no initializer");
       }
@@ -18961,14 +19040,14 @@ function analyzeLazyPreamble(preamble, indexParam, primableNames) {
   for (const declared of declaredNames) freeNames.delete(declared);
   return { lazySafe: true, facts: { declaredNames, freeNames } };
 }
-function collectBindingNames2(name2, out) {
+function collectBindingNames3(name2, out) {
   if (ts15.isIdentifier(name2)) {
     out.add(name2.text);
     return;
   }
   for (const element of name2.elements) {
     if (ts15.isOmittedExpression(element)) continue;
-    collectBindingNames2(element.name, out);
+    collectBindingNames3(element.name, out);
   }
 }
 function findImpureNode(root2, primableNames) {
@@ -22814,18 +22893,18 @@ function isJsxLike(expr) {
 }
 function collectArrowParamNames(arrow) {
   const names = /* @__PURE__ */ new Set();
-  for (const p of arrow.parameters) collectBindingNames3(p.name, names);
+  for (const p of arrow.parameters) collectBindingNames4(p.name, names);
   return names;
 }
-function collectBindingNames3(name2, out) {
+function collectBindingNames4(name2, out) {
   const push = Array.isArray(out) ? (n) => out.push(n) : (n) => out.add(n);
   if (ts18.isIdentifier(name2)) {
     push(name2.text);
   } else if (ts18.isObjectBindingPattern(name2)) {
-    name2.elements.forEach((el) => collectBindingNames3(el.name, out));
+    name2.elements.forEach((el) => collectBindingNames4(el.name, out));
   } else if (ts18.isArrayBindingPattern(name2)) {
     name2.elements.forEach((el) => {
-      if (!ts18.isOmittedExpression(el)) collectBindingNames3(el.name, out);
+      if (!ts18.isOmittedExpression(el)) collectBindingNames4(el.name, out);
     });
   }
 }
@@ -22834,12 +22913,12 @@ function collectFreeIdentifiers(arrow) {
   const bound = [];
   for (const p of arrow.parameters) {
     const names = [];
-    collectBindingNames3(p.name, names);
+    collectBindingNames4(p.name, names);
     bound.push(...names);
   }
   function pushBindings(name2) {
     const names = [];
-    collectBindingNames3(name2, names);
+    collectBindingNames4(name2, names);
     bound.push(...names);
     return names;
   }
@@ -22937,7 +23016,7 @@ function collectModuleScopeNames(sourceFile) {
     if (ts18.isFunctionDeclaration(stmt) && stmt.name) names.add(stmt.name.text);
     else if (ts18.isClassDeclaration(stmt) && stmt.name) names.add(stmt.name.text);
     else if (ts18.isVariableStatement(stmt)) {
-      for (const decl of stmt.declarationList.declarations) collectBindingNames3(decl.name, names);
+      for (const decl of stmt.declarationList.declarations) collectBindingNames4(decl.name, names);
     } else if (ts18.isImportDeclaration(stmt) && stmt.importClause) {
       const ic = stmt.importClause;
       if (ic.name) names.add(ic.name.text);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barefootjs/cli",
-  "version": "0.30.0",
+  "version": "0.30.2",
   "description": "CLI for agent-driven UI component discovery and scaffolding",
   "type": "module",
   "main": "./dist/index.js",
@@ -29,11 +29,11 @@
   "dependencies": {
     "esbuild": "^0.25.0",
     "typescript": "^5.0.0",
-    "@barefootjs/client": "0.30.0",
-    "@barefootjs/shared": "0.30.0"
+    "@barefootjs/client": "0.30.2",
+    "@barefootjs/shared": "0.30.2"
   },
   "devDependencies": {
-    "@barefootjs/jsx": "0.30.0",
+    "@barefootjs/jsx": "0.30.2",
     "@types/node": "^22.0.0",
     "@happy-dom/global-registrator": "^20.0.11",
     "happy-dom": "^20.0.11"