@barefootjs/jsx 0.24.1 → 0.26.0

package/dist/index.js

@@ -5244,7 +5244,8 @@ var ErrorCodes = {
   UNRECOGNIZED_REACTIVE_FACTORY: "BF110",
   REACTIVE_FACTORY_RENAME_UNSUPPORTED: "BF111",
   REACTIVE_FACTORY_MODULE_CAPTURE: "BF112",
-  REACTIVE_FACTORY_IMPORT_COLLISION: "BF113"
+  REACTIVE_FACTORY_IMPORT_COLLISION: "BF113",
+  REACTIVE_FACTORY_PARAM_SHADOWED: "BF114"
 };
 var errorMessages = {
   [ErrorCodes.MISSING_USE_CLIENT]: "'use client' directive required for components with createSignal or event handlers",
@@ -5271,7 +5272,8 @@ var errorMessages = {
   [ErrorCodes.UNRECOGNIZED_REACTIVE_FACTORY]: "Tuple destructuring of a non-reactive factory call. The compiler only recognizes createSignal / createMemo calls and same-file helpers that wrap them with a single `return [a, b]` exit.",
   [ErrorCodes.REACTIVE_FACTORY_RENAME_UNSUPPORTED]: "Reactive factory object return/destructure must use shorthand properties only. " + "Property renames (`{ lists: myLists }`), defaults, and rest elements are not " + "supported — destructure with the factory's own property names.",
   [ErrorCodes.REACTIVE_FACTORY_MODULE_CAPTURE]: "Imported reactive factory references bindings from its own module scope, so its " + "body cannot be inlined into the component file. Move those helpers into the " + "component file, pass them to the factory as parameters, or define the factory " + "in the component file.",
-  [ErrorCodes.REACTIVE_FACTORY_IMPORT_COLLISION]: "Inlining an imported reactive factory requires re-importing one of its helper " + "imports into this file, but that name is already bound here to something else. " + "Rename the conflicting binding in this file, or alias the import in the factory's own file."
+  [ErrorCodes.REACTIVE_FACTORY_IMPORT_COLLISION]: "Inlining an imported reactive factory requires re-importing one of its helper " + "imports into this file, but that name is already bound here to something else. " + "Rename the conflicting binding in this file, or alias the import in the factory's own file.",
+  [ErrorCodes.REACTIVE_FACTORY_PARAM_SHADOWED]: "Reactive factory parameter is shadowed by a nested declaration inside the factory body, so argument substitution at the inline site would be ambiguous. Rename the inner binding so it does not collide with the parameter."
 };
 function createError(code, loc, options) {
   if (code === undefined || !(code in errorMessages)) {
@@ -6954,6 +6956,37 @@ function extractFreeIdentifiersFromNode(node) {
   visit2(node);
   return ids;
 }
+function extractFreeTypeIdentifiersFromNode(node) {
+  const ids = new Set;
+  const boundTypeParams = new Set;
+  function rootName(name) {
+    return ts8.isQualifiedName(name) ? rootName(name.left) : name;
+  }
+  function visit2(n) {
+    if (ts8.isTypeReferenceNode(n)) {
+      const name = rootName(n.typeName).text;
+      if (!boundTypeParams.has(name))
+        ids.add(name);
+    }
+    if (ts8.isTypeQueryNode(n)) {
+      const name = rootName(n.exprName).text;
+      if (!boundTypeParams.has(name))
+        ids.add(name);
+    }
+    if (ts8.isFunctionLike(n) && n.typeParameters && n.typeParameters.length > 0) {
+      const names = n.typeParameters.map((p) => p.name.text);
+      for (const p of names)
+        boundTypeParams.add(p);
+      ts8.forEachChild(n, visit2);
+      for (const p of names)
+        boundTypeParams.delete(p);
+      return;
+    }
+    ts8.forEachChild(n, visit2);
+  }
+  visit2(node);
+  return ids;
+}
 function initializerShapeContainsJsx(node) {
   let found = false;
   function visit2(n) {
@@ -7798,16 +7831,17 @@ function buildEntryImportIndex(sf, filePath) {
       continue;
     if (!ts8.isStringLiteral(stmt.moduleSpecifier))
       continue;
-    if (stmt.importClause?.isTypeOnly)
-      continue;
     const src = stmt.moduleSpecifier.text;
     const targetKey = src.startsWith("./") || src.startsWith("../") ? resolveRelativeImportToFile(src, filePath) ?? "unresolved:" + src : src;
+    const wholeTypeOnly = stmt.importClause?.isTypeOnly === true;
     const namedBindings = stmt.importClause?.namedBindings;
     if (namedBindings && ts8.isNamedImports(namedBindings)) {
       for (const el of namedBindings.elements) {
-        if (el.isTypeOnly)
-          continue;
-        index.set(el.name.text, { targetKey, exportedName: (el.propertyName ?? el.name).text });
+        index.set(el.name.text, {
+          targetKey,
+          exportedName: (el.propertyName ?? el.name).text,
+          isTypeOnly: wholeTypeOnly || el.isTypeOnly
+        });
       }
     }
   }
@@ -7837,6 +7871,9 @@ function collectEntryBindingNames(sf) {
     if ((ts8.isFunctionDeclaration(node) || ts8.isClassDeclaration(node) || ts8.isEnumDeclaration(node)) && node.name) {
       names.add(node.name.text);
     }
+    if ((ts8.isTypeAliasDeclaration(node) || ts8.isInterfaceDeclaration(node)) && node.name) {
+      names.add(node.name.text);
+    }
     if (ts8.isFunctionLike(node)) {
       for (const p of node.parameters) {
         const out = [];
@@ -7850,6 +7887,7 @@ function collectEntryBindingNames(sf) {
   visit2(sf);
   return names;
 }
+var MAX_REEXPORT_HOPS = 1;
 function prescanImportedReactiveFactories(entrySourceFile, filePath, result) {
   const candidateCallees = new Set;
   function collectCandidates(node) {
@@ -7893,29 +7931,28 @@ function prescanImportedReactiveFactories(entrySourceFile, filePath, result) {
   const entryBindingNames = collectEntryBindingNames(entrySourceFile);
   const entryImportIndex = buildEntryImportIndex(entrySourceFile, filePath);
   const plannedInjections = new Map;
-  for (const { src, specs } of importsToCheck) {
-    const resolved = resolveRelativeImportToFile(src, filePath);
-    if (!resolved)
-      continue;
+  const helperCache = new Map;
+  function loadHelperFile(abs) {
+    const cached = helperCache.get(abs);
+    if (cached !== undefined)
+      return cached;
     let content;
     try {
-      content = fs.readFileSync(resolved, "utf8");
+      content = fs.readFileSync(abs, "utf8");
     } catch {
-      continue;
+      helperCache.set(abs, null);
+      return null;
     }
-    const alreadyKnown = (name) => result.factories.has(name) || result.declined.has(name) || result.reactiveShaped.has(name);
     const hasAnyPrimitiveText = [...REACTIVE_PRIMITIVES].some((p) => content.includes(p));
-    if (!hasAnyPrimitiveText) {
-      for (const spec of specs) {
-        if (!alreadyKnown(spec.local))
-          result.cleanFactoryImports.add(spec.local);
-      }
-      continue;
+    const hasReexportText = content.includes("export") && content.includes("from");
+    if (!hasAnyPrimitiveText && !hasReexportText) {
+      helperCache.set(abs, "clean");
+      return "clean";
     }
-    const helperSf = ts8.createSourceFile(resolved + ".prescan", content, ts8.ScriptTarget.Latest, true, ts8.ScriptKind.TSX);
+    const sf = ts8.createSourceFile(abs + ".prescan", content, ts8.ScriptTarget.Latest, true, ts8.ScriptKind.TSX);
     const localFns = new Map;
     const exportedFns = new Map;
-    for (const stmt of helperSf.statements) {
+    for (const stmt of sf.statements) {
       if (ts8.isFunctionDeclaration(stmt) && stmt.name && stmt.body) {
         localFns.set(stmt.name.text, stmt);
         const hasExportModifier = stmt.modifiers?.some((m) => m.kind === ts8.SyntaxKind.ExportKeyword) ?? false;
@@ -7925,27 +7962,89 @@ function prescanImportedReactiveFactories(entrySourceFile, filePath, result) {
         }
       }
     }
-    for (const stmt of helperSf.statements) {
-      if (ts8.isExportDeclaration(stmt) && stmt.exportClause && ts8.isNamedExports(stmt.exportClause) && !stmt.moduleSpecifier && !stmt.isTypeOnly) {
+    const reexports = new Map;
+    let hasStarReexport = false;
+    for (const stmt of sf.statements) {
+      if (!ts8.isExportDeclaration(stmt) || stmt.isTypeOnly)
+        continue;
+      if (!stmt.moduleSpecifier) {
+        if (stmt.exportClause && ts8.isNamedExports(stmt.exportClause)) {
+          for (const el of stmt.exportClause.elements) {
+            if (el.isTypeOnly)
+              continue;
+            const fn = localFns.get((el.propertyName ?? el.name).text);
+            if (fn)
+              exportedFns.set(el.name.text, fn);
+          }
+        }
+        continue;
+      }
+      if (!ts8.isStringLiteral(stmt.moduleSpecifier))
+        continue;
+      if (stmt.exportClause && ts8.isNamedExports(stmt.exportClause)) {
         for (const el of stmt.exportClause.elements) {
           if (el.isTypeOnly)
             continue;
-          const fn = localFns.get((el.propertyName ?? el.name).text);
-          if (fn)
-            exportedFns.set(el.name.text, fn);
+          reexports.set(el.name.text, {
+            source: stmt.moduleSpecifier.text,
+            innerName: (el.propertyName ?? el.name).text
+          });
         }
-      }
-    }
-    const moduleBindings = collectHelperModuleValueBindings(helperSf);
+      } else if (!stmt.exportClause) {
+        hasStarReexport = true;
+      }
+    }
+    const moduleBindings = collectHelperModuleValueBindings(sf);
+    const info = { sf, exportedFns, reexports, hasStarReexport, moduleBindings };
+    helperCache.set(abs, info);
+    return info;
+  }
+  function lookupExportedFactory(abs, exportedName, visited, hopsLeft) {
+    if (visited.has(abs))
+      return { kind: "unknown" };
+    visited.add(abs);
+    const file = loadHelperFile(abs);
+    if (file === null)
+      return { kind: "unknown" };
+    if (file === "clean")
+      return { kind: "clean" };
+    const fn = file.exportedFns.get(exportedName);
+    if (fn)
+      return { kind: "fn", fn, file, definingPath: abs };
+    const re = file.reexports.get(exportedName);
+    if (re) {
+      if (hopsLeft <= 0)
+        return { kind: "unknown" };
+      if (!re.source.startsWith("./") && !re.source.startsWith("../"))
+        return { kind: "unknown" };
+      const target = resolveRelativeImportToFile(re.source, abs);
+      if (!target)
+        return { kind: "unknown" };
+      return lookupExportedFactory(target, re.innerName, visited, hopsLeft - 1);
+    }
+    if (file.hasStarReexport)
+      return { kind: "unknown" };
+    return { kind: "clean" };
+  }
+  for (const { src, specs } of importsToCheck) {
+    const resolved = resolveRelativeImportToFile(src, filePath);
+    if (!resolved)
+      continue;
+    const alreadyKnown = (name) => result.factories.has(name) || result.declined.has(name) || result.reactiveShaped.has(name);
     for (const spec of specs) {
       if (alreadyKnown(spec.local))
         continue;
-      const fn = exportedFns.get(spec.exported);
-      if (!fn) {
+      const found = lookupExportedFactory(resolved, spec.exported, new Set, MAX_REEXPORT_HOPS);
+      if (found.kind === "clean") {
         result.cleanFactoryImports.add(spec.local);
         continue;
       }
-      const det = detectReactiveFactory(fn, helperSf, resolved);
+      if (found.kind === "unknown")
+        continue;
+      const { fn, file, definingPath } = found;
+      const helperSf = file.sf;
+      const moduleBindings = file.moduleBindings;
+      const det = detectReactiveFactory(fn, helperSf, definingPath);
       if (!det) {
         result.cleanFactoryImports.add(spec.local);
         continue;
@@ -7970,11 +8069,15 @@ function prescanImportedReactiveFactories(entrySourceFile, filePath, result) {
           const required = [];
           const pending = [];
           let declinedEntry = null;
-          for (const ref of capture.importedRefs) {
+          const allRefs = [
+            ...capture.importedRefs.map((r) => ({ ...r, isTypeOnly: false })),
+            ...capture.importedTypeRefs.map((r) => ({ ...r, isTypeOnly: true }))
+          ];
+          for (const ref of allRefs) {
             let specifier;
             let targetKey;
             if (ref.source.startsWith("./") || ref.source.startsWith("../")) {
-              const abs = resolveRelativeImportToFile(ref.source, resolved);
+              const abs = resolveRelativeImportToFile(ref.source, definingPath);
               if (!abs) {
                 declinedEntry = {
                   code: "BF112",
@@ -7990,7 +8093,7 @@ function prescanImportedReactiveFactories(entrySourceFile, filePath, result) {
               targetKey = ref.source;
             }
             const existing = entryImportIndex.get(ref.localName);
-            if (existing && existing.targetKey === targetKey && existing.exportedName === ref.exportedName) {
+            if (existing && existing.targetKey === targetKey && existing.exportedName === ref.exportedName && (ref.isTypeOnly || !existing.isTypeOnly)) {
               continue;
             }
             const planned = plannedInjections.get(ref.localName);
@@ -8004,7 +8107,7 @@ function prescanImportedReactiveFactories(entrySourceFile, filePath, result) {
               break;
             }
             pending.push([ref.localName, { targetKey, exportedName: ref.exportedName }]);
-            required.push({ localName: ref.localName, exportedName: ref.exportedName, specifier });
+            required.push({ localName: ref.localName, exportedName: ref.exportedName, specifier, isTypeOnly: ref.isTypeOnly || undefined });
           }
           if (declinedEntry) {
             result.declined.set(spec.local, declinedEntry);
@@ -8012,7 +8115,7 @@ function prescanImportedReactiveFactories(entrySourceFile, filePath, result) {
           }
           for (const [name, id] of pending)
             plannedInjections.set(name, id);
-          det.info.sourceFilePath = resolved;
+          det.info.sourceFilePath = definingPath;
           if (required.length > 0)
             det.info.requiredImports = required;
           result.factories.set(spec.local, det.info);
@@ -8024,6 +8127,8 @@ function prescanImportedReactiveFactories(entrySourceFile, filePath, result) {
 }
 function collectHelperModuleValueBindings(sf) {
   const local = new Set;
+  const localTypes = new Set;
+  const importedTypes = new Map;
   const imported = new Map;
   for (const stmt of sf.statements) {
     if (ts8.isVariableStatement(stmt)) {
@@ -8039,35 +8144,41 @@ function collectHelperModuleValueBindings(sf) {
       local.add(stmt.name.text);
       continue;
     }
+    if ((ts8.isTypeAliasDeclaration(stmt) || ts8.isInterfaceDeclaration(stmt)) && stmt.name) {
+      localTypes.add(stmt.name.text);
+      continue;
+    }
     if (ts8.isImportDeclaration(stmt)) {
-      if (stmt.importClause?.isTypeOnly)
-        continue;
       if (!ts8.isStringLiteral(stmt.moduleSpecifier))
         continue;
       const src = stmt.moduleSpecifier.text;
       if (src === "@barefootjs/client" || src === "@barefootjs/client/runtime")
         continue;
+      const wholeTypeOnly = stmt.importClause?.isTypeOnly === true;
       if (stmt.importClause?.name)
-        local.add(stmt.importClause.name.text);
+        (wholeTypeOnly ? localTypes : local).add(stmt.importClause.name.text);
       const namedBindings = stmt.importClause?.namedBindings;
       if (namedBindings && ts8.isNamedImports(namedBindings)) {
         for (const el of namedBindings.elements) {
-          if (el.isTypeOnly)
-            continue;
-          imported.set(el.name.text, { source: src, exportedName: (el.propertyName ?? el.name).text });
+          const entry = { source: src, exportedName: (el.propertyName ?? el.name).text };
+          if (wholeTypeOnly || el.isTypeOnly)
+            importedTypes.set(el.name.text, entry);
+          else
+            imported.set(el.name.text, entry);
         }
       }
       if (namedBindings && ts8.isNamespaceImport(namedBindings)) {
-        local.add(namedBindings.name.text);
+        (wholeTypeOnly ? localTypes : local).add(namedBindings.name.text);
       }
     }
   }
-  return { local, imported };
+  return { local, imported, localTypes, importedTypes };
 }
 function moduleCaptureCheck(fn, info, moduleBindings, selfName) {
   if (!fn.body)
-    return { captured: [], importedRefs: [] };
+    return { captured: [], importedRefs: [], importedTypeRefs: [] };
   const free = extractFreeIdentifiersFromNode(fn.body);
+  const freeTypes = extractFreeTypeIdentifiersFromNode(fn.body);
   const exclude = new Set(info.params);
   for (const b of info.localBindings)
     exclude.add(b);
@@ -8076,8 +8187,12 @@ function moduleCaptureCheck(fn, info, moduleBindings, selfName) {
   for (const p of REACTIVE_PRIMITIVES)
     exclude.add(p);
   exclude.add(selfName);
+  if (fn.typeParameters)
+    for (const p of fn.typeParameters)
+      exclude.add(p.name.text);
   const captured = [];
   const importedRefs = [];
+  const importedTypeRefs = [];
   for (const id of free) {
     if (exclude.has(id))
       continue;
@@ -8089,9 +8204,28 @@ function moduleCaptureCheck(fn, info, moduleBindings, selfName) {
     if (imp)
       importedRefs.push({ localName: id, source: imp.source, exportedName: imp.exportedName });
   }
+  for (const id of freeTypes) {
+    if (exclude.has(id))
+      continue;
+    if (free.has(id))
+      continue;
+    if (moduleBindings.localTypes.has(id) || moduleBindings.local.has(id)) {
+      captured.push(id);
+      continue;
+    }
+    const typeImp = moduleBindings.importedTypes.get(id);
+    if (typeImp) {
+      importedTypeRefs.push({ localName: id, source: typeImp.source, exportedName: typeImp.exportedName });
+      continue;
+    }
+    const valueImp = moduleBindings.imported.get(id);
+    if (valueImp)
+      importedRefs.push({ localName: id, source: valueImp.source, exportedName: valueImp.exportedName });
+  }
   captured.sort();
   importedRefs.sort((a, b) => a.localName < b.localName ? -1 : 1);
-  return { captured, importedRefs };
+  importedTypeRefs.sort((a, b) => a.localName < b.localName ? -1 : 1);
+  return { captured, importedRefs, importedTypeRefs };
 }
 function detectReactiveFactory(node, sourceFile, filePath) {
   if (!node.body || !node.name)
@@ -8110,6 +8244,17 @@ function detectReactiveFactory(node, sourceFile, filePath) {
   if (!hasReactiveCall)
     return null;
   const loc = getSourceLocation(node, sourceFile, filePath);
+  let totalReturnCount = 0;
+  function countReturns(n) {
+    if (ts8.isFunctionLike(n))
+      return;
+    if (ts8.isReturnStatement(n)) {
+      totalReturnCount++;
+      return;
+    }
+    ts8.forEachChild(n, countReturns);
+  }
+  ts8.forEachChild(node.body, countReturns);
   let returnExpr = null;
   let returnCount = 0;
   for (const stmt of node.body.statements) {
@@ -8127,7 +8272,7 @@ function detectReactiveFactory(node, sourceFile, filePath) {
       expr = expr.expression;
     returnExpr = expr;
   }
-  if (returnCount !== 1 || !returnExpr)
+  if (totalReturnCount !== 1 || returnCount !== 1 || !returnExpr)
     return { kind: "reactive-shaped" };
   const returnTupleIdentifiers = [];
   let returnKind;
@@ -8161,6 +8306,14 @@ function detectReactiveFactory(node, sourceFile, filePath) {
   } else {
     return { kind: "reactive-shaped" };
   }
+  const params = [];
+  for (const p of node.parameters) {
+    if (ts8.isIdentifier(p.name)) {
+      params.push(p.name.text);
+      continue;
+    }
+    return { kind: "reactive-shaped" };
+  }
   const localBindings = [];
   for (const stmt of node.body.statements) {
     if (ts8.isVariableStatement(stmt)) {
@@ -8171,15 +8324,95 @@ function detectReactiveFactory(node, sourceFile, filePath) {
       localBindings.push(stmt.name.text);
     }
   }
-  const bodyStatements = node.body.statements.filter((s) => !ts8.isReturnStatement(s)).map((s) => s.getText(sourceFile)).join(`
+  const relevantNames = new Set([...params, ...localBindings, ...returnTupleIdentifiers]);
+  const renameSites = [];
+  let shadowedParam = null;
+  function collectRenameSites(root, toBodyOffset) {
+    function push(id, form) {
+      renameSites.push({
+        name: id.text,
+        start: toBodyOffset(id.getStart(sourceFile)),
+        end: toBodyOffset(id.getEnd()),
+        form
+      });
+    }
+    function classify(id) {
+      if (!relevantNames.has(id.text))
+        return;
+      const p = id.parent;
+      if (ts8.isPropertyAccessExpression(p) && p.name === id)
+        return;
+      if (ts8.isPropertyAssignment(p) && p.name === id)
+        return;
+      if (ts8.isBindingElement(p) && p.propertyName === id)
+        return;
+      if ((ts8.isMethodDeclaration(p) || ts8.isGetAccessorDeclaration(p) || ts8.isSetAccessorDeclaration(p) || ts8.isPropertyDeclaration(p) || ts8.isEnumMember(p)) && p.name === id)
+        return;
+      if (ts8.isJsxAttribute(p) && p.name === id)
+        return;
+      if (ts8.isLabeledStatement(p) && p.label === id || (ts8.isBreakStatement(p) || ts8.isContinueStatement(p)) && p.label === id)
+        return;
+      if ((ts8.isJsxOpeningElement(p) || ts8.isJsxSelfClosingElement(p) || ts8.isJsxClosingElement(p)) && p.tagName === id && /^[a-z]/.test(id.text))
+        return;
+      if (ts8.isShorthandPropertyAssignment(p) && p.name === id) {
+        push(id, "shorthand");
+        return;
+      }
+      if (ts8.isBindingElement(p) && p.name === id && !p.propertyName && ts8.isObjectBindingPattern(p.parent)) {
+        if (params.includes(id.text))
+          shadowedParam = id.text;
+        push(id, "shorthand");
+        return;
+      }
+      const isDecl = (ts8.isVariableDeclaration(p) || ts8.isParameter(p) || ts8.isBindingElement(p) || ts8.isFunctionDeclaration(p) || ts8.isFunctionExpression(p) || ts8.isClassDeclaration(p) || ts8.isClassExpression(p)) && p.name === id;
+      if (isDecl && params.includes(id.text))
+        shadowedParam = id.text;
+      push(id, "plain");
+    }
+    function visit2(n) {
+      if (ts8.isTypeNode(n) || ts8.isTypeParameterDeclaration(n) || ts8.isTypeAliasDeclaration(n) || ts8.isInterfaceDeclaration(n))
+        return;
+      if (ts8.isIdentifier(n)) {
+        classify(n);
+        return;
+      }
+      ts8.forEachChild(n, visit2);
+    }
+    visit2(root);
+  }
+  const keptStatements = node.body.statements.filter((s) => !ts8.isReturnStatement(s));
+  const pieces = [];
+  let base = 0;
+  for (const stmt of keptStatements) {
+    const text = stmt.getText(sourceFile);
+    const stmtStart = stmt.getStart(sourceFile);
+    collectRenameSites(stmt, (pos) => pos - stmtStart + base);
+    pieces.push(text);
+    base += text.length + 1;
+  }
+  const bodyStatements = pieces.join(`
 `);
-  const params = [];
-  for (const p of node.parameters) {
-    if (ts8.isIdentifier(p.name)) {
-      params.push(p.name.text);
-      continue;
+  if (shadowedParam !== null) {
+    return {
+      kind: "declined",
+      declined: {
+        code: "BF114",
+        detail: `parameter '${shadowedParam}' of '${node.name.text}' is shadowed by a nested declaration inside the factory body`,
+        loc
+      }
+    };
+  }
+  for (const site of renameSites) {
+    if (bodyStatements.slice(site.start, site.end) !== site.name) {
+      return {
+        kind: "declined",
+        declined: {
+          code: "BF111",
+          detail: `internal rename-site offset mismatch for '${site.name}' — this is a compiler bug, ` + `please report it`,
+          loc
+        }
+      };
     }
-    return { kind: "reactive-shaped" };
   }
   return {
     kind: "factory",
@@ -8189,7 +8422,8 @@ function detectReactiveFactory(node, sourceFile, filePath) {
       returnTupleIdentifiers,
       returnKind,
       localBindings,
-      loc
+      loc,
+      renameSites
     }
   };
 }
@@ -8293,24 +8527,31 @@ function rewriteFactoryCallsInSource(source, prescan) {
     const argTexts = args.map((a) => a.getText(sourceFile));
     const thisCallIndex = callSiteIndex++;
     const suffix = `_bf${thisCallIndex}`;
-    let body = factory.bodySource;
-    const internalRenames = new Set(factory.localBindings);
-    for (const ex of excludeFromSuffixRename)
-      internalRenames.delete(ex);
-    for (const name of internalRenames) {
-      body = body.replace(new RegExp(`\\b${escapeRegex(name)}\\b`, "g"), name + suffix);
+    const renames = new Map;
+    for (const name of factory.localBindings) {
+      if (!excludeFromSuffixRename.has(name))
+        renames.set(name, name + suffix);
+    }
+    if (renameReturnToCallerNames) {
+      for (const [n, caller] of renameReturnToCallerNames) {
+        if (caller !== n)
+          renames.set(n, caller);
+      }
     }
     const atomicArg = /^(?:[\w$.]+|'[^'\\]*'|"[^"\\]*"|-?\d+(?:\.\d+)?)$/;
     for (let i = 0;i < factory.params.length; i++) {
       const p = factory.params[i];
-      const a = argTexts[i] ?? "undefined";
-      const wrapped = atomicArg.test(a.trim()) ? a.trim() : `(${a})`;
-      body = body.replace(new RegExp(`\\b${escapeRegex(p)}\\b`, "g"), wrapped);
+      const a = (argTexts[i] ?? "undefined").trim();
+      renames.set(p, atomicArg.test(a) ? a : `(${a})`);
     }
-    if (renameReturnToCallerNames) {
-      for (const [n, caller] of renameReturnToCallerNames) {
-        body = body.replace(new RegExp(`\\b${escapeRegex(n)}\\b`, "g"), caller);
-      }
+    let body = factory.bodySource;
+    for (let i = factory.renameSites.length - 1;i >= 0; i--) {
+      const site = factory.renameSites[i];
+      const repl = renames.get(site.name);
+      if (repl === undefined)
+        continue;
+      const text = site.form === "shorthand" ? `${site.name}: ${repl}` : repl;
+      body = body.slice(0, site.start) + text + body.slice(site.end);
     }
     edits.push({
       start: stmt.getStart(sourceFile),
@@ -8323,20 +8564,44 @@ function rewriteFactoryCallsInSource(source, prescan) {
   if (edits.length === 0)
     return source;
   const importsBySpecifier = new Map;
+  const typeImportsBySpecifier = new Map;
   for (const f of inlinedFactories) {
     for (const r of f.requiredImports ?? []) {
-      let names = importsBySpecifier.get(r.specifier);
+      const bySpecifier = r.isTypeOnly ? typeImportsBySpecifier : importsBySpecifier;
+      let names = bySpecifier.get(r.specifier);
       if (!names) {
         names = new Map;
-        importsBySpecifier.set(r.specifier, names);
+        bySpecifier.set(r.specifier, names);
       }
       names.set(r.localName, r.exportedName);
     }
   }
-  if (importsBySpecifier.size > 0) {
-    const lines = [...importsBySpecifier].sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0).map(([spec, names]) => {
+  for (const [spec, typeNames] of typeImportsBySpecifier) {
+    const valueNames = importsBySpecifier.get(spec);
+    if (!valueNames)
+      continue;
+    for (const local of [...typeNames.keys()]) {
+      if (valueNames.has(local))
+        typeNames.delete(local);
+    }
+    if (typeNames.size === 0)
+      typeImportsBySpecifier.delete(spec);
+  }
+  if (importsBySpecifier.size > 0 || typeImportsBySpecifier.size > 0) {
+    const buildLine = (names, keyword, spec) => {
       const specifiers = [...names].sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0).map(([local, exported]) => exported === local ? local : `${exported} as ${local}`);
-      return `import { ${specifiers.join(", ")} } from '${spec}'`;
+      return `import ${keyword}{ ${specifiers.join(", ")} } from '${spec}'`;
+    };
+    const allSpecifiers = new Set([...importsBySpecifier.keys(), ...typeImportsBySpecifier.keys()]);
+    const lines = [...allSpecifiers].sort().flatMap((spec) => {
+      const out2 = [];
+      const valueNames = importsBySpecifier.get(spec);
+      if (valueNames)
+        out2.push(buildLine(valueNames, "", spec));
+      const typeNames = typeImportsBySpecifier.get(spec);
+      if (typeNames)
+        out2.push(buildLine(typeNames, "type ", spec));
+      return out2;
     });
     const at = factoryImportInsertionOffset(sourceFile);
     edits.push({ start: at, end: at, replacement: at === 0 ? lines.join(`
@@ -8375,9 +8640,6 @@ function isPascalCaseComponentFn(node) {
   }
   return false;
 }
-function escapeRegex(s) {
-  return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
 function declinedFactoryMessage(callee, d) {
   if (d.code === "BF112") {
     return `Reactive factory '${callee}' references ${d.detail} from its own module ` + `scope and cannot be inlined. Move the referenced helper(s) into this file, ` + `pass them as factory arguments, or inline the factory here.`;
@@ -8393,6 +8655,8 @@ function declinedFactoryErrorCode(code) {
       return ErrorCodes.REACTIVE_FACTORY_MODULE_CAPTURE;
     case "BF113":
       return ErrorCodes.REACTIVE_FACTORY_IMPORT_COLLISION;
+    case "BF114":
+      return ErrorCodes.REACTIVE_FACTORY_PARAM_SHADOWED;
     default:
       return ErrorCodes.REACTIVE_FACTORY_RENAME_UNSUPPORTED;
   }
@@ -9028,6 +9292,20 @@ function resolveFreeRefs(node, env) {
 
 // src/to-locale-date-lowering.ts
 var TO_LOCALE_TZ_RE = /^(?:UTC|[+-](?:[01]\d|2[0-3]):[0-5]\d)$/;
+var tzProbeCache = new Map;
+function isBuildResolvableTimeZone(value) {
+  const cached = tzProbeCache.get(value);
+  if (cached !== undefined)
+    return cached;
+  let verified;
+  try {
+    verified = new Intl.DateTimeFormat("en-US", { timeZone: value }).resolvedOptions().timeZone === value;
+  } catch {
+    verified = false;
+  }
+  tzProbeCache.set(value, verified);
+  return verified;
+}
 var PROBE_UTC = new Date(Date.UTC(2001, 1, 3));
 var formatCache = new Map;
 var namesCache = new Map;
@@ -9266,7 +9544,7 @@ function matchToLocaleDateStringCall(callee, args, metadata) {
       return null;
     const value = String(prop.value.value);
     if (prop.key === "timeZone") {
-      if (!TO_LOCALE_TZ_RE.test(value))
+      if (!TO_LOCALE_TZ_RE.test(value) && !isBuildResolvableTimeZone(value))
         return null;
       tz = value;
     } else {
@@ -12838,13 +13116,19 @@ function collectEventHandlersFromIR(node) {
   });
   return handlers;
 }
-function traverseElements(node, visitor) {
+function traverseElements(node, visitor, stopAtReactiveConditionals = false) {
   walkIR(node, 0, {
     element: ({ node: el, scope: domDepth, descend }) => {
       visitor(el, domDepth);
       descend(domDepth + 1);
     },
-    loop: () => {}
+    loop: () => {},
+    ...stopAtReactiveConditionals ? {
+      conditional: ({ node: c, scope: domDepth, descend }) => {
+        if (!c.slotId)
+          descend(domDepth);
+      }
+    } : {}
   });
 }
 function collectConditionalBranchEvents(node) {
@@ -12859,7 +13143,7 @@ function collectConditionalBranchEvents(node) {
         });
       }
     }
-  });
+  }, true);
   return events;
 }
 function collectConditionalBranchRefs(node) {
@@ -12871,7 +13155,7 @@ function collectConditionalBranchRefs(node) {
         callback: el.ref
       });
     }
-  });
+  }, true);
   return refs;
 }
 function collectLoopChildRefs(node) {
@@ -12967,7 +13251,7 @@ function traverseForComponents(node, components, skipConditionals = false) {
     }
   });
 }
-function collectLoopChildReactiveTexts(node, ctx, loopParam, loopParamBindings) {
+function collectLoopChildReactiveTexts(node, ctx, loopParam, loopParamBindings, stopAtReactiveConditionals = false) {
   const texts = [];
   walkIR(node, false, {
     ...stopAt("loop", "async", "ifStatement"),
@@ -12986,13 +13270,14 @@ function collectLoopChildReactiveTexts(node, ctx, loopParam, loopParamBindings)
         ...expanded.freeIds !== undefined && { freeIdentifiers: expanded.freeIds }
       });
     },
-    conditional: ({ descend }) => {
-      descend(true);
+    conditional: ({ node: c, descend }) => {
+      if (!stopAtReactiveConditionals || !c.slotId)
+        descend(true);
     }
   });
   return texts;
 }
-function collectLoopChildReactiveAttrs(node, ctx, loopParam, loopParamBindings) {
+function collectLoopChildReactiveAttrs(node, ctx, loopParam, loopParamBindings, stopAtReactiveConditionals = false) {
   const attrs = [];
   traverseElements(node, (el) => {
     if (el.slotId) {
@@ -13019,7 +13304,7 @@ function collectLoopChildReactiveAttrs(node, ctx, loopParam, loopParamBindings)
         });
       }
     }
-  });
+  }, stopAtReactiveConditionals);
   return attrs;
 }
 
@@ -13843,8 +14128,8 @@ function collectLoopChildBindings(children, ctx, siblingOffsets, loopParam, loop
   const bindings = emptyLoopChildBindings();
   for (const child of children) {
     bindings.events.push(...collectLoopChildEventsWithNesting(child));
-    bindings.reactiveAttrs.push(...collectLoopChildReactiveAttrs(child, ctx, loopParam, loopParamBindings));
-    bindings.reactiveTexts.push(...collectLoopChildReactiveTexts(child, ctx, loopParam, loopParamBindings));
+    bindings.reactiveAttrs.push(...collectLoopChildReactiveAttrs(child, ctx, loopParam, loopParamBindings, true));
+    bindings.reactiveTexts.push(...collectLoopChildReactiveTexts(child, ctx, loopParam, loopParamBindings, true));
     bindings.refs.push(...collectLoopChildRefs(child));
     bindings.conditionals.push(...collectLoopChildConditionals(child, ctx, siblingOffsets, loopParam, loopParamBindings));
   }
@@ -13896,7 +14181,9 @@ function summarizeLoopChildBranch(node, ctx, siblingOffsets, loopParam, loopPara
     childComponents: collectConditionalBranchChildComponents(node),
     innerLoops: inner.length > 0 ? inner : undefined,
     conditionals: collectLoopChildConditionals(node, ctx, siblingOffsets, loopParam, loopParamBindings),
-    events: collectConditionalBranchEvents(node)
+    events: collectConditionalBranchEvents(node),
+    reactiveAttrs: collectLoopChildReactiveAttrs(node, ctx, loopParam, loopParamBindings, true),
+    reactiveTexts: node.type === "expression" ? [] : collectLoopChildReactiveTexts(node, ctx, loopParam, loopParamBindings, true)
   };
 }
 
@@ -16904,6 +17191,39 @@ function buildLoopChildConditionalsPlan(args) {
   }
   return plans;
 }
+function buildArmAttrsPlan(attrs, wrap) {
+  if (!attrs || attrs.length === 0)
+    return [];
+  const bySlot = new Map;
+  for (const attr of attrs) {
+    let bucket = bySlot.get(attr.childSlotId);
+    if (!bucket) {
+      bucket = [];
+      bySlot.set(attr.childSlotId, bucket);
+    }
+    bucket.push(attr);
+  }
+  const slots = [];
+  for (const [slotId, slotAttrs] of bySlot) {
+    slots.push({
+      slotId,
+      attrs: slotAttrs.map((attr) => ({
+        attrName: attr.attrName,
+        wrappedExpression: wrap(attr.expression),
+        meta: pickAttrMeta(attr)
+      }))
+    });
+  }
+  return slots;
+}
+function buildArmTextsPlan(texts, wrap) {
+  if (!texts || texts.length === 0)
+    return [];
+  return texts.map((text) => ({
+    slotId: text.slotId,
+    wrappedExpression: wrap(text.expression)
+  }));
+}
 function buildLoopChildArmPlan(args) {
   const { branch, wrap, loopParam, loopParamBindings } = args;
   return {
@@ -16929,7 +17249,8 @@ function buildLoopChildArmPlan(args) {
       loopParam,
       loopParamBindings
     }),
-    texts: []
+    attrs: buildArmAttrsPlan(branch.reactiveAttrs, wrap),
+    texts: buildArmTextsPlan(branch.reactiveTexts, wrap)
   };
 }
 
@@ -16957,49 +17278,20 @@ function buildReactiveEffectsPlan(args) {
       }))
     });
   }
-  const textSlotsInConditionals = new Set;
-  if (conditionals) {
-    for (const cond of conditionals) {
-      for (const text of texts) {
-        if (cond.whenTrueHtml.includes(`bf:${text.slotId}`) || cond.whenFalseHtml.includes(`bf:${text.slotId}`)) {
-          textSlotsInConditionals.add(text.slotId);
-        }
-      }
-    }
-  }
-  const outerTexts = [];
-  for (const text of texts) {
-    if (textSlotsInConditionals.has(text.slotId))
-      continue;
-    outerTexts.push({
-      slotId: text.slotId,
-      wrappedExpression: wrap(text.expression)
-    });
-  }
+  const outerTexts = texts.map((text) => ({
+    slotId: text.slotId,
+    wrappedExpression: wrap(text.expression)
+  }));
   const conditionalPlans = [];
   if (conditionals) {
     for (const cond of conditionals) {
-      const trueTexts = [];
-      const falseTexts = [];
-      for (const text of texts) {
-        if (!textSlotsInConditionals.has(text.slotId))
-          continue;
-        const wrapped = {
-          slotId: text.slotId,
-          wrappedExpression: wrap(text.expression)
-        };
-        if (cond.whenTrueHtml.includes(`bf:${text.slotId}`))
-          trueTexts.push(wrapped);
-        if (cond.whenFalseHtml.includes(`bf:${text.slotId}`))
-          falseTexts.push(wrapped);
-      }
       conditionalPlans.push({
         slotId: cond.slotId,
         wrappedCondition: wrap(cond.condition),
         whenTrueTemplateHtml: addCondAttrToTemplate(wrap(cond.whenTrueHtml), cond.slotId),
         whenFalseTemplateHtml: addCondAttrToTemplate(wrap(cond.whenFalseHtml), cond.slotId),
-        whenTrueArm: buildOuterArm(cond.whenTrue, trueTexts, wrap, loopParam, loopParamBindings, profileComponentName),
-        whenFalseArm: buildOuterArm(cond.whenFalse, falseTexts, wrap, loopParam, loopParamBindings, profileComponentName)
+        whenTrueArm: buildOuterArm(cond.whenTrue, wrap, loopParam, loopParamBindings, profileComponentName),
+        whenFalseArm: buildOuterArm(cond.whenFalse, wrap, loopParam, loopParamBindings, profileComponentName)
       });
     }
   }
@@ -17010,7 +17302,7 @@ function buildReactiveEffectsPlan(args) {
     profileComponentName
   };
 }
-function buildOuterArm(branch, texts, wrap, loopParam, loopParamBindings, profileComponentName) {
+function buildOuterArm(branch, wrap, loopParam, loopParamBindings, profileComponentName) {
   return {
     events: buildBranchEventBindingsPlan({
       events: branch.events,
@@ -17035,7 +17327,8 @@ function buildOuterArm(branch, texts, wrap, loopParam, loopParamBindings, profil
       loopParam,
       loopParamBindings
     }),
-    texts
+    attrs: buildArmAttrsPlan(branch.reactiveAttrs, wrap),
+    texts: buildArmTextsPlan(branch.reactiveTexts, wrap)
   };
 }
 function buildLoopReactiveEffectsPlan(elem, profileComponentName) {
@@ -17814,6 +18107,21 @@ function emitReactiveChildProps(lines, ctx) {
 }
 
 // src/ir-to-client-js/control-flow/stringify/loop-child-arm.ts
+function stringifyBranchReactiveAttrs(lines, plan, indent, pc) {
+  for (const slot of plan) {
+    const varName = `__ra_${varSlotId(slot.slotId)}`;
+    lines.push(`${indent}{ const ${varName} = qsa(__branchScope, '[bf="${slot.slotId}"]')`);
+    lines.push(`${indent}if (${varName}) {`);
+    for (const attr of slot.attrs) {
+      lines.push(`${indent}  __disposers.push(createDisposableEffect(() => {`);
+      for (const stmt of emitAttrUpdate(varName, attr.attrName, attr.wrappedExpression, attr.meta)) {
+        lines.push(`${indent}    ${stmt}`);
+      }
+      lines.push(`${indent}  }${profileBindingId(pc, slot.slotId)}))`);
+    }
+    lines.push(`${indent}} }`);
+  }
+}
 function stringifyBranchEventBindings(lines, plan, indent) {
   for (const slot of plan) {
     const v = varSlotId(slot.slotId);
@@ -17891,12 +18199,22 @@ function stringifyLoopChildArm(lines, arm, armIndent, pc) {
   stringifyBranchEventBindings(lines, arm.events, armIndent);
   stringifyBranchChildComponentInits(lines, arm.childComponents, armIndent);
   stringifyBranchInnerLoops(lines, arm.innerLoops, armIndent, pc);
-  stringifyLoopChildConditionals(lines, arm.nestedConditionals, armIndent, pc);
+  const hasDisposables = arm.attrs.length > 0 || arm.texts.length > 0 || arm.nestedConditionals.length > 0;
+  if (!hasDisposables)
+    return;
+  lines.push(`${armIndent}const __disposers = []`);
+  stringifyBranchReactiveAttrs(lines, arm.attrs, armIndent, pc);
+  for (const cond of arm.nestedConditionals) {
+    lines.push(`${armIndent}__disposers.push(createDisposableEffect(() => {`);
+    stringifyLoopChildConditional(lines, cond, `${armIndent}  `, pc);
+    lines.push(`${armIndent}}))`);
+  }
   for (const text of arm.texts) {
     const varName = `__rt_${varSlotId(text.slotId)}`;
-    lines.push(`${armIndent}{ const [${varName}] = $t(__branchScope, '${text.slotId}')`);
-    lines.push(`${armIndent}if (${varName}) createEffect(() => { ${varName}.textContent = String(${text.wrappedExpression}) }${profileBindingId(pc, text.slotId)}) }`);
+    lines.push(`${armIndent}let ${varName} = $t(__branchScope, '${text.slotId}')[0]`);
+    lines.push(`${armIndent}__disposers.push(createDisposableEffect(() => { ${varName} = __bfText(${varName}, ${text.wrappedExpression}) }${profileBindingId(pc, text.slotId)}))`);
   }
+  lines.push(`${armIndent}return () => __disposers.forEach(d => d())`);
 }
 
 // src/ir-to-client-js/control-flow/stringify/reactive-effects.ts
@@ -17941,29 +18259,15 @@ function emitOuterConditional(lines, indent, elVar, cond, pc) {
   lines.push(`${indent}insert(${elVar}, '${cond.slotId}', () => ${cond.wrappedCondition}, {`);
   lines.push(`${indent}  template: () => { const __slots = []; return { html: \`${cond.whenTrueTemplateHtml}\`, slots: __slots } },`);
   lines.push(`${indent}  bindEvents: (__branchScope, { isFirstRun: __bfFirstRun = false } = {}) => {`);
-  emitArmBody(lines, cond.whenTrueArm, armIndent, pc);
+  stringifyLoopChildArm(lines, cond.whenTrueArm, armIndent, pc);
   lines.push(`${indent}  }`);
   lines.push(`${indent}}, {`);
   lines.push(`${indent}  template: () => { const __slots = []; return { html: \`${cond.whenFalseTemplateHtml}\`, slots: __slots } },`);
   lines.push(`${indent}  bindEvents: (__branchScope, { isFirstRun: __bfFirstRun = false } = {}) => {`);
-  emitArmBody(lines, cond.whenFalseArm, armIndent, pc);
+  stringifyLoopChildArm(lines, cond.whenFalseArm, armIndent, pc);
   lines.push(`${indent}  }`);
   lines.push(`${indent}}${profileBindingId(pc, cond.slotId)})`);
 }
-function emitArmBody(lines, arm, armIndent, pc) {
-  stringifyBranchEventBindings(lines, arm.events, armIndent);
-  stringifyBranchChildComponentInits(lines, arm.childComponents, armIndent);
-  stringifyBranchInnerLoops(lines, arm.innerLoops, armIndent, pc);
-  stringifyLoopChildConditionals(lines, arm.nestedConditionals, armIndent, pc);
-  for (const text of arm.texts) {
-    emitArmText(lines, armIndent, text, pc);
-  }
-}
-function emitArmText(lines, indent, text, pc) {
-  const varName = `__rt_${varSlotId(text.slotId)}`;
-  lines.push(`${indent}{ const [${varName}] = $t(__branchScope, '${text.slotId}')`);
-  lines.push(`${indent}if (${varName}) createEffect(() => { ${varName}.textContent = String(${text.wrappedExpression}) }${profileBindingId(pc, text.slotId)}) }`);
-}
 
 // src/ir-to-client-js/control-flow/stringify/skeleton-paths.ts
 function pathExpr(base, path) {
@@ -18709,10 +19013,10 @@ function stringifyInsert(lines, plan, opts) {
 function emitArm(lines, arm, mode, armIndent, bodyIndent, profileComponentName) {
   lines.push(`${armIndent}template: () => { const __slots = []; return { html: \`${arm.templateHtml}\`, slots: __slots } },`);
   lines.push(`${armIndent}bindEvents: (__branchScope, { isFirstRun: __bfFirstRun = false } = {}) => {`);
-  emitArmBody2(lines, arm.body, mode, bodyIndent, profileComponentName);
+  emitArmBody(lines, arm.body, mode, bodyIndent, profileComponentName);
   lines.push(`${armIndent}}`);
 }
-function emitArmBody2(lines, body, mode, indent, profileComponentName) {
+function emitArmBody(lines, body, mode, indent, profileComponentName) {
   const bindingBfId = (slotId) => profileComponentName ? `, ${JSON.stringify(`${profileComponentName}#binding:${slotId}`)}` : "";
   const allSlotIds = new Set;
   for (const ev of body.events)
@@ -20894,7 +21198,7 @@ function pushDiagnostic(errors, seen, loc, method, receiverPath, isProp, typeNam
     return;
   seen.add(key);
   const receiver = isProp ? `prop '${receiverPath}'` : `'${receiverPath}'`;
-  const suggestion = method === "toLocaleDateString" && typeName === "Date" ? "Pass a literal locale and an explicit literal timeZone — .toLocaleDateString('ja-JP', { timeZone: 'UTC' }) (or a fixed '±HH:MM' offset) — to compile it to the format_date helper; for a runtime locale, resolve the pattern in your i18n layer and use formatDate(date, pattern, tz) from @barefootjs/client. Alternatively add /* @client */ or pre-compute server-side." : "Add /* @client */ to evaluate this expression on the client only, or pre-compute the value server-side.";
+  const suggestion = method === "toLocaleDateString" && typeName === "Date" ? "Pass a literal locale and an explicit literal timeZone — .toLocaleDateString('ja-JP', { timeZone: 'UTC' }), a fixed '±HH:MM' offset, or a canonical IANA zone ID like 'Asia/Tokyo' (exact case; #2344) — to compile it to the format_date helper; for a runtime locale, resolve the pattern in your i18n layer and use formatDate(date, pattern, tz) from @barefootjs/client. Alternatively add /* @client */ or pre-compute server-side." : "Add /* @client */ to evaluate this expression on the client only, or pre-compute the value server-side.";
   errors.push({
     code: ErrorCodes.UNSUPPORTED_JSX_PATTERN,
     severity: "error",
@@ -22531,27 +22835,31 @@ function resolveDangerousInnerHtml(element) {
   if (attr.clientOnly)
     return null;
   if (attr.value.kind !== "expression") {
-    return { kind: "dynamic", expr: "", loc: attr.loc };
+    return { kind: "unlowerable", 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 };
+  const value = htmlPropValue(parsed);
+  if (value === null)
+    return { kind: "unlowerable", expr: attr.value.expr, loc: attr.loc };
+  if (value.kind === "literal" && value.literalType === "string") {
+    return { kind: "static", html: value.value };
+  }
+  return {
+    kind: "dynamic",
+    valueExpr: stringifyParsedExpr(value),
+    valueParsed: value,
+    loc: attr.loc
+  };
 }
-function staticHtmlLiteral(parsed) {
+function htmlPropValue(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;
+  return prop.value;
 }
 var TEMPLATE_METACHAR_PATTERNS = {
   blade: /\{\{|\{!!|<\?|@\w|<\/?\s*x[-:]/,
@@ -22573,14 +22881,14 @@ function dangerousInnerHtmlMetacharViolation(html, adapterId) {
   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, reason) {
-  const detail = reason ? ` — ${reason}.` : "";
+  const base = reason ? `dangerouslySetInnerHTML value cannot be lowered on this adapter — ${reason}` : "dangerouslySetInnerHTML requires an object literal with a single `__html` property (e.g. { __html: value }) — spreads, extra keys, and computed keys are not supported";
   return {
     code: "BF101",
     severity: "error",
-    message: `dangerouslySetInnerHTML requires a compile-time string literal __html value on template adapters (e.g. { __html: '...' })${expr ? `: ${expr.trim()}` : ""}${detail}`,
+    message: `${base}${expr ? `: ${expr.trim()}` : ""}`,
     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."
+      message: "Pass an object literal { __html: value } with exactly one `__html` property (a string literal is spliced as trusted template text; a prop/signal value is lowered through the adapter's raw-output sink). To force it onto the client instead of SSR, use /* @client */ (e.g. dangerouslySetInnerHTML={/* @client */ { __html: expr }}) so hydration sets it."
     }
   };
 }