@barefootjs/jsx 0.31.7 → 0.31.9

package/dist/index.js

@@ -3351,8 +3351,8 @@ function templateAttrExpr(attrName, valExpr, presenceOrUndefined) {
 function escapeAttrValueExpr(valExpr) {
   return `escapeAttr(${valExpr})`;
 }
-function escapeTextSlotExpr(innerExpr) {
-  return `escapeText(${innerExpr})`;
+function escapeTextSlotExpr(innerExpr, isMarkup = false) {
+  return `${isMarkup ? "escapeTextOrMarkup" : "escapeText"}(${innerExpr})`;
 }
 function dangerouslyHtmlChildren(attrs, toExpr) {
   const attr = attrs.find((a) => a.name === "dangerouslySetInnerHTML");
@@ -3629,7 +3629,7 @@ function irToHtmlTemplate(node, restSpreadNames, loopDepth = 0, loopParams, bran
           case "jsx-children": {
             const hoistedRecurse = (n) => irToHtmlTemplate(n, restSpreadNames, loopDepth, loopParams, branchSlotsVar, true);
             const childHtml = p.value.children.map((c) => hoistedRecurse(c)).join("");
-            return `${quotePropName(p.name)}: \`${childHtml}\``;
+            return p.name === "children" ? `${quotePropName(p.name)}: \`${childHtml}\`` : `${quotePropName(p.name)}: bfMarkup(\`${childHtml}\`)`;
           }
           case "literal":
             return `${quotePropName(p.name)}: ${JSON.stringify(p.value.value)}`;
@@ -3988,6 +3988,9 @@ function irChildrenToJsExpr(children) {
     return exprs[0];
   return `[${exprs.join(", ")}]`;
 }
+function isSingleElementJsxChildren(nodes) {
+  return nodes.length === 1 && nodes[0].type === "element";
+}
 function irNodeToJsExprs(node) {
   switch (node.type) {
     case "component": {
@@ -3996,8 +3999,11 @@ function irNodeToJsExprs(node) {
           return `${quotePropName(p.name)}: ${attrValueToString(p.value) ?? "undefined"}`;
         }
         switch (p.value.kind) {
-          case "jsx-children":
-            return `get ${quotePropName(p.name)}() { return ${irChildrenToJsExpr(p.value.children)} }`;
+          case "jsx-children": {
+            const jsxExpr = irChildrenToJsExpr(p.value.children);
+            const wrapped = p.name !== "children" && isSingleElementJsxChildren(p.value.children) ? `bfMarkup(${jsxExpr})` : jsxExpr;
+            return `get ${quotePropName(p.name)}() { return ${wrapped} }`;
+          }
           case "literal":
             return `get ${quotePropName(p.name)}() { return ${JSON.stringify(p.value.value)} }`;
           case "boolean-shorthand":
@@ -4056,8 +4062,8 @@ function isSingleRootElement(html) {
   const closingPattern = new RegExp(`</${tag}>\\s*$`);
   return closingPattern.test(html.trim());
 }
-function irToComponentTemplate(node, inlinableConstants, restSpreadNames, propsObjectName) {
-  return irToComponentTemplateWithOpts(node, { inlinableConstants, restSpreadNames, propsObjectName, loopDepth: -1 });
+function irToComponentTemplate(node, inlinableConstants, restSpreadNames, propsObjectName, markupSlotIds) {
+  return irToComponentTemplateWithOpts(node, { inlinableConstants, restSpreadNames, propsObjectName, loopDepth: -1, markupSlotIds });
 }
 function irToComponentTemplateWithOpts(node, opts) {
   const { inlinableConstants, restSpreadNames, propsObjectName, loopDepth = 0 } = opts;
@@ -4162,7 +4168,8 @@ function irToComponentTemplateWithOpts(node, opts) {
       const wrapped = transformExpr(node.expr, node.templateExpr);
       const value = node.joinArrayChild ? `Array.isArray(${wrapped}) ? ${wrapped}.join('') : (${wrapped} ?? '')` : wrapped;
       if (node.slotId) {
-        return `<!--bf:${node.slotId}-->\${${node.joinArrayChild ? value : escapeTextSlotExpr(wrapped)}}<!--/-->`;
+        const isMarkup = opts.markupSlotIds?.has(node.slotId) ?? false;
+        return `<!--bf:${node.slotId}-->\${${node.joinArrayChild ? value : escapeTextSlotExpr(wrapped, isMarkup)}}<!--/-->`;
       }
       return `\${${value}}`;
     }
@@ -4189,7 +4196,7 @@ function irToComponentTemplateWithOpts(node, opts) {
           case "jsx-children": {
             const hoistedRecurse = (n) => irToComponentTemplateWithOpts(n, { ...opts, inHoistedChildren: true });
             const childHtml = p.value.children.map((c) => hoistedRecurse(c)).join("");
-            return `${quotePropName(p.name)}: \`${childHtml}\``;
+            return p.name === "children" ? `${quotePropName(p.name)}: \`${childHtml}\`` : `${quotePropName(p.name)}: bfMarkup(\`${childHtml}\`)`;
           }
           case "literal":
             return `${quotePropName(p.name)}: ${JSON.stringify(p.value.value)}`;
@@ -4310,7 +4317,8 @@ function generateCsrTemplate(node, inlinableConstants, ctx, restSpreadNames, pro
     }
   }
   const effectiveUnsafeLocalNames = mergeCsrNullUnsafe(ctx, unsafeLocalNames);
-  return generateCsrTemplateWithOpts(node, { inlinableConstants, restSpreadNames, propsObjectName, csrEnv, unsafeLocalNames: effectiveUnsafeLocalNames, deferredChildSlots, loopDepth: -1 });
+  const markupSlotIds = new Set(ctx.dynamicElements.map((e) => e.slotId));
+  return generateCsrTemplateWithOpts(node, { inlinableConstants, restSpreadNames, propsObjectName, csrEnv, unsafeLocalNames: effectiveUnsafeLocalNames, deferredChildSlots, loopDepth: -1, markupSlotIds });
 }
 function mergeCsrNullUnsafe(ctx, unsafeLocalNames) {
   let merged = null;
@@ -4491,7 +4499,8 @@ function generateCsrTemplateWithOpts(node, opts) {
         const expr = transformed === UNSAFE_TEMPLATE_EXPR ? "''" : transformed;
         const value = node.joinArrayChild ? `Array.isArray(${expr}) ? ${expr}.join('') : (${expr} ?? '')` : expr;
         if (node.slotId) {
-          return `<!--bf:${node.slotId}-->\${${node.joinArrayChild ? value : escapeTextSlotExpr(expr)}}<!--/-->`;
+          const isMarkup = opts.markupSlotIds?.has(node.slotId) ?? false;
+          return `<!--bf:${node.slotId}-->\${${node.joinArrayChild ? value : escapeTextSlotExpr(expr, isMarkup)}}<!--/-->`;
         }
         return `\${${value}}`;
       }
@@ -4521,7 +4530,7 @@ function generateCsrTemplateWithOpts(node, opts) {
           case "jsx-children": {
             const hoistedRecurse = (n) => generateCsrTemplateWithOpts(n, { ...opts, inHoistedChildren: true });
             const childHtml = p.value.children.map((c) => hoistedRecurse(c)).join("");
-            return `${quotePropName(p.name)}: \`${childHtml}\``;
+            return p.name === "children" ? `${quotePropName(p.name)}: \`${childHtml}\`` : `${quotePropName(p.name)}: bfMarkup(\`${childHtml}\`)`;
           }
           case "literal":
             return `${quotePropName(p.name)}: ${JSON.stringify(p.value.value)}`;
@@ -14585,25 +14594,85 @@ var SVG_ROOT_TAGS = new Set([
   "animateTransform",
   "animateMotion"
 ]);
-function templateRootIsSvg(template) {
+var MATHML_ROOT_TAGS = new Set([
+  "math",
+  "mrow",
+  "mfrac",
+  "msup",
+  "msub",
+  "msubsup",
+  "mn",
+  "mi",
+  "mo",
+  "mtext",
+  "munder",
+  "mover",
+  "munderover",
+  "mtable",
+  "mtr",
+  "mtd",
+  "msqrt",
+  "mroot",
+  "mstyle",
+  "merror",
+  "mpadded",
+  "mphantom",
+  "menclose",
+  "semantics",
+  "annotation",
+  "annotation-xml"
+]);
+function namespaceForTag(tag) {
+  if (SVG_ROOT_TAGS.has(tag) || SVG_ROOT_TAGS.has(tag.toLowerCase()))
+    return "svg";
+  if (MATHML_ROOT_TAGS.has(tag) || MATHML_ROOT_TAGS.has(tag.toLowerCase()))
+    return "math";
+  return null;
+}
+function detectRootNamespaceWrapTag(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());
-  }
+  if (m)
+    return namespaceForTag(m[1]);
   const branches = extractConditionalBranchTemplates(stripped);
   if (branches === null || branches.length === 0)
-    return false;
-  return branches.every(templateRootIsSvg);
+    return null;
+  let result;
+  for (const branch of branches) {
+    const branchNs = detectRootNamespaceWrapTag(branch);
+    if (result === undefined) {
+      result = branchNs;
+    } else if (result !== branchNs) {
+      return null;
+    }
+  }
+  return result ?? null;
 }
-function multiRootTemplateNeedsSvgWrap(template) {
+function multiRootTemplateNeedsNamespaceWrap(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);
+  if (m) {
+    const tagLower = m[1].toLowerCase();
+    if (tagLower === "svg" || tagLower === "math")
+      return null;
+  }
+  return detectRootNamespaceWrapTag(template);
+}
+function namespaceWrapForTemplate(template) {
+  const wrapTag = detectRootNamespaceWrapTag(template);
+  return {
+    wrapTag,
+    childPath: wrapTag ? ".firstElementChild.firstElementChild" : ".firstElementChild"
+  };
+}
+function multiRootNamespaceWrapForTemplate(template) {
+  const wrapTag = multiRootTemplateNeedsNamespaceWrap(template);
+  return {
+    wrapTag,
+    childPath: wrapTag ? ".firstElementChild" : ""
+  };
+}
+function wrapHtmlForNamespace(html, wrapTag) {
+  return wrapTag ? `<${wrapTag}>${html}</${wrapTag}>` : html;
 }
 function stripLeadingNonContent(template) {
   let s = template.trimStart();
@@ -14628,32 +14697,26 @@ function extractConditionalBranchTemplates(template) {
   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)`;
+  const { wrapTag, childPath } = namespaceWrapForTemplate(template);
+  const html = wrapHtmlForNamespace(template, wrapTag);
+  return `const __tpl = document.createElement('template'); __tpl.innerHTML = \`${html}\`; return __tpl.content${childPath}.cloneNode(true)`;
 }
 function emitHoistedTemplateDecl(lines, indent, tplVar, skeletonTemplate) {
-  const isSvg = templateRootIsSvg(skeletonTemplate);
-  const html = isSvg ? `<svg>${skeletonTemplate}</svg>` : skeletonTemplate;
+  const { wrapTag } = namespaceWrapForTemplate(skeletonTemplate);
+  const html = wrapHtmlForNamespace(skeletonTemplate, wrapTag);
   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)`;
+  return `${tplVar}.content${namespaceWrapForTemplate(skeletonTemplate).childPath}.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)`
-    ];
-  }
+  const { wrapTag, childPath } = namespaceWrapForTemplate(template);
+  const html = wrapHtmlForNamespace(template, wrapTag);
   return [
     `${indent}const __tpl = document.createElement('template')`,
-    `${indent}__tpl.innerHTML = \`${template}\``,
-    `${indent}return __tpl.content.firstElementChild.cloneNode(true)`
+    `${indent}__tpl.innerHTML = \`${html}\``,
+    `${indent}return __tpl.content${childPath}.cloneNode(true)`
   ];
 }
 function emitLoopItemElementSetup(lines, opts) {
@@ -14685,9 +14748,9 @@ function emitLoopItemElementSetup(lines, opts) {
   lines.push(`${indent}})()${mountRow ? ")" : ""}`);
 }
 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`;
+  const { wrapTag, childPath } = multiRootNamespaceWrapForTemplate(template);
+  const innerHtmlExpr = `\`${wrapHtmlForNamespace(template, wrapTag)}\``;
+  const parentExpr = `__tpl.content${childPath}`;
   return [
     `${indent}const __tpl = document.createElement('template')`,
     `${indent}__tpl.innerHTML = ${innerHtmlExpr}`,
@@ -14918,6 +14981,9 @@ function jsxChildrenContainComponent(nodes) {
   }
   return false;
 }
+function isSingleElementJsxChildren2(nodes) {
+  return nodes.length === 1 && nodes[0].type === "element";
+}
 function buildRestSpreadNames(ctx) {
   const names = new Set;
   if (ctx.restPropsName)
@@ -14954,6 +15020,8 @@ function buildComponentPropsExpr(props, ctx) {
         const jsxExpr = irChildrenToJsExpr(prop.value.children);
         if (jsxChildrenContainComponent(prop.value.children)) {
           propsForInit.push(`get ${quotePropName(prop.name)}() { return __slot(() => ${jsxExpr}) }`);
+        } else if (prop.name !== "children" && isSingleElementJsxChildren2(prop.value.children)) {
+          propsForInit.push(`get ${quotePropName(prop.name)}() { return bfMarkup(${jsxExpr}) }`);
         } else {
           propsForInit.push(`get ${quotePropName(prop.name)}() { return ${jsxExpr} }`);
         }
@@ -15094,7 +15162,7 @@ function collectElements(node, ctx, siblingOffsets, insideConditional = false) {
             reactiveTextSlotIds: new Set(bindings.reactiveTexts.map((t) => t.slotId))
           };
           skeletonTemplate = buildLoopSkeletonTemplate(l.children[0], skeletonSafeSlots) ?? undefined;
-          if (skeletonTemplate && !templateRootIsSvg(skeletonTemplate)) {
+          if (skeletonTemplate && !detectRootNamespaceWrapTag(skeletonTemplate)) {
             skeletonPaths = computeSkeletonSlotPaths(l.children[0], skeletonSafeSlots) ?? undefined;
           }
         }
@@ -16013,6 +16081,8 @@ var RUNTIME_IMPORT_CANDIDATES = [
   "escapeAttr",
   "escapeText",
   "escapeTextOrNode",
+  "bfMarkup",
+  "escapeTextOrMarkup",
   "qsa",
   "qsaItem",
   "qsaChildScope",
@@ -17006,6 +17076,13 @@ function csrInlinableConstantsFromCtx(ctx) {
   }
   return out;
 }
+function buildTemplateDefPart(ctx, templateHtml) {
+  const envDecls = ctx.signals.filter((s) => Boolean(s.envReader) && Boolean(s.envFactory)).map((s) => `const [${s.getter}] = ${s.envFactory}()`);
+  if (envDecls.length === 0) {
+    return `template: (${PROPS_PARAM}) => \`${templateHtml}\``;
+  }
+  return `template: (${PROPS_PARAM}) => { ${envDecls.join("; ")}; return \`${templateHtml}\` }`;
+}
 function emitRegistrationAndHydration(lines, ctx, _ir, graph, inlinability) {
   const name = ctx.componentName;
   lines.push(`}`);
@@ -17020,15 +17097,16 @@ function emitRegistrationAndHydration(lines, ctx, _ir, graph, inlinability) {
   const isCommentScope = _ir.root.type === "fragment" && _ir.root.needsScopeComment || _ir.root.type === "component";
   const defParts = [`init: init${name}`];
   if (canGenerateStaticTemplate(_ir.root, propNamesForStaticCheck, inlinableConstants, unsafeLocalNames)) {
-    const templateHtml = irToComponentTemplate(_ir.root, inlinableConstants, restSpreadNames, ctx.propsObjectName);
+    const markupSlotIds = new Set(ctx.dynamicElements.map((e) => e.slotId));
+    const templateHtml = irToComponentTemplate(_ir.root, inlinableConstants, restSpreadNames, ctx.propsObjectName, markupSlotIds);
     if (templateHtml) {
-      defParts.push(`template: (${PROPS_PARAM}) => \`${templateHtml}\``);
+      defParts.push(buildTemplateDefPart(ctx, templateHtml));
     }
   } else {
     const csrInlinableConstants = csrInlinableConstantsFromCtx(ctx);
     const templateHtml = generateCsrTemplate(_ir.root, csrInlinableConstants, ctx, restSpreadNames, ctx.propsObjectName, unsafeLocalNames, ctx.deferredChildSlots);
     if (templateHtml) {
-      defParts.push(`template: (${PROPS_PARAM}) => \`${templateHtml}\``);
+      defParts.push(buildTemplateDefPart(ctx, templateHtml));
     }
   }
   if (isCommentScope) {
@@ -20272,9 +20350,8 @@ function stringifyBranchInnerLoops(lines, plan, indent, pc) {
       lines.push(`${indent}  ${inner.paramUnwrap}`);
     }
     {
-      const isSvg = templateRootIsSvg(inner.wrappedTemplate);
-      const innerHtml = isSvg ? `<svg>${inner.wrappedTemplate}</svg>` : inner.wrappedTemplate;
-      const childPath = isSvg ? ".firstElementChild.firstElementChild" : ".firstElementChild";
+      const { wrapTag, childPath } = namespaceWrapForTemplate(inner.wrappedTemplate);
+      const innerHtml = wrapTag ? `<${wrapTag}>${inner.wrappedTemplate}</${wrapTag}>` : inner.wrappedTemplate;
       lines.push(`${indent}  let __bel${uid} = __existing ?? (() => { const __t = document.createElement('template'); __t.innerHTML = \`${innerHtml}\`; return __t.content${childPath}.cloneNode(true) })()`);
     }
     if (inner.wrappedKey) {
@@ -21015,14 +21092,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;
+    const { wrapTag, childPath } = csrMaterialize.bodyIsMultiRoot ? multiRootNamespaceWrapForTemplate(csrMaterialize.itemTemplate) : namespaceWrapForTemplate(csrMaterialize.itemTemplate);
+    const itemHtml = wrapHtmlForNamespace(csrMaterialize.itemTemplate, wrapTag);
     if (csrMaterialize.bodyIsMultiRoot) {
       lines.push(`        const __mtpl = document.createElement('template')`);
       lines.push(`        __mtpl.innerHTML = \`${itemHtml}\``);
       lines.push(`        const __anchor = ${containerVar}.children[${childIndexExpr}] ?? null`);
       lines.push(`        let __first = null`);
-      lines.push(`        let __sib = __mtpl.content${isSvg ? ".firstElementChild" : ""}.firstElementChild`);
+      lines.push(`        let __sib = __mtpl.content${childPath}.firstElementChild`);
       lines.push(`        while (__sib) {`);
       lines.push(`          const __next = __sib.nextElementSibling`);
       lines.push(`          const __cloned = __sib.cloneNode(true)`);
@@ -21034,7 +21111,7 @@ function stringifyStaticLoop(lines, plan) {
     } else {
       lines.push(`        const __tpl = document.createElement('template')`);
       lines.push(`        __tpl.innerHTML = \`${itemHtml}\``);
-      lines.push(`        const __cloned = __tpl.content${isSvg ? ".firstElementChild" : ""}.firstElementChild`);
+      lines.push(`        const __cloned = __tpl.content${childPath}`);
       lines.push(`        if (__cloned) {`);
       lines.push(`          const __anchor = ${containerVar}.children[${childIndexExpr}] ?? null`);
       lines.push(`          ${containerVar}.insertBefore(__cloned, __anchor)`);
@@ -21104,9 +21181,8 @@ function emitReactive(lines, inner, indent, pc) {
     lines.push(`${innerIndent}  __innerEl${uid}.__bfExtras = __innerExtras${uid}`);
     lines.push(`${indent}  }`);
   } else {
-    const isSvg = templateRootIsSvg(emit.wrappedTemplate);
-    const innerHtml = isSvg ? `<svg>${emit.wrappedTemplate}</svg>` : emit.wrappedTemplate;
-    const childPath = isSvg ? ".firstElementChild.firstElementChild" : ".firstElementChild";
+    const { wrapTag, childPath } = namespaceWrapForTemplate(emit.wrappedTemplate);
+    const innerHtml = wrapTag ? `<${wrapTag}>${emit.wrappedTemplate}</${wrapTag}>` : emit.wrappedTemplate;
     lines.push(`${indent}  let __innerEl${uid} = __existing ?? (() => { const __t = document.createElement('template'); __t.innerHTML = \`${innerHtml}\`; return __t.content${childPath}.cloneNode(true) })()`);
   }
   if (emit.wrappedKey) {
@@ -22433,7 +22509,8 @@ function generateTemplateOnlyMount(ir, ctx) {
     restSpreadNames.add(ctx.propsObjectName);
   let templateHtml;
   if (canGenerateStaticTemplate(ir.root, propNamesForStaticCheck, inlinableConstants, unsafeLocalNames)) {
-    templateHtml = irToComponentTemplate(ir.root, inlinableConstants, restSpreadNames, ctx.propsObjectName);
+    const markupSlotIds = new Set(ctx.dynamicElements.map((e) => e.slotId));
+    templateHtml = irToComponentTemplate(ir.root, inlinableConstants, restSpreadNames, ctx.propsObjectName, markupSlotIds);
   }
   if (!templateHtml) {
     const csrInlinableConstants = csrInlinableConstantsFromCtx(ctx);

package/dist/ir-to-client-js/collect-elements.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collect-elements.d.ts","sourceRoot":"","sources":["../../src/ir-to-client-js/collect-elements.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,KAAK,MAAM,EAAoC,KAAK,MAAM,EAAmC,MAAM,aAAa,CAAA;AACzH,OAAO,KAAK,EAAE,eAAe,EAA+H,iBAAiB,EAA0B,oBAAoB,EAAc,UAAU,EAAE,MAAM,YAAY,CAAA;AA2GvQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CA0C7E;AAyBD;;;;;;;;;;GAUG;AACH,MAAM,WAAW,wBAAwB;IACvC;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B;;;;;OAKG;IACH,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB;;;;;;;OAOG;IACH,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB;AAED,4DAA4D;AAC5D,eAAO,MAAM,sBAAsB,EAAE,wBAIpC,CAAA;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,MAAM,EAAE,EACf,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EACrC,cAAc,CAAC,EAAE,MAAM,EACvB,GAAG,CAAC,EAAE,eAAe,EACrB,OAAO,CAAC,EAAE,wBAAwB,GACjC,UAAU,EAAE,CA6Id;AAqKD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,eAAe,EACpB,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EACrC,iBAAiB,UAAQ,GACxB,IAAI,CAqSN;AAocD,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,SAAS,MAAM,EAAE,EAC3B,GAAG,EAAE,eAAe,EACpB,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EACrC,SAAS,EAAE,MAAM,EACjB,iBAAiB,EAAE,SAAS,OAAO,aAAa,EAAE,gBAAgB,EAAE,GAAG,SAAS;AAChF;;;;GAIG;AACH,aAAa,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC;AACnC;;;;GAIG;AACH,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,GACxB,iBAAiB,CAenB;AAED,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,eAAe,EACpB,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EACrC,SAAS,CAAC,EAAE,MAAM,EAClB,iBAAiB,CAAC,EAAE,SAAS,OAAO,aAAa,EAAE,gBAAgB,EAAE;AACrE;;;;;;;;GAQG;AACH,aAAa,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC;AACnC;;;GAGG;AACH,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,GACxB,oBAAoB,EAAE,CA2ExB"}
+{"version":3,"file":"collect-elements.d.ts","sourceRoot":"","sources":["../../src/ir-to-client-js/collect-elements.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,KAAK,MAAM,EAAoC,KAAK,MAAM,EAAmC,MAAM,aAAa,CAAA;AACzH,OAAO,KAAK,EAAE,eAAe,EAA+H,iBAAiB,EAA0B,oBAAoB,EAAc,UAAU,EAAE,MAAM,YAAY,CAAA;AA2GvQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CA0C7E;AAyBD;;;;;;;;;;GAUG;AACH,MAAM,WAAW,wBAAwB;IACvC;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B;;;;;OAKG;IACH,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB;;;;;;;OAOG;IACH,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB;AAED,4DAA4D;AAC5D,eAAO,MAAM,sBAAsB,EAAE,wBAIpC,CAAA;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,MAAM,EAAE,EACf,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EACrC,cAAc,CAAC,EAAE,MAAM,EACvB,GAAG,CAAC,EAAE,eAAe,EACrB,OAAO,CAAC,EAAE,wBAAwB,GACjC,UAAU,EAAE,CA6Id;AAqMD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,eAAe,EACpB,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EACrC,iBAAiB,UAAQ,GACxB,IAAI,CAsSN;AAocD,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,SAAS,MAAM,EAAE,EAC3B,GAAG,EAAE,eAAe,EACpB,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EACrC,SAAS,EAAE,MAAM,EACjB,iBAAiB,EAAE,SAAS,OAAO,aAAa,EAAE,gBAAgB,EAAE,GAAG,SAAS;AAChF;;;;GAIG;AACH,aAAa,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC;AACnC;;;;GAIG;AACH,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,GACxB,iBAAiB,CAenB;AAED,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,eAAe,EACpB,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EACrC,SAAS,CAAC,EAAE,MAAM,EAClB,iBAAiB,CAAC,EAAE,SAAS,OAAO,aAAa,EAAE,gBAAgB,EAAE;AACrE;;;;;;;;GAQG;AACH,aAAa,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC;AACnC;;;GAGG;AACH,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,GACxB,oBAAoB,EAAE,CA2ExB"}

package/dist/ir-to-client-js/control-flow/stringify/loop-child-arm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loop-child-arm.d.ts","sourceRoot":"","sources":["../../../../src/ir-to-client-js/control-flow/stringify/loop-child-arm.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AASH,OAAO,KAAK,EACV,6BAA6B,EAC7B,uBAAuB,EACvB,oBAAoB,EACpB,gBAAgB,EAChB,wBAAwB,EACzB,MAAM,2BAA2B,CAAA;AAClC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAEnE;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,MAAM,EAAE,EACf,IAAI,EAAE,SAAS,gBAAgB,EAAE,EACjC,MAAM,EAAE,MAAM,EACd,EAAE,CAAC,EAAE,MAAM,GACV,IAAI,CAcN;AAED;;;;;;;GAOG;AACH,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,MAAM,EAAE,EACf,IAAI,EAAE,uBAAuB,EAC7B,MAAM,EAAE,MAAM,GACb,IAAI,CAYN;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,kCAAkC,CAChD,KAAK,EAAE,MAAM,EAAE,EACf,IAAI,EAAE,6BAA6B,EACnC,MAAM,EAAE,MAAM,GACb,IAAI,CAIN;AAED;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,MAAM,EAAE,EACf,IAAI,EAAE,oBAAoB,EAC1B,MAAM,EAAE,MAAM,EACd,EAAE,CAAC,EAAE,MAAM,GACV,IAAI,CA0DN;AAED;;;;;;GAMG;AACH,wBAAgB,8BAA8B,CAC5C,KAAK,EAAE,MAAM,EAAE,EACf,YAAY,EAAE,SAAS,wBAAwB,EAAE,EACjD,MAAM,EAAE,MAAM,EACd,EAAE,CAAC,EAAE,MAAM,GACV,IAAI,CAIN;AA0BD;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,MAAM,EAAE,EACf,GAAG,EAAE,gBAAgB,EACrB,SAAS,EAAE,MAAM,EACjB,EAAE,EAAE,MAAM,GAAG,SAAS,GACrB,IAAI,CAiDN"}
+{"version":3,"file":"loop-child-arm.d.ts","sourceRoot":"","sources":["../../../../src/ir-to-client-js/control-flow/stringify/loop-child-arm.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AASH,OAAO,KAAK,EACV,6BAA6B,EAC7B,uBAAuB,EACvB,oBAAoB,EACpB,gBAAgB,EAChB,wBAAwB,EACzB,MAAM,2BAA2B,CAAA;AAClC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAEnE;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,MAAM,EAAE,EACf,IAAI,EAAE,SAAS,gBAAgB,EAAE,EACjC,MAAM,EAAE,MAAM,EACd,EAAE,CAAC,EAAE,MAAM,GACV,IAAI,CAcN;AAED;;;;;;;GAOG;AACH,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,MAAM,EAAE,EACf,IAAI,EAAE,uBAAuB,EAC7B,MAAM,EAAE,MAAM,GACb,IAAI,CAYN;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,kCAAkC,CAChD,KAAK,EAAE,MAAM,EAAE,EACf,IAAI,EAAE,6BAA6B,EACnC,MAAM,EAAE,MAAM,GACb,IAAI,CAIN;AAED;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,MAAM,EAAE,EACf,IAAI,EAAE,oBAAoB,EAC1B,MAAM,EAAE,MAAM,EACd,EAAE,CAAC,EAAE,MAAM,GACV,IAAI,CAyDN;AAED;;;;;;GAMG;AACH,wBAAgB,8BAA8B,CAC5C,KAAK,EAAE,MAAM,EAAE,EACf,YAAY,EAAE,SAAS,wBAAwB,EAAE,EACjD,MAAM,EAAE,MAAM,EACd,EAAE,CAAC,EAAE,MAAM,GACV,IAAI,CAIN;AA0BD;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,MAAM,EAAE,EACf,GAAG,EAAE,gBAAgB,EACrB,SAAS,EAAE,MAAM,EACjB,EAAE,EAAE,MAAM,GAAG,SAAS,GACrB,IAAI,CAiDN"}

package/dist/ir-to-client-js/control-flow/stringify/loop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loop.d.ts","sourceRoot":"","sources":["../../../../src/ir-to-client-js/control-flow/stringify/loop.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AAWH,OAAO,KAAK,EAAE,mBAAmB,EAAE,QAAQ,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEpG;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,MAAM,EAAE,EACf,IAAI,EAAE,SAAS,mBAAmB,EAAE,EACpC,IAAI,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,OAAO,CAAC;IAAC,kBAAkB,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,GAClH,IAAI,CAaN;AAED;;;;;;;;;;GAUG;AAEH;;;;;;;;;;GAUG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,GAAG,IAAI,CAoBnE;AAYD,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,MAAM,EAAE,EACf,IAAI,EAAE,aAAa,EACnB,SAAS,GAAE,MAAa,GACvB,IAAI,CA+KN;AAoDD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,cAAc,GAAG,IAAI,CAkH/E"}
+{"version":3,"file":"loop.d.ts","sourceRoot":"","sources":["../../../../src/ir-to-client-js/control-flow/stringify/loop.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AAWH,OAAO,KAAK,EAAE,mBAAmB,EAAE,QAAQ,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEpG;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,MAAM,EAAE,EACf,IAAI,EAAE,SAAS,mBAAmB,EAAE,EACpC,IAAI,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,OAAO,CAAC;IAAC,kBAAkB,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,GAClH,IAAI,CAaN;AAED;;;;;;;;;;GAUG;AAEH;;;;;;;;;;GAUG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,GAAG,IAAI,CAoBnE;AAYD,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,MAAM,EAAE,EACf,IAAI,EAAE,aAAa,EACnB,SAAS,GAAE,MAAa,GACvB,IAAI,CA+KN;AAoDD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,cAAc,GAAG,IAAI,CAsH/E"}

package/dist/ir-to-client-js/control-flow/stringify/template-parse.d.ts

@@ -1,7 +1,7 @@
 /**
  * Helpers for emitting code that parses a template literal into a DOM
- * element clone, while preserving the SVG namespace when the loop body
- * root is an SVG element.
+ * element clone, while preserving the SVG/MathML namespace when the loop
+ * body root is a foreign-content element.
  *
  * Background (#135): the standard pattern
  *   `const __tpl = document.createElement('template')`
@@ -14,60 +14,87 @@
  * Editor block when a new edge `<path>` was appended via mapArray and
  * never showed up on the canvas.
  *
- * Fix: when the template's root tag is an SVG element, wrap the parsed
- * markup in a synthetic `<svg>` so the HTML5 parser walks into SVG
- * foreign content and assigns the correct namespace, then descend one
- * extra level to get the real root.
+ * Fix: when the template's root tag is an SVG (or, #1096, MathML) element,
+ * wrap the parsed markup in the matching synthetic namespace root
+ * (`<svg>` / `<math>`) so the HTML5 parser walks into foreign content and
+ * assigns the correct namespace, then descend one extra level to get the
+ * real root. The two namespaces share every byte of this machinery —
+ * only the wrap tag name differs — so `detectRootNamespaceWrapTag` and
+ * `namespaceWrapForTemplate` below are the single door every emitter
+ * (in this file and its consumers) reads the wrap decision through.
  */
+/** Namespaces whose root tags need the synthetic-wrap parser nudge. */
+export type NamespaceWrapTag = 'svg' | 'math';
 /**
- * Decide whether a template literal needs SVG-context parsing.
- * Looks at the first opening tag in the literal. The check is purely
- * lexical so that interpolations inside attribute values do not
- * confuse it.
+ * Decide whether a template literal needs foreign-content (SVG or MathML)
+ * parsing, and which. Looks at the first opening tag in the literal. The
+ * check is purely lexical so that interpolations inside attribute values
+ * do not confuse it.
  *
  * Three shapes are recognised:
- *   1. Direct element root — `<circle .../>`
+ *   1. Direct element root — `<circle .../>` / `<mrow>...</mrow>`
  *   2. Conditional body (#1088) — `${cond ? `<circle .../>` : `<rect .../>`}`
- *      where every result-position template literal starts with an SVG
- *      tag. The compiler emits this shape for `.map(s => cond ? <a/> : <b/>)`
- *      bodies; without the wrap the cloned element ends up in the xhtml
- *      namespace and renders nothing.
+ *      where every result-position template literal (recursively) resolves
+ *      to the SAME namespace. The compiler emits this shape for
+ *      `.map(s => cond ? <a/> : <b/>)` bodies; without the wrap the cloned
+ *      element ends up in the xhtml namespace and renders nothing.
  *   3. Reactive-conditional body — a branch wrapped in `<!--bf-cond-start:sX-->`
  *      / `<!--bf-cond-end:sX-->` markers (emitted for nested reactive
  *      conditionals). The check skips leading HTML comments and recurses
  *      into the inner `${...}`.
  *
- * Mixed-namespace branches (one HTML, one SVG) intentionally fall through
- * to no-wrap so the user sees the same broken output as before instead of
- * a silent over-wrap into a `<foreignObject>`-style mismatch.
+ * Mixed-namespace branches (HTML+SVG, HTML+MathML, or SVG+MathML)
+ * intentionally fall through to no-wrap so the user sees the same broken
+ * output as before instead of a silent over-wrap that would drag one
+ * branch into the wrong foreign-content namespace.
  */
-export declare function templateRootIsSvg(template: string): boolean;
+export declare function detectRootNamespaceWrapTag(template: string): NamespaceWrapTag | null;
 /**
  * Wrap decision for MULTI-ROOT (fragment) templates, where the synthetic
- * `<svg>` wrap swallows every sibling root at once (#2233 Copilot review).
+ * namespace wrap swallows every sibling root at once (#2233 Copilot
+ * review, generalised to MathML in #1096).
  *
- * `templateRootIsSvg` inspects only the FIRST root tag. For single-root
- * templates that's exact, but a fragment whose first root is an `<svg>`
- * CONTAINER (`<><svg/><span/></>`) doesn't need the wrap at all — the
- * HTML parser enters foreign content at `<svg>` on its own — and wrapping
- * would drag the HTML siblings into the SVG namespace (`<span>` becomes an
- * SVGUnknownElement, silently undrawn). So `<svg>`-first fragments skip
- * the wrap; only leaf-rooted fragments (`<line>`, `<circle>`, ...) get it.
+ * `detectRootNamespaceWrapTag` inspects only the FIRST root tag. For
+ * single-root templates that's exact, but a fragment whose first root is
+ * the namespace CONTAINER itself (`<><svg/><span/></>`, `<><math/><span/></>`)
+ * doesn't need the wrap at all — the HTML parser enters foreign content at
+ * `<svg>`/`<math>` on its own — and wrapping would drag the HTML siblings
+ * into the foreign namespace (`<span>` becomes an SVGUnknownElement/etc.,
+ * silently undrawn). So container-first fragments skip the wrap; only
+ * leaf-rooted fragments (`<line>`, `<circle>`, `<mrow>`, ...) get it.
  *
- * Known edge (degenerate, pre-existing): an `<svg>`-first fragment with
- * SVG-LEAF siblings (`<><svg/><line/></>`) leaves the bare leaf siblings
- * in the HTML namespace — exactly the pre-#2219 behavior. Deciding that
- * shape correctly needs a scan of every top-level root tag; not worth the
- * parser until a real component hits it.
+ * Known edge (degenerate, pre-existing): a container-first fragment with
+ * LEAF siblings of the same namespace (`<><svg/><line/></>`) leaves the
+ * bare leaf siblings in the HTML namespace — exactly the pre-#2219
+ * behavior. Deciding that shape correctly needs a scan of every top-level
+ * root tag; not worth the parser until a real component hits it.
  */
-export declare function multiRootTemplateNeedsSvgWrap(template: string): boolean;
+export declare function multiRootTemplateNeedsNamespaceWrap(template: string): NamespaceWrapTag | null;
+/**
+ * Single door for the "wrap tag + descent path" pair every namespace-aware
+ * clone site needs. Consumers outside this file (`inner-loop.ts`,
+ * `loop-child-arm.ts`, `loop.ts`) read the wrap decision through this
+ * function instead of re-deriving `isSvg ? '<svg>' : ...` locally — keeps
+ * the SVG/MathML wrap code path in exactly one place (#1096).
+ */
+export declare function namespaceWrapForTemplate(template: string): {
+    wrapTag: NamespaceWrapTag | null;
+    childPath: string;
+};
+/** `namespaceWrapForTemplate`, but for the multi-root fragment predicate. */
+export declare function multiRootNamespaceWrapForTemplate(template: string): {
+    wrapTag: NamespaceWrapTag | null;
+    childPath: string;
+};
+/** Wrap `html` in the namespace's synthetic root tag, or return it as-is. */
+export declare function wrapHtmlForNamespace(html: string, wrapTag: NamespaceWrapTag | null): string;
 /**
  * Build the inline template-clone expression as one line.
  *
  *   ` const __tpl = document.createElement('template'); __tpl.innerHTML = \`${template}\`; return __tpl.content.firstElementChild.cloneNode(true) `
  *
- * For SVG roots, the `innerHTML` is wrapped in `<svg>...</svg>` and the
- * traversal descends one extra level.
+ * For SVG/MathML roots, the `innerHTML` is wrapped in the matching
+ * namespace root tag and the traversal descends one extra level.
  */
 export declare function emitTemplateCloneInline(template: string): string;
 /**
@@ -78,9 +105,10 @@ export declare function emitTemplateCloneInline(template: string): string;
  * STATIC-ONLY skeleton produced by `buildLoopSkeletonTemplate` (dynamic attrs
  * omitted, text markers empty) — never the per-row interpolated `template`.
  *
- * SVG namespace wrap mirrors `emitTemplateCloneLines` (#135 / #1088):
- * `templateRootIsSvg` is re-checked against the skeleton (same root tag as
- * the interpolated template, so the same wrap decision applies).
+ * Namespace wrap mirrors `emitTemplateCloneLines` (#135 / #1088 / #1096):
+ * `detectRootNamespaceWrapTag` is re-checked against the skeleton (same
+ * root tag as the interpolated template, so the same wrap decision
+ * applies).
  */
 export declare function emitHoistedTemplateDecl(lines: string[], indent: string, tplVar: string, skeletonTemplate: string): void;
 /**

package/dist/ir-to-client-js/control-flow/stringify/template-parse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"template-parse.d.ts","sourceRoot":"","sources":["../../../../src/ir-to-client-js/control-flow/stringify/template-parse.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAkBH;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAsB3D;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAIvE;AAkDD;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKhE;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAKvH;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,MAAM,CAIjF;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAajF;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,MAAM,EAAE,EACf,IAAI,EAAE;IACJ,QAAQ,EAAE,MAAM,CAAA;IAChB,eAAe,EAAE,OAAO,CAAA;IACxB,MAAM,EAAE,MAAM,CAAA;IACd,sFAAsF;IACtF,gBAAgB,EAAE,QAAQ,GAAG,WAAW,CAAA;IACxC;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,GACA,IAAI,CA4BN;AAED;;;;;;;;;GASG;AACH,wBAAgB,+BAA+B,CAC7C,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,GAChB,MAAM,EAAE,CAeV"}
+{"version":3,"file":"template-parse.d.ts","sourceRoot":"","sources":["../../../../src/ir-to-client-js/control-flow/stringify/template-parse.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAkCH,uEAAuE;AACvE,MAAM,MAAM,gBAAgB,GAAG,KAAK,GAAG,MAAM,CAAA;AAe7C;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI,CAsBpF;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,mCAAmC,CAAC,QAAQ,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI,CAO7F;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,GAAG;IAAE,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAMlH;AAED,6EAA6E;AAC7E,wBAAgB,iCAAiC,CAAC,QAAQ,EAAE,MAAM,GAAG;IAAE,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAM3H;AAED,6EAA6E;AAC7E,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,GAAG,IAAI,GAAG,MAAM,CAE3F;AAkDD;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAIhE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAKvH;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,MAAM,CAEjF;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAQjF;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,MAAM,EAAE,EACf,IAAI,EAAE;IACJ,QAAQ,EAAE,MAAM,CAAA;IAChB,eAAe,EAAE,OAAO,CAAA;IACxB,MAAM,EAAE,MAAM,CAAA;IACd,sFAAsF;IACtF,gBAAgB,EAAE,QAAQ,GAAG,WAAW,CAAA;IACxC;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,GACA,IAAI,CA4BN;AAED;;;;;;;;;GASG;AACH,wBAAgB,+BAA+B,CAC7C,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,GAChB,MAAM,EAAE,CAeV"}

package/dist/ir-to-client-js/csr-substitute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"csr-substitute.d.ts","sourceRoot":"","sources":["../../src/ir-to-client-js/csr-substitute.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAKH,OAAO,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAE7D;;;;;;;;;;;GAWG;AACH,MAAM,WAAW,iBAAiB;IAChC,cAAc,EAAE,MAAM,CAAA;IACtB,eAAe,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;CACrC;AAED;;;;;GAKG;AACH,MAAM,MAAM,kBAAkB,GAAG,GAAG,CAAC,MAAM,EAAE,iBAAiB,GAAG,IAAI,CAAC,CAAA;AAEtE;;;;GAIG;AACH,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,GAAG,YAAY,CAAA;IAC3B,sEAAsE;IACtE,WAAW,EAAE,MAAM,CAAA;IACnB,qFAAqF;IACrF,eAAe,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;CACrC;AAED,MAAM,WAAW,MAAM;IACrB;;;;;OAKG;IACH,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;IAC3C,4EAA4E;IAC5E,eAAe,EAAE,MAAM,GAAG,IAAI,CAAA;CAC/B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,aAAa,CAC3B,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,EACX,cAAc,CAAC,EAAE,YAAY,GAC5B;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;CAAE,CAmB7D;AAwMD;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAGtF;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAaxE;AAED;;;;;;;;GAQG;AACH,wBAAgB,uCAAuC,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAUjF;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,sCAAsC,CAAC,QAAQ,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAkBpF;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAQ/D;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,SAAS,UAAU,EAAE,EAC9B,KAAK,EAAE,SAAS,QAAQ,EAAE,EAC1B,eAAe,EAAE,MAAM,GAAG,IAAI,GAC7B,MAAM,CA2BR"}
+{"version":3,"file":"csr-substitute.d.ts","sourceRoot":"","sources":["../../src/ir-to-client-js/csr-substitute.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAKH,OAAO,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAE7D;;;;;;;;;;;GAWG;AACH,MAAM,WAAW,iBAAiB;IAChC,cAAc,EAAE,MAAM,CAAA;IACtB,eAAe,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;CACrC;AAED;;;;;GAKG;AACH,MAAM,MAAM,kBAAkB,GAAG,GAAG,CAAC,MAAM,EAAE,iBAAiB,GAAG,IAAI,CAAC,CAAA;AAEtE;;;;GAIG;AACH,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,GAAG,YAAY,CAAA;IAC3B,sEAAsE;IACtE,WAAW,EAAE,MAAM,CAAA;IACnB,qFAAqF;IACrF,eAAe,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;CACrC;AAED,MAAM,WAAW,MAAM;IACrB;;;;;OAKG;IACH,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;IAC3C,4EAA4E;IAC5E,eAAe,EAAE,MAAM,GAAG,IAAI,CAAA;CAC/B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,aAAa,CAC3B,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,EACX,cAAc,CAAC,EAAE,YAAY,GAC5B;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;CAAE,CAmB7D;AAwMD;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAGtF;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAaxE;AAED;;;;;;;;GAQG;AACH,wBAAgB,uCAAuC,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAUjF;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,sCAAsC,CAAC,QAAQ,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAkBpF;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAQ/D;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,SAAS,UAAU,EAAE,EAC9B,KAAK,EAAE,SAAS,QAAQ,EAAE,EAC1B,eAAe,EAAE,MAAM,GAAG,IAAI,GAC7B,MAAM,CA4BR"}

package/dist/ir-to-client-js/emit-registration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"emit-registration.d.ts","sourceRoot":"","sources":["../../src/ir-to-client-js/emit-registration.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAc,MAAM,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AACnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAMjD;;;;;;;;;;;GAWG;AACH,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,UAAU,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAmD9G;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,eAAe,EACpB,KAAK,EAAE,eAAe,EACtB,MAAM,EAAE,MAAM,GACb;IACD,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACvC,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;CAC9B,CAGA;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,eAAe,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAMtF;AAED,4EAA4E;AAC5E;;;;GAIG;AACH,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,MAAM,EAAE,EACf,GAAG,EAAE,eAAe,EACpB,GAAG,EAAE,WAAW,EAChB,KAAK,EAAE,eAAe;AACtB;;;;;;GAMG;AACH,YAAY,CAAC,EAAE;IAAE,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;CAAE,GACxF,MAAM,CAqFR"}
+{"version":3,"file":"emit-registration.d.ts","sourceRoot":"","sources":["../../src/ir-to-client-js/emit-registration.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAc,MAAM,EAAE,eAAe,EAAc,MAAM,aAAa,CAAA;AAC/F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAMjD;;;;;;;;;;;GAWG;AACH,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,UAAU,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAmD9G;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,eAAe,EACpB,KAAK,EAAE,eAAe,EACtB,MAAM,EAAE,MAAM,GACb;IACD,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACvC,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;CAC9B,CAGA;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,eAAe,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAMtF;AAkDD,4EAA4E;AAC5E;;;;GAIG;AACH,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,MAAM,EAAE,EACf,GAAG,EAAE,eAAe,EACpB,GAAG,EAAE,WAAW,EAChB,KAAK,EAAE,eAAe;AACtB;;;;;;GAMG;AACH,YAAY,CAAC,EAAE;IAAE,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;CAAE,GACxF,MAAM,CAyFR"}

package/dist/ir-to-client-js/html-template.d.ts

@@ -323,6 +323,20 @@ export interface TemplateOptions {
      * the template phase agree on which children defer (dropped-prop fix).
      */
     deferredChildSlots?: ReadonlySet<string>;
+    /**
+     * Slot ids of top-level, non-conditional dynamic expressions
+     * (`ctx.dynamicElements`, populated by `collectElements` — the exact set
+     * `emit-reactive.ts`'s `emitDynamicTextUpdates` claims `kind: 'markup'`
+     * for on the REACTIVE side, #2651). When a text-marker expression's
+     * `slotId` is a member, `escapeTextSlotExpr` emits `escapeTextOrMarkup`
+     * instead of `escapeText` so a `bfMarkup()`-branded prop value (a JSX
+     * element passed at a non-`children` component prop position) reaches
+     * the initial-render template raw, matching what the reactive writer
+     * already does via `escapeTextOrNode`. Computed once per component from
+     * `ctx.dynamicElements` by `irToComponentTemplate` / `generateCsrTemplate`
+     * — never re-derived here.
+     */
+    markupSlotIds?: ReadonlySet<string>;
 }
 /**
  * Generate HTML template for registerTemplate().
@@ -333,7 +347,7 @@ export interface TemplateOptions {
  * - Local constant references are inlined with their resolved values (#343)
  * - bf markers ARE included so client code can find elements
  */
-export declare function irToComponentTemplate(node: IRNode, inlinableConstants?: Map<string, string>, restSpreadNames?: Set<string>, propsObjectName?: string | null): string;
+export declare function irToComponentTemplate(node: IRNode, inlinableConstants?: Map<string, string>, restSpreadNames?: Set<string>, propsObjectName?: string | null, markupSlotIds?: ReadonlySet<string>): string;
 /**
  * Check if a component can have a simple static template generated.
  * Returns false if the component has: