@barefootjs/jsx 0.26.4 → 0.27.0

package/dist/index.js

@@ -3505,6 +3505,10 @@ function irToHtmlTemplate(node, restSpreadNames, loopDepth = 0, loopParams, bran
     case "expression": {
       if (node.expr === "null" || node.expr === "undefined")
         return "";
+      if (node.markerless) {
+        const bare = wrapInterpolation(wrapExpr(node.expr));
+        return `\${${bare}}`;
+      }
       const inner = wrapInterpolation(wrapExpr(node.expr));
       const valueExpr = node.joinArrayChild ? `Array.isArray(${inner}) ? ${inner}.join('') : (${inner} ?? '')` : inner;
       if (node.slotId) {
@@ -4380,7 +4384,7 @@ function generateCsrTemplateWithOpts(node, opts) {
       if (node.expr === "null" || node.expr === "undefined")
         return "";
       if (node.clientOnly && node.slotId) {
-        return `<!--bf-client:${node.slotId}--><!--/-->`;
+        return `<!--bf:${node.slotId}--><!--/-->`;
       }
       {
         const transformed = transformExpr(node.expr, node.templateExpr);
@@ -14402,7 +14406,11 @@ function collectElements(node, ctx, siblingOffsets, insideConditional = false) {
     },
     expression: ({ node: ex, scope: inCond }) => {
       if (ex.clientOnly && ex.slotId) {
-        ctx.clientOnlyElements.push({ slotId: ex.slotId, expression: ex.expr });
+        ctx.clientOnlyElements.push({
+          slotId: ex.slotId,
+          expression: ex.expr,
+          elidedPath: ex.markerless ? ex.elidedPath : undefined
+        });
         return;
       }
       if (!ex.slotId || inCond)
@@ -15279,13 +15287,11 @@ var RUNTIME_IMPORT_CANDIDATES = [
   "onMount",
   "hydrate",
   "insert",
-  "reconcileElements",
   "getLoopChildren",
   "getLoopNodes",
   "mapArray",
   "mapArrayAnchored",
   "patchLeaf",
-  "patchSlotRange",
   "createDisposableEffect",
   "createComponent",
   "renderChild",
@@ -15293,7 +15299,6 @@ var RUNTIME_IMPORT_CANDIDATES = [
   "registerTemplate",
   "initChild",
   "upsertChild",
-  "updateClientMarker",
   "createPortal",
   "provideContext",
   "createContext",
@@ -15305,6 +15310,7 @@ var RUNTIME_IMPORT_CANDIDATES = [
   "styleToCss",
   "escapeAttr",
   "escapeText",
+  "escapeTextOrNode",
   "qsa",
   "qsaItem",
   "qsaChildScope",
@@ -15313,7 +15319,8 @@ var RUNTIME_IMPORT_CANDIDATES = [
   "__slot",
   "__bfSlot",
   "__bfText",
-  "tAfter",
+  "claimSlots",
+  "lazySlots",
   "beginTurn",
   "endTurn",
   "date",
@@ -18484,6 +18491,22 @@ function buildArmBody(branch, options) {
 
 // src/ir-to-client-js/emit-reactive.ts
 import ts14 from "typescript";
+
+// src/ir-to-client-js/control-flow/stringify/claim-plan.ts
+function slotSpecLiteral(slot) {
+  const pathSrc = slot.pathExpr ?? `[${slot.path.join(", ")}]`;
+  const markerlessSrc = slot.markerless ? ", markerless: true" : "";
+  return `{ id: '${slot.id}', kind: '${slot.kind}', path: ${pathSrc}${markerlessSrc} }`;
+}
+function claimPlanLiteral(slots) {
+  return `[${slots.map(slotSpecLiteral).join(", ")}]`;
+}
+function claimWriterVarName(slots, sanitize) {
+  const first = slots[0]?.id ?? "0";
+  return `__bfw_${sanitize(first)}`;
+}
+
+// src/ir-to-client-js/emit-reactive.ts
 function bindingIdArg(ctx, slotId) {
   if (!ctx.profile || !slotId)
     return "";
@@ -18667,17 +18690,18 @@ function emitDynamicTextUpdates(lines, ctx) {
     const conditionalElems = elems.filter((e) => e.insideConditional);
     const normalElems = elems.filter((e) => !e.insideConditional);
     if (normalElems.length > 0 || conditionalElems.length > 0) {
-      for (const elem of normalElems) {
-        const v = varSlotId(elem.slotId);
-        lines.push(`  let __anchor_${v} = _${v}`);
-      }
       const __textSlot = (normalElems[0] ?? conditionalElems[0])?.slotId;
+      let writer = "";
+      if (normalElems.length > 0) {
+        const slots = normalElems.map((elem) => ({ id: elem.slotId, kind: "markup", path: [] }));
+        writer = claimWriterVarName(slots, varSlotId);
+        lines.push(`  const ${writer} = lazySlots(__scope, ${claimPlanLiteral(slots)})`);
+      }
       lines.push(`  createEffect(() => {`);
       if (normalElems.length > 0) {
         lines.push(`    const __val = ${expr}`);
         for (const elem of normalElems) {
-          const v = varSlotId(elem.slotId);
-          lines.push(`    __anchor_${v} = __bfText(__anchor_${v}, __val)`);
+          lines.push(`    ${writer}('${elem.slotId}', escapeTextOrNode(__val))`);
         }
         for (const elem of conditionalElems) {
           const v = varSlotId(elem.slotId);
@@ -18700,10 +18724,13 @@ function emitDynamicTextUpdates(lines, ctx) {
 }
 function emitClientOnlyExpressions(lines, ctx) {
   for (const elem of ctx.clientOnlyElements) {
+    const slots = elem.elidedPath ? [{ id: elem.slotId, kind: "text", path: elem.elidedPath, markerless: true }] : [{ id: elem.slotId, kind: "text", path: [] }];
+    const writer = claimWriterVarName(slots, varSlotId);
     lines.push(`  // @client: ${elem.slotId}`);
+    lines.push(`  { const ${writer} = lazySlots(__scope, ${claimPlanLiteral(slots)})`);
     lines.push(`  createEffect(() => {`);
-    lines.push(`    updateClientMarker(__scope, '${elem.slotId}', ${elem.expression})`);
-    lines.push(`  }${bindingIdArg(ctx, elem.slotId)})`);
+    lines.push(`    ${writer}('${elem.slotId}', ${elem.expression})`);
+    lines.push(`  }${bindingIdArg(ctx, elem.slotId)}) }`);
     lines.push("");
   }
 }
@@ -18861,13 +18888,18 @@ function stringifyBranchInnerLoops(lines, plan, indent, pc) {
     if (inner.legacyComponents.length > 0 || inner.legacyEvents.length > 0) {
       emitComponentAndEventSetup(lines, `${indent}  `, `__bel${uid}`, [...inner.legacyComponents], [...inner.legacyEvents], inner.outerLoopParam, inner.outerLoopParamBindings);
     }
-    for (const text of inner.reactiveTexts) {
+    const conditionalTexts = inner.reactiveTexts.filter((t) => t.insideConditional);
+    const plainTexts = inner.reactiveTexts.filter((t) => !t.insideConditional);
+    for (const text of conditionalTexts) {
       const bf = profileBindingId(pc, text.slotId);
-      if (text.insideConditional) {
-        lines.push(`${indent}  createEffect(() => { const [__rt] = $t(__bel${uid}, '${text.slotId}'); if (__rt) __rt.textContent = String(${text.wrappedExpression}) }${bf})`);
-      } else {
-        lines.push(`${indent}  { const [__rt] = $t(__bel${uid}, '${text.slotId}')`);
-        lines.push(`${indent}  if (__rt) createEffect(() => { __rt.textContent = String(${text.wrappedExpression}) }${bf}) }`);
+      lines.push(`${indent}  createEffect(() => { claimSlots(__bel${uid}, [{ id: '${text.slotId}', kind: 'text', path: [] }]).write('${text.slotId}', String(${text.wrappedExpression})) }${bf})`);
+    }
+    if (plainTexts.length > 0) {
+      const slots = plainTexts.map((t) => ({ id: t.slotId, kind: "text", path: [] }));
+      const writer = claimWriterVarName(slots, varSlotId);
+      lines.push(`${indent}  const ${writer} = lazySlots(__bel${uid}, ${claimPlanLiteral(slots)})`);
+      for (const text of plainTexts) {
+        lines.push(`${indent}  createEffect(() => { ${writer}('${text.slotId}', String(${text.wrappedExpression})) }${profileBindingId(pc, text.slotId)})`);
       }
     }
     if (inner.nestedConditionals.length > 0) {
@@ -18910,24 +18942,41 @@ function stringifyLoopChildArm(lines, arm, armIndent, pc) {
     stringifyLoopChildConditional(lines, cond, `${armIndent}  `, pc);
     lines.push(`${armIndent}}))`);
   }
-  for (const text of arm.texts) {
-    const varName = `__rt_${varSlotId(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)}))`);
+  if (arm.texts.length > 0) {
+    const slots = arm.texts.map((t) => ({ id: t.slotId, kind: "markup", path: [] }));
+    const writer = claimWriterVarName(slots, varSlotId);
+    lines.push(`${armIndent}const ${writer} = lazySlots(__branchScope, ${claimPlanLiteral(slots)})`);
+    for (const text of arm.texts) {
+      lines.push(`${armIndent}__disposers.push(createDisposableEffect(() => { ${writer}('${text.slotId}', escapeTextOrNode(${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
 function stringifyReactiveEffects(lines, plan, opts) {
-  const { indent, elVar, bodyIsMultiRoot, elementIndexBySlot, textIndexBySlot } = opts;
+  const { indent, elVar, bodyIsMultiRoot, elementIndexBySlot, textClaimPathExprs, preambleRegions = [], mapPreambleWrapped } = opts;
   const lookup = bodyIsMultiRoot ? "qsaItem" : "qsa";
-  const pc = plan.profileComponentName;
+  const pc = plan?.profileComponentName;
   const bindingBfId = (slotId) => profileBindingId(pc, slotId);
-  for (const slot of plan.attrSlots) {
+  const attrSlots = plan?.attrSlots ?? [];
+  const outerTexts = plan?.outerTexts ?? [];
+  const conditionals = plan?.conditionals ?? [];
+  if (pc) {
+    emitAttrSlotsGranular(lines, indent, elVar, lookup, attrSlots, elementIndexBySlot, bindingBfId);
+    emitOuterTexts(lines, indent, elVar, outerTexts, bindingBfId, textClaimPathExprs);
+    emitPreambleRegionsEffect(lines, indent, elVar, preambleRegions, mapPreambleWrapped);
+  } else {
+    emitConsolidatedRowEffect(lines, indent, elVar, lookup, attrSlots, outerTexts, elementIndexBySlot, textClaimPathExprs, preambleRegions, mapPreambleWrapped);
+  }
+  for (const cond of conditionals) {
+    emitOuterConditional(lines, indent, elVar, cond, pc);
+  }
+}
+function emitAttrSlotsGranular(lines, indent, elVar, lookup, attrSlots, elementIndexBySlot, bindingBfId) {
+  for (const slot of attrSlots) {
     const varName = `__ra_${varSlotId(slot.slotId)}`;
-    const pIdx = elementIndexBySlot?.get(slot.slotId);
-    const lookupExpr = pIdx !== undefined ? `__p ? __p[${pIdx}] : ${lookup}(${elVar}, '[bf="${slot.slotId}"]')` : `${lookup}(${elVar}, '[bf="${slot.slotId}"]')`;
+    const lookupExpr = attrLookupExpr(slot.slotId, varName, elVar, lookup, elementIndexBySlot);
     lines.push(`${indent}{ const ${varName} = ${lookupExpr}`);
     lines.push(`${indent}if (${varName}) {`);
     for (const attr of slot.attrs) {
@@ -18939,21 +18988,83 @@ function stringifyReactiveEffects(lines, plan, opts) {
     }
     lines.push(`${indent}} }`);
   }
-  for (const text of plan.outerTexts) {
-    emitOuterText(lines, indent, elVar, text, bindingBfId(text.slotId), textIndexBySlot?.get(text.slotId));
+}
+function emitPreambleRegionsEffect(lines, indent, elVar, preambleRegions, mapPreambleWrapped) {
+  if (preambleRegions.length === 0)
+    return;
+  const slots = preambleRegions.map((r) => ({ id: r.slotId, kind: "markup", path: [] }));
+  const writer = claimWriterVarName(slots, varSlotId);
+  lines.push(`${indent}const ${writer} = lazySlots(${elVar}, ${claimPlanLiteral(slots)})`);
+  lines.push(`${indent}createEffect(() => {`);
+  if (mapPreambleWrapped)
+    lines.push(`${indent}  ${mapPreambleWrapped}`);
+  for (const region of preambleRegions) {
+    lines.push(`${indent}  ${writer}('${region.slotId}', ${region.valueExpr})`);
   }
-  for (const cond of plan.conditionals) {
-    emitOuterConditional(lines, indent, elVar, cond, pc);
+  lines.push(`${indent}})`);
+}
+function attrLookupExpr(slotId, varName, elVar, lookup, elementIndexBySlot) {
+  const pIdx = elementIndexBySlot?.get(slotId);
+  return pIdx !== undefined ? `__p ? __p[${pIdx}] : ${lookup}(${elVar}, '[bf="${slotId}"]')` : `${lookup}(${elVar}, '[bf="${slotId}"]')`;
+}
+function emitConsolidatedRowEffect(lines, indent, elVar, lookup, attrSlots, outerTexts, elementIndexBySlot, textClaimPathExprs, preambleRegions, mapPreambleWrapped) {
+  if (attrSlots.length === 0 && outerTexts.length === 0 && preambleRegions.length === 0)
+    return;
+  for (const slot of attrSlots) {
+    const varName = `__ra_${varSlotId(slot.slotId)}`;
+    lines.push(`${indent}const ${varName} = ${attrLookupExpr(slot.slotId, varName, elVar, lookup, elementIndexBySlot)}`);
+  }
+  const claimSlots = [
+    ...outerTexts.map((t) => ({ id: t.slotId, kind: "text", path: [], pathExpr: textClaimPathExprs?.get(t.slotId) })),
+    ...preambleRegions.map((r) => ({ id: r.slotId, kind: "markup", path: [] }))
+  ];
+  const writer = claimSlots.length > 0 ? claimWriterVarName(claimSlots, varSlotId) : null;
+  if (writer) {
+    lines.push(`${indent}const ${writer} = lazySlots(${elVar}, ${claimPlanLiteral(claimSlots)})`);
   }
+  if (attrSlots.length === 0 && preambleRegions.length === 0 && outerTexts.length === 1) {
+    const text = outerTexts[0];
+    lines.push(`${indent}createEffect(() => { ${writer}('${text.slotId}', String(${text.wrappedExpression})) })`);
+    return;
+  }
+  lines.push(`${indent}createEffect(() => {`);
+  for (const slot of attrSlots) {
+    const varName = `__ra_${varSlotId(slot.slotId)}`;
+    lines.push(`${indent}  if (${varName}) {`);
+    for (const attr of slot.attrs) {
+      lines.push(`${indent}    {`);
+      for (const stmt of emitAttrUpdate(varName, attr.attrName, attr.wrappedExpression, attr.meta)) {
+        lines.push(`${indent}      ${stmt}`);
+      }
+      lines.push(`${indent}    }`);
+    }
+    lines.push(`${indent}  }`);
+  }
+  if (preambleRegions.length > 0 && mapPreambleWrapped) {
+    lines.push(`${indent}  ${mapPreambleWrapped}`);
+  }
+  for (const text of outerTexts) {
+    lines.push(`${indent}  ${writer}('${text.slotId}', String(${text.wrappedExpression}))`);
+  }
+  for (const region of preambleRegions) {
+    lines.push(`${indent}  ${writer}('${region.slotId}', ${region.valueExpr})`);
+  }
+  lines.push(`${indent}})`);
 }
-function emitOuterText(lines, indent, elVar, text, bfId = "", pIdx) {
-  const varName = `__rt_${varSlotId(text.slotId)}`;
-  if (pIdx !== undefined) {
-    lines.push(`${indent}{ const ${varName} = __p ? tAfter(__p[${pIdx}]) : $t(${elVar}, '${text.slotId}')[0]`);
-  } else {
-    lines.push(`${indent}{ const [${varName}] = $t(${elVar}, '${text.slotId}')`);
+function emitOuterTexts(lines, indent, elVar, texts, bindingBfId, textClaimPathExprs) {
+  if (texts.length === 0)
+    return;
+  const slots = texts.map((t) => ({
+    id: t.slotId,
+    kind: "text",
+    path: [],
+    pathExpr: textClaimPathExprs?.get(t.slotId)
+  }));
+  const writer = claimWriterVarName(slots, varSlotId);
+  lines.push(`${indent}const ${writer} = lazySlots(${elVar}, ${claimPlanLiteral(slots)})`);
+  for (const text of texts) {
+    lines.push(`${indent}createEffect(() => { ${writer}('${text.slotId}', String(${text.wrappedExpression})) }${bindingBfId(text.slotId)})`);
   }
-  lines.push(`${indent}if (${varName}) createEffect(() => { ${varName}.textContent = String(${text.wrappedExpression}) }${bfId}) }`);
 }
 function emitOuterConditional(lines, indent, elVar, cond, pc) {
   const armIndent = `${indent}    `;
@@ -19074,22 +19185,6 @@ function emitLoopChildRefs(lines, refs, opts) {
     lines.push(`${indent}if (${varName}) ${emitRefCall(ref.callback, varName)} }`);
   }
 }
-function emitPreambleRegionEffects(lines, regions, mapPreambleWrapped, opts) {
-  if (regions.length === 0)
-    return;
-  const { indent, elVar } = opts;
-  for (const region of regions) {
-    const v = varSlotId(region.slotId);
-    lines.push(`${indent}{ let __last_${v}`);
-    lines.push(`${indent}createEffect(() => {`);
-    if (mapPreambleWrapped)
-      lines.push(`${indent}  ${mapPreambleWrapped}`);
-    lines.push(`${indent}  const __html_${v} = ${region.valueExpr}`);
-    lines.push(`${indent}  if (__last_${v} === undefined) { __last_${v} = __html_${v}; return }`);
-    lines.push(`${indent}  if (__html_${v} !== __last_${v}) { __last_${v} = __html_${v}; patchSlotRange(${elVar}, '${region.slotId}', __html_${v}) }`);
-    lines.push(`${indent}}) }`);
-  }
-}
 function stringifyLoop(lines, plan) {
   switch (plan.kind) {
     case "static":
@@ -19188,26 +19283,34 @@ function stringifyPlainLoop(lines, plan, topIndent = "  ") {
       ...reactiveEffects?.attrSlots.map((s) => s.slotId) ?? [],
       ...childRefs.map((r) => r.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 (elementSlotIds.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) {
+  const textClaimPathExprs = new Map;
+  if (hoistedTpl && plan.skeletonPaths) {
+    for (const text of reactiveEffects?.outerTexts ?? []) {
+      const path = plan.skeletonPaths.textMarkerPaths.get(text.slotId);
+      if (path)
+        textClaimPathExprs.set(text.slotId, `__existing ? [] : [${path.join(", ")}]`);
+    }
+  }
+  if (reactiveEffects !== null || preambleRegions.length > 0) {
     stringifyReactiveEffects(lines, reactiveEffects, {
       indent: bodyIndent,
       elVar: "__el",
       bodyIsMultiRoot,
       elementIndexBySlot: pathPlan?.elementIndexBySlot,
-      textIndexBySlot: pathPlan?.textIndexBySlot
+      textClaimPathExprs,
+      preambleRegions,
+      mapPreambleWrapped
     });
   }
   emitLoopChildRefs(lines, childRefs, { indent: bodyIndent, elVar: "__el", bodyIsMultiRoot, elementIndexBySlot: pathPlan?.elementIndexBySlot });
-  emitPreambleRegionEffects(lines, preambleRegions, mapPreambleWrapped, { indent: bodyIndent, elVar: "__el" });
   lines.push(`${bodyIndent}return __el`);
   lines.push(`${topIndent}}, '${markerId}'${loopBfId})`);
 }
@@ -19316,10 +19419,13 @@ function stringifyStaticLoop(lines, plan) {
     }
     lines.push(`        }`);
   }
-  for (const text of texts) {
-    const vn = `__rt_${varSlotId(text.slotId)}`;
-    lines.push(`        { const [${vn}] = $t(__iterEl, '${text.slotId}')`);
-    lines.push(`        if (${vn}) createEffect(() => { ${vn}.textContent = String(${text.expression}) }${profileBindingId(pc, text.slotId)}) }`);
+  if (texts.length > 0) {
+    const slots = texts.map((t) => ({ id: t.slotId, kind: "text", path: [] }));
+    const writer = claimWriterVarName(slots, varSlotId);
+    lines.push(`        const ${writer} = lazySlots(__iterEl, ${claimPlanLiteral(slots)})`);
+    for (const text of texts) {
+      lines.push(`        createEffect(() => { ${writer}('${text.slotId}', String(${text.expression})) }${profileBindingId(pc, text.slotId)})`);
+    }
   }
   emitLoopChildRefs(lines, childRefs, { indent: "        ", elVar: "__iterEl", bodyIsMultiRoot: false });
   lines.push(`      }`);
@@ -19374,13 +19480,18 @@ function emitReactive(lines, inner, indent, pc) {
   if (inner.childLevels.length > 0) {
     stringifyInnerLoops(lines, inner.childLevels, `${indent}  `, pc);
   }
-  for (const text of emit.reactiveTexts) {
+  const conditionalTexts = emit.reactiveTexts.filter((t) => t.insideConditional);
+  const plainTexts = emit.reactiveTexts.filter((t) => !t.insideConditional);
+  for (const text of conditionalTexts) {
     const bf = profileBindingId(pc, text.slotId);
-    if (text.insideConditional) {
-      lines.push(`${indent}  createEffect(() => { const [__rt] = $t(__innerEl${uid}, '${text.slotId}'); if (__rt) __rt.textContent = String(${text.wrappedExpression}) }${bf})`);
-    } else {
-      lines.push(`${indent}  { const [__rt] = $t(__innerEl${uid}, '${text.slotId}')`);
-      lines.push(`${indent}  if (__rt) createEffect(() => { __rt.textContent = String(${text.wrappedExpression}) }${bf}) }`);
+    lines.push(`${indent}  createEffect(() => { claimSlots(__innerEl${uid}, [{ id: '${text.slotId}', kind: 'text', path: [] }]).write('${text.slotId}', String(${text.wrappedExpression})) }${bf})`);
+  }
+  if (plainTexts.length > 0) {
+    const slots = plainTexts.map((t) => ({ id: t.slotId, kind: "text", path: [] }));
+    const writer = claimWriterVarName(slots, varSlotId);
+    lines.push(`${indent}  const ${writer} = lazySlots(__innerEl${uid}, ${claimPlanLiteral(slots)})`);
+    for (const text of plainTexts) {
+      lines.push(`${indent}  createEffect(() => { ${writer}('${text.slotId}', String(${text.wrappedExpression})) }${profileBindingId(pc, text.slotId)})`);
     }
   }
   for (const attr of emit.reactiveAttrs) {
@@ -19751,11 +19862,16 @@ function emitPlain(lines, plan) {
       indent: "          ",
       singleRootLayout: "inline"
     });
-    if (reactiveEffects !== null) {
-      stringifyReactiveEffects(lines, reactiveEffects, { indent: "          ", elVar: "__el", bodyIsMultiRoot });
+    if (reactiveEffects !== null || preambleRegions.length > 0) {
+      stringifyReactiveEffects(lines, reactiveEffects, {
+        indent: "          ",
+        elVar: "__el",
+        bodyIsMultiRoot,
+        preambleRegions,
+        mapPreambleWrapped
+      });
     }
     emitLoopChildRefs(lines, childRefs, { indent: "          ", elVar: "__el", bodyIsMultiRoot });
-    emitPreambleRegionEffects(lines, preambleRegions, mapPreambleWrapped, { indent: "          ", elVar: "__el" });
     lines.push(`          return __el`);
     lines.push(`        }, '${markerId}'${loopBfId})`);
   }
@@ -19841,13 +19957,13 @@ function emitArmBody(lines, body, mode, indent, profileComponentName) {
     }
     lines.push(`${indent}} }`);
   }
-  for (const te of body.textEffects) {
-    const v = varSlotId(te.slotId);
-    lines.push(`${indent}let __anchor_${v} = $t(__branchScope, '${te.slotId}')[0]`);
-    lines.push(`${indent}__disposers.push(createDisposableEffect(() => {`);
-    lines.push(`${indent}  const __val = ${te.expression}`);
-    lines.push(`${indent}  __anchor_${v} = __bfText(__anchor_${v}, __val)`);
-    lines.push(`${indent}}${bindingBfId(te.slotId)}))`);
+  if (body.textEffects.length > 0) {
+    const slots = body.textEffects.map((te) => ({ id: te.slotId, kind: "markup", path: [] }));
+    const writer = claimWriterVarName(slots, varSlotId);
+    lines.push(`${indent}const ${writer} = lazySlots(__branchScope, ${claimPlanLiteral(slots)})`);
+    for (const te of body.textEffects) {
+      lines.push(`${indent}__disposers.push(createDisposableEffect(() => { ${writer}('${te.slotId}', escapeTextOrNode(${te.expression})) }${bindingBfId(te.slotId)}))`);
+    }
   }
   if (body.loops.length > 0) {
     stringifyBranchLoops(lines, body.loops);
@@ -20079,7 +20195,6 @@ function emitLoopEventDelegation(lines, elem, kind, profileComponentName) {
 // src/ir-to-client-js/element-refs.ts
 function generateElementRefs(ctx) {
   const regularSlots = new Set;
-  const textSlots = new Set;
   const componentSlots = new Set;
   const conditionalSlotIds = collectConditionalSlotIds(ctx);
   for (const elem of ctx.interactiveElements) {
@@ -20087,11 +20202,6 @@ function generateElementRefs(ctx) {
       regularSlots.add(elem.slotId);
     }
   }
-  for (const elem of ctx.dynamicElements) {
-    if (!elem.insideConditional) {
-      textSlots.add(elem.slotId);
-    }
-  }
   for (const elem of ctx.conditionalElements) {
     regularSlots.add(elem.slotId);
   }
@@ -20120,11 +20230,10 @@ function generateElementRefs(ctx) {
   for (const slotId of componentSlots) {
     regularSlots.delete(slotId);
   }
-  if (regularSlots.size === 0 && textSlots.size === 0 && componentSlots.size === 0)
+  if (regularSlots.size === 0 && componentSlots.size === 0)
     return "";
   const refLines = [];
   emitSlotRefs(refLines, [...regularSlots], "$");
-  emitSlotRefs(refLines, [...textSlots], "$t");
   emitSlotRefs(refLines, [...componentSlots], "$c");
   return refLines.join(`
 `);
@@ -20680,6 +20789,111 @@ ${externalImports.join(`
   return generatedCode.replace(IMPORT_PLACEHOLDER, allImports);
 }
 
+// src/ir-to-client-js/client-only-elision.ts
+function decideClientOnlyElision(root) {
+  walkNode(root, [], new Set, { bailed: false });
+}
+function walkNode(node, path, forceCloseAncestors, state) {
+  if (state.bailed)
+    return;
+  if (node.type === "element") {
+    if (!elementIsPathSafe(node.tag, flattenSkeletonChildren(node.children))) {
+      state.bailed = true;
+      return;
+    }
+    const groupIdx = skeletonForceCloseGroup(node.tag);
+    if (groupIdx >= 0 && forceCloseAncestors.has(groupIdx)) {
+      state.bailed = true;
+      return;
+    }
+    const nextAncestors = groupIdx >= 0 ? new Set([...forceCloseAncestors, groupIdx]) : forceCloseAncestors;
+    walkChildren(flattenSkeletonChildren(node.children), path, nextAncestors, state);
+  } else if (node.type === "fragment") {
+    walkChildren(flattenSkeletonChildren(node.children), path, forceCloseAncestors, state);
+  }
+}
+function walkChildren(children, parentPath, forceCloseAncestors, state) {
+  let frozen = false;
+  let idx = 0;
+  let pendingText = false;
+  for (let i = 0;i < children.length; i++) {
+    if (state.bailed)
+      return;
+    const child = children[i];
+    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.clientOnly && child.slotId) {
+          const adjacent = isTextLike(children[i - 1]) || isTextLike(children[i + 1]);
+          if (!frozen && !adjacent) {
+            markElided(child, [...parentPath, idx]);
+            frozen = true;
+          } else {
+            frozen = true;
+          }
+          idx += 1;
+          pendingText = false;
+          continue;
+        }
+        frozen = true;
+        idx += 1;
+        pendingText = false;
+        continue;
+      }
+      case "element": {
+        if (!elementIsPathSafe(child.tag, flattenSkeletonChildren(child.children))) {
+          state.bailed = true;
+          return;
+        }
+        if (!frozen) {
+          walkNode(child, [...parentPath, idx], forceCloseAncestors, state);
+        }
+        idx += 1;
+        pendingText = false;
+        continue;
+      }
+      case "fragment":
+        continue;
+      default:
+        frozen = true;
+        idx += 1;
+        pendingText = false;
+        continue;
+    }
+  }
+}
+function isTextLike(node) {
+  if (!node)
+    return false;
+  if (node.type === "text")
+    return node.value !== "";
+  if (node.type === "expression")
+    return node.expr !== "null" && node.expr !== "undefined";
+  return false;
+}
+function markElided(expr, path) {
+  expr.markerless = true;
+  expr.elidedPath = path;
+}
+function elementIsPathSafe(tag, flatChildren) {
+  if (SKELETON_PATH_HAZARD_TAGS.has(tag))
+    return false;
+  if (VOID_ELEMENTS.has(tag) && flatChildren.length > 0)
+    return false;
+  if (tag === "tr" && hasForeignTableRowContent(flatChildren))
+    return false;
+  return true;
+}
+
 // src/css-layer-prefixer.ts
 function prefixClass(cls, layerName) {
   if (!cls || cls.startsWith("layer-"))
@@ -21972,7 +22186,7 @@ function checkRichTypeMethodCalls(root, metadata, errors) {
     return;
   const matchers = prepareLoweringMatchers(metadata);
   const seen = new Set;
-  walkNode(root, metadata, EMPTY_BINDINGS2, matchers, errors, seen);
+  walkNode2(root, metadata, EMPTY_BINDINGS2, matchers, errors, seen);
 }
 function isLoweringClaimed(matchers, callee, args) {
   return matchers.some((m) => m(callee, args) !== null);
@@ -22109,7 +22323,7 @@ function walkAttrValue(value, clientOnly, loc, meta, bindings, matchers, errors,
     walkTemplateParts(value.parts, loc, meta, bindings, matchers, errors, seen);
   }
 }
-function walkNode(node, meta, bindings, matchers, errors, seen) {
+function walkNode2(node, meta, bindings, matchers, errors, seen) {
   if (node.type === "expression") {
     if (!node.clientOnly && node.parsed)
       checkExpr(node.parsed, node.loc, meta, bindings, matchers, errors, seen);
@@ -22135,12 +22349,12 @@ function walkNode(node, meta, bindings, matchers, errors, seen) {
     case "fragment":
     case "provider":
       for (const child of node.children)
-        walkNode(child, meta, bindings, matchers, errors, seen);
+        walkNode2(child, meta, bindings, matchers, errors, seen);
       break;
     case "async":
-      walkNode(node.fallback, meta, bindings, matchers, errors, seen);
+      walkNode2(node.fallback, meta, bindings, matchers, errors, seen);
       for (const child of node.children)
-        walkNode(child, meta, bindings, matchers, errors, seen);
+        walkNode2(child, meta, bindings, matchers, errors, seen);
       break;
     case "loop": {
       if (node.clientOnly)
@@ -22153,35 +22367,35 @@ function walkNode(node, meta, bindings, matchers, errors, seen) {
       if (node.index)
         loopBindings.set(node.index, null);
       for (const child of node.children)
-        walkNode(child, meta, loopBindings, matchers, errors, seen);
+        walkNode2(child, meta, loopBindings, matchers, errors, seen);
       if (node.childComponent) {
         for (const child of node.childComponent.children)
-          walkNode(child, meta, loopBindings, matchers, errors, seen);
+          walkNode2(child, meta, loopBindings, matchers, errors, seen);
       }
       for (const nested of node.nestedComponents ?? []) {
         for (const child of nested.children)
-          walkNode(child, meta, loopBindings, matchers, errors, seen);
+          walkNode2(child, meta, loopBindings, matchers, errors, seen);
       }
       for (const seg of node.flatMapCallback?.segments ?? []) {
         if (seg.kind === "jsx")
-          walkNode(seg.ir, meta, loopBindings, matchers, errors, seen);
+          walkNode2(seg.ir, meta, loopBindings, matchers, errors, seen);
       }
       for (const seg of node.preamble?.segments ?? []) {
         if (seg.kind === "jsx")
-          walkNode(seg.ir, meta, loopBindings, matchers, errors, seen);
+          walkNode2(seg.ir, meta, loopBindings, matchers, errors, seen);
       }
       break;
     }
     case "conditional":
       if (node.clientOnly)
         break;
-      walkNode(node.whenTrue, meta, bindings, matchers, errors, seen);
-      walkNode(node.whenFalse, meta, bindings, matchers, errors, seen);
+      walkNode2(node.whenTrue, meta, bindings, matchers, errors, seen);
+      walkNode2(node.whenFalse, meta, bindings, matchers, errors, seen);
       break;
     case "if-statement":
-      walkNode(node.consequent, meta, bindings, matchers, errors, seen);
+      walkNode2(node.consequent, meta, bindings, matchers, errors, seen);
       if (node.alternate)
-        walkNode(node.alternate, meta, bindings, matchers, errors, seen);
+        walkNode2(node.alternate, meta, bindings, matchers, errors, seen);
       break;
   }
 }
@@ -22247,6 +22461,7 @@ function compileMultipleComponents(source, filePath, componentNames, options) {
     };
     componentIR.metadata.clientAnalysis = analyzeClientNeeds(componentIR);
     checkRichTypeMethodCalls(componentIR.root, componentIR.metadata, errors);
+    decideClientOnlyElision(componentIR.root);
     if (options.cssLayerPrefix) {
       applyCssLayerPrefix(componentIR, options.cssLayerPrefix);
     }
@@ -22586,6 +22801,7 @@ function compileJSX(source, filePath, options) {
   };
   componentIR.metadata.clientAnalysis = analyzeClientNeeds(componentIR);
   checkRichTypeMethodCalls(componentIR.root, componentIR.metadata, errors);
+  decideClientOnlyElision(componentIR.root);
   if (ctx.importedClientSignalNames.size > 0) {
     const sources = new Set;
     for (const imp of ctx.imports) {
@@ -26653,6 +26869,7 @@ export {
   diffStaticBudget,
   diffProfiles,
   describeFallback,
+  decideClientOnlyElision,
   dangerousInnerHtmlMetacharViolation,
   dangerousInnerHtmlDiagnostic,
   createProgramForFile,