@barefootjs/vite 0.31.2 → 0.31.3

package/dist/index.js

@@ -5439,7 +5439,8 @@ function visit(node, ctx, targetComponentName, namedExports) {
   if (!ctx.componentNode) {
     collectAmbientGlobals(node, ctx);
   }
-  if (ts9.isVariableStatement(node) && !ctx.componentNode) {
+  const isDeclareStatement = ts9.isVariableStatement(node) && (node.modifiers?.some((m) => m.kind === ts9.SyntaxKind.DeclareKeyword) ?? false);
+  if (ts9.isVariableStatement(node) && !ctx.componentNode && !isDeclareStatement) {
     const isExported = node.modifiers?.some((m) => m.kind === ts9.SyntaxKind.ExportKeyword) ?? false;
     const isLet = (node.declarationList.flags & ts9.NodeFlags.Let) !== 0;
     const isModuleClientDirective = hasLeadingClientDirectiveOnStatement(node, ctx.sourceFile);
@@ -5452,7 +5453,7 @@ function visit(node, ctx, targetComponentName, namedExports) {
         }
         continue;
       }
-      if (ts9.isIdentifier(decl.name) && decl.initializer && !isArrowComponentFunction(decl)) {
+      if (ts9.isIdentifier(decl.name) && (decl.initializer || isLet) && !isArrowComponentFunction(decl)) {
         collectConstant(decl, ctx, true, isLet ? "let" : "const", isExported);
       }
     }
@@ -7023,6 +7024,7 @@ function collectConstant(node, ctx, _isModule, declarationKind = "const", isExpo
     value,
     parsed,
     typedValue: typedValue !== value ? typedValue : undefined,
+    typeAnnotation: node.type ? node.type.getText(ctx.sourceFile) : undefined,
     valueBranches,
     declarationKind,
     isExported,
@@ -9427,6 +9429,83 @@ var toLocaleDatePlugin = {
   }
 };
 
+// ../jsx/src/scope/binding-scope.ts
+class BindingScope {
+  frames;
+  static EMPTY = new BindingScope([]);
+  constructor(frames) {
+    this.frames = frames;
+  }
+  enterLoopRow(loop) {
+    const bindings = new Map;
+    if (loop.paramBindings && loop.paramBindings.length > 0) {
+      for (const b of loop.paramBindings)
+        bindings.set(b.name, { source: "destructure" });
+    } else {
+      bindings.set(loop.param, { source: "item" });
+    }
+    if (loop.index != null)
+      bindings.set(loop.index, { source: "index" });
+    for (const name of loop.preamble?.declaredNames ?? [])
+      bindings.set(name, { source: "preamble" });
+    const frame = { kind: "loop-row", bindings };
+    return new BindingScope([frame, ...this.frames]);
+  }
+  enterCallback(params) {
+    const bindings = new Map;
+    for (const name of params)
+      bindings.set(name, { source: "param" });
+    const frame = { kind: "callback", bindings };
+    return new BindingScope([frame, ...this.frames]);
+  }
+  isBound(name) {
+    for (const frame of this.frames) {
+      if (frame.bindings.has(name))
+        return true;
+    }
+    return false;
+  }
+  lookup(name) {
+    for (let depth = 0;depth < this.frames.length; depth++) {
+      const frame = this.frames[depth];
+      const binding = frame.bindings.get(name);
+      if (binding)
+        return { depth, frame, binding };
+    }
+    return null;
+  }
+  boundNames() {
+    if (this.boundNamesCache)
+      return this.boundNamesCache;
+    const names = new Set;
+    for (const frame of this.frames) {
+      for (const name of frame.bindings.keys())
+        names.add(name);
+    }
+    this.boundNamesCache = names;
+    return names;
+  }
+  boundNamesCache;
+  valueBoundNamesCache;
+  valueBoundNames() {
+    if (this.valueBoundNamesCache)
+      return this.valueBoundNamesCache;
+    const names = new Set;
+    for (const frame of this.frames) {
+      for (const [name, binding] of frame.bindings) {
+        if (binding.source === "item" || binding.source === "index" || binding.source === "destructure") {
+          names.add(name);
+        }
+      }
+    }
+    this.valueBoundNamesCache = names;
+    return names;
+  }
+  asShadowPredicate() {
+    return (name) => this.isBound(name);
+  }
+}
+
 // ../jsx/src/jsx-to-ir.ts
 var CLIENT_DIRECTIVE_INTERIOR_RE2 = /^\s*@client\s*$/;
 var BLOCK_COMMENT_RE2 = /\/\*([\s\S]*?)\*\//g;
@@ -9607,8 +9686,9 @@ function rewriteBarePropRefs2(text, expr, ctx) {
   let propNames = getDestructuredPropNames(ctx);
   if (!propNames)
     return dateLowered === text ? undefined : dateLowered;
-  if (ctx.loopParams.size > 0) {
-    const filtered = new Set([...propNames].filter((n) => !ctx.loopParams.has(n)));
+  const shadowingNames = ctx.scope.boundNames();
+  if (shadowingNames.size > 0) {
+    const filtered = new Set([...propNames].filter((n) => !shadowingNames.has(n)));
     if (filtered.size === 0)
       return dateLowered === text ? undefined : dateLowered;
     propNames = filtered;
@@ -9684,7 +9764,7 @@ function createTransformContext(analyzer) {
     spreadIdCounter: 0,
     isRoot: true,
     insideComponentChildren: false,
-    loopParams: new Set,
+    scope: BindingScope.EMPTY,
     loopDepth: 0,
     patterns: {
       signals: analyzer.signals.map((s) => ({
@@ -9761,7 +9841,8 @@ function generateSpreadSlotId(ctx) {
   return `Spread_${ctx.spreadIdCounter++}`;
 }
 function makeBindingEnv(ctx) {
-  const loopKey = ctx.loopParams.size === 0 ? "" : Array.from(ctx.loopParams).sort().join("\x00");
+  const boundNames = ctx.scope.valueBoundNames();
+  const loopKey = boundNames.size === 0 ? "" : Array.from(boundNames).sort().join("\x00");
   if (ctx._bindingEnv && ctx._bindingEnvLoopKey === loopKey) {
     return ctx._bindingEnv;
   }
@@ -9776,7 +9857,7 @@ function makeBindingEnv(ctx) {
     localFunctions: a.localFunctions,
     imports: a.imports,
     ambientGlobals: a.ambientGlobals,
-    loopParams: new Set(ctx.loopParams),
+    loopParams: boundNames,
     checker: a.checker
   };
   ctx._bindingEnv = env;
@@ -10469,7 +10550,8 @@ function transformExpressionInner(expr, ctx, node, isClientOnly) {
     freeRefs
   };
   const reactive = isReactiveExpression(exprText, ctx, expr) || isReactiveOrigin(origin);
-  const refsLoopParam = ctx.loopParams.size > 0 && Array.from(ctx.loopParams).some((p) => new RegExp(`\\b${p}\\b`).test(exprText));
+  const scopeValueNames = ctx.scope.valueBoundNames();
+  const refsLoopParam = scopeValueNames.size > 0 && Array.from(scopeValueNames).some((p) => new RegExp(`\\b${p}\\b`).test(exprText));
   const callsReactive = exprCallsReactiveGetters(expr, ctx);
   const hasCalls = exprHasFunctionCalls(expr);
   const needsSlot = reactive || isClientOnly || refsLoopParam || callsReactive || hasCalls;
@@ -11557,7 +11639,7 @@ function extractItemConditionalKey(cond) {
   return a ?? b;
 }
 function transformMapCall(node, ctx, isClientOnly = false, method = "map") {
-  const isNested = ctx.loopParams.size > 0;
+  const isNested = ctx.scope.valueBoundNames().size > 0;
   const diagCountAtEntry = ctx.analyzer.errors.length;
   const depth = ctx.loopDepth;
   const propAccess = node.expression;
@@ -11716,14 +11798,8 @@ function transformMapCall(node, ctx, isClientOnly = false, method = "map") {
         indexType = secondParam.type.getText(ctx.sourceFile);
       }
     }
-    if (paramBindings) {
-      for (const b of paramBindings)
-        ctx.loopParams.add(b.name);
-    } else {
-      ctx.loopParams.add(param);
-    }
-    if (index)
-      ctx.loopParams.add(index);
+    const savedScope = ctx.scope;
+    ctx.scope = ctx.scope.enterLoopRow({ param, index, paramBindings });
     ctx.loopDepth++;
     const tryTransformRenderableBody = (expr) => {
       if (!ts12.isBinaryExpression(expr))
@@ -11784,6 +11860,24 @@ function transformMapCall(node, ctx, isClientOnly = false, method = "map") {
         }
       }
       const returnStmt = children.length === 0 ? body.statements.find((s) => ts12.isReturnStatement(s) && s.expression != null) : undefined;
+      let rowScopeBeforePreamble = null;
+      if (returnStmt) {
+        const preambleNames = new Set;
+        for (const stmt of body.statements) {
+          if (stmt === returnStmt)
+            break;
+          collectPreambleDeclaredNames(stmt, preambleNames);
+        }
+        if (preambleNames.size > 0) {
+          rowScopeBeforePreamble = ctx.scope;
+          ctx.scope = savedScope.enterLoopRow({
+            param,
+            index,
+            paramBindings,
+            preamble: { declaredNames: [...preambleNames] }
+          });
+        }
+      }
       if (returnStmt && returnStmt.expression) {
         let returnExpr = returnStmt.expression;
         while (ts12.isParenthesizedExpression(returnExpr)) {
@@ -11853,6 +11947,9 @@ function transformMapCall(node, ctx, isClientOnly = false, method = "map") {
           }
         }
       }
+      if (rowScopeBeforePreamble) {
+        ctx.scope = rowScopeBeforePreamble;
+      }
       if (method === "flatMap" && children.length === 0 && !flatMapProjectionCall(body)) {
         flatMapCallback = buildFlatMapCallback(callback, body, ctx);
       }
@@ -11881,14 +11978,7 @@ function transformMapCall(node, ctx, isClientOnly = false, method = "map") {
         }
       }));
     }
-    if (paramBindings) {
-      for (const b of paramBindings)
-        ctx.loopParams.delete(b.name);
-    } else {
-      ctx.loopParams.delete(param);
-    }
-    if (index)
-      ctx.loopParams.delete(index);
+    ctx.scope = savedScope;
     ctx.loopDepth--;
   }
   if (children.length === 0 && !flatMapCallback) {
@@ -12635,7 +12725,7 @@ function parseTemplateLiteral(expr, ctx) {
 }
 function tryResolveTemplateSpanFromConst(expr, ctx) {
   if (ts12.isIdentifier(expr)) {
-    if (ctx.loopParams.has(expr.text))
+    if (ctx.scope.isBound(expr.text))
       return null;
     const constInfo = findLocalConst(expr.text, ctx.analyzer);
     if (!constInfo)
@@ -12651,7 +12741,7 @@ function tryResolveTemplateSpanFromConst(expr, ctx) {
   if (ts12.isElementAccessExpression(expr)) {
     if (!ts12.isIdentifier(expr.expression))
       return null;
-    if (ctx.loopParams.has(expr.expression.text))
+    if (ctx.scope.isBound(expr.expression.text))
       return null;
     const constInfo = findLocalConst(expr.expression.text, ctx.analyzer);
     if (!constInfo)
@@ -12730,7 +12820,7 @@ function hasDynamicTagBinding(name, sourceFile) {
   return found;
 }
 function tryResolveIdentifierAsTemplateLiteral(ident, ctx) {
-  if (ctx.loopParams.has(ident.text))
+  if (ctx.scope.isBound(ident.text))
     return null;
   const constInfo = findLocalConst(ident.text, ctx.analyzer);
   if (!constInfo)
@@ -13079,9 +13169,10 @@ function isSignalOrMemoArray(array, ctx) {
   return false;
 }
 function referencesLoopParam(expr, ctx) {
-  if (ctx.loopParams.size === 0)
+  const boundNames = ctx.scope.valueBoundNames();
+  if (boundNames.size === 0)
     return false;
-  for (const p of ctx.loopParams) {
+  for (const p of boundNames) {
     if (new RegExp(`\\b${p}\\b`).test(expr))
       return true;
   }
@@ -13161,8 +13252,9 @@ function hasReactiveAttributes(attrs, ctx) {
     if (isSignalOrMemoReference(valueToCheck, ctx) || isPropsReference(valueToCheck, ctx)) {
       return true;
     }
-    if (ctx.loopParams.size > 0) {
-      for (const p of ctx.loopParams) {
+    const scopeValueNames = ctx.scope.valueBoundNames();
+    if (scopeValueNames.size > 0) {
+      for (const p of scopeValueNames) {
         if (new RegExp(`\\b${p}\\b`).test(valueToCheck))
           return true;
       }
@@ -23592,7 +23684,7 @@ class JsxAdapter extends BaseAdapter {
         continue;
       const keyword = constant.declarationKind ?? "const";
       if (!constant.value) {
-        const typeAnnotation = preserveTypes && constant.type ? `: ${constant.type.raw}` : "";
+        const typeAnnotation = preserveTypes && (constant.typeAnnotation ?? constant.type) ? `: ${constant.typeAnnotation ?? constant.type?.raw}` : "";
         lines.push(`  ${keyword} ${constant.name}${typeAnnotation}`);
         continue;
       }
@@ -23602,7 +23694,8 @@ class JsxAdapter extends BaseAdapter {
       if (!reachable.has(constant.name))
         continue;
       const constValue = preserveTypes ? constant.typedValue ?? constant.value : constant.value;
-      lines.push(`  ${keyword} ${constant.name} = ${constValue}`);
+      const letTypeAnnotation = preserveTypes && keyword === "let" && constant.typeAnnotation ? `: ${constant.typeAnnotation}` : "";
+      lines.push(`  ${keyword} ${constant.name}${letTypeAnnotation} = ${constValue}`);
     }
     for (const func of localFunctions) {
       if (moduleScopeNames.has(func.name))
@@ -23709,7 +23802,8 @@ class JsxAdapter extends BaseAdapter {
       const keyword = c.declarationKind ?? "const";
       const exportKw = c.isExported ? "export " : "";
       if (!c.value) {
-        entries.push({ line: c.loc.start.line, text: `${exportKw}${keyword} ${c.name}` });
+        const typeAnnotation = preserveTypes && (c.typeAnnotation ?? c.type) ? `: ${c.typeAnnotation ?? c.type?.raw}` : "";
+        entries.push({ line: c.loc.start.line, text: `${exportKw}${keyword} ${c.name}${typeAnnotation}` });
         continue;
       }
       const trimmed = c.value.trim();
@@ -23718,7 +23812,8 @@ class JsxAdapter extends BaseAdapter {
       if (c.isExported && /^createContext\b/.test(trimmed))
         continue;
       const value = preserveTypes ? c.typedValue ?? c.value : c.value;
-      entries.push({ line: c.loc.start.line, text: `${exportKw}${keyword} ${c.name} = ${value}` });
+      const letTypeAnnotation = preserveTypes && keyword === "let" && c.typeAnnotation ? `: ${c.typeAnnotation}` : "";
+      entries.push({ line: c.loc.start.line, text: `${exportKw}${keyword} ${c.name}${letTypeAnnotation} = ${value}` });
     }
     for (const f of ir.metadata.localFunctions) {
       if (!f.isModule || !moduleNames.has(f.name))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barefootjs/vite",
-  "version": "0.31.2",
+  "version": "0.31.3",
   "description": "Vite plugin for BarefootJS: Vite/Rollup owns bundling, hashing, chunking, tree-shaking and minification of client assets, BarefootJS keeps only the JSX to (template, client JS) compile",
   "type": "module",
   "main": "./dist/index.js",
@@ -38,17 +38,17 @@
     "directory": "packages/vite"
   },
   "dependencies": {
-    "@barefootjs/shared": "0.31.2"
+    "@barefootjs/shared": "0.31.3"
   },
   "peerDependencies": {
     "@barefootjs/jsx": ">=0.2.0",
     "vite": "^6.0.0"
   },
   "devDependencies": {
-    "@barefootjs/client": "0.31.2",
-    "@barefootjs/go-template": "0.31.2",
-    "@barefootjs/hono": "0.31.2",
-    "@barefootjs/jsx": "0.31.2",
+    "@barefootjs/client": "0.31.3",
+    "@barefootjs/go-template": "0.31.3",
+    "@barefootjs/hono": "0.31.3",
+    "@barefootjs/jsx": "0.31.3",
     "typescript": "^5.0.0",
     "vite": "^6.0.0"
   }