hadars 0.3.0 → 0.3.2

package/README.md

@@ -2,6 +2,8 @@
 
 A minimal server-side rendering framework for React built on [rspack](https://rspack.dev). Runs on Bun, Node.js, and Deno.
 
+**[hadars.xyz](https://hadars.xyz)** — docs & website
+
 ## Why hadars?
 
 hadars is an alternative to Next.js for apps that just need SSR.
@@ -19,30 +21,30 @@ Bring your own router (or none), keep your components as plain React, and get SS
 ## Benchmarks
 
 <!-- BENCHMARK_START -->
-> Last run: 2026-03-23 · 120s · 100 connections · Bun runtime
-> hadars is **8.7x faster** in requests/sec
+> Last run: 2026-03-25 · 120s · 100 connections · Bun runtime
+> hadars is **8.9x faster** in requests/sec
 
 **Throughput** (autocannon, 120s)
 
 | Metric | hadars | Next.js |
 |---|---:|---:|
-| Requests/sec | **165** | 19 |
-| Latency median | **599 ms** | 2621 ms |
-| Latency p99 | **982 ms** | 3716 ms |
-| Throughput | **46.99** MB/s | 10.37 MB/s |
-| Peak RSS | 1038.2 MB | **489.6 MB** |
-| Avg RSS | 793.4 MB | **432.4 MB** |
-| Build time | 0.8 s | 6.0 s |
+| Requests/sec | **151** | 17 |
+| Latency median | **642 ms** | 2747 ms |
+| Latency p99 | **959 ms** | 4019 ms |
+| Throughput | **43.05** MB/s | 9.5 MB/s |
+| Peak RSS | 950.3 MB | **478.5 MB** |
+| Avg RSS | 763.3 MB | **426.4 MB** |
+| Build time | 0.7 s | 6.0 s |
 
 **Page load** (Playwright · Chromium headless · median)
 
 | Metric | hadars | Next.js |
 |---|---:|---:|
-| TTFB | **18 ms** | 38 ms |
-| FCP | **96 ms** | 128 ms |
-| DOMContentLoaded | **39 ms** | 118 ms |
-| Load | **122 ms** | 164 ms |
-| Peak RSS | 496.7 MB | **304.8 MB** |
+| TTFB | **19 ms** | 42 ms |
+| FCP | **96 ms** | 136 ms |
+| DOMContentLoaded | **39 ms** | 127 ms |
+| Load | **122 ms** | 173 ms |
+| Peak RSS | 476.8 MB | **289.5 MB** |
 <!-- BENCHMARK_END -->
 
 ## Quick start

package/dist/{chunk-H72BZXOA.js → chunk-2J2L2H3H.js}

@@ -1,7 +1,7 @@
 import {
   renderPreflight,
   renderToString
-} from "./chunk-LY5MTHFV.js";
+} from "./chunk-TV37IMRB.js";
 import {
   createElement
 } from "./chunk-OS3V4CPN.js";
@@ -230,18 +230,18 @@ var makePrecontentHtmlGetter = (htmlFilePromise) => {
   let preHead = null;
   let postHead = null;
   let postContent = null;
+  const primed = htmlFilePromise.then((html) => {
+    const headEnd = html.indexOf(HEAD_MARKER);
+    const contentStart = html.indexOf(BODY_MARKER);
+    preHead = html.slice(0, headEnd);
+    postHead = html.slice(headEnd + HEAD_MARKER.length, contentStart);
+    postContent = html.slice(contentStart + BODY_MARKER.length);
+  });
   return (headHtml) => {
     if (preHead !== null) {
       return [preHead + headHtml + postHead, postContent];
     }
-    return htmlFilePromise.then((html) => {
-      const headEnd = html.indexOf(HEAD_MARKER);
-      const contentStart = html.indexOf(BODY_MARKER);
-      preHead = html.slice(0, headEnd);
-      postHead = html.slice(headEnd + HEAD_MARKER.length, contentStart);
-      postContent = html.slice(contentStart + BODY_MARKER.length);
-      return [preHead + headHtml + postHead, postContent];
-    });
+    return primed.then(() => [preHead + headHtml + postHead, postContent]);
   };
 };
 async function transformStream(data, stream) {
@@ -264,8 +264,18 @@ async function transformStream(data, stream) {
   }
   return out;
 }
-var gzipCompress = (d) => transformStream(d, new globalThis.CompressionStream("gzip"));
-var gzipDecompress = (d) => transformStream(d, new globalThis.DecompressionStream("gzip"));
+async function zlibGzip(d) {
+  const zlib = await import("node:zlib");
+  const { promisify } = await import("node:util");
+  return promisify(zlib.gzip)(d);
+}
+async function zlibGunzip(d) {
+  const zlib = await import("node:zlib");
+  const { promisify } = await import("node:util");
+  return promisify(zlib.gunzip)(d);
+}
+var gzipCompress = (d) => globalThis.CompressionStream ? transformStream(d, new globalThis.CompressionStream("gzip")) : zlibGzip(d);
+var gzipDecompress = (d) => globalThis.DecompressionStream ? transformStream(d, new globalThis.DecompressionStream("gzip")) : zlibGunzip(d);
 async function buildCacheEntry(res, ttl) {
   const buf = await res.arrayBuffer();
   const body = await gzipCompress(new Uint8Array(buf));

package/dist/{chunk-LY5MTHFV.js → chunk-TV37IMRB.js}

@@ -115,7 +115,16 @@ function componentCalledUseId() {
 function snapshotContext() {
   const st = s();
   const ctx = st.currentTreeContext;
-  return { tree: { id: ctx.id, overflow: ctx.overflow }, localId: st.localIdCounter, treeDepth: _treeDepth };
+  const depth = _treeDepth;
+  return {
+    tree: { id: ctx.id, overflow: ctx.overflow },
+    localId: st.localIdCounter,
+    treeDepth: depth,
+    // Snapshot the live stack so that popTreeContext reads correct saved values
+    // even if another concurrent render's resetRenderState stomped the arrays.
+    idStack: _treeIdStack.slice(0, depth),
+    ovStack: _treeOvStack.slice(0, depth)
+  };
 }
 function restoreContext(snap) {
   const st = s();
@@ -124,6 +133,10 @@ function restoreContext(snap) {
   ctx.overflow = snap.tree.overflow;
   st.localIdCounter = snap.localId;
   _treeDepth = snap.treeDepth;
+  for (let i = 0; i < snap.treeDepth; i++) {
+    _treeIdStack[i] = snap.idStack[i];
+    _treeOvStack[i] = snap.ovStack[i];
+  }
 }
 function getTreeId() {
   const { id, overflow } = s().currentTreeContext;
@@ -269,6 +282,14 @@ function restoreDispatcher(prev) {
 }
 
 // src/slim-react/render.ts
+function captureRenderCtx() {
+  return { m: captureMap(), u: captureUnsuspend(), t: snapshotContext() };
+}
+function restoreRenderCtx(ctx) {
+  swapContextMap(ctx.m);
+  restoreUnsuspend(ctx.u);
+  restoreContext(ctx.t);
+}
 var VOID_ELEMENTS = /* @__PURE__ */ new Set([
   "area",
   "base",
@@ -712,11 +733,9 @@ function renderComponent(type, props, writer, isSvg, _suspenseRetries = 0) {
       if (e && typeof e.then === "function") {
         if (_suspenseRetries + 1 >= MAX_COMPONENT_SUSPENSE_RETRIES) throw SUSPENSE_RETRY_LIMIT;
         patchPromiseStatus(e);
-        const m = captureMap();
-        const u = captureUnsuspend();
+        const rctx = captureRenderCtx();
         return e.then(() => {
-          swapContextMap(m);
-          restoreUnsuspend(u);
+          restoreRenderCtx(rctx);
           return renderComponent(type, props, writer, isSvg, _suspenseRetries + 1);
         });
       }
@@ -753,17 +772,14 @@ function renderComponent(type, props, writer, isSvg, _suspenseRetries = 0) {
     };
     const r2 = renderChildren(props.children, writer, isSvg);
     if (r2 && typeof r2.then === "function") {
-      const m = captureMap();
-      const u = captureUnsuspend();
+      const rctx = captureRenderCtx();
       return r2.then(
         () => {
-          swapContextMap(m);
-          restoreUnsuspend(u);
+          restoreRenderCtx(rctx);
           finish();
         },
         (e) => {
-          swapContextMap(m);
-          restoreUnsuspend(u);
+          restoreRenderCtx(rctx);
           finish();
           throw e;
         }
@@ -792,11 +808,9 @@ function renderComponent(type, props, writer, isSvg, _suspenseRetries = 0) {
     if (e && typeof e.then === "function") {
       if (_suspenseRetries + 1 >= MAX_COMPONENT_SUSPENSE_RETRIES) throw SUSPENSE_RETRY_LIMIT;
       patchPromiseStatus(e);
-      const m = captureMap();
-      const u = captureUnsuspend();
+      const rctx = captureRenderCtx();
       return e.then(() => {
-        swapContextMap(m);
-        restoreUnsuspend(u);
+        restoreRenderCtx(rctx);
         return renderComponent(type, props, writer, isSvg, _suspenseRetries + 1);
       });
     }
@@ -808,30 +822,25 @@ function renderComponent(type, props, writer, isSvg, _suspenseRetries = 0) {
     savedIdTree = pushTreeContext(1, 0);
   }
   if (result instanceof Promise) {
-    const m = captureMap();
-    const u = captureUnsuspend();
+    const rctx = captureRenderCtx();
     return result.then((resolved) => {
-      swapContextMap(m);
-      restoreUnsuspend(u);
+      restoreRenderCtx(rctx);
       let asyncSavedIdTree;
       if (componentCalledUseId()) {
         asyncSavedIdTree = pushTreeContext(1, 0);
       }
       const r2 = renderNode(resolved, writer, isSvg);
       if (r2 && typeof r2.then === "function") {
-        const m2 = captureMap();
-        const u2 = captureUnsuspend();
+        const rctx2 = captureRenderCtx();
         return r2.then(
           () => {
-            swapContextMap(m2);
-            restoreUnsuspend(u2);
+            restoreRenderCtx(rctx2);
             if (asyncSavedIdTree !== void 0) popTreeContext(asyncSavedIdTree);
             popComponentScope(savedScope);
             if (isProvider) popContextValue(ctx, prevCtxValue);
           },
           (e) => {
-            swapContextMap(m2);
-            restoreUnsuspend(u2);
+            restoreRenderCtx(rctx2);
             if (asyncSavedIdTree !== void 0) popTreeContext(asyncSavedIdTree);
             popComponentScope(savedScope);
             if (isProvider) popContextValue(ctx, prevCtxValue);
@@ -843,8 +852,7 @@ function renderComponent(type, props, writer, isSvg, _suspenseRetries = 0) {
       popComponentScope(savedScope);
       if (isProvider) popContextValue(ctx, prevCtxValue);
     }, (e) => {
-      swapContextMap(m);
-      restoreUnsuspend(u);
+      restoreRenderCtx(rctx);
       popComponentScope(savedScope);
       if (isProvider) popContextValue(ctx, prevCtxValue);
       throw e;
@@ -852,19 +860,16 @@ function renderComponent(type, props, writer, isSvg, _suspenseRetries = 0) {
   }
   const r = renderNode(result, writer, isSvg);
   if (r && typeof r.then === "function") {
-    const m = captureMap();
-    const u = captureUnsuspend();
+    const rctx = captureRenderCtx();
     return r.then(
       () => {
-        swapContextMap(m);
-        restoreUnsuspend(u);
+        restoreRenderCtx(rctx);
         if (savedIdTree !== void 0) popTreeContext(savedIdTree);
         popComponentScope(savedScope);
         if (isProvider) popContextValue(ctx, prevCtxValue);
       },
       (e) => {
-        swapContextMap(m);
-        restoreUnsuspend(u);
+        restoreRenderCtx(rctx);
         if (savedIdTree !== void 0) popTreeContext(savedIdTree);
         popComponentScope(savedScope);
         if (isProvider) popContextValue(ctx, prevCtxValue);
@@ -889,11 +894,9 @@ function renderChildArrayFrom(children, startIndex, writer, isSvg) {
     const savedTree = pushTreeContext(totalChildren, i);
     const r = renderNode(child, writer, isSvg);
     if (r && typeof r.then === "function") {
-      const m = captureMap();
-      const u = captureUnsuspend();
+      const rctx = captureRenderCtx();
       return r.then(() => {
-        swapContextMap(m);
-        restoreUnsuspend(u);
+        restoreRenderCtx(rctx);
         popTreeContext(savedTree);
         return renderChildArrayFrom(children, i + 1, writer, isSvg);
       });
@@ -917,11 +920,9 @@ async function renderSuspense(props, writer, isSvg = false) {
   try {
     const r = renderNode(children, buffer, isSvg);
     if (r && typeof r.then === "function") {
-      const m = captureMap();
-      const u = captureUnsuspend();
+      const rctx = captureRenderCtx();
       await r;
-      swapContextMap(m);
-      restoreUnsuspend(u);
+      restoreRenderCtx(rctx);
     }
     writer.write("<!--$-->");
     buffer.flushTo(writer);
@@ -935,11 +936,9 @@ async function renderSuspense(props, writer, isSvg = false) {
       if (fallback) {
         const r = renderNode(fallback, writer, isSvg);
         if (r && typeof r.then === "function") {
-          const m = captureMap();
-          const u = captureUnsuspend();
+          const rctx = captureRenderCtx();
           await r;
-          swapContextMap(m);
-          restoreUnsuspend(u);
+          restoreRenderCtx(rctx);
         }
       }
       writer.write("<!--/$-->");
@@ -976,9 +975,9 @@ function renderToStream(element, options) {
       try {
         const r = renderNode(element, writer);
         if (r && typeof r.then === "function") {
-          const m = captureMap();
+          const rctx = captureRenderCtx();
           await r;
-          swapContextMap(m);
+          restoreRenderCtx(rctx);
         }
         writer.flush();
         controller.close();
@@ -1005,9 +1004,9 @@ async function renderPreflight(element, options) {
     NULL_WRITER.lastWasText = false;
     const r = renderNode(element, NULL_WRITER);
     if (r && typeof r.then === "function") {
-      const m = captureMap();
+      const rctx = captureRenderCtx();
       await r;
-      swapContextMap(m);
+      restoreRenderCtx(rctx);
     }
   } finally {
     swapContextMap(prev);
@@ -1032,9 +1031,9 @@ async function renderToString(element, options) {
     resetRenderState(idPrefix);
     const r = renderNode(element, writer);
     if (r && typeof r.then === "function") {
-      const m = captureMap();
+      const rctx = captureRenderCtx();
       await r;
-      swapContextMap(m);
+      restoreRenderCtx(rctx);
     }
     return output;
   } finally {