hadars 1.0.4 → 1.0.5

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-EJUCAJXR.js}

@@ -1,7 +1,7 @@
 import {
   renderPreflight,
   renderToString
-} from "./chunk-QOTDCUE5.js";
+} from "./chunk-6SOA2HTO.js";
 import {
   createElement
 } from "./chunk-OZUZS2PD.js";

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;

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;

package/dist/cloudflare.js

@@ -6,8 +6,8 @@ import {
   getReactResponse,
   makePrecontentHtmlGetter,
   parseRequest
-} from "./chunk-PQ5N5GOY.js";
-import "./chunk-QOTDCUE5.js";
+} from "./chunk-EJUCAJXR.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;

package/dist/lambda.js

@@ -6,8 +6,8 @@ import {
   getReactResponse,
   makePrecontentHtmlGetter,
   parseRequest
-} from "./chunk-PQ5N5GOY.js";
-import "./chunk-QOTDCUE5.js";
+} from "./chunk-EJUCAJXR.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.5",
   "description": "Minimal SSR framework for React — rspack, HMR, TypeScript, Bun/Node/Deno",
   "module": "./dist/index.js",
   "type": "module",