@barefootjs/cli 0.18.5 → 0.18.7

package/dist/index.js

@@ -3397,6 +3397,38 @@ function extractFreeIdentifiersFromText(text) {
   const expr = ts4.isParenthesizedExpression(stmt.expression) ? stmt.expression.expression : stmt.expression;
   return extractFreeIdentifiersFromNode(expr);
 }
+function extractFreeIdentifiersFromStatementText(text) {
+  if (!text || text.trim().length === 0) return /* @__PURE__ */ new Set();
+  const sf = ts4.createSourceFile(
+    "__free_ids_stmt__.ts",
+    text,
+    ts4.ScriptTarget.Latest,
+    /* setParentNodes */
+    true,
+    ts4.ScriptKind.TS
+  );
+  return extractFreeIdentifiersFromNode(sf);
+}
+function extractFreeIdentifiersFromTemplateText(template) {
+  if (!template || template.length === 0) return /* @__PURE__ */ new Set();
+  const sf = ts4.createSourceFile(
+    "__free_ids_template__.ts",
+    `(\`${template}\`);`,
+    ts4.ScriptTarget.Latest,
+    /* setParentNodes */
+    true,
+    ts4.ScriptKind.TS
+  );
+  const stmt = sf.statements[0];
+  if (!stmt || !ts4.isExpressionStatement(stmt)) return /* @__PURE__ */ new Set();
+  const expr = ts4.isParenthesizedExpression(stmt.expression) ? stmt.expression.expression : stmt.expression;
+  if (!ts4.isTemplateExpression(expr)) return /* @__PURE__ */ new Set();
+  const ids = /* @__PURE__ */ new Set();
+  for (const span of expr.templateSpans) {
+    for (const id2 of extractFreeIdentifiersFromNode(span.expression)) ids.add(id2);
+  }
+  return ids;
+}
 function extractMemoBodyExpr(computation) {
   const arrowMatch = computation.match(/^\(\)\s*=>\s*(.+)$/s);
   if (!arrowMatch) return computation;
@@ -3879,6 +3911,100 @@ function buildLoopSkeletonTemplate(node, safe) {
       return assertNever(node);
   }
 }
+function skeletonForceCloseGroup(tag) {
+  return SKELETON_PATH_FORCE_CLOSE_GROUPS.findIndex((group) => group.has(tag));
+}
+function computeSkeletonSlotPaths(node, safe) {
+  const state2 = { elementPaths: /* @__PURE__ */ new Map(), textMarkerPaths: /* @__PURE__ */ new Map(), bailed: false };
+  walkSkeletonPathNode(node, [], safe, state2, /* @__PURE__ */ new Set());
+  if (state2.bailed) return null;
+  return { elementPaths: state2.elementPaths, textMarkerPaths: state2.textMarkerPaths };
+}
+function walkSkeletonPathNode(node, path25, safe, state2, forceCloseAncestors) {
+  if (state2.bailed || node.type !== "element") return;
+  if (SKELETON_PATH_HAZARD_TAGS.has(node.tag)) {
+    state2.bailed = true;
+    return;
+  }
+  const groupIdx = skeletonForceCloseGroup(node.tag);
+  if (groupIdx >= 0 && forceCloseAncestors.has(groupIdx)) {
+    state2.bailed = true;
+    return;
+  }
+  const flatChildren = flattenSkeletonChildren(node.children);
+  if (VOID_ELEMENTS.has(node.tag) && flatChildren.length > 0) {
+    state2.bailed = true;
+    return;
+  }
+  if (node.tag === "tr" && hasForeignTableRowContent(flatChildren)) {
+    state2.bailed = true;
+    return;
+  }
+  if (node.slotId) state2.elementPaths.set(node.slotId, path25);
+  const nextAncestors = groupIdx >= 0 ? /* @__PURE__ */ new Set([...forceCloseAncestors, groupIdx]) : forceCloseAncestors;
+  walkSkeletonPathChildren(flatChildren, path25, safe, state2, nextAncestors);
+}
+function hasForeignTableRowContent(children2) {
+  for (const child of children2) {
+    if (child.type === "text") {
+      if (child.value.trim() !== "") return true;
+      continue;
+    }
+    if (child.type === "element" && child.tag !== "td" && child.tag !== "th") {
+      return true;
+    }
+  }
+  return false;
+}
+function flattenSkeletonChildren(children2) {
+  const out = [];
+  for (const child of children2) {
+    if (child.type === "fragment") {
+      out.push(...flattenSkeletonChildren(child.children));
+    } else {
+      out.push(child);
+    }
+  }
+  return out;
+}
+function walkSkeletonPathChildren(children2, parentPath, safe, state2, forceCloseAncestors) {
+  let idx = 0;
+  let pendingText = false;
+  for (const child of children2) {
+    if (state2.bailed) return;
+    switch (child.type) {
+      case "text": {
+        if (child.value === "") continue;
+        if (!pendingText) idx += 1;
+        pendingText = true;
+        continue;
+      }
+      case "expression": {
+        if (child.expr === "null" || child.expr === "undefined") continue;
+        if (!child.slotId || !safe.reactiveTextSlotIds.has(child.slotId)) {
+          state2.bailed = true;
+          return;
+        }
+        state2.textMarkerPaths.set(child.slotId, [...parentPath, idx]);
+        idx += 2;
+        pendingText = false;
+        continue;
+      }
+      case "element": {
+        walkSkeletonPathNode(child, [...parentPath, idx], safe, state2, forceCloseAncestors);
+        idx += 1;
+        pendingText = false;
+        continue;
+      }
+      case "fragment":
+        continue;
+      // already flattened
+      default:
+        state2.bailed = true;
+        return;
+    }
+  }
+}
 function irToPlaceholderTemplate(node, restSpreadNames, loopDepth = 0, loopParams) {
   const recurse = (n) => irToPlaceholderTemplate(n, restSpreadNames, loopDepth, loopParams);
   const wrapExpr = (expr) => wrapExprWithLoopParams(expr, loopParams);
@@ -4495,7 +4621,26 @@ function generateCsrTemplateWithOpts(node, opts) {
       return `\${renderChild('${nameForRegistryRef(node.name)}', ${propsExpr}${keyArg || (slotArg ? ", undefined" : "")}${slotArg})}`;
     }
     case "loop": {
-      let childTemplate = node.children.map(recurseInLoop).join("");
+      const boundHere = new Set(opts.loopBoundNames ?? []);
+      if (node.paramBindings && node.paramBindings.length > 0) {
+        for (const b of node.paramBindings) boundHere.add(b.name);
+      } else if (!node.param.startsWith("[") && !node.param.startsWith("{")) {
+        boundHere.add(node.param);
+      }
+      if (node.index) boundHere.add(node.index);
+      const childEnv = {
+        ...env,
+        substitutions: new Map([...env.substitutions].filter(([name2]) => !boundHere.has(name2)))
+      };
+      const recurseInLoopBody = (n) => generateCsrTemplateWithOpts(n, {
+        ...opts,
+        insideLoop: true,
+        loopDepth: loopDepth + 1,
+        inHoistedChildren: false,
+        loopBoundNames: boundHere,
+        csrEnv: childEnv
+      });
+      let childTemplate = node.children.map(recurseInLoopBody).join("");
       if (node.bodyIsItemConditional && node.key) {
         childTemplate = `${itemAnchorTemplate(node.key)}${childTemplate}`;
       }
@@ -4509,7 +4654,7 @@ function generateCsrTemplateWithOpts(node, opts) {
       if (node.flatMapCallback) {
         let body2 = node.flatMapCallback.templateBody ?? node.flatMapCallback.body;
         for (const frag of node.flatMapCallback.fragments) {
-          const renderedIr = recurseInLoop(frag.ir);
+          const renderedIr = recurseInLoopBody(frag.ir);
           body2 = body2.replace(frag.placeholder, `\`${renderedIr}\``);
         }
         body2 = applyPropsRewrite(body2, propsObjectName ?? null);
@@ -4551,7 +4696,7 @@ function isSimplePropExpression(expr, propNames) {
   if (expr.includes("()")) return false;
   return true;
 }
-var VOID_ELEMENTS, UNSAFE_TEMPLATE_EXPR;
+var VOID_ELEMENTS, UNSAFE_TEMPLATE_EXPR, SKELETON_PATH_HAZARD_TAGS, SKELETON_PATH_FORCE_CLOSE_GROUPS;
 var init_html_template = __esm({
   "../jsx/src/ir-to-client-js/html-template.ts"() {
     "use strict";
@@ -4579,6 +4724,33 @@ var init_html_template = __esm({
       "wbr"
     ]);
     UNSAFE_TEMPLATE_EXPR = "undefined";
+    SKELETON_PATH_HAZARD_TAGS = /* @__PURE__ */ new Set([
+      "table",
+      "thead",
+      "tbody",
+      "tfoot",
+      "caption",
+      "colgroup",
+      "col",
+      "select",
+      "optgroup",
+      "p",
+      "pre",
+      "textarea",
+      "listing",
+      "template",
+      "math"
+      // MathML foreign-content: breakout tags pop content back out, same class of hazard as SVG.
+    ]);
+    SKELETON_PATH_FORCE_CLOSE_GROUPS = [
+      /* @__PURE__ */ new Set(["a"]),
+      /* @__PURE__ */ new Set(["button"]),
+      /* @__PURE__ */ new Set(["form"]),
+      /* @__PURE__ */ new Set(["option"]),
+      /* @__PURE__ */ new Set(["h1", "h2", "h3", "h4", "h5", "h6"]),
+      /* @__PURE__ */ new Set(["dd", "dt"]),
+      /* @__PURE__ */ new Set(["li"])
+    ];
   }
 });
 
@@ -5229,6 +5401,7 @@ import fs from "node:fs";
 function needsTypeBasedDetection(source) {
   if (REACTIVE_BRAND_PACKAGES.some((pkg) => source.includes(pkg))) return true;
   if (/\.map\s*\(/.test(source)) return true;
+  if (source.includes("createSelector")) return true;
   return false;
 }
 function findBrandPackageImportLoc(sourceFile, filePath) {
@@ -7518,6 +7691,7 @@ var init_analyzer = __esm({
       "createEffect",
       "createDisposableEffect",
       "createMemo",
+      "createSelector",
       "createRoot",
       "onCleanup",
       "onMount",
@@ -8184,8 +8358,13 @@ function exprHasFunctionCalls(expr) {
   return found;
 }
 function rewriteBarePropRefs2(text, expr, ctx2) {
-  const propNames = getDestructuredPropNames(ctx2);
+  let propNames = getDestructuredPropNames(ctx2);
   if (!propNames) return void 0;
+  if (ctx2.loopParams.size > 0) {
+    const filtered = new Set([...propNames].filter((n) => !ctx2.loopParams.has(n)));
+    if (filtered.size === 0) return void 0;
+    propNames = filtered;
+  }
   const extraPropRefs = collectBranchLocalPropRefsViaSubstitution(expr, ctx2);
   return rewriteBarePropRefs(text, expr, propNames, extraPropRefs);
 }
@@ -8339,35 +8518,37 @@ function makeBindingEnv(ctx2) {
 function parseValueExpr(trimmed) {
   return parseExpression(trimmed.startsWith("{") ? `(${trimmed})` : trimmed);
 }
-function attachParsedExpressions(node) {
+function attachParsedExpressions(node, analyzer, bound = EMPTY_BOUND) {
+  const parse = (trimmed) => resolveCallbackMethodFunctionReferences(parseExpression(trimmed), analyzer, bound);
+  const parseValue = (trimmed) => resolveCallbackMethodFunctionReferences(parseValueExpr(trimmed), analyzer, bound);
   if (node.type === "expression") {
     const trimmed = node.expr.trim();
-    if (trimmed) node.parsed = parseExpression(trimmed);
+    if (trimmed) node.parsed = parse(trimmed);
   } else if (node.type === "conditional" || node.type === "if-statement") {
     const trimmed = node.condition.trim();
-    if (trimmed) node.parsedCondition = parseExpression(trimmed);
+    if (trimmed) node.parsedCondition = parse(trimmed);
   }
   if (node.type === "element") {
     for (const attr of node.attrs) {
       if (attr.value.kind === "expression") {
         const trimmed = attr.value.expr.trim();
-        if (trimmed) attr.value.parsed = parseValueExpr(trimmed);
+        if (trimmed) attr.value.parsed = parseValue(trimmed);
       } else if (attr.value.kind === "spread") {
         const trimmed = attr.value.expr.trim();
-        if (trimmed) attr.value.parsed = parseExpression(trimmed);
+        if (trimmed) attr.value.parsed = parse(trimmed);
       }
     }
   } else if (node.type === "component") {
     for (const prop of node.props) {
       if (prop.value.kind === "expression") {
         const trimmed = prop.value.expr.trim();
-        if (trimmed) prop.value.parsed = parseValueExpr(trimmed);
+        if (trimmed) prop.value.parsed = parseValue(trimmed);
       }
     }
   } else if (node.type === "provider") {
     if (node.valueProp.value.kind === "expression") {
       const trimmed = node.valueProp.value.expr.trim();
-      if (trimmed) node.valueProp.value.parsed = parseValueExpr(trimmed);
+      if (trimmed) node.valueProp.value.parsed = parseValue(trimmed);
     }
   }
   switch (node.type) {
@@ -8375,40 +8556,43 @@ function attachParsedExpressions(node) {
     case "component":
     case "fragment":
     case "provider":
-      for (const child of node.children) attachParsedExpressions(child);
+      for (const child of node.children) attachParsedExpressions(child, analyzer, bound);
       break;
     case "async":
-      attachParsedExpressions(node.fallback);
-      for (const child of node.children) attachParsedExpressions(child);
+      attachParsedExpressions(node.fallback, analyzer, bound);
+      for (const child of node.children) attachParsedExpressions(child, analyzer, bound);
       break;
     case "loop": {
       const trimmedArray = node.array.trim();
-      if (trimmedArray) node.arrayParsed = parseExpression(trimmedArray);
-      for (const child of node.children) attachParsedExpressions(child);
+      if (trimmedArray) node.arrayParsed = parse(trimmedArray);
+      const loopBound = new Set(bound);
+      loopBound.add(node.param);
+      if (node.index) loopBound.add(node.index);
+      for (const child of node.children) attachParsedExpressions(child, analyzer, loopBound);
       if (node.childComponent) {
-        for (const child of node.childComponent.children) attachParsedExpressions(child);
+        for (const child of node.childComponent.children) attachParsedExpressions(child, analyzer, loopBound);
       }
       for (const nested of node.nestedComponents ?? []) {
-        for (const child of nested.children) attachParsedExpressions(child);
+        for (const child of nested.children) attachParsedExpressions(child, analyzer, loopBound);
       }
       for (const frag of node.flatMapCallback?.fragments ?? []) {
-        attachParsedExpressions(frag.ir);
+        attachParsedExpressions(frag.ir, analyzer, loopBound);
       }
       break;
     }
     case "conditional":
-      attachParsedExpressions(node.whenTrue);
-      attachParsedExpressions(node.whenFalse);
+      attachParsedExpressions(node.whenTrue, analyzer, bound);
+      attachParsedExpressions(node.whenFalse, analyzer, bound);
       break;
     case "if-statement":
-      attachParsedExpressions(node.consequent);
-      if (node.alternate) attachParsedExpressions(node.alternate);
+      attachParsedExpressions(node.consequent, analyzer, bound);
+      if (node.alternate) attachParsedExpressions(node.alternate, analyzer, bound);
       break;
   }
 }
 function jsxToIR(analyzer) {
   const root2 = buildIRRoot(analyzer);
-  if (root2) attachParsedExpressions(root2);
+  if (root2) attachParsedExpressions(root2, analyzer);
   return root2;
 }
 function buildIRRoot(analyzer) {
@@ -9504,8 +9688,8 @@ function extractSortComparator(callback, _method, ctx2) {
   };
 }
 function resolveSortComparatorIdentifier(name2, ctx2) {
-  const constInfo = findLocalConst(name2, ctx2);
-  const fnInfo = findLocalFunction(name2, ctx2);
+  const constInfo = findLocalConst(name2, ctx2.analyzer);
+  const fnInfo = findLocalFunction(name2, ctx2.analyzer);
   if (constInfo && fnInfo) return null;
   if (constInfo) {
     const ast = parseConstInitializer(constInfo);
@@ -9517,6 +9701,70 @@ function resolveSortComparatorIdentifier(name2, ctx2) {
   }
   return null;
 }
+function resolveCallbackMethodFunctionReferenceIdentifier(name2, analyzer) {
+  const constInfo = findLocalConst(name2, analyzer);
+  const fnInfo = findLocalFunction(name2, analyzer);
+  if (constInfo && fnInfo) return null;
+  if (constInfo) {
+    const ast = parseConstInitializer(constInfo);
+    return ast && (ts11.isArrowFunction(ast) || ts11.isFunctionExpression(ast)) ? ast : null;
+  }
+  if (fnInfo) {
+    const ast = parseFunctionInfoAsExpr(fnInfo);
+    return ast && (ts11.isArrowFunction(ast) || ts11.isFunctionExpression(ast)) ? ast : null;
+  }
+  return null;
+}
+function resolveCallbackMethodFunctionReferences(expr, analyzer, bound = EMPTY_BOUND) {
+  function visit3(e, bound2) {
+    switch (e.kind) {
+      case "literal":
+      case "identifier":
+      case "regex":
+      case "unsupported":
+        return e;
+      case "call": {
+        const callee = visit3(e.callee, bound2);
+        const args2 = e.args.map((a) => visit3(a, bound2));
+        if (callee.kind === "member" && !callee.computed && CALLBACK_METHODS.has(callee.property) && args2[0]?.kind === "identifier" && !bound2.has(args2[0].name)) {
+          const resolved = resolveCallbackMethodFunctionReferenceIdentifier(args2[0].name, analyzer);
+          const arrow = resolved ? tsNodeToParsedExpr(resolved) : null;
+          if (arrow && arrow.kind === "arrow") args2[0] = arrow;
+        }
+        return { ...e, callee, args: args2 };
+      }
+      case "member":
+        return { ...e, object: visit3(e.object, bound2) };
+      case "index-access":
+        return { ...e, object: visit3(e.object, bound2), index: visit3(e.index, bound2) };
+      case "binary":
+      case "logical":
+        return { ...e, left: visit3(e.left, bound2), right: visit3(e.right, bound2) };
+      case "unary":
+        return { ...e, argument: visit3(e.argument, bound2) };
+      case "conditional":
+        return { ...e, test: visit3(e.test, bound2), consequent: visit3(e.consequent, bound2), alternate: visit3(e.alternate, bound2) };
+      case "template-literal":
+        return { ...e, parts: e.parts.map((p) => p.type === "expression" ? { ...p, expr: visit3(p.expr, bound2) } : p) };
+      case "array-literal":
+        return { ...e, elements: e.elements.map((el) => visit3(el, bound2)) };
+      case "array-method":
+        return {
+          ...e,
+          object: visit3(e.object, bound2),
+          args: e.args.map((a) => visit3(a, bound2)),
+          ...e.method === "flat" && e.depthExpr ? { depthExpr: visit3(e.depthExpr, bound2) } : {}
+        };
+      case "object-literal":
+        return { ...e, properties: e.properties.map((p) => ({ ...p, value: visit3(p.value, bound2) })) };
+      case "arrow": {
+        const inner = e.params.length === 0 ? bound2 : /* @__PURE__ */ new Set([...bound2, ...e.params]);
+        return { ...e, body: visit3(e.body, inner) };
+      }
+    }
+  }
+  return visit3(expr, bound);
+}
 function extractFilterPredicate(callback, ctx2) {
   if (!ts11.isArrowFunction(callback)) return { result: null };
   if (callback.parameters.length < 1) return { result: null };
@@ -9995,13 +10243,11 @@ function transformMapCall(node, ctx2, isClientOnly = false, method2 = "map") {
           setArray(innerSort.array);
         }
       } else {
-        array = ctx2.getJS(filterInfo.array);
-        arrayExpr = filterInfo.array;
+        setArray(filterInfo.array);
       }
     }
   } else {
-    array = ctx2.getJS(chainSource);
-    arrayExpr = chainSource;
+    setArray(chainSource);
   }
   const callback = node.arguments[0];
   let param = "item";
@@ -10561,7 +10807,7 @@ function parseTemplateLiteral(expr, ctx2) {
 }
 function tryResolveTemplateSpanFromConst(expr, ctx2) {
   if (ts11.isIdentifier(expr)) {
-    const constInfo = findLocalConst(expr.text, ctx2);
+    const constInfo = findLocalConst(expr.text, ctx2.analyzer);
     if (!constInfo) return null;
     const ast = parseConstInitializer(constInfo);
     if (!ast) return null;
@@ -10572,7 +10818,7 @@ function tryResolveTemplateSpanFromConst(expr, ctx2) {
   }
   if (ts11.isElementAccessExpression(expr)) {
     if (!ts11.isIdentifier(expr.expression)) return null;
-    const constInfo = findLocalConst(expr.expression.text, ctx2);
+    const constInfo = findLocalConst(expr.expression.text, ctx2.analyzer);
     if (!constInfo) return null;
     const ast = parseConstInitializer(constInfo);
     if (!ast || !ts11.isObjectLiteralExpression(ast)) return null;
@@ -10594,15 +10840,15 @@ function tryResolveTemplateSpanFromConst(expr, ctx2) {
   }
   return null;
 }
-function findLocalConst(name2, ctx2) {
-  const matches = ctx2.analyzer.localConstants.filter((c) => c.name === name2);
+function findLocalConst(name2, analyzer) {
+  const matches = analyzer.localConstants.filter((c) => c.name === name2);
   if (matches.length === 0) return void 0;
   const fnScoped = matches.filter((c) => !c.isModule);
   const pool = fnScoped.length > 0 ? fnScoped : matches;
   return pool[pool.length - 1];
 }
-function findLocalFunction(name2, ctx2) {
-  const matches = ctx2.analyzer.localFunctions.filter((f) => f.name === name2);
+function findLocalFunction(name2, analyzer) {
+  const matches = analyzer.localFunctions.filter((f) => f.name === name2);
   if (matches.length === 0) return void 0;
   const fnScoped = matches.filter((f) => !f.isModule);
   const pool = fnScoped.length > 0 ? fnScoped : matches;
@@ -10637,7 +10883,8 @@ function hasDynamicTagBinding(name2, sourceFile) {
   return found;
 }
 function tryResolveIdentifierAsTemplateLiteral(ident, ctx2) {
-  const constInfo = findLocalConst(ident.text, ctx2);
+  if (ctx2.loopParams.has(ident.text)) return null;
+  const constInfo = findLocalConst(ident.text, ctx2.analyzer);
   if (!constInfo) return null;
   const ast = parseConstInitializer(constInfo);
   if (!ast) return null;
@@ -10729,8 +10976,8 @@ function tryDesugarInterleaveTaggedTemplate(expr, ctx2) {
   return rewritten ?? expr;
 }
 function resolveInterleaveTagIdentifier(name2, ctx2) {
-  const constInfo = findLocalConst(name2, ctx2);
-  const fnInfo = findLocalFunction(name2, ctx2);
+  const constInfo = findLocalConst(name2, ctx2.analyzer);
+  const fnInfo = findLocalFunction(name2, ctx2.analyzer);
   if (constInfo && fnInfo) return null;
   if (constInfo) {
     const ast = parseConstInitializer(constInfo);
@@ -11229,7 +11476,7 @@ function buildIfStatementChain(analyzer, ctx2) {
   }
   return alternate;
 }
-var CLIENT_DIRECTIVE_INTERIOR_RE2, BLOCK_COMMENT_RE2, constInitializerCache, functionInfoExprCache;
+var CLIENT_DIRECTIVE_INTERIOR_RE2, BLOCK_COMMENT_RE2, EMPTY_BOUND, constInitializerCache, functionInfoExprCache;
 var init_jsx_to_ir = __esm({
   "../jsx/src/jsx-to-ir.ts"() {
     "use strict";
@@ -11248,6 +11495,7 @@ var init_jsx_to_ir = __esm({
     init_src();
     CLIENT_DIRECTIVE_INTERIOR_RE2 = /^\s*@client\s*$/;
     BLOCK_COMMENT_RE2 = /\/\*([\s\S]*?)\*\//g;
+    EMPTY_BOUND = /* @__PURE__ */ new Set();
     constInitializerCache = /* @__PURE__ */ new WeakMap();
     functionInfoExprCache = /* @__PURE__ */ new WeakMap();
   }
@@ -11480,6 +11728,12 @@ function collectLoopChildEventsWithNesting(node, initialNestingStack = []) {
             depth: scope.nestingStack.length + 1,
             array: l.array,
             param: l.param,
+            // Event-delegation metadata only (see the field comment on
+            // `NestedLoop.index`) — threaded for type-completeness (#2218)
+            // so this record stays a structurally-valid `NestedLoop`, even
+            // though delegated-handler index binding is handled separately
+            // by `indexBindingLine` in `stringify/event-delegation.ts` (#2189).
+            index: l.index,
             key: l.key,
             markerId: l.markerId,
             containerSlotId: scope.lastElementSlotId,
@@ -11576,6 +11830,156 @@ var init_reactivity = __esm({
   }
 });
 
+// ../jsx/src/ir-to-client-js/control-flow/stringify/template-parse.ts
+function templateRootIsSvg(template) {
+  const stripped = stripLeadingNonContent(template);
+  const m = stripped.match(/^<\s*([A-Za-z][A-Za-z0-9-]*)/);
+  if (m) {
+    const tag = m[1];
+    if (SVG_ROOT_TAGS.has(tag)) return true;
+    return SVG_ROOT_TAGS.has(tag.toLowerCase());
+  }
+  const branches = extractConditionalBranchTemplates(stripped);
+  if (branches === null || branches.length === 0) return false;
+  return branches.every(templateRootIsSvg);
+}
+function multiRootTemplateNeedsSvgWrap(template) {
+  const m = stripLeadingNonContent(template).match(/^<\s*([A-Za-z][A-Za-z0-9-]*)/);
+  if (m && m[1].toLowerCase() === "svg") return false;
+  return templateRootIsSvg(template);
+}
+function stripLeadingNonContent(template) {
+  let s = template.trimStart();
+  while (s.startsWith("<!--")) {
+    const end2 = s.indexOf("-->");
+    if (end2 < 0) return s;
+    s = s.slice(end2 + 3).trimStart();
+  }
+  return s;
+}
+function extractConditionalBranchTemplates(template) {
+  if (!template.startsWith("${")) return null;
+  const exprEnd = findInterpolationEnd(template, 2);
+  if (exprEnd < 0) return null;
+  const trailing = stripLeadingNonContent(template.slice(exprEnd + 1));
+  if (trailing.length > 0) return null;
+  const expr = template.slice(2, exprEnd);
+  return findTopLevelTemplateLiterals(expr);
+}
+function emitTemplateCloneInline(template) {
+  if (templateRootIsSvg(template)) {
+    return `const __tpl = document.createElement('template'); __tpl.innerHTML = \`<svg>${template}</svg>\`; return __tpl.content.firstElementChild.firstElementChild.cloneNode(true)`;
+  }
+  return `const __tpl = document.createElement('template'); __tpl.innerHTML = \`${template}\`; return __tpl.content.firstElementChild.cloneNode(true)`;
+}
+function emitHoistedTemplateDecl(lines, indent, tplVar, skeletonTemplate) {
+  const isSvg = templateRootIsSvg(skeletonTemplate);
+  const html = isSvg ? `<svg>${skeletonTemplate}</svg>` : skeletonTemplate;
+  lines.push(`${indent}const ${tplVar} = document.createElement('template')`);
+  lines.push(`${indent}${tplVar}.innerHTML = \`${html}\``);
+}
+function hoistedCloneExpr(tplVar, skeletonTemplate) {
+  return templateRootIsSvg(skeletonTemplate) ? `${tplVar}.content.firstElementChild.firstElementChild.cloneNode(true)` : `${tplVar}.content.firstElementChild.cloneNode(true)`;
+}
+function emitTemplateCloneLines(template, indent) {
+  if (templateRootIsSvg(template)) {
+    return [
+      `${indent}const __tpl = document.createElement('template')`,
+      `${indent}__tpl.innerHTML = \`<svg>${template}</svg>\``,
+      `${indent}return __tpl.content.firstElementChild.firstElementChild.cloneNode(true)`
+    ];
+  }
+  return [
+    `${indent}const __tpl = document.createElement('template')`,
+    `${indent}__tpl.innerHTML = \`${template}\``,
+    `${indent}return __tpl.content.firstElementChild.cloneNode(true)`
+  ];
+}
+function emitLoopItemElementSetup(lines, opts) {
+  const { template, bodyIsMultiRoot, indent, singleRootLayout } = opts;
+  const innerIndent = indent + "  ";
+  if (bodyIsMultiRoot) {
+    lines.push(`${indent}let __el, __extras`);
+    lines.push(`${indent}if (__existing) {`);
+    lines.push(`${innerIndent}__el = __existing`);
+    lines.push(`${indent}} else {`);
+    for (const ln of emitMultiRootTemplateCloneLines(template, innerIndent, "__el", "__extras")) {
+      lines.push(ln);
+    }
+    lines.push(`${innerIndent}__el.__bfExtras = __extras`);
+    lines.push(`${indent}}`);
+    return;
+  }
+  if (singleRootLayout === "inline") {
+    const cloneExpr = emitTemplateCloneInline(template);
+    lines.push(`${indent}const __el = __existing ?? (() => { ${cloneExpr} })()`);
+    return;
+  }
+  lines.push(`${indent}const __el = __existing ?? (() => {`);
+  for (const ln of emitTemplateCloneLines(template, innerIndent)) lines.push(ln);
+  lines.push(`${indent}})()`);
+}
+function emitMultiRootTemplateCloneLines(template, indent, varEl, varExtras) {
+  const isSvg = multiRootTemplateNeedsSvgWrap(template);
+  const innerHtmlExpr = isSvg ? `\`<svg>${template}</svg>\`` : `\`${template}\``;
+  const parentExpr = isSvg ? `__tpl.content.firstElementChild` : `__tpl.content`;
+  return [
+    `${indent}const __tpl = document.createElement('template')`,
+    `${indent}__tpl.innerHTML = ${innerHtmlExpr}`,
+    `${indent}${varEl} = ${parentExpr}.firstElementChild.cloneNode(true)`,
+    `${indent}${varExtras} = []`,
+    `${indent}{ let __sib = ${parentExpr}.firstElementChild.nextElementSibling; while (__sib) { ${varExtras}.push(__sib.cloneNode(true)); __sib = __sib.nextElementSibling } }`
+  ];
+}
+var SVG_ROOT_TAGS;
+var init_template_parse = __esm({
+  "../jsx/src/ir-to-client-js/control-flow/stringify/template-parse.ts"() {
+    "use strict";
+    init_js_scanner();
+    SVG_ROOT_TAGS = /* @__PURE__ */ new Set([
+      "svg",
+      "path",
+      "circle",
+      "rect",
+      "line",
+      "polyline",
+      "polygon",
+      "ellipse",
+      "text",
+      "tspan",
+      "textPath",
+      "g",
+      "defs",
+      "use",
+      "symbol",
+      "switch",
+      "clipPath",
+      "mask",
+      "marker",
+      "pattern",
+      "linearGradient",
+      "radialGradient",
+      "stop",
+      "image",
+      "foreignObject",
+      "filter",
+      "feBlend",
+      "feColorMatrix",
+      "feComposite",
+      "feFlood",
+      "feGaussianBlur",
+      "feMerge",
+      "feMergeNode",
+      "feMorphology",
+      "feOffset",
+      "feTurbulence",
+      "animate",
+      "animateTransform",
+      "animateMotion"
+    ]);
+  }
+});
+
 // ../jsx/src/ir-to-client-js/collect-elements.ts
 function domElementCount(node) {
   switch (node.type) {
@@ -11745,6 +12149,7 @@ function collectInnerLoops(nodes, siblingOffsets, outerLoopParam, ctx2, options2
           arrayFreeIdentifiers: n.arrayFreeIdentifiers,
           param: n.param,
           paramBindings: n.paramBindings,
+          index: n.index,
           key: n.key,
           markerId: n.markerId,
           bodyIsMultiRoot: n.bodyIsMultiRoot,
@@ -11926,6 +12331,7 @@ function collectElements(node, ctx2, siblingOffsets, insideConditional = false)
       let template = "";
       let staticItemTemplate;
       let skeletonTemplate;
+      let skeletonPaths;
       if (l.childComponent) {
         template = "";
         if (l.isStaticArray && l.children[0]) {
@@ -11945,10 +12351,14 @@ function collectElements(node, ctx2, siblingOffsets, insideConditional = false)
         if (l.isStaticArray) {
           staticItemTemplate = useElementReconciliation ? irToPlaceholderTemplate(l.children[0], buildRestSpreadNames(ctx2), 0) : irToHtmlTemplate(l.children[0], buildRestSpreadNames(ctx2), 0);
         } else if (!useElementReconciliation && !l.bodyIsMultiRoot && !l.bodyIsItemConditional) {
-          skeletonTemplate = buildLoopSkeletonTemplate(l.children[0], {
+          const skeletonSafeSlots = {
             reactiveAttrKeys: new Set(bindings.reactiveAttrs.map((a) => `${a.childSlotId}::${a.attrName}`)),
             reactiveTextSlotIds: new Set(bindings.reactiveTexts.map((t) => t.slotId))
-          }) ?? void 0;
+          };
+          skeletonTemplate = buildLoopSkeletonTemplate(l.children[0], skeletonSafeSlots) ?? void 0;
+          if (skeletonTemplate && !templateRootIsSvg(skeletonTemplate)) {
+            skeletonPaths = computeSkeletonSlotPaths(l.children[0], skeletonSafeSlots) ?? void 0;
+          }
         }
       }
       ctx2.loopElements.push({
@@ -11968,6 +12378,7 @@ function collectElements(node, ctx2, siblingOffsets, insideConditional = false)
         template,
         staticItemTemplate,
         skeletonTemplate,
+        skeletonPaths,
         childEventHandlers: childHandlers,
         bindings,
         childComponent: l.childComponent,
@@ -12287,6 +12698,7 @@ var init_collect_elements = __esm({
     init_utils();
     init_reactivity();
     init_html_template();
+    init_template_parse();
     init_prop_handling();
     init_walker();
     init_loop_chain();
@@ -12862,6 +13274,7 @@ var init_imports = __esm({
       "__slot",
       "__bfSlot",
       "__bfText",
+      "tAfter",
       // Profile mode (#1690, SR3) — turn-boundary markers around event handlers.
       "beginTurn",
       "endTurn"
@@ -14695,9 +15108,49 @@ var init_event_listener = __esm({
 // ../jsx/src/ir-to-client-js/control-flow/shared.ts
 function loopKeyFn(loop) {
   if (loop.key === null) return "null";
-  const params = loop.kind === "nested" ? loop.param : `${loop.param}${loop.index ? `, ${loop.index}` : ""}`;
+  const params = `${loop.param}${loop.index ? `, ${loop.index}` : ""}`;
   return `(${params}) => String(${loop.key})`;
 }
+function nestedLoopReferencesIndex(inner, comps, events) {
+  const index = inner.index;
+  if (!index) return false;
+  const exprRefs = (text, precomputed) => {
+    if (precomputed) return precomputed.has(index);
+    if (!text) return false;
+    return extractFreeIdentifiersFromText(text).has(index);
+  };
+  if (exprRefs(inner.key)) return true;
+  for (const t of inner.bindings.reactiveTexts) {
+    if (exprRefs(t.expression, t.freeIdentifiers)) return true;
+  }
+  for (const a of inner.bindings.reactiveAttrs) {
+    if (exprRefs(a.expression, a.freeIdentifiers)) return true;
+  }
+  if (inner.mapPreamble && extractFreeIdentifiersFromStatementText(inner.mapPreamble).has(index)) return true;
+  if (inner.template && extractFreeIdentifiersFromTemplateText(inner.template).has(index)) return true;
+  for (const ev of events) {
+    if (exprRefs(ev.handler)) return true;
+  }
+  for (const r2 of inner.bindings.refs) {
+    if (exprRefs(r2.callback)) return true;
+  }
+  for (const c of comps) {
+    for (const p of c.props) {
+      if (exprRefs(attrValueToString(p.value))) return true;
+    }
+    if (c.children?.length) {
+      const childrenExpr = irChildrenToJsExpr(c.children);
+      if (childrenExpr && exprRefs(childrenExpr)) return true;
+    }
+  }
+  return false;
+}
+function nestedLoopIndexAlias(inner, syntheticIndexVar, paramHead, comps, events) {
+  const index = inner.index;
+  if (!index || index === paramHead) return null;
+  if (!nestedLoopReferencesIndex(inner, comps, events)) return null;
+  return `const ${index} = ${syntheticIndexVar}`;
+}
 function buildChildRefBindings(refs, loopParam, loopParamBindings) {
   if (refs.length === 0) return [];
   return refs.map((r2) => ({
@@ -14827,6 +15280,7 @@ var init_shared = __esm({
     init_event_listener();
     init_component_scope();
     init_src();
+    init_csr_substitute();
   }
 });
 
@@ -14890,6 +15344,7 @@ function buildOuterNestedPlan(elem, comp) {
 }
 function buildInnerLoopNestedPlan(elem, innerLoop, innerComps) {
   const outerIndexParam = elem.index || "__idx";
+  const innerIndexParam = innerLoop.index || "__innerIdx";
   const comps = innerComps.map((comp) => ({
     componentName: comp.name,
     selector: buildCompSelector(comp),
@@ -14906,7 +15361,8 @@ function buildInnerLoopNestedPlan(elem, innerLoop, innerComps) {
     innerContainerSlotId: innerLoop.containerSlotId ?? null,
     innerArrayExpr: innerLoop.array,
     innerParam: innerLoop.param,
-    innerOffsetExpr: buildLoopChildIndexExpr("__innerIdx", innerLoop.offset),
+    innerIndexParam,
+    innerOffsetExpr: buildLoopChildIndexExpr(innerIndexParam, innerLoop.offset),
     innerPreludeStatements: innerLoop.mapPreamble ? [innerLoop.mapPreamble] : [],
     depth: innerLoop.depth,
     comps
@@ -14923,9 +15379,14 @@ function buildComponentRootedInnerLoopPlan(elem, innerLoop, innerComps) {
     containerVar: `_${varSlotId(elem.slotId)}`,
     outerArrayExpr: elem.array,
     outerParam: elem.param,
+    // Declared index names only (#2231) — the zip shape never indexes by
+    // position, so there's no synthetic fallback and index-less loops keep
+    // byte-identical output.
+    outerIndexParam: elem.index,
     outerPreludeStatements: elem.mapPreamble ? [elem.mapPreamble] : [],
     innerArrayExpr: innerLoop.array,
     innerParam: innerLoop.param,
+    innerIndexParam: innerLoop.index,
     innerPreludeStatements: innerLoop.mapPreamble ? [innerLoop.mapPreamble] : [],
     depth: innerLoop.depth,
     comps
@@ -15026,6 +15487,7 @@ function emitInnerLoopNested(lines, plan) {
     innerContainerSlotId,
     innerArrayExpr,
     innerParam,
+    innerIndexParam,
     innerOffsetExpr,
     innerPreludeStatements,
     depth,
@@ -15044,7 +15506,7 @@ function emitInnerLoopNested(lines, plan) {
   } else {
     lines.push(`      const __ic = __outerEl`);
   }
-  lines.push(`      ${innerArrayExpr}.forEach((${innerParam}, __innerIdx) => {`);
+  lines.push(`      ${innerArrayExpr}.forEach((${innerParam}, ${innerIndexParam}) => {`);
   lines.push(`        const __innerEl = __ic.children[${innerOffsetExpr}]`);
   lines.push(`        if (!__innerEl) return`);
   for (const stmt of innerPreludeStatements) {
@@ -15065,9 +15527,11 @@ function emitComponentRootedInnerLoop(lines, plan) {
     containerVar,
     outerArrayExpr,
     outerParam,
+    outerIndexParam,
     outerPreludeStatements,
     innerArrayExpr,
     innerParam,
+    innerIndexParam,
     innerPreludeStatements,
     depth,
     comps
@@ -15081,11 +15545,11 @@ function emitComponentRootedInnerLoop(lines, plan) {
     lines.push(`    const ${scopesVar(i)} = qsaChildScopes(${containerVar}, ${comp.selector})`);
     lines.push(`    let ${cursorVar(i)} = 0`);
   });
-  lines.push(`    ${outerArrayExpr}.forEach((${outerParam}) => {`);
+  lines.push(`    ${outerArrayExpr}.forEach((${outerParam}${outerIndexParam ? `, ${outerIndexParam}` : ""}) => {`);
   for (const stmt of outerPreludeStatements) {
     lines.push(`      ${stmt}`);
   }
-  lines.push(`      ${innerArrayExpr}.forEach((${innerParam}) => {`);
+  lines.push(`      ${innerArrayExpr}.forEach((${innerParam}${innerIndexParam ? `, ${innerIndexParam}` : ""}) => {`);
   for (const stmt of innerPreludeStatements) {
     lines.push(`        ${stmt}`);
   }
@@ -15248,6 +15712,13 @@ function buildBranchInnerLoopsPlan(args2) {
       ...ev,
       handler: wrapInner(ev.handler)
     }));
+    const indexAlias = nestedLoopIndexAlias(
+      inner,
+      `__bidxbr_${i}`,
+      paramHead,
+      inner.childComponents ?? [],
+      inner.bindings.events
+    );
     const reactiveTexts = inner.bindings.reactiveTexts.map((text) => ({
       slotId: text.slotId,
       wrappedExpression: wrapBoth(text.expression),
@@ -15264,6 +15735,7 @@ function buildBranchInnerLoopsPlan(args2) {
       keyFn: loopKeyFn(inner),
       paramHead,
       paramUnwrap,
+      indexAlias,
       wrappedTemplate: inner.template,
       wrappedKey,
       keyDepth: 1,
@@ -15519,7 +15991,7 @@ function buildInnerLoopsPlan(args2) {
     const containerExpr = inner.containerSlotId ? `qsa(${parentElVar}, '[bf="${inner.containerSlotId}"]')` : parentElVar;
     const refsParent = !!outerLoopParam && (inner.arrayFreeIdentifiers?.has(outerLoopParam) ?? false);
     const useReactive = refsParent && !!inner.template;
-    const emit = useReactive ? buildReactiveEmit(inner, level, wrapOuter) : buildStaticEmit(inner, level);
+    const emit = useReactive ? buildReactiveEmit(inner, level, wrapOuter, uidSuffix) : buildStaticEmit(inner, level, uidSuffix);
     const arrayExpr = useReactive ? wrapOuter(inner.array) : inner.array;
     const childLevelsPlan = childLevels.length > 0 ? buildInnerLoopsPlan({
       levels: childLevels,
@@ -15546,7 +16018,7 @@ function buildInnerLoopsPlan(args2) {
   }
   return plan;
 }
-function buildReactiveEmit(inner, level, wrapOuter) {
+function buildReactiveEmit(inner, level, wrapOuter, uidSuffix) {
   const wrapInner = (expr) => wrapLoopParamAsAccessor(expr, inner.param, inner.paramBindings);
   const { head: paramHead, unwrap: paramUnwrap } = destructureLoopParam(inner.param, inner.paramBindings);
   const wrappedKey = inner.key ? wrapLoopParamAsAccessor(inner.key, inner.param, inner.paramBindings) : null;
@@ -15593,6 +16065,8 @@ function buildReactiveEmit(inner, level, wrapOuter) {
     };
   });
   const preludeStatements = [];
+  const indexAlias = nestedLoopIndexAlias(inner, `__innerIdx${uidSuffix}`, paramHead, level.comps, level.events);
+  if (indexAlias) preludeStatements.push(indexAlias);
   if (paramUnwrap) preludeStatements.push(paramUnwrap);
   if (inner.mapPreamble) preludeStatements.push(wrapInner(wrapOuter(inner.mapPreamble)));
   const childRefs = buildChildRefBindings(inner.bindings.refs, inner.param, inner.paramBindings);
@@ -15611,8 +16085,11 @@ function buildReactiveEmit(inner, level, wrapOuter) {
     childRefs
   };
 }
-function buildStaticEmit(inner, level) {
-  const preludeStatements = inner.mapPreamble ? [inner.mapPreamble] : [];
+function buildStaticEmit(inner, level, uidSuffix) {
+  const preludeStatements = [];
+  const indexAlias = nestedLoopIndexAlias(inner, `__innerIdx${uidSuffix}`, inner.param, level.comps, level.events);
+  if (indexAlias) preludeStatements.push(indexAlias);
+  if (inner.mapPreamble) preludeStatements.push(inner.mapPreamble);
   return {
     mode: "static",
     rawKey: inner.key ?? null,
@@ -16140,191 +16617,46 @@ function emitReactivePropBindings(lines, ctx2) {
         }
       }
       lines.push(`    }`);
-    }
-    lines.push(`  }${bindingIdArg(ctx2, ctx2.reactiveProps[0]?.slotId)})`);
-  }
-}
-function emitReactiveChildProps(lines, ctx2) {
-  if (ctx2.reactiveChildProps.length > 0) {
-    lines.push("");
-    lines.push(`  // Reactive child component props`);
-    lines.push(`  createEffect(() => {`);
-    const propsByComponent = /* @__PURE__ */ new Map();
-    for (const prop of ctx2.reactiveChildProps) {
-      const key = `${prop.componentName}_${prop.slotId ?? "__scope"}`;
-      if (!propsByComponent.has(key)) {
-        propsByComponent.set(key, []);
-      }
-      propsByComponent.get(key).push(prop);
-    }
-    for (const [, props] of propsByComponent) {
-      const first = props[0];
-      const varSuffix = first.slotId ? varSlotId(first.slotId).replace(/-/g, "_") : first.componentName;
-      const varName = `__${first.componentName}_${varSuffix}El`;
-      const selectorArg = first.slotId ? first.slotId : first.componentName;
-      lines.push(`    const [${varName}] = $c(__scope, '${selectorArg}')`);
-      lines.push(`    if (${varName}) {`);
-      for (const prop of props) {
-        for (const stmt of emitAttrUpdate(varName, prop.attrName, prop.expression, prop)) {
-          lines.push(`      ${stmt}`);
-        }
-      }
-      lines.push(`    }`);
-    }
-    lines.push(`  }${bindingIdArg(ctx2, ctx2.reactiveChildProps[0]?.slotId ?? void 0)})`);
-  }
-}
-var init_emit_reactive = __esm({
-  "../jsx/src/ir-to-client-js/emit-reactive.ts"() {
-    "use strict";
-    init_html_constants();
-    init_utils();
-    init_html_template();
-  }
-});
-
-// ../jsx/src/ir-to-client-js/control-flow/stringify/template-parse.ts
-function templateRootIsSvg(template) {
-  const stripped = stripLeadingNonContent(template);
-  const m = stripped.match(/^<\s*([A-Za-z][A-Za-z0-9-]*)/);
-  if (m) {
-    const tag = m[1];
-    if (SVG_ROOT_TAGS.has(tag)) return true;
-    return SVG_ROOT_TAGS.has(tag.toLowerCase());
-  }
-  const branches = extractConditionalBranchTemplates(stripped);
-  if (branches === null || branches.length === 0) return false;
-  return branches.every(templateRootIsSvg);
-}
-function stripLeadingNonContent(template) {
-  let s = template.trimStart();
-  while (s.startsWith("<!--")) {
-    const end2 = s.indexOf("-->");
-    if (end2 < 0) return s;
-    s = s.slice(end2 + 3).trimStart();
-  }
-  return s;
-}
-function extractConditionalBranchTemplates(template) {
-  if (!template.startsWith("${")) return null;
-  const exprEnd = findInterpolationEnd(template, 2);
-  if (exprEnd < 0) return null;
-  const trailing = stripLeadingNonContent(template.slice(exprEnd + 1));
-  if (trailing.length > 0) return null;
-  const expr = template.slice(2, exprEnd);
-  return findTopLevelTemplateLiterals(expr);
-}
-function emitTemplateCloneInline(template) {
-  if (templateRootIsSvg(template)) {
-    return `const __tpl = document.createElement('template'); __tpl.innerHTML = \`<svg>${template}</svg>\`; return __tpl.content.firstElementChild.firstElementChild.cloneNode(true)`;
-  }
-  return `const __tpl = document.createElement('template'); __tpl.innerHTML = \`${template}\`; return __tpl.content.firstElementChild.cloneNode(true)`;
-}
-function emitHoistedTemplateDecl(lines, indent, tplVar, skeletonTemplate) {
-  const isSvg = templateRootIsSvg(skeletonTemplate);
-  const html = isSvg ? `<svg>${skeletonTemplate}</svg>` : skeletonTemplate;
-  lines.push(`${indent}const ${tplVar} = document.createElement('template')`);
-  lines.push(`${indent}${tplVar}.innerHTML = \`${html}\``);
-}
-function hoistedCloneExpr(tplVar, skeletonTemplate) {
-  return templateRootIsSvg(skeletonTemplate) ? `${tplVar}.content.firstElementChild.firstElementChild.cloneNode(true)` : `${tplVar}.content.firstElementChild.cloneNode(true)`;
-}
-function emitTemplateCloneLines(template, indent) {
-  if (templateRootIsSvg(template)) {
-    return [
-      `${indent}const __tpl = document.createElement('template')`,
-      `${indent}__tpl.innerHTML = \`<svg>${template}</svg>\``,
-      `${indent}return __tpl.content.firstElementChild.firstElementChild.cloneNode(true)`
-    ];
+    }
+    lines.push(`  }${bindingIdArg(ctx2, ctx2.reactiveProps[0]?.slotId)})`);
   }
-  return [
-    `${indent}const __tpl = document.createElement('template')`,
-    `${indent}__tpl.innerHTML = \`${template}\``,
-    `${indent}return __tpl.content.firstElementChild.cloneNode(true)`
-  ];
 }
-function emitLoopItemElementSetup(lines, opts) {
-  const { template, bodyIsMultiRoot, indent, singleRootLayout } = opts;
-  const innerIndent = indent + "  ";
-  if (bodyIsMultiRoot) {
-    lines.push(`${indent}let __el, __extras`);
-    lines.push(`${indent}if (__existing) {`);
-    lines.push(`${innerIndent}__el = __existing`);
-    lines.push(`${indent}} else {`);
-    for (const ln of emitMultiRootTemplateCloneLines(template, innerIndent, "__el", "__extras")) {
-      lines.push(ln);
+function emitReactiveChildProps(lines, ctx2) {
+  if (ctx2.reactiveChildProps.length > 0) {
+    lines.push("");
+    lines.push(`  // Reactive child component props`);
+    lines.push(`  createEffect(() => {`);
+    const propsByComponent = /* @__PURE__ */ new Map();
+    for (const prop of ctx2.reactiveChildProps) {
+      const key = `${prop.componentName}_${prop.slotId ?? "__scope"}`;
+      if (!propsByComponent.has(key)) {
+        propsByComponent.set(key, []);
+      }
+      propsByComponent.get(key).push(prop);
     }
-    lines.push(`${innerIndent}__el.__bfExtras = __extras`);
-    lines.push(`${indent}}`);
-    return;
-  }
-  if (singleRootLayout === "inline") {
-    const cloneExpr = emitTemplateCloneInline(template);
-    lines.push(`${indent}const __el = __existing ?? (() => { ${cloneExpr} })()`);
-    return;
+    for (const [, props] of propsByComponent) {
+      const first = props[0];
+      const varSuffix = first.slotId ? varSlotId(first.slotId).replace(/-/g, "_") : first.componentName;
+      const varName = `__${first.componentName}_${varSuffix}El`;
+      const selectorArg = first.slotId ? first.slotId : first.componentName;
+      lines.push(`    const [${varName}] = $c(__scope, '${selectorArg}')`);
+      lines.push(`    if (${varName}) {`);
+      for (const prop of props) {
+        for (const stmt of emitAttrUpdate(varName, prop.attrName, prop.expression, prop)) {
+          lines.push(`      ${stmt}`);
+        }
+      }
+      lines.push(`    }`);
+    }
+    lines.push(`  }${bindingIdArg(ctx2, ctx2.reactiveChildProps[0]?.slotId ?? void 0)})`);
   }
-  lines.push(`${indent}const __el = __existing ?? (() => {`);
-  for (const ln of emitTemplateCloneLines(template, innerIndent)) lines.push(ln);
-  lines.push(`${indent}})()`);
-}
-function emitMultiRootTemplateCloneLines(template, indent, varEl, varExtras) {
-  const isSvg = templateRootIsSvg(template);
-  const innerHtmlExpr = isSvg ? `\`<svg>${template}</svg>\`` : `\`${template}\``;
-  const parentExpr = isSvg ? `__tpl.content.firstElementChild` : `__tpl.content`;
-  return [
-    `${indent}const __tpl = document.createElement('template')`,
-    `${indent}__tpl.innerHTML = ${innerHtmlExpr}`,
-    `${indent}${varEl} = ${parentExpr}.firstElementChild.cloneNode(true)`,
-    `${indent}${varExtras} = []`,
-    `${indent}{ let __sib = ${parentExpr}.firstElementChild.nextElementSibling; while (__sib) { ${varExtras}.push(__sib.cloneNode(true)); __sib = __sib.nextElementSibling } }`
-  ];
 }
-var SVG_ROOT_TAGS;
-var init_template_parse = __esm({
-  "../jsx/src/ir-to-client-js/control-flow/stringify/template-parse.ts"() {
+var init_emit_reactive = __esm({
+  "../jsx/src/ir-to-client-js/emit-reactive.ts"() {
     "use strict";
-    init_js_scanner();
-    SVG_ROOT_TAGS = /* @__PURE__ */ new Set([
-      "svg",
-      "path",
-      "circle",
-      "rect",
-      "line",
-      "polyline",
-      "polygon",
-      "ellipse",
-      "text",
-      "tspan",
-      "textPath",
-      "g",
-      "defs",
-      "use",
-      "symbol",
-      "switch",
-      "clipPath",
-      "mask",
-      "marker",
-      "pattern",
-      "linearGradient",
-      "radialGradient",
-      "stop",
-      "image",
-      "foreignObject",
-      "filter",
-      "feBlend",
-      "feColorMatrix",
-      "feComposite",
-      "feFlood",
-      "feGaussianBlur",
-      "feMerge",
-      "feMergeNode",
-      "feMorphology",
-      "feOffset",
-      "feTurbulence",
-      "animate",
-      "animateTransform",
-      "animateMotion"
-    ]);
+    init_html_constants();
+    init_utils();
+    init_html_template();
   }
 });
 
@@ -16349,6 +16681,9 @@ function stringifyBranchInnerLoops(lines, plan, indent, pc) {
     const uid = inner.uidSuffix;
     lines.push(`${indent}{ const __bic${uid} = ${inner.containerExpr}`);
     lines.push(`${indent}if (__bic${uid}) mapArray(() => ${inner.arrayExpr} || [], __bic${uid}, ${inner.keyFn}, (${inner.paramHead}, __bidx${uid}, __existing) => {`);
+    if (inner.indexAlias) {
+      lines.push(`${indent}  ${inner.indexAlias}`);
+    }
     if (inner.paramUnwrap) {
       lines.push(`${indent}  ${inner.paramUnwrap}`);
     }
@@ -16431,13 +16766,15 @@ var init_loop_child_arm = __esm({
 
 // ../jsx/src/ir-to-client-js/control-flow/stringify/reactive-effects.ts
 function stringifyReactiveEffects(lines, plan, opts) {
-  const { indent, elVar, bodyIsMultiRoot } = opts;
+  const { indent, elVar, bodyIsMultiRoot, elementIndexBySlot, textIndexBySlot } = opts;
   const lookup = bodyIsMultiRoot ? "qsaItem" : "qsa";
   const pc = plan.profileComponentName;
   const bindingBfId = (slotId) => profileBindingId(pc, slotId);
   for (const slot of plan.attrSlots) {
     const varName = `__ra_${varSlotId(slot.slotId)}`;
-    lines.push(`${indent}{ const ${varName} = ${lookup}(${elVar}, '[bf="${slot.slotId}"]')`);
+    const pIdx = elementIndexBySlot?.get(slot.slotId);
+    const lookupExpr = pIdx !== void 0 ? `__p ? __p[${pIdx}] : ${lookup}(${elVar}, '[bf="${slot.slotId}"]')` : `${lookup}(${elVar}, '[bf="${slot.slotId}"]')`;
+    lines.push(`${indent}{ const ${varName} = ${lookupExpr}`);
     lines.push(`${indent}if (${varName}) {`);
     for (const attr of slot.attrs) {
       lines.push(`${indent}  createEffect(() => {`);
@@ -16449,15 +16786,19 @@ function stringifyReactiveEffects(lines, plan, opts) {
     lines.push(`${indent}} }`);
   }
   for (const text of plan.outerTexts) {
-    emitOuterText(lines, indent, elVar, text, bindingBfId(text.slotId));
+    emitOuterText(lines, indent, elVar, text, bindingBfId(text.slotId), textIndexBySlot?.get(text.slotId));
   }
   for (const cond of plan.conditionals) {
     emitOuterConditional(lines, indent, elVar, cond, pc);
   }
 }
-function emitOuterText(lines, indent, elVar, text, bfId = "") {
+function emitOuterText(lines, indent, elVar, text, bfId = "", pIdx) {
   const varName = `__rt_${varSlotId(text.slotId)}`;
-  lines.push(`${indent}{ const [${varName}] = $t(${elVar}, '${text.slotId}')`);
+  if (pIdx !== void 0) {
+    lines.push(`${indent}{ const ${varName} = __p ? tAfter(__p[${pIdx}]) : $t(${elVar}, '${text.slotId}')[0]`);
+  } else {
+    lines.push(`${indent}{ const [${varName}] = $t(${elVar}, '${text.slotId}')`);
+  }
   lines.push(`${indent}if (${varName}) createEffect(() => { ${varName}.textContent = String(${text.wrappedExpression}) }${bfId}) }`);
 }
 function emitOuterConditional(lines, indent, elVar, cond, pc) {
@@ -16497,6 +16838,41 @@ var init_reactive_effects = __esm({
   }
 });
 
+// ../jsx/src/ir-to-client-js/control-flow/stringify/skeleton-paths.ts
+function pathExpr(base, path25) {
+  let expr = base;
+  for (const idx of path25) {
+    expr += ".firstChild";
+    if (idx > 0) expr += ".nextSibling".repeat(idx);
+  }
+  return expr;
+}
+function buildSkeletonPathPlan(skeletonPaths, elVar, opts) {
+  const arrayElems = [];
+  const elementIndexBySlot = /* @__PURE__ */ new Map();
+  const textIndexBySlot = /* @__PURE__ */ new Map();
+  for (const slotId of opts.elementSlotIds) {
+    if (elementIndexBySlot.has(slotId)) continue;
+    const path25 = skeletonPaths.elementPaths.get(slotId);
+    if (!path25) continue;
+    elementIndexBySlot.set(slotId, arrayElems.length);
+    arrayElems.push(pathExpr(elVar, path25));
+  }
+  for (const slotId of opts.textSlotIds) {
+    if (textIndexBySlot.has(slotId)) continue;
+    const path25 = skeletonPaths.textMarkerPaths.get(slotId);
+    if (!path25) continue;
+    textIndexBySlot.set(slotId, arrayElems.length);
+    arrayElems.push(pathExpr(elVar, path25));
+  }
+  return { arrayElems, elementIndexBySlot, textIndexBySlot };
+}
+var init_skeleton_paths = __esm({
+  "../jsx/src/ir-to-client-js/control-flow/stringify/skeleton-paths.ts"() {
+    "use strict";
+  }
+});
+
 // ../jsx/src/ir-to-client-js/control-flow/stringify/component-loop.ts
 function stringifyComponentLoop(lines, plan) {
   const {
@@ -16559,11 +16935,13 @@ var init_component_loop = __esm({
 // ../jsx/src/ir-to-client-js/control-flow/stringify/loop.ts
 function emitLoopChildRefs(lines, refs, opts) {
   if (refs.length === 0) return;
-  const { indent, elVar, bodyIsMultiRoot } = opts;
+  const { indent, elVar, bodyIsMultiRoot, elementIndexBySlot } = opts;
   const lookup = bodyIsMultiRoot ? "qsaItem" : "qsa";
   for (const ref of refs) {
     const varName = `__rf_${varSlotId(ref.childSlotId)}`;
-    lines.push(`${indent}{ const ${varName} = ${lookup}(${elVar}, '[bf="${ref.childSlotId}"]')`);
+    const pIdx = elementIndexBySlot?.get(ref.childSlotId);
+    const lookupExpr = pIdx !== void 0 ? `__p ? __p[${pIdx}] : ${lookup}(${elVar}, '[bf="${ref.childSlotId}"]')` : `${lookup}(${elVar}, '[bf="${ref.childSlotId}"]')`;
+    lines.push(`${indent}{ const ${varName} = ${lookupExpr}`);
     lines.push(`${indent}if (${varName}) ${emitRefCall(ref.callback, varName)} }`);
   }
 }
@@ -16643,10 +17021,31 @@ function stringifyPlainLoop(lines, plan, topIndent = "  ") {
       singleRootLayout: "inline"
     });
   }
+  let pathPlan = null;
+  if (hoistedTpl && plan.skeletonPaths) {
+    const elementSlotIds = [
+      ...reactiveEffects?.attrSlots.map((s) => s.slotId) ?? [],
+      ...childRefs.map((r2) => r2.childSlotId)
+    ];
+    const textSlotIds = reactiveEffects?.outerTexts.map((t) => t.slotId) ?? [];
+    if (elementSlotIds.length > 0 || textSlotIds.length > 0) {
+      const built = buildSkeletonPathPlan(plan.skeletonPaths, "__el", { elementSlotIds, textSlotIds });
+      if (built.arrayElems.length > 0) {
+        pathPlan = built;
+        lines.push(`${bodyIndent}const __p = __existing ? null : [${built.arrayElems.join(", ")}]`);
+      }
+    }
+  }
   if (reactiveEffects !== null) {
-    stringifyReactiveEffects(lines, reactiveEffects, { indent: bodyIndent, elVar: "__el", bodyIsMultiRoot });
+    stringifyReactiveEffects(lines, reactiveEffects, {
+      indent: bodyIndent,
+      elVar: "__el",
+      bodyIsMultiRoot,
+      elementIndexBySlot: pathPlan?.elementIndexBySlot,
+      textIndexBySlot: pathPlan?.textIndexBySlot
+    });
   }
-  emitLoopChildRefs(lines, childRefs, { indent: bodyIndent, elVar: "__el", bodyIsMultiRoot });
+  emitLoopChildRefs(lines, childRefs, { indent: bodyIndent, elVar: "__el", bodyIsMultiRoot, elementIndexBySlot: pathPlan?.elementIndexBySlot });
   lines.push(`${bodyIndent}return __el`);
   lines.push(`${topIndent}}, '${markerId}'${loopBfId})`);
 }
@@ -16705,12 +17104,14 @@ function stringifyStaticLoop(lines, plan) {
   lines.push(`      let __iterEl = ${containerVar}.children[${childIndexExpr}]`);
   if (csrMaterialize) {
     lines.push(`      if (!__iterEl) {`);
+    const isSvg = csrMaterialize.bodyIsMultiRoot ? multiRootTemplateNeedsSvgWrap(csrMaterialize.itemTemplate) : templateRootIsSvg(csrMaterialize.itemTemplate);
+    const itemHtml = isSvg ? `<svg>${csrMaterialize.itemTemplate}</svg>` : csrMaterialize.itemTemplate;
     if (csrMaterialize.bodyIsMultiRoot) {
       lines.push(`        const __mtpl = document.createElement('template')`);
-      lines.push(`        __mtpl.innerHTML = \`${csrMaterialize.itemTemplate}\``);
+      lines.push(`        __mtpl.innerHTML = \`${itemHtml}\``);
       lines.push(`        const __anchor = ${containerVar}.children[${childIndexExpr}] ?? null`);
       lines.push(`        let __first = null`);
-      lines.push(`        let __sib = __mtpl.content.firstElementChild`);
+      lines.push(`        let __sib = __mtpl.content${isSvg ? ".firstElementChild" : ""}.firstElementChild`);
       lines.push(`        while (__sib) {`);
       lines.push(`          const __next = __sib.nextElementSibling`);
       lines.push(`          const __cloned = __sib.cloneNode(true)`);
@@ -16721,8 +17122,8 @@ function stringifyStaticLoop(lines, plan) {
       lines.push(`        __iterEl = __first`);
     } else {
       lines.push(`        const __tpl = document.createElement('template')`);
-      lines.push(`        __tpl.innerHTML = \`${csrMaterialize.itemTemplate}\``);
-      lines.push(`        const __cloned = __tpl.content.firstElementChild`);
+      lines.push(`        __tpl.innerHTML = \`${itemHtml}\``);
+      lines.push(`        const __cloned = __tpl.content${isSvg ? ".firstElementChild" : ""}.firstElementChild`);
       lines.push(`        if (__cloned) {`);
       lines.push(`          const __anchor = ${containerVar}.children[${childIndexExpr}] ?? null`);
       lines.push(`          ${containerVar}.insertBefore(__cloned, __anchor)`);
@@ -16763,6 +17164,7 @@ var init_loop = __esm({
     init_emit_reactive();
     init_reactive_effects();
     init_template_parse();
+    init_skeleton_paths();
     init_component_loop();
     init_composite_loop();
   }
@@ -16798,7 +17200,10 @@ function emitReactive(lines, inner, indent, pc) {
     lines.push(`${innerIndent}  __innerEl${uid}.__bfExtras = __innerExtras${uid}`);
     lines.push(`${indent}  }`);
   } else {
-    lines.push(`${indent}  let __innerEl${uid} = __existing ?? (() => { const __t = document.createElement('template'); __t.innerHTML = \`${emit.wrappedTemplate}\`; return __t.content.firstElementChild.cloneNode(true) })()`);
+    const isSvg = templateRootIsSvg(emit.wrappedTemplate);
+    const innerHtml = isSvg ? `<svg>${emit.wrappedTemplate}</svg>` : emit.wrappedTemplate;
+    const childPath = isSvg ? ".firstElementChild.firstElementChild" : ".firstElementChild";
+    lines.push(`${indent}  let __innerEl${uid} = __existing ?? (() => { const __t = document.createElement('template'); __t.innerHTML = \`${innerHtml}\`; return __t.content${childPath}.cloneNode(true) })()`);
   }
   if (emit.wrappedKey) {
     lines.push(`${indent}  __innerEl${uid}.setAttribute('${keyAttrName(inner.keyDepth)}', String(${emit.wrappedKey}))`);
@@ -17407,6 +17812,7 @@ function buildPlainLoopPlan(elem, profileComponentName) {
     mapPreambleWrapped: elem.mapPreamble ? wrap(elem.mapPreamble) : "",
     template: elem.template,
     skeletonTemplate: elem.skeletonTemplate,
+    skeletonPaths: elem.skeletonPaths,
     reactiveEffects: hasReactive2 ? buildLoopReactiveEffectsPlan(elem, profileComponentName) : null,
     childRefs: buildChildRefBindings(elem.bindings.refs, elem.param, elem.paramBindings),
     bodyIsMultiRoot: elem.bodyIsMultiRoot ?? false,
@@ -20448,6 +20854,7 @@ function isStringTypedOperand(expr, isStringName) {
   if (expr.kind === "member" && expr.object.kind === "identifier" && expr.object.name === "props") {
     return isStringName(expr.property);
   }
+  if (expr.kind === "identifier") return isStringName(expr.name);
   if (expr.kind === "binary" && expr.op === "+") {
     return isStringTypedOperand(expr.left, isStringName) || isStringTypedOperand(expr.right, isStringName);
   }
@@ -20519,6 +20926,213 @@ var init_parsed_expr_emitter = __esm({
   }
 });
 
+// ../jsx/src/adapters/loop-bound-names.ts
+function collectLoopBoundNames(ir) {
+  const names = /* @__PURE__ */ new Set();
+  const visit3 = (node) => {
+    if (!node) return;
+    switch (node.type) {
+      case "element":
+      case "component":
+      case "fragment":
+      case "provider":
+        for (const child of node.children) visit3(child);
+        break;
+      case "async":
+        visit3(node.fallback);
+        for (const child of node.children) visit3(child);
+        break;
+      case "loop":
+        names.add(node.param);
+        if (node.index) names.add(node.index);
+        for (const binding of node.paramBindings ?? []) names.add(binding.name);
+        if (node.filterPredicate) names.add(node.filterPredicate.param);
+        for (const child of node.children) visit3(child);
+        if (node.childComponent) {
+          for (const child of node.childComponent.children) visit3(child);
+        }
+        for (const nested of node.nestedComponents ?? []) {
+          for (const child of nested.children) visit3(child);
+        }
+        for (const frag of node.flatMapCallback?.fragments ?? []) {
+          visit3(frag.ir);
+        }
+        break;
+      case "conditional":
+        visit3(node.whenTrue);
+        visit3(node.whenFalse);
+        break;
+      case "if-statement":
+        visit3(node.consequent);
+        if (node.alternate) visit3(node.alternate);
+        break;
+      case "text":
+      case "expression":
+      case "slot":
+        break;
+    }
+  };
+  visit3(ir.root);
+  return names;
+}
+var init_loop_bound_names = __esm({
+  "../jsx/src/adapters/loop-bound-names.ts"() {
+    "use strict";
+  }
+});
+
+// ../jsx/src/signal-init-eval.ts
+function isTransportable(value2, ancestors = /* @__PURE__ */ new Set()) {
+  if (value2 === null) return true;
+  const t = typeof value2;
+  if (t === "boolean" || t === "number" || t === "string") return true;
+  if (t !== "object") return false;
+  if (ancestors.has(value2)) return false;
+  ancestors.add(value2);
+  try {
+    if (Array.isArray(value2)) {
+      if (Object.keys(value2).length !== value2.length) return false;
+      return value2.every((el) => el !== void 0 && isTransportable(el, ancestors));
+    }
+    const proto = Object.getPrototypeOf(value2);
+    if (proto !== Object.prototype && proto !== null) return false;
+    return Object.values(value2).every((v) => isTransportable(v, ancestors));
+  } finally {
+    ancestors.delete(value2);
+  }
+}
+function tryEvaluateSignalInit(expr, props) {
+  const src = expr.trim();
+  if (src === "") return { ok: false };
+  let fn;
+  try {
+    fn = new Function(
+      "props",
+      ...BLOCKED_GLOBALS,
+      `'use strict'; return (
+${src}
+);`
+    );
+  } catch {
+    return { ok: false };
+  }
+  try {
+    const value2 = fn(props ?? {});
+    if (value2 === void 0) return { ok: true, value: void 0 };
+    return isTransportable(value2) ? { ok: true, value: value2 } : { ok: false };
+  } catch {
+    return { ok: false };
+  }
+}
+function evaluateSignalInit(expr, props) {
+  const result2 = tryEvaluateSignalInit(expr, props);
+  return result2.ok && result2.value !== void 0 ? result2.value : null;
+}
+var BLOCKED_GLOBALS;
+var init_signal_init_eval = __esm({
+  "../jsx/src/signal-init-eval.ts"() {
+    "use strict";
+    BLOCKED_GLOBALS = [
+      "globalThis",
+      "window",
+      "document",
+      "Date",
+      "Math",
+      "crypto",
+      "performance",
+      "fetch",
+      "setTimeout",
+      "setInterval",
+      "require",
+      "process",
+      "Function"
+    ];
+  }
+});
+
+// ../jsx/src/static-literal.ts
+function evaluateStaticLiteral(expr, bindings) {
+  switch (expr.kind) {
+    case "literal":
+      return { value: expr.value };
+    case "template-literal": {
+      let out = "";
+      for (const part of expr.parts) {
+        if (part.type === "string") {
+          out += part.value;
+          continue;
+        }
+        const resolved = evaluateStaticLiteral(part.expr, bindings);
+        if (!resolved) return null;
+        out += String(resolved.value);
+      }
+      return { value: out };
+    }
+    case "array-literal": {
+      const values2 = [];
+      for (const element of expr.elements) {
+        const resolved = evaluateStaticLiteral(element, bindings);
+        if (!resolved) return null;
+        values2.push(resolved.value);
+      }
+      return { value: values2 };
+    }
+    case "object-literal": {
+      const out = {};
+      for (const prop of expr.properties) {
+        const resolved = evaluateStaticLiteral(prop.value, bindings);
+        if (!resolved) return null;
+        out[prop.key] = resolved.value;
+      }
+      return { value: out };
+    }
+    case "unary": {
+      const resolved = evaluateStaticLiteral(expr.argument, bindings);
+      if (!resolved) return null;
+      if (expr.op === "-") return typeof resolved.value === "number" ? { value: -resolved.value } : null;
+      if (expr.op === "+") return typeof resolved.value === "number" ? { value: +resolved.value } : null;
+      if (expr.op === "!") return { value: !resolved.value };
+      return null;
+    }
+    case "identifier":
+      return bindings?.has(expr.name) ? { value: bindings.get(expr.name) } : null;
+    case "member": {
+      const base = evaluateStaticLiteral(expr.object, bindings);
+      if (!base || base.value === null || typeof base.value !== "object") return null;
+      return { value: base.value[expr.property] };
+    }
+    case "index-access": {
+      const base = evaluateStaticLiteral(expr.object, bindings);
+      const index = evaluateStaticLiteral(expr.index, bindings);
+      if (!base || !index || !Array.isArray(base.value) || typeof index.value !== "number") return null;
+      return { value: base.value[index.value] };
+    }
+    default:
+      return null;
+  }
+}
+function isFullyStaticLiteral(expr) {
+  return evaluateStaticLiteral(expr) !== null;
+}
+function resolveStaticLoopSource(arrayParsed, localConstants, opts) {
+  if (!arrayParsed) return null;
+  let target2 = arrayParsed;
+  if (arrayParsed.kind === "identifier") {
+    if (opts?.isNameShadowed?.(arrayParsed.name)) return null;
+    const local = localConstants?.find((c) => c.name === arrayParsed.name);
+    if (!local || local.isModule || !local.parsed) return null;
+    target2 = local.parsed;
+  }
+  const resolved = evaluateStaticLiteral(target2);
+  if (!resolved || !Array.isArray(resolved.value)) return null;
+  return resolved.value;
+}
+var init_static_literal = __esm({
+  "../jsx/src/static-literal.ts"() {
+    "use strict";
+  }
+});
+
 // ../jsx/src/query-href-lowering.ts
 function matchQueryHrefCall(callee, args2, localNames) {
   if (callee.kind !== "identifier" || !localNames.has(callee.name)) return null;
@@ -20681,6 +21295,70 @@ var init_attr_value_emitter = __esm({
   }
 });
 
+// ../jsx/src/adapters/dangerous-inner-html.ts
+function isDangerousInnerHtmlAttr(attr) {
+  return attr.name === DANGEROUS_INNER_HTML_ATTR;
+}
+function resolveDangerousInnerHtml(element) {
+  const attr = element.attrs.find(isDangerousInnerHtmlAttr);
+  if (!attr) return null;
+  if (attr.clientOnly) return null;
+  if (attr.value.kind !== "expression") {
+    return { kind: "dynamic", expr: "", loc: attr.loc };
+  }
+  const parsed = attr.value.parsed ?? parseExpression(attr.value.expr.trim());
+  const html = staticHtmlLiteral(parsed);
+  if (html !== null) return { kind: "static", html };
+  return { kind: "dynamic", expr: attr.value.expr, loc: attr.loc };
+}
+function staticHtmlLiteral(parsed) {
+  if (parsed.kind !== "object-literal") return null;
+  if (parsed.properties.length !== 1) return null;
+  const [prop] = parsed.properties;
+  if (prop.shorthand) return null;
+  if (prop.key !== "__html") return null;
+  if (prop.value.kind !== "literal" || prop.value.literalType !== "string") return null;
+  return prop.value.value;
+}
+function dangerousInnerHtmlMetacharViolation(html, adapterId) {
+  const pattern = TEMPLATE_METACHAR_PATTERNS[adapterId];
+  if (!pattern) {
+    return `no template-metacharacter guard is defined for adapter '${adapterId}' \u2014 refusing rather than splicing unguarded`;
+  }
+  if (!pattern.test(html)) return null;
+  return `the literal HTML contains a sequence ${adapterId}'s own template compiler would interpret (not inert text once spliced into the template)`;
+}
+function dangerousInnerHtmlDiagnostic(expr, loc, reason2) {
+  const detail2 = reason2 ? ` \u2014 ${reason2}.` : "";
+  return {
+    code: "BF101",
+    severity: "error",
+    message: `dangerouslySetInnerHTML requires a compile-time string literal __html value on template adapters (e.g. { __html: '...' })${expr ? `: ${expr.trim()}` : ""}${detail2}`,
+    loc,
+    suggestion: {
+      message: "Dynamic or signal-derived HTML for dangerouslySetInnerHTML is only supported on Hono/CSR today (tracked separately: https://github.com/piconic-ai/barefootjs/issues/2215). Use an inline string literal, or defer it to the client with /* @client */ (e.g. dangerouslySetInnerHTML={/* @client */ { __html: expr }}) so hydration sets it instead of SSR."
+    }
+  };
+}
+var DANGEROUS_INNER_HTML_ATTR, TEMPLATE_METACHAR_PATTERNS;
+var init_dangerous_inner_html = __esm({
+  "../jsx/src/adapters/dangerous-inner-html.ts"() {
+    "use strict";
+    init_expression_parser();
+    DANGEROUS_INNER_HTML_ATTR = "dangerouslySetInnerHTML";
+    TEMPLATE_METACHAR_PATTERNS = {
+      blade: /\{\{|\{!!|<\?|@\w|<\/?\s*x[-:]/,
+      erb: /<%/,
+      "go-template": /\{\{/,
+      jinja: /\{\{|\{%|\{#/,
+      minijinja: /\{\{|\{%|\{#/,
+      mojolicious: /<%|^\s*%/m,
+      twig: /\{\{|\{%|\{#/,
+      xslate: /<:|^\s*:/m
+    };
+  }
+});
+
 // ../jsx/src/combine-client-js.ts
 import ts19 from "typescript";
 function combineParentChildClientJs(files2) {
@@ -23497,6 +24175,7 @@ __export(src_exports, {
   buildStaticBudget: () => buildStaticBudget,
   buildWhyUpdate: () => buildWhyUpdate,
   collectContextConsumers: () => collectContextConsumers,
+  collectLoopBoundNames: () => collectLoopBoundNames,
   collectModuleStringConsts: () => collectModuleStringConsts,
   combineParentChildClientJs: () => combineParentChildClientJs,
   compileJSX: () => compileJSX,
@@ -23505,6 +24184,8 @@ __export(src_exports, {
   createError: () => createError,
   createProgramForCorpus: () => createProgramForCorpus,
   createProgramForFile: () => createProgramForFile,
+  dangerousInnerHtmlDiagnostic: () => dangerousInnerHtmlDiagnostic,
+  dangerousInnerHtmlMetacharViolation: () => dangerousInnerHtmlMetacharViolation,
   describeFallback: () => describeFallback,
   diffProfiles: () => diffProfiles,
   diffStaticBudget: () => diffStaticBudget,
@@ -23517,6 +24198,8 @@ __export(src_exports, {
   envSignalReaderFor: () => envSignalReaderFor,
   evalStringArrayJoin: () => evalStringArrayJoin,
   evaluateProfileGates: () => evaluateProfileGates,
+  evaluateSignalInit: () => evaluateSignalInit,
+  evaluateStaticLiteral: () => evaluateStaticLiteral,
   exprToString: () => exprToString,
   extractArrowBodyExpression: () => extractArrowBodyExpression,
   extractFunctionParams: () => extractFunctionParams,
@@ -23557,6 +24240,8 @@ __export(src_exports, {
   identifierPath: () => identifierPath,
   importsSearchParams: () => importsSearchParams,
   isBooleanAttr: () => isBooleanAttr,
+  isDangerousInnerHtmlAttr: () => isDangerousInnerHtmlAttr,
+  isFullyStaticLiteral: () => isFullyStaticLiteral,
   isLowerableLoopDestructure: () => isLowerableLoopDestructure,
   isLowerableObjectRestDestructure: () => isLowerableObjectRestDestructure,
   isStringConcatBinary: () => isStringConcatBinary,
@@ -23591,7 +24276,9 @@ __export(src_exports, {
   registerLoweringPlugin: () => registerLoweringPlugin,
   renderImportMapHtml: () => renderImportMapHtml,
   resetCompilerCounters: () => resetCompilerCounters,
+  resolveDangerousInnerHtml: () => resolveDangerousInnerHtml,
   resolveSetters: () => resolveSetters,
+  resolveStaticLoopSource: () => resolveStaticLoopSource,
   rewriteImportsForTemplate: () => rewriteImportsForTemplate,
   searchParamsLocalNames: () => searchParamsLocalNames,
   serializeParsedExpr: () => serializeParsedExpr,
@@ -23599,6 +24286,7 @@ __export(src_exports, {
   stringifyParsedExpr: () => stringifyParsedExpr,
   testAdapter: () => testAdapter,
   traceUpdatePath: () => traceUpdatePath,
+  tryEvaluateSignalInit: () => tryEvaluateSignalInit,
   tsNodeToParsedExpr: () => tsNodeToParsedExpr
 });
 var init_src2 = __esm({
@@ -23616,6 +24304,9 @@ var init_src2 = __esm({
     init_jsx_adapter();
     init_template_imports();
     init_parsed_expr_emitter();
+    init_loop_bound_names();
+    init_signal_init_eval();
+    init_static_literal();
     init_env_signal();
     init_query_href_lowering();
     init_lowering_registry();
@@ -23623,6 +24314,7 @@ var init_src2 = __esm({
     init_builtin_lowering_plugins();
     init_ir_node_emitter();
     init_attr_value_emitter();
+    init_dangerous_inner_html();
     init_ir_to_client_js();
     init_source_map();
     init_combine_client_js();
@@ -25096,7 +25788,7 @@ async function build(config, options2 = {}) {
     }
   }
   let runtimeKeepHash = cache2.runtimeKeepHash;
-  if (runtimeMode === "treeshake") {
+  if (runtimeMode !== "full") {
     if (!domDistFile) {
       console.warn("Warning: @barefootjs/client dist not found. Skipping barefoot.js generation.");
       runtimeKeepHash = void 0;
@@ -25133,7 +25825,7 @@ async function build(config, options2 = {}) {
         runtimeKeepHash = void 0;
       } else {
         const keepNames = /* @__PURE__ */ new Set([
-          ...ALWAYS_KEEP_RUNTIME_EXPORTS,
+          ...runtimeMode === "treeshake-exact" ? [] : ALWAYS_KEEP_RUNTIME_EXPORTS,
           ...config.runtimeKeep ?? [],
           ...merged.names
         ]);
@@ -25144,7 +25836,17 @@ async function build(config, options2 = {}) {
           distHash: hashBytes(distBytes),
           keep: [...keepNames].sort()
         }));
-        if (nextKeepHash === cache2.runtimeKeepHash && await fileExists(runtimeOutPath)) {
+        if (keepNames.size === 0) {
+          if (nextKeepHash !== cache2.runtimeKeepHash) {
+            try {
+              await unlink(runtimeOutPath);
+              anyOutputChanged = true;
+              console.log(`Skipped: ${runtimeSubdir}/barefoot.js (no runtime exports used)`);
+            } catch {
+            }
+          }
+          runtimeKeepHash = nextKeepHash;
+        } else if (nextKeepHash === cache2.runtimeKeepHash && await fileExists(runtimeOutPath)) {
           runtimeKeepHash = nextKeepHash;
         } else {
           try {