hadars 1.0.4 → 1.0.6

package/README.md

@@ -21,30 +21,30 @@ Bring your own router (or none), keep your components as plain React, and get SS
 ## Benchmarks
 
 <!-- BENCHMARK_START -->
-> Last run: 2026-04-19 · 120s · 100 connections · Bun runtime
-> hadars is **9.7x faster** in requests/sec
+> Last run: 2026-05-12 · 120s · 100 connections · Bun runtime
+> hadars is **8.9x faster** in requests/sec
 
 **Throughput** (autocannon, 120s)
 
 | Metric | hadars | Next.js |
 |---|---:|---:|
-| Requests/sec | **165** | 17 |
-| Latency median | **605 ms** | 2716 ms |
-| Latency p99 | **944 ms** | 4004 ms |
-| Throughput | **47** MB/s | 9.6 MB/s |
-| Peak RSS | 1030.4 MB | **476.8 MB** |
-| Avg RSS | 802.6 MB | **424.8 MB** |
-| Build time | 0.8 s | 5.9 s |
+| Requests/sec | **152** | 17 |
+| Latency median | **603 ms** | 2762 ms |
+| Latency p99 | **1307 ms** | 4162 ms |
+| Throughput | **43.4** MB/s | 9.4 MB/s |
+| Peak RSS | 788.6 MB | **477.3 MB** |
+| Avg RSS | 617.5 MB | **425.6 MB** |
+| Build time | 0.6 s | 6.1 s |
 
 **Page load** (Playwright · Chromium headless · median)
 
 | Metric | hadars | Next.js |
 |---|---:|---:|
-| TTFB | **17 ms** | 42 ms |
-| FCP | **92 ms** | 140 ms |
-| DOMContentLoaded | **36 ms** | 126 ms |
-| Load | **118 ms** | 173 ms |
-| Peak RSS | 455.4 MB | **272.8 MB** |
+| TTFB | **18 ms** | 43 ms |
+| FCP | **96 ms** | 144 ms |
+| DOMContentLoaded | **39 ms** | 131 ms |
+| Load | **121 ms** | 177 ms |
+| Peak RSS | 457.3 MB | **288.8 MB** |
 <!-- BENCHMARK_END -->
 
 ## Quick start

package/dist/{chunk-QOTDCUE5.js → chunk-6SOA2HTO.js}

@@ -26,6 +26,13 @@ function captureUnsuspend() {
 function restoreUnsuspend(u) {
   _g[UNSUSPEND_KEY] = u;
 }
+var HADARS_CTX_KEY = "__hadarsContext";
+function captureHadarsCtx() {
+  return _g[HADARS_CTX_KEY];
+}
+function restoreHadarsCtx(h) {
+  _g[HADARS_CTX_KEY] = h;
+}
 function getContextValue(context) {
   const map = _g[MAP_KEY];
   if (map && map.has(context)) return map.get(context);
@@ -165,8 +172,8 @@ function useState(initialState) {
   return [value, () => {
   }];
 }
-function useReducer(_reducer, initialState) {
-  return [initialState, () => {
+function useReducer(_reducer, initialArg, init) {
+  return [init ? init(initialArg) : initialArg, () => {
   }];
 }
 function useEffect(_effect, _deps) {
@@ -313,12 +320,13 @@ function restoreDispatcher(prev) {
 
 // src/slim-react/render.ts
 function captureRenderCtx() {
-  return { m: captureMap(), u: captureUnsuspend(), t: snapshotContext() };
+  return { m: captureMap(), u: captureUnsuspend(), t: snapshotContext(), h: captureHadarsCtx() };
 }
 function restoreRenderCtx(ctx) {
   swapContextMap(ctx.m);
   restoreUnsuspend(ctx.u);
   restoreContext(ctx.t);
+  restoreHadarsCtx(ctx.h);
 }
 var VOID_ELEMENTS = /* @__PURE__ */ new Set([
   "area",
@@ -926,11 +934,18 @@ function renderChildArrayFrom(children, startIndex, writer, isSvg) {
     const r = renderNode(child, writer, isSvg);
     if (r && typeof r.then === "function") {
       const rctx = captureRenderCtx();
-      return r.then(() => {
-        restoreRenderCtx(rctx);
-        popTreeContext(savedTree);
-        return renderChildArrayFrom(children, i + 1, writer, isSvg);
-      });
+      return r.then(
+        () => {
+          restoreRenderCtx(rctx);
+          popTreeContext(savedTree);
+          return renderChildArrayFrom(children, i + 1, writer, isSvg);
+        },
+        (e) => {
+          restoreRenderCtx(rctx);
+          popTreeContext(savedTree);
+          throw e;
+        }
+      );
     }
     popTreeContext(savedTree);
   }
@@ -1020,20 +1035,15 @@ function renderToStream(element, options) {
     }
   });
 }
-var NULL_WRITER = {
-  lastWasText: false,
-  write(_c) {
-  },
-  text(_s) {
-  }
-};
 async function renderPreflight(element, options) {
   const idPrefix = options?.identifierPrefix ?? "";
+  const writer = { lastWasText: false, write() {
+  }, text() {
+  } };
   const prev = swapContextMap(null);
   try {
     resetRenderState(idPrefix);
-    NULL_WRITER.lastWasText = false;
-    const r = renderNode(element, NULL_WRITER);
+    const r = renderNode(element, writer);
     if (r && typeof r.then === "function") {
       const rctx = captureRenderCtx();
       await r;

package/dist/{chunk-PQ5N5GOY.js → chunk-VAR5KTG3.js}

@@ -1,7 +1,7 @@
 import {
   renderPreflight,
   renderToString
-} from "./chunk-QOTDCUE5.js";
+} from "./chunk-6SOA2HTO.js";
 import {
   createElement
 } from "./chunk-OZUZS2PD.js";
@@ -180,7 +180,16 @@ var getReactResponse = async (req, opts) => {
   globalThis.__hadarsContext = context;
   const element = createElement(App, props);
   let bodyHtml = null;
-  if (opts.singlePass) {
+  if (opts.dataOnly) {
+    globalThis.__hadarsUnsuspend = unsuspend;
+    globalThis.__hadarsContext = context;
+    try {
+      await renderPreflight(element);
+    } finally {
+      globalThis.__hadarsUnsuspend = null;
+      globalThis.__hadarsContext = null;
+    }
+  } else if (opts.singlePass) {
     globalThis.__hadarsUnsuspend = unsuspend;
     globalThis.__hadarsContext = context;
     try {
@@ -190,6 +199,8 @@ var getReactResponse = async (req, opts) => {
       globalThis.__hadarsContext = null;
     }
   } else {
+    globalThis.__hadarsUnsuspend = unsuspend;
+    globalThis.__hadarsContext = context;
     try {
       await renderPreflight(element);
     } finally {

package/dist/cli.js

@@ -167,6 +167,13 @@ function captureUnsuspend() {
 function restoreUnsuspend(u) {
   _g[UNSUSPEND_KEY] = u;
 }
+var HADARS_CTX_KEY = "__hadarsContext";
+function captureHadarsCtx() {
+  return _g[HADARS_CTX_KEY];
+}
+function restoreHadarsCtx(h) {
+  _g[HADARS_CTX_KEY] = h;
+}
 function getContextValue(context) {
   const map = _g[MAP_KEY];
   if (map && map.has(context))
@@ -320,8 +327,8 @@ function useState(initialState) {
   const value = typeof initialState === "function" ? initialState() : initialState;
   return [value, () => {}];
 }
-function useReducer(_reducer, initialState) {
-  return [initialState, () => {}];
+function useReducer(_reducer, initialArg, init) {
+  return [init ? init(initialArg) : initialArg, () => {}];
 }
 function useEffect(_effect, _deps) {}
 function useLayoutEffect(_effect, _deps) {}
@@ -431,12 +438,13 @@ function restoreDispatcher(prev) {
 
 // src/slim-react/render.ts
 function captureRenderCtx() {
-  return { m: captureMap(), u: captureUnsuspend(), t: snapshotContext() };
+  return { m: captureMap(), u: captureUnsuspend(), t: snapshotContext(), h: captureHadarsCtx() };
 }
 function restoreRenderCtx(ctx) {
   swapContextMap(ctx.m);
   restoreUnsuspend(ctx.u);
   restoreContext(ctx.t);
+  restoreHadarsCtx(ctx.h);
 }
 var VOID_ELEMENTS = new Set([
   "area",
@@ -1061,6 +1069,10 @@ function renderChildArrayFrom(children, startIndex, writer, isSvg) {
         restoreRenderCtx(rctx);
         popTreeContext(savedTree);
         return renderChildArrayFrom(children, i + 1, writer, isSvg);
+      }, (e) => {
+        restoreRenderCtx(rctx);
+        popTreeContext(savedTree);
+        throw e;
       });
     }
     popTreeContext(savedTree);
@@ -1111,18 +1123,13 @@ async function renderSuspense(props, writer, isSvg = false) {
   }
 }
 var _streamEncoder = new TextEncoder;
-var NULL_WRITER = {
-  lastWasText: false,
-  write(_c) {},
-  text(_s) {}
-};
 async function renderPreflight(element, options) {
   const idPrefix = options?.identifierPrefix ?? "";
+  const writer = { lastWasText: false, write() {}, text() {} };
   const prev = swapContextMap(null);
   try {
     resetRenderState(idPrefix);
-    NULL_WRITER.lastWasText = false;
-    const r = renderNode(element, NULL_WRITER);
+    const r = renderNode(element, writer);
     if (r && typeof r.then === "function") {
       const rctx = captureRenderCtx();
       await r;
@@ -1221,7 +1228,16 @@ var getReactResponse = async (req, opts) => {
   globalThis.__hadarsContext = context;
   const element = createElement(App, props);
   let bodyHtml = null;
-  if (opts.singlePass) {
+  if (opts.dataOnly) {
+    globalThis.__hadarsUnsuspend = unsuspend;
+    globalThis.__hadarsContext = context;
+    try {
+      await renderPreflight(element);
+    } finally {
+      globalThis.__hadarsUnsuspend = null;
+      globalThis.__hadarsContext = null;
+    }
+  } else if (opts.singlePass) {
     globalThis.__hadarsUnsuspend = unsuspend;
     globalThis.__hadarsContext = context;
     try {
@@ -1231,6 +1247,8 @@ var getReactResponse = async (req, opts) => {
       globalThis.__hadarsContext = null;
     }
   } else {
+    globalThis.__hadarsUnsuspend = unsuspend;
+    globalThis.__hadarsContext = context;
     try {
       await renderPreflight(element);
     } finally {
@@ -1753,6 +1771,15 @@ async function tryServeFile(filePath) {
     return null;
   }
 }
+var _notFound = new Set;
+async function tryServeFileCached(filePath) {
+  if (_notFound.has(filePath))
+    return null;
+  const res = await tryServeFile(filePath);
+  if (!res)
+    _notFound.add(filePath);
+  return res;
+}
 
 // src/build.ts
 import { RspackDevServer } from "@rspack/dev-server";
@@ -1776,10 +1803,11 @@ function buildSsrResponse(head, status, getAppBody, finalize, getPrecontentHtml)
     async start(controller) {
       try {
         const [precontentHtml, postContent] = precontentResult instanceof Promise ? await precontentResult : precontentResult;
+        const finalizePromise = finalize();
         controller.enqueue(encoder.encode(precontentHtml));
         const bodyHtml = await getAppBody();
         controller.enqueue(encoder.encode(`<div id="app">${bodyHtml}</div>`));
-        const { clientProps } = await finalize();
+        const { clientProps } = await finalizePromise;
         const scriptContent = JSON.stringify({ hadars: { props: clientProps } }).replace(/</g, "\\u003c");
         controller.enqueue(encoder.encode(`<script id="hadars" type="application/json">${scriptContent}</script>` + postContent));
         controller.close();
@@ -2735,6 +2763,7 @@ var dev = async (options) => {
     } catch (e) {}
   })();
   const getPrecontentHtml = makePrecontentHtmlGetter(readyPromise.then(() => fs.readFile(pathMod2.join(__dirname3, StaticPath, "out.html"), "utf-8")));
+  const projectStaticPath = pathMod2.resolve(process.cwd(), "static");
   await serve(port, async (req, ctx) => {
     await readyPromise;
     const request = parseRequest(req);
@@ -2755,11 +2784,10 @@ var dev = async (options) => {
       return proxied;
     const url = new URL(request.url);
     const path2 = url.pathname;
-    const staticRes = await tryServeFile(pathMod2.join(__dirname3, StaticPath, path2));
+    const staticRes = await tryServeFileCached(pathMod2.join(__dirname3, StaticPath, path2));
     if (staticRes)
       return staticRes;
-    const projectStaticPath = pathMod2.resolve(process.cwd(), "static");
-    const projectRes = await tryServeFile(pathMod2.join(projectStaticPath, path2));
+    const projectRes = await tryServeFileCached(pathMod2.join(projectStaticPath, path2));
     if (projectRes)
       return projectRes;
     const ssrComponentPath = pathMod2.join(__dirname3, HadarsFolder, SSR_FILENAME);
@@ -2775,6 +2803,7 @@ var dev = async (options) => {
         getFinalProps
       } = cachedSsrModule;
       globalThis.__hadarsGraphQL = devStaticCtx?.graphql;
+      const isDataOnly = request.headers.get("Accept") === "application/json";
       const { head, status, getAppBody, finalize } = await getReactResponse(request, {
         document: {
           body: Component,
@@ -2783,9 +2812,10 @@ var dev = async (options) => {
           getFinalProps
         },
         staticCtx: devStaticCtx,
-        singlePass: true
+        singlePass: !isDataOnly,
+        dataOnly: isDataOnly
       });
-      if (request.headers.get("Accept") === "application/json") {
+      if (isDataOnly) {
         const { clientProps } = await finalize();
         const serverData = clientProps.__serverData ?? {};
         return new Response(JSON.stringify({ serverData }), {
@@ -2892,6 +2922,7 @@ var run = async (options) => {
     console.log(`[hadars] SSR render pool: ${workers} worker threads`);
   }
   const getPrecontentHtml = makePrecontentHtmlGetter(fs.readFile(pathMod2.join(__dirname3, StaticPath, "out.html"), "utf-8"));
+  const projectStaticPath = pathMod2.resolve(process.cwd(), "static");
   const componentPath = pathToFileURL(pathMod2.resolve(__dirname3, HadarsFolder, SSR_FILENAME)).href;
   const ssrModulePromise = import(componentPath);
   const runHandler = async (req, ctx) => {
@@ -2908,16 +2939,15 @@ var run = async (options) => {
       return proxied;
     const url = new URL(request.url);
     const path2 = url.pathname;
-    const staticRes = await tryServeFile(pathMod2.join(__dirname3, StaticPath, path2));
+    const staticRes = await tryServeFileCached(pathMod2.join(__dirname3, StaticPath, path2));
     if (staticRes)
       return staticRes;
-    const projectStaticPath = pathMod2.resolve(process.cwd(), "static");
-    const projectRes = await tryServeFile(pathMod2.join(projectStaticPath, path2));
+    const projectRes = await tryServeFileCached(pathMod2.join(projectStaticPath, path2));
     if (projectRes)
       return projectRes;
     const routeClean = path2.replace(/(^\/|\/$)/g, "");
     if (routeClean) {
-      const routeRes = await tryServeFile(pathMod2.join(__dirname3, StaticPath, routeClean, "index.html"));
+      const routeRes = await tryServeFileCached(pathMod2.join(__dirname3, StaticPath, routeClean, "index.html"));
       if (routeRes)
         return routeRes;
     }
@@ -2936,6 +2966,7 @@ var run = async (options) => {
           status: wStatus
         });
       }
+      const isDataOnly = request.headers.get("Accept") === "application/json";
       const { head, status, getAppBody, finalize } = await getReactResponse(request, {
         document: {
           body: Component,
@@ -2943,9 +2974,10 @@ var run = async (options) => {
           getInitProps,
           getFinalProps
         },
-        singlePass: true
+        singlePass: !isDataOnly,
+        dataOnly: isDataOnly
       });
-      if (request.headers.get("Accept") === "application/json") {
+      if (isDataOnly) {
         const { clientProps } = await finalize();
         const serverData = clientProps.__serverData ?? {};
         return new Response(JSON.stringify({ serverData }), {

package/dist/cloudflare.cjs

@@ -176,6 +176,13 @@ function captureUnsuspend() {
 function restoreUnsuspend(u) {
   _g[UNSUSPEND_KEY] = u;
 }
+var HADARS_CTX_KEY = "__hadarsContext";
+function captureHadarsCtx() {
+  return _g[HADARS_CTX_KEY];
+}
+function restoreHadarsCtx(h) {
+  _g[HADARS_CTX_KEY] = h;
+}
 function getContextValue(context) {
   const map = _g[MAP_KEY];
   if (map && map.has(context)) return map.get(context);
@@ -329,8 +336,8 @@ function useState(initialState) {
   return [value, () => {
   }];
 }
-function useReducer(_reducer, initialState) {
-  return [initialState, () => {
+function useReducer(_reducer, initialArg, init) {
+  return [init ? init(initialArg) : initialArg, () => {
   }];
 }
 function useEffect(_effect, _deps) {
@@ -445,12 +452,13 @@ function restoreDispatcher(prev) {
 
 // src/slim-react/render.ts
 function captureRenderCtx() {
-  return { m: captureMap(), u: captureUnsuspend(), t: snapshotContext() };
+  return { m: captureMap(), u: captureUnsuspend(), t: snapshotContext(), h: captureHadarsCtx() };
 }
 function restoreRenderCtx(ctx) {
   swapContextMap(ctx.m);
   restoreUnsuspend(ctx.u);
   restoreContext(ctx.t);
+  restoreHadarsCtx(ctx.h);
 }
 var VOID_ELEMENTS = /* @__PURE__ */ new Set([
   "area",
@@ -1058,11 +1066,18 @@ function renderChildArrayFrom(children, startIndex, writer, isSvg) {
     const r = renderNode(child, writer, isSvg);
     if (r && typeof r.then === "function") {
       const rctx = captureRenderCtx();
-      return r.then(() => {
-        restoreRenderCtx(rctx);
-        popTreeContext(savedTree);
-        return renderChildArrayFrom(children, i + 1, writer, isSvg);
-      });
+      return r.then(
+        () => {
+          restoreRenderCtx(rctx);
+          popTreeContext(savedTree);
+          return renderChildArrayFrom(children, i + 1, writer, isSvg);
+        },
+        (e) => {
+          restoreRenderCtx(rctx);
+          popTreeContext(savedTree);
+          throw e;
+        }
+      );
     }
     popTreeContext(savedTree);
   }
@@ -1111,20 +1126,15 @@ async function renderSuspense(props, writer, isSvg = false) {
   }
 }
 var _streamEncoder = new TextEncoder();
-var NULL_WRITER = {
-  lastWasText: false,
-  write(_c) {
-  },
-  text(_s) {
-  }
-};
 async function renderPreflight(element, options) {
   const idPrefix = options?.identifierPrefix ?? "";
+  const writer = { lastWasText: false, write() {
+  }, text() {
+  } };
   const prev = swapContextMap(null);
   try {
     resetRenderState(idPrefix);
-    NULL_WRITER.lastWasText = false;
-    const r = renderNode(element, NULL_WRITER);
+    const r = renderNode(element, writer);
     if (r && typeof r.then === "function") {
       const rctx = captureRenderCtx();
       await r;
@@ -1221,7 +1231,16 @@ var getReactResponse = async (req, opts) => {
   globalThis.__hadarsContext = context;
   const element = createElement(App, props);
   let bodyHtml = null;
-  if (opts.singlePass) {
+  if (opts.dataOnly) {
+    globalThis.__hadarsUnsuspend = unsuspend;
+    globalThis.__hadarsContext = context;
+    try {
+      await renderPreflight(element);
+    } finally {
+      globalThis.__hadarsUnsuspend = null;
+      globalThis.__hadarsContext = null;
+    }
+  } else if (opts.singlePass) {
     globalThis.__hadarsUnsuspend = unsuspend;
     globalThis.__hadarsContext = context;
     try {
@@ -1231,6 +1250,8 @@ var getReactResponse = async (req, opts) => {
       globalThis.__hadarsContext = null;
     }
   } else {
+    globalThis.__hadarsUnsuspend = unsuspend;
+    globalThis.__hadarsContext = context;
     try {
       await renderPreflight(element);
     } finally {

package/dist/cloudflare.js

@@ -6,8 +6,8 @@ import {
   getReactResponse,
   makePrecontentHtmlGetter,
   parseRequest
-} from "./chunk-PQ5N5GOY.js";
-import "./chunk-QOTDCUE5.js";
+} from "./chunk-VAR5KTG3.js";
+import "./chunk-6SOA2HTO.js";
 import "./chunk-OZUZS2PD.js";
 
 // src/cloudflare.ts

package/dist/lambda.cjs

@@ -216,6 +216,13 @@ function captureUnsuspend() {
 function restoreUnsuspend(u) {
   _g[UNSUSPEND_KEY] = u;
 }
+var HADARS_CTX_KEY = "__hadarsContext";
+function captureHadarsCtx() {
+  return _g[HADARS_CTX_KEY];
+}
+function restoreHadarsCtx(h) {
+  _g[HADARS_CTX_KEY] = h;
+}
 function getContextValue(context) {
   const map = _g[MAP_KEY];
   if (map && map.has(context)) return map.get(context);
@@ -369,8 +376,8 @@ function useState(initialState) {
   return [value, () => {
   }];
 }
-function useReducer(_reducer, initialState) {
-  return [initialState, () => {
+function useReducer(_reducer, initialArg, init) {
+  return [init ? init(initialArg) : initialArg, () => {
   }];
 }
 function useEffect(_effect, _deps) {
@@ -485,12 +492,13 @@ function restoreDispatcher(prev) {
 
 // src/slim-react/render.ts
 function captureRenderCtx() {
-  return { m: captureMap(), u: captureUnsuspend(), t: snapshotContext() };
+  return { m: captureMap(), u: captureUnsuspend(), t: snapshotContext(), h: captureHadarsCtx() };
 }
 function restoreRenderCtx(ctx) {
   swapContextMap(ctx.m);
   restoreUnsuspend(ctx.u);
   restoreContext(ctx.t);
+  restoreHadarsCtx(ctx.h);
 }
 var VOID_ELEMENTS = /* @__PURE__ */ new Set([
   "area",
@@ -1098,11 +1106,18 @@ function renderChildArrayFrom(children, startIndex, writer, isSvg) {
     const r = renderNode(child, writer, isSvg);
     if (r && typeof r.then === "function") {
       const rctx = captureRenderCtx();
-      return r.then(() => {
-        restoreRenderCtx(rctx);
-        popTreeContext(savedTree);
-        return renderChildArrayFrom(children, i + 1, writer, isSvg);
-      });
+      return r.then(
+        () => {
+          restoreRenderCtx(rctx);
+          popTreeContext(savedTree);
+          return renderChildArrayFrom(children, i + 1, writer, isSvg);
+        },
+        (e) => {
+          restoreRenderCtx(rctx);
+          popTreeContext(savedTree);
+          throw e;
+        }
+      );
     }
     popTreeContext(savedTree);
   }
@@ -1151,20 +1166,15 @@ async function renderSuspense(props, writer, isSvg = false) {
   }
 }
 var _streamEncoder = new TextEncoder();
-var NULL_WRITER = {
-  lastWasText: false,
-  write(_c) {
-  },
-  text(_s) {
-  }
-};
 async function renderPreflight(element, options) {
   const idPrefix = options?.identifierPrefix ?? "";
+  const writer = { lastWasText: false, write() {
+  }, text() {
+  } };
   const prev = swapContextMap(null);
   try {
     resetRenderState(idPrefix);
-    NULL_WRITER.lastWasText = false;
-    const r = renderNode(element, NULL_WRITER);
+    const r = renderNode(element, writer);
     if (r && typeof r.then === "function") {
       const rctx = captureRenderCtx();
       await r;
@@ -1261,7 +1271,16 @@ var getReactResponse = async (req, opts) => {
   globalThis.__hadarsContext = context;
   const element = createElement(App, props);
   let bodyHtml = null;
-  if (opts.singlePass) {
+  if (opts.dataOnly) {
+    globalThis.__hadarsUnsuspend = unsuspend;
+    globalThis.__hadarsContext = context;
+    try {
+      await renderPreflight(element);
+    } finally {
+      globalThis.__hadarsUnsuspend = null;
+      globalThis.__hadarsContext = null;
+    }
+  } else if (opts.singlePass) {
     globalThis.__hadarsUnsuspend = unsuspend;
     globalThis.__hadarsContext = context;
     try {
@@ -1271,6 +1290,8 @@ var getReactResponse = async (req, opts) => {
       globalThis.__hadarsContext = null;
     }
   } else {
+    globalThis.__hadarsUnsuspend = unsuspend;
+    globalThis.__hadarsContext = context;
     try {
       await renderPreflight(element);
     } finally {

package/dist/lambda.js

@@ -6,8 +6,8 @@ import {
   getReactResponse,
   makePrecontentHtmlGetter,
   parseRequest
-} from "./chunk-PQ5N5GOY.js";
-import "./chunk-QOTDCUE5.js";
+} from "./chunk-VAR5KTG3.js";
+import "./chunk-6SOA2HTO.js";
 import "./chunk-OZUZS2PD.js";
 
 // src/lambda.ts

package/dist/slim-react/index.cjs

@@ -104,6 +104,13 @@ function captureUnsuspend() {
 function restoreUnsuspend(u) {
   _g[UNSUSPEND_KEY] = u;
 }
+var HADARS_CTX_KEY = "__hadarsContext";
+function captureHadarsCtx() {
+  return _g[HADARS_CTX_KEY];
+}
+function restoreHadarsCtx(h) {
+  _g[HADARS_CTX_KEY] = h;
+}
 function getContextValue(context) {
   const map = _g[MAP_KEY];
   if (map && map.has(context)) return map.get(context);
@@ -270,8 +277,8 @@ function useState(initialState) {
   return [value, () => {
   }];
 }
-function useReducer(_reducer, initialState) {
-  return [initialState, () => {
+function useReducer(_reducer, initialArg, init) {
+  return [init ? init(initialArg) : initialArg, () => {
   }];
 }
 function useEffect(_effect, _deps) {
@@ -418,12 +425,13 @@ function restoreDispatcher(prev) {
 
 // src/slim-react/render.ts
 function captureRenderCtx() {
-  return { m: captureMap(), u: captureUnsuspend(), t: snapshotContext() };
+  return { m: captureMap(), u: captureUnsuspend(), t: snapshotContext(), h: captureHadarsCtx() };
 }
 function restoreRenderCtx(ctx) {
   swapContextMap(ctx.m);
   restoreUnsuspend(ctx.u);
   restoreContext(ctx.t);
+  restoreHadarsCtx(ctx.h);
 }
 var VOID_ELEMENTS = /* @__PURE__ */ new Set([
   "area",
@@ -1031,11 +1039,18 @@ function renderChildArrayFrom(children, startIndex, writer, isSvg) {
     const r = renderNode(child, writer, isSvg);
     if (r && typeof r.then === "function") {
       const rctx = captureRenderCtx();
-      return r.then(() => {
-        restoreRenderCtx(rctx);
-        popTreeContext(savedTree);
-        return renderChildArrayFrom(children, i + 1, writer, isSvg);
-      });
+      return r.then(
+        () => {
+          restoreRenderCtx(rctx);
+          popTreeContext(savedTree);
+          return renderChildArrayFrom(children, i + 1, writer, isSvg);
+        },
+        (e) => {
+          restoreRenderCtx(rctx);
+          popTreeContext(savedTree);
+          throw e;
+        }
+      );
     }
     popTreeContext(savedTree);
   }
@@ -1125,20 +1140,15 @@ function renderToStream(element, options) {
     }
   });
 }
-var NULL_WRITER = {
-  lastWasText: false,
-  write(_c) {
-  },
-  text(_s) {
-  }
-};
 async function renderPreflight(element, options) {
   const idPrefix = options?.identifierPrefix ?? "";
+  const writer = { lastWasText: false, write() {
+  }, text() {
+  } };
   const prev = swapContextMap(null);
   try {
     resetRenderState(idPrefix);
-    NULL_WRITER.lastWasText = false;
-    const r = renderNode(element, NULL_WRITER);
+    const r = renderNode(element, writer);
     if (r && typeof r.then === "function") {
       const rctx = captureRenderCtx();
       await r;

package/dist/slim-react/index.d.cts

@@ -11,7 +11,7 @@ declare function setReactVersion(major: number, version?: string): void;
  * compatible libraries to work during server-side rendering.
  */
 declare function useState<T>(initialState: T | (() => T)): [T, (value: T | ((prev: T) => T)) => void];
-declare function useReducer<S, A>(_reducer: (state: S, action: A) => S, initialState: S): [S, (action: A) => void];
+declare function useReducer<S, A>(_reducer: (state: S, action: A) => S, initialArg: S, init?: (arg: S) => S): [S, (action: A) => void];
 declare function useEffect(_effect: () => void | (() => void), _deps?: any[]): void;
 declare function useLayoutEffect(_effect: () => void | (() => void), _deps?: any[]): void;
 declare function useInsertionEffect(_effect: () => void | (() => void), _deps?: any[]): void;
@@ -100,7 +100,7 @@ declare function renderToStream(element: SlimNode, options?: RenderOptions): Rea
 /**
  * Pass-1 preflight render.
  *
- * Walks the component tree with a NullWriter (discards all HTML output) so
+ * Walks the component tree with a discard writer (no HTML output) so
  * that all `useServerData` promises are resolved into the `__hadarsUnsuspend`
  * cache and all `context.head` mutations are applied.
  *

package/dist/slim-react/index.d.ts

@@ -11,7 +11,7 @@ declare function setReactVersion(major: number, version?: string): void;
  * compatible libraries to work during server-side rendering.
  */
 declare function useState<T>(initialState: T | (() => T)): [T, (value: T | ((prev: T) => T)) => void];
-declare function useReducer<S, A>(_reducer: (state: S, action: A) => S, initialState: S): [S, (action: A) => void];
+declare function useReducer<S, A>(_reducer: (state: S, action: A) => S, initialArg: S, init?: (arg: S) => S): [S, (action: A) => void];
 declare function useEffect(_effect: () => void | (() => void), _deps?: any[]): void;
 declare function useLayoutEffect(_effect: () => void | (() => void), _deps?: any[]): void;
 declare function useInsertionEffect(_effect: () => void | (() => void), _deps?: any[]): void;
@@ -100,7 +100,7 @@ declare function renderToStream(element: SlimNode, options?: RenderOptions): Rea
 /**
  * Pass-1 preflight render.
  *
- * Walks the component tree with a NullWriter (discards all HTML output) so
+ * Walks the component tree with a discard writer (no HTML output) so
  * that all `useServerData` promises are resolved into the `__hadarsUnsuspend`
  * cache and all `context.head` mutations are applied.
  *

package/dist/slim-react/index.js

@@ -36,7 +36,7 @@ import {
   useSyncExternalStore,
   useTransition,
   version
-} from "../chunk-QOTDCUE5.js";
+} from "../chunk-6SOA2HTO.js";
 import {
   FRAGMENT_TYPE,
   Fragment,

package/dist/ssr-render-worker.js

@@ -27,6 +27,13 @@ function captureUnsuspend() {
 function restoreUnsuspend(u) {
   _g[UNSUSPEND_KEY] = u;
 }
+var HADARS_CTX_KEY = "__hadarsContext";
+function captureHadarsCtx() {
+  return _g[HADARS_CTX_KEY];
+}
+function restoreHadarsCtx(h) {
+  _g[HADARS_CTX_KEY] = h;
+}
 function getContextValue(context) {
   const map = _g[MAP_KEY];
   if (map && map.has(context))
@@ -180,8 +187,8 @@ function useState(initialState) {
   const value = typeof initialState === "function" ? initialState() : initialState;
   return [value, () => {}];
 }
-function useReducer(_reducer, initialState) {
-  return [initialState, () => {}];
+function useReducer(_reducer, initialArg, init) {
+  return [init ? init(initialArg) : initialArg, () => {}];
 }
 function useEffect(_effect, _deps) {}
 function useLayoutEffect(_effect, _deps) {}
@@ -291,12 +298,13 @@ function restoreDispatcher(prev) {
 
 // src/slim-react/render.ts
 function captureRenderCtx() {
-  return { m: captureMap(), u: captureUnsuspend(), t: snapshotContext() };
+  return { m: captureMap(), u: captureUnsuspend(), t: snapshotContext(), h: captureHadarsCtx() };
 }
 function restoreRenderCtx(ctx) {
   swapContextMap(ctx.m);
   restoreUnsuspend(ctx.u);
   restoreContext(ctx.t);
+  restoreHadarsCtx(ctx.h);
 }
 var VOID_ELEMENTS = new Set([
   "area",
@@ -921,6 +929,10 @@ function renderChildArrayFrom(children, startIndex, writer, isSvg) {
         restoreRenderCtx(rctx);
         popTreeContext(savedTree);
         return renderChildArrayFrom(children, i + 1, writer, isSvg);
+      }, (e) => {
+        restoreRenderCtx(rctx);
+        popTreeContext(savedTree);
+        throw e;
       });
     }
     popTreeContext(savedTree);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hadars",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Minimal SSR framework for React — rspack, HMR, TypeScript, Bun/Node/Deno",
   "module": "./dist/index.js",
   "type": "module",
@@ -85,6 +85,7 @@
     "typescript": "^5.9.3"
   },
   "dependencies": {
+    "hadars": "^1.0.5",
     "postcss": "^8.5.8",
     "postcss-load-config": "^6.0.1",
     "postcss-loader": "^8.2.1"