hadars 0.1.18 → 0.1.19

package/dist/{chunk-TGSIYGY2.js → chunk-OS3V4CPN.js}

@@ -1,5 +1,6 @@
 // src/slim-react/types.ts
 var SLIM_ELEMENT = Symbol.for("react.element");
+var REACT19_ELEMENT = Symbol.for("react.transitional.element");
 var FRAGMENT_TYPE = Symbol.for("react.fragment");
 var SUSPENSE_TYPE = Symbol.for("react.suspense");
 
@@ -32,6 +33,7 @@ function createElement(type, props, ...children) {
 
 export {
   SLIM_ELEMENT,
+  REACT19_ELEMENT,
   FRAGMENT_TYPE,
   SUSPENSE_TYPE,
   Fragment,

package/dist/cli.js

@@ -136,6 +136,7 @@ var upgradeHandler = (options) => {
 
 // src/slim-react/types.ts
 var SLIM_ELEMENT = Symbol.for("react.element");
+var REACT19_ELEMENT = Symbol.for("react.transitional.element");
 var FRAGMENT_TYPE = Symbol.for("react.fragment");
 var SUSPENSE_TYPE = Symbol.for("react.suspense");
 
@@ -233,7 +234,7 @@ var VOID_ELEMENTS = /* @__PURE__ */ new Set([
   "wbr"
 ]);
 function escapeHtml(str) {
-  return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+  return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/'/g, "&#x27;");
 }
 function escapeAttr(str) {
   return str.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
@@ -378,7 +379,7 @@ var SVG_ATTR_MAP = {
 function renderAttributes(props, isSvg) {
   let attrs = "";
   for (const [key, value] of Object.entries(props)) {
-    if (key === "children" || key === "key" || key === "ref" || key === "dangerouslySetInnerHTML")
+    if (key === "children" || key === "key" || key === "ref" || key === "dangerouslySetInnerHTML" || key === "suppressHydrationWarning" || key === "suppressContentEditableWarning")
       continue;
     if (key.startsWith("on") && key.length > 2 && key[2] === key[2].toUpperCase())
       continue;
@@ -386,12 +387,16 @@ function renderAttributes(props, isSvg) {
     if (isSvg && key in SVG_ATTR_MAP) {
       attrName = SVG_ATTR_MAP[key];
     } else {
-      attrName = key === "className" ? "class" : key === "htmlFor" ? "for" : key === "tabIndex" ? "tabindex" : key;
+      attrName = key === "className" ? "class" : key === "htmlFor" ? "for" : key === "tabIndex" ? "tabindex" : key === "defaultValue" ? "value" : key === "defaultChecked" ? "checked" : key;
     }
-    if (value === false || value == null)
+    if (value === false || value == null) {
+      if (value === false && (attrName.startsWith("aria-") || attrName.startsWith("data-"))) {
+        attrs += ` ${attrName}="false"`;
+      }
       continue;
+    }
     if (value === true) {
-      attrs += ` ${attrName}`;
+      attrs += ` ${attrName}=""`;
       continue;
     }
     if (key === "style" && typeof value === "object") {
@@ -404,23 +409,30 @@ function renderAttributes(props, isSvg) {
 }
 var BufferWriter = class {
   chunks = [];
+  lastWasText = false;
   write(chunk) {
     this.chunks.push(chunk);
+    this.lastWasText = false;
+  }
+  text(s2) {
+    this.chunks.push(s2);
+    this.lastWasText = true;
   }
   flush(target) {
     for (const c of this.chunks)
       target.write(c);
+    target.lastWasText = this.lastWasText;
   }
 };
 function renderNode(node, writer, isSvg = false) {
   if (node == null || typeof node === "boolean")
     return;
   if (typeof node === "string") {
-    writer.write(escapeHtml(node));
+    writer.text(escapeHtml(node));
     return;
   }
   if (typeof node === "number") {
-    writer.write(String(node));
+    writer.text(String(node));
     return;
   }
   if (Array.isArray(node)) {
@@ -433,7 +445,10 @@ function renderNode(node, writer, isSvg = false) {
       isSvg
     );
   }
-  if (typeof node === "object" && node !== null && "$$typeof" in node && node.$$typeof === SLIM_ELEMENT) {
+  if (typeof node === "object" && node !== null && "$$typeof" in node) {
+    const elType = node["$$typeof"];
+    if (elType !== SLIM_ELEMENT && elType !== REACT19_ELEMENT)
+      return;
     const element = node;
     const { type, props } = element;
     if (type === FRAGMENT_TYPE) {
@@ -445,16 +460,79 @@ function renderNode(node, writer, isSvg = false) {
     if (typeof type === "function") {
       return renderComponent(type, props, writer, isSvg);
     }
+    if (typeof type === "object" && type !== null) {
+      return renderComponent(type, props, writer, isSvg);
+    }
     if (typeof type === "string") {
       return renderHostElement(type, props, writer, isSvg);
     }
   }
 }
+function markSelectedOptionsMulti(children, selectedValues) {
+  if (children == null || typeof children === "boolean")
+    return children;
+  if (typeof children === "string" || typeof children === "number")
+    return children;
+  if (Array.isArray(children)) {
+    return children.map((c) => markSelectedOptionsMulti(c, selectedValues));
+  }
+  if (typeof children === "object" && "$$typeof" in children) {
+    const elType = children["$$typeof"];
+    if (elType !== SLIM_ELEMENT && elType !== REACT19_ELEMENT)
+      return children;
+    const el = children;
+    if (el.type === "option") {
+      const optValue = el.props.value !== void 0 ? el.props.value : el.props.children;
+      const isSelected = selectedValues.has(String(optValue));
+      return { ...el, props: { ...el.props, selected: isSelected || void 0 } };
+    }
+    if (el.type === "optgroup" || el.type === FRAGMENT_TYPE) {
+      const newChildren = markSelectedOptionsMulti(el.props.children, selectedValues);
+      return { ...el, props: { ...el.props, children: newChildren } };
+    }
+  }
+  return children;
+}
 function renderHostElement(tag, props, writer, isSvg) {
   const enteringSvg = tag === "svg";
   const childSvg = isSvg || enteringSvg;
-  const effectiveProps = enteringSvg && !props.xmlns ? { xmlns: "http://www.w3.org/2000/svg", ...props } : props;
-  writer.write(`<${tag}${renderAttributes(effectiveProps, childSvg)}>`);
+  if (tag === "textarea") {
+    const textContent = props.value ?? props.defaultValue ?? props.children ?? "";
+    const filteredProps = {};
+    for (const k of Object.keys(props)) {
+      if (k !== "value" && k !== "defaultValue" && k !== "children")
+        filteredProps[k] = props[k];
+    }
+    writer.write(`<textarea${renderAttributes(filteredProps, false)}>`);
+    writer.text(escapeHtml(String(textContent)));
+    writer.write("</textarea>");
+    return;
+  }
+  if (tag === "select") {
+    const selectedValue = props.value ?? props.defaultValue;
+    const filteredProps = {};
+    for (const k of Object.keys(props)) {
+      if (k !== "value" && k !== "defaultValue")
+        filteredProps[k] = props[k];
+    }
+    writer.write(`<select${renderAttributes(filteredProps, false)}>`);
+    const selectedSet = selectedValue == null ? null : Array.isArray(selectedValue) ? new Set(selectedValue.map(String)) : /* @__PURE__ */ new Set([String(selectedValue)]);
+    const patchedChildren = selectedSet != null ? markSelectedOptionsMulti(props.children, selectedSet) : props.children;
+    const inner2 = renderChildren(patchedChildren, writer, false);
+    if (inner2 && typeof inner2.then === "function") {
+      return inner2.then(() => {
+        writer.write("</select>");
+      });
+    }
+    writer.write("</select>");
+    return;
+  }
+  writer.write(`<${tag}${renderAttributes(props, childSvg)}`);
+  if (VOID_ELEMENTS.has(tag)) {
+    writer.write("/>");
+    return;
+  }
+  writer.write(">");
   const childContext = tag === "foreignObject" ? false : childSvg;
   let inner = void 0;
   if (props.dangerouslySetInnerHTML) {
@@ -464,17 +542,17 @@ function renderHostElement(tag, props, writer, isSvg) {
   }
   if (inner && typeof inner.then === "function") {
     return inner.then(() => {
-      if (!VOID_ELEMENTS.has(tag))
-        writer.write(`</${tag}>`);
+      writer.write(`</${tag}>`);
     });
   }
-  if (!VOID_ELEMENTS.has(tag))
-    writer.write(`</${tag}>`);
+  writer.write(`</${tag}>`);
 }
 var REACT_MEMO = Symbol.for("react.memo");
 var REACT_FORWARD_REF = Symbol.for("react.forward_ref");
 var REACT_PROVIDER = Symbol.for("react.provider");
 var REACT_CONTEXT = Symbol.for("react.context");
+var REACT_CONSUMER = Symbol.for("react.consumer");
+var REACT_LAZY = Symbol.for("react.lazy");
 function renderComponent(type, props, writer, isSvg) {
   const typeOf = type?.$$typeof;
   if (typeOf === REACT_MEMO) {
@@ -487,6 +565,24 @@ function renderComponent(type, props, writer, isSvg) {
   if (typeOf === REACT_FORWARD_REF) {
     return renderComponent(type.render, props, writer, isSvg);
   }
+  if (typeOf === REACT_LAZY) {
+    const resolved = type._init(type._payload);
+    const LazyComp = resolved?.default ?? resolved;
+    return renderComponent(LazyComp, props, writer, isSvg);
+  }
+  if (typeOf === REACT_CONSUMER) {
+    const ctx2 = type._context;
+    const value = ctx2?._currentValue;
+    const result2 = typeof props.children === "function" ? props.children(value) : null;
+    const savedScope2 = pushComponentScope();
+    const finish2 = () => popComponentScope(savedScope2);
+    const r2 = renderNode(result2, writer, isSvg);
+    if (r2 && typeof r2.then === "function") {
+      return r2.then(finish2);
+    }
+    finish2();
+    return;
+  }
   const isProvider = "_context" in type || typeOf === REACT_PROVIDER || typeOf === REACT_CONTEXT && "value" in props;
   let prevCtxValue;
   let ctx;
@@ -496,10 +592,27 @@ function renderComponent(type, props, writer, isSvg) {
     ctx._currentValue = props.value;
   }
   const savedScope = pushComponentScope();
+  if (isProvider && typeof type !== "function") {
+    const finish2 = () => {
+      popComponentScope(savedScope);
+      ctx._currentValue = prevCtxValue;
+    };
+    const r2 = renderChildren(props.children, writer, isSvg);
+    if (r2 && typeof r2.then === "function") {
+      return r2.then(finish2);
+    }
+    finish2();
+    return;
+  }
   let result;
   try {
     if (type.prototype && typeof type.prototype.render === "function") {
       const instance = new type(props);
+      if (typeof type.getDerivedStateFromProps === "function") {
+        const derived = type.getDerivedStateFromProps(props, instance.state ?? {});
+        if (derived != null)
+          instance.state = { ...instance.state ?? {}, ...derived };
+      }
       result = instance.render();
     } else {
       result = type(props);
@@ -536,7 +649,7 @@ function isTextLike(node) {
 function renderChildArray(children, writer, isSvg) {
   const totalChildren = children.length;
   for (let i = 0; i < totalChildren; i++) {
-    if (i > 0 && isTextLike(children[i]) && isTextLike(children[i - 1])) {
+    if (isTextLike(children[i]) && writer.lastWasText) {
       writer.write("<!-- -->");
     }
     const savedTree = pushTreeContext(totalChildren, i);
@@ -553,7 +666,7 @@ function renderChildArray(children, writer, isSvg) {
 function renderChildArrayFrom(children, startIndex, writer, isSvg) {
   const totalChildren = children.length;
   for (let i = startIndex; i < totalChildren; i++) {
-    if (i > 0 && isTextLike(children[i]) && isTextLike(children[i - 1])) {
+    if (isTextLike(children[i]) && writer.lastWasText) {
       writer.write("<!-- -->");
     }
     const savedTree = pushTreeContext(totalChildren, i);
@@ -614,9 +727,17 @@ async function renderToString(element) {
   for (let attempt = 0; attempt < MAX_SUSPENSE_RETRIES; attempt++) {
     resetRenderState();
     const chunks = [];
-    const writer = { write(c) {
-      chunks.push(c);
-    } };
+    const writer = {
+      lastWasText: false,
+      write(c) {
+        chunks.push(c);
+        this.lastWasText = false;
+      },
+      text(s2) {
+        chunks.push(s2);
+        this.lastWasText = true;
+      }
+    };
     try {
       const r = renderNode(element, writer);
       if (r && typeof r.then === "function")

package/dist/slim-react/index.cjs

@@ -67,6 +67,7 @@ module.exports = __toCommonJS(slim_react_exports);
 
 // src/slim-react/types.ts
 var SLIM_ELEMENT = Symbol.for("react.element");
+var REACT19_ELEMENT = Symbol.for("react.transitional.element");
 var FRAGMENT_TYPE = Symbol.for("react.fragment");
 var SUSPENSE_TYPE = Symbol.for("react.suspense");
 
@@ -277,7 +278,7 @@ var VOID_ELEMENTS = /* @__PURE__ */ new Set([
   "wbr"
 ]);
 function escapeHtml(str) {
-  return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+  return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/'/g, "&#x27;");
 }
 function escapeAttr(str) {
   return str.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
@@ -422,7 +423,7 @@ var SVG_ATTR_MAP = {
 function renderAttributes(props, isSvg) {
   let attrs = "";
   for (const [key, value] of Object.entries(props)) {
-    if (key === "children" || key === "key" || key === "ref" || key === "dangerouslySetInnerHTML")
+    if (key === "children" || key === "key" || key === "ref" || key === "dangerouslySetInnerHTML" || key === "suppressHydrationWarning" || key === "suppressContentEditableWarning")
       continue;
     if (key.startsWith("on") && key.length > 2 && key[2] === key[2].toUpperCase())
       continue;
@@ -430,12 +431,16 @@ function renderAttributes(props, isSvg) {
     if (isSvg && key in SVG_ATTR_MAP) {
       attrName = SVG_ATTR_MAP[key];
     } else {
-      attrName = key === "className" ? "class" : key === "htmlFor" ? "for" : key === "tabIndex" ? "tabindex" : key;
+      attrName = key === "className" ? "class" : key === "htmlFor" ? "for" : key === "tabIndex" ? "tabindex" : key === "defaultValue" ? "value" : key === "defaultChecked" ? "checked" : key;
     }
-    if (value === false || value == null)
+    if (value === false || value == null) {
+      if (value === false && (attrName.startsWith("aria-") || attrName.startsWith("data-"))) {
+        attrs += ` ${attrName}="false"`;
+      }
       continue;
+    }
     if (value === true) {
-      attrs += ` ${attrName}`;
+      attrs += ` ${attrName}=""`;
       continue;
     }
     if (key === "style" && typeof value === "object") {
@@ -448,23 +453,30 @@ function renderAttributes(props, isSvg) {
 }
 var BufferWriter = class {
   chunks = [];
+  lastWasText = false;
   write(chunk) {
     this.chunks.push(chunk);
+    this.lastWasText = false;
+  }
+  text(s2) {
+    this.chunks.push(s2);
+    this.lastWasText = true;
   }
   flush(target) {
     for (const c of this.chunks)
       target.write(c);
+    target.lastWasText = this.lastWasText;
   }
 };
 function renderNode(node, writer, isSvg = false) {
   if (node == null || typeof node === "boolean")
     return;
   if (typeof node === "string") {
-    writer.write(escapeHtml(node));
+    writer.text(escapeHtml(node));
     return;
   }
   if (typeof node === "number") {
-    writer.write(String(node));
+    writer.text(String(node));
     return;
   }
   if (Array.isArray(node)) {
@@ -477,7 +489,10 @@ function renderNode(node, writer, isSvg = false) {
       isSvg
     );
   }
-  if (typeof node === "object" && node !== null && "$$typeof" in node && node.$$typeof === SLIM_ELEMENT) {
+  if (typeof node === "object" && node !== null && "$$typeof" in node) {
+    const elType = node["$$typeof"];
+    if (elType !== SLIM_ELEMENT && elType !== REACT19_ELEMENT)
+      return;
     const element = node;
     const { type, props } = element;
     if (type === FRAGMENT_TYPE) {
@@ -489,16 +504,79 @@ function renderNode(node, writer, isSvg = false) {
     if (typeof type === "function") {
       return renderComponent(type, props, writer, isSvg);
     }
+    if (typeof type === "object" && type !== null) {
+      return renderComponent(type, props, writer, isSvg);
+    }
     if (typeof type === "string") {
       return renderHostElement(type, props, writer, isSvg);
     }
   }
 }
+function markSelectedOptionsMulti(children, selectedValues) {
+  if (children == null || typeof children === "boolean")
+    return children;
+  if (typeof children === "string" || typeof children === "number")
+    return children;
+  if (Array.isArray(children)) {
+    return children.map((c) => markSelectedOptionsMulti(c, selectedValues));
+  }
+  if (typeof children === "object" && "$$typeof" in children) {
+    const elType = children["$$typeof"];
+    if (elType !== SLIM_ELEMENT && elType !== REACT19_ELEMENT)
+      return children;
+    const el = children;
+    if (el.type === "option") {
+      const optValue = el.props.value !== void 0 ? el.props.value : el.props.children;
+      const isSelected = selectedValues.has(String(optValue));
+      return { ...el, props: { ...el.props, selected: isSelected || void 0 } };
+    }
+    if (el.type === "optgroup" || el.type === FRAGMENT_TYPE) {
+      const newChildren = markSelectedOptionsMulti(el.props.children, selectedValues);
+      return { ...el, props: { ...el.props, children: newChildren } };
+    }
+  }
+  return children;
+}
 function renderHostElement(tag, props, writer, isSvg) {
   const enteringSvg = tag === "svg";
   const childSvg = isSvg || enteringSvg;
-  const effectiveProps = enteringSvg && !props.xmlns ? { xmlns: "http://www.w3.org/2000/svg", ...props } : props;
-  writer.write(`<${tag}${renderAttributes(effectiveProps, childSvg)}>`);
+  if (tag === "textarea") {
+    const textContent = props.value ?? props.defaultValue ?? props.children ?? "";
+    const filteredProps = {};
+    for (const k of Object.keys(props)) {
+      if (k !== "value" && k !== "defaultValue" && k !== "children")
+        filteredProps[k] = props[k];
+    }
+    writer.write(`<textarea${renderAttributes(filteredProps, false)}>`);
+    writer.text(escapeHtml(String(textContent)));
+    writer.write("</textarea>");
+    return;
+  }
+  if (tag === "select") {
+    const selectedValue = props.value ?? props.defaultValue;
+    const filteredProps = {};
+    for (const k of Object.keys(props)) {
+      if (k !== "value" && k !== "defaultValue")
+        filteredProps[k] = props[k];
+    }
+    writer.write(`<select${renderAttributes(filteredProps, false)}>`);
+    const selectedSet = selectedValue == null ? null : Array.isArray(selectedValue) ? new Set(selectedValue.map(String)) : /* @__PURE__ */ new Set([String(selectedValue)]);
+    const patchedChildren = selectedSet != null ? markSelectedOptionsMulti(props.children, selectedSet) : props.children;
+    const inner2 = renderChildren(patchedChildren, writer, false);
+    if (inner2 && typeof inner2.then === "function") {
+      return inner2.then(() => {
+        writer.write("</select>");
+      });
+    }
+    writer.write("</select>");
+    return;
+  }
+  writer.write(`<${tag}${renderAttributes(props, childSvg)}`);
+  if (VOID_ELEMENTS.has(tag)) {
+    writer.write("/>");
+    return;
+  }
+  writer.write(">");
   const childContext = tag === "foreignObject" ? false : childSvg;
   let inner = void 0;
   if (props.dangerouslySetInnerHTML) {
@@ -508,17 +586,17 @@ function renderHostElement(tag, props, writer, isSvg) {
   }
   if (inner && typeof inner.then === "function") {
     return inner.then(() => {
-      if (!VOID_ELEMENTS.has(tag))
-        writer.write(`</${tag}>`);
+      writer.write(`</${tag}>`);
     });
   }
-  if (!VOID_ELEMENTS.has(tag))
-    writer.write(`</${tag}>`);
+  writer.write(`</${tag}>`);
 }
 var REACT_MEMO = Symbol.for("react.memo");
 var REACT_FORWARD_REF = Symbol.for("react.forward_ref");
 var REACT_PROVIDER = Symbol.for("react.provider");
 var REACT_CONTEXT = Symbol.for("react.context");
+var REACT_CONSUMER = Symbol.for("react.consumer");
+var REACT_LAZY = Symbol.for("react.lazy");
 function renderComponent(type, props, writer, isSvg) {
   const typeOf = type?.$$typeof;
   if (typeOf === REACT_MEMO) {
@@ -531,6 +609,24 @@ function renderComponent(type, props, writer, isSvg) {
   if (typeOf === REACT_FORWARD_REF) {
     return renderComponent(type.render, props, writer, isSvg);
   }
+  if (typeOf === REACT_LAZY) {
+    const resolved = type._init(type._payload);
+    const LazyComp = resolved?.default ?? resolved;
+    return renderComponent(LazyComp, props, writer, isSvg);
+  }
+  if (typeOf === REACT_CONSUMER) {
+    const ctx2 = type._context;
+    const value = ctx2?._currentValue;
+    const result2 = typeof props.children === "function" ? props.children(value) : null;
+    const savedScope2 = pushComponentScope();
+    const finish2 = () => popComponentScope(savedScope2);
+    const r2 = renderNode(result2, writer, isSvg);
+    if (r2 && typeof r2.then === "function") {
+      return r2.then(finish2);
+    }
+    finish2();
+    return;
+  }
   const isProvider = "_context" in type || typeOf === REACT_PROVIDER || typeOf === REACT_CONTEXT && "value" in props;
   let prevCtxValue;
   let ctx;
@@ -540,10 +636,27 @@ function renderComponent(type, props, writer, isSvg) {
     ctx._currentValue = props.value;
   }
   const savedScope = pushComponentScope();
+  if (isProvider && typeof type !== "function") {
+    const finish2 = () => {
+      popComponentScope(savedScope);
+      ctx._currentValue = prevCtxValue;
+    };
+    const r2 = renderChildren(props.children, writer, isSvg);
+    if (r2 && typeof r2.then === "function") {
+      return r2.then(finish2);
+    }
+    finish2();
+    return;
+  }
   let result;
   try {
     if (type.prototype && typeof type.prototype.render === "function") {
       const instance = new type(props);
+      if (typeof type.getDerivedStateFromProps === "function") {
+        const derived = type.getDerivedStateFromProps(props, instance.state ?? {});
+        if (derived != null)
+          instance.state = { ...instance.state ?? {}, ...derived };
+      }
       result = instance.render();
     } else {
       result = type(props);
@@ -580,7 +693,7 @@ function isTextLike(node) {
 function renderChildArray(children, writer, isSvg) {
   const totalChildren = children.length;
   for (let i = 0; i < totalChildren; i++) {
-    if (i > 0 && isTextLike(children[i]) && isTextLike(children[i - 1])) {
+    if (isTextLike(children[i]) && writer.lastWasText) {
       writer.write("<!-- -->");
     }
     const savedTree = pushTreeContext(totalChildren, i);
@@ -597,7 +710,7 @@ function renderChildArray(children, writer, isSvg) {
 function renderChildArrayFrom(children, startIndex, writer, isSvg) {
   const totalChildren = children.length;
   for (let i = startIndex; i < totalChildren; i++) {
-    if (i > 0 && isTextLike(children[i]) && isTextLike(children[i - 1])) {
+    if (isTextLike(children[i]) && writer.lastWasText) {
       writer.write("<!-- -->");
     }
     const savedTree = pushTreeContext(totalChildren, i);
@@ -660,8 +773,14 @@ function renderToStream(element) {
     async start(controller) {
       resetRenderState();
       const writer = {
+        lastWasText: false,
         write(chunk) {
           controller.enqueue(encoder.encode(chunk));
+          this.lastWasText = false;
+        },
+        text(s2) {
+          controller.enqueue(encoder.encode(s2));
+          this.lastWasText = true;
         }
       };
       try {
@@ -679,9 +798,17 @@ async function renderToString(element) {
   for (let attempt = 0; attempt < MAX_SUSPENSE_RETRIES; attempt++) {
     resetRenderState();
     const chunks = [];
-    const writer = { write(c) {
-      chunks.push(c);
-    } };
+    const writer = {
+      lastWasText: false,
+      write(c) {
+        chunks.push(c);
+        this.lastWasText = false;
+      },
+      text(s2) {
+        chunks.push(s2);
+        this.lastWasText = true;
+      }
+    };
     try {
       const r = renderNode(element, writer);
       if (r && typeof r.then === "function")