hadars 0.3.1 → 0.4.0

package/dist/index.cjs

@@ -182,42 +182,46 @@ function getCtx() {
 var clientServerDataCache = /* @__PURE__ */ new Map();
 var pendingDataFetch = /* @__PURE__ */ new Map();
 var fetchedPaths = /* @__PURE__ */ new Set();
-var ssrInitialKeys = null;
-var unclaimedKeyCheckScheduled = false;
-function scheduleUnclaimedKeyCheck() {
-  if (unclaimedKeyCheckScheduled) return;
-  unclaimedKeyCheckScheduled = true;
-  setTimeout(() => {
-    unclaimedKeyCheckScheduled = false;
-    if (ssrInitialKeys && ssrInitialKeys.size > 0) {
-      console.warn(
-        `[hadars] useServerData: ${ssrInitialKeys.size} server-resolved key(s) were never claimed during client hydration: ${[...ssrInitialKeys].map((k) => JSON.stringify(k)).join(", ")}. This usually means the key passed to useServerData was different on the server than on the client (e.g. it contains Date.now(), Math.random(), or another value that changes between renders). Keys must be stable and deterministic.`
-      );
-    }
-    ssrInitialKeys = null;
-  }, 0);
-}
+var _navValues = [];
+var _navIdx = 0;
 function initServerDataCache(data) {
   clientServerDataCache.clear();
-  ssrInitialKeys = /* @__PURE__ */ new Set();
+  _navValues = [];
+  _navIdx = 0;
   for (const [k, v] of Object.entries(data)) {
     clientServerDataCache.set(k, v);
-    ssrInitialKeys.add(k);
   }
 }
-function useServerData(key, fn) {
-  const cacheKey = Array.isArray(key) ? JSON.stringify(key) : key;
+function useServerData(fn, options) {
+  const cacheKey = import_react.default.useId();
+  const evictTimerRef = import_react.default.useRef(null);
+  import_react.default.useEffect(() => {
+    if (options?.cache !== false) return;
+    if (evictTimerRef.current !== null) {
+      clearTimeout(evictTimerRef.current);
+      evictTimerRef.current = null;
+    }
+    return () => {
+      evictTimerRef.current = setTimeout(() => {
+        clientServerDataCache.delete(cacheKey);
+        evictTimerRef.current = null;
+      }, 0);
+    };
+  }, []);
   if (typeof window !== "undefined") {
     if (clientServerDataCache.has(cacheKey)) {
-      ssrInitialKeys?.delete(cacheKey);
       return clientServerDataCache.get(cacheKey);
     }
-    if (ssrInitialKeys !== null && ssrInitialKeys.size > 0) {
-      scheduleUnclaimedKeyCheck();
-    }
     const pathKey = window.location.pathname + window.location.search;
     if (fetchedPaths.has(pathKey)) {
-      return void 0;
+      if (_navIdx < _navValues.length) {
+        const value = _navValues[_navIdx++];
+        clientServerDataCache.set(cacheKey, value);
+        return value;
+      }
+      fetchedPaths.delete(pathKey);
+      _navValues = [];
+      _navIdx = 0;
     }
     if (!pendingDataFetch.has(pathKey)) {
       let resolve;
@@ -236,9 +240,9 @@ function useServerData(key, fn) {
             const res = await fetch(pathKey, { headers: { "Accept": "application/json" } });
             if (res.ok) json = await res.json();
           }
-          for (const [k, v] of Object.entries(json?.serverData ?? {})) {
-            clientServerDataCache.set(k, v);
-          }
+          _navValues = Object.values(json?.serverData ?? {});
+          _navIdx = 0;
+          fetchedPaths.clear();
         } finally {
           fetchedPaths.add(pathKey);
           pendingDataFetch.delete(pathKey);
@@ -250,12 +254,7 @@ function useServerData(key, fn) {
   }
   const unsuspend = globalThis.__hadarsUnsuspend;
   if (!unsuspend) return void 0;
-  const _u = unsuspend;
-  if (!_u.pendingCreated) _u.pendingCreated = 0;
   const existing = unsuspend.cache.get(cacheKey);
-  if (existing?.status === "fulfilled" && _u.lastPendingKey === cacheKey) {
-    _u.lastPendingKeyAccessed = true;
-  }
   if (!existing) {
     const result = fn();
     const isThenable = result !== null && typeof result === "object" && typeof result.then === "function";
@@ -264,22 +263,6 @@ function useServerData(key, fn) {
       unsuspend.cache.set(cacheKey, { status: "fulfilled", value });
       return value;
     }
-    if (_u.lastPendingKey != null && !_u.lastPendingKeyAccessed) {
-      const prev = unsuspend.cache.get(_u.lastPendingKey);
-      if (prev?.status === "fulfilled") {
-        throw new Error(
-          `[hadars] useServerData: key ${JSON.stringify(cacheKey)} is not stable between render passes. The previous pass resolved ${JSON.stringify(_u.lastPendingKey)} but it was not requested in this pass \u2014 the key is changing between renders. Avoid dynamic values in keys (e.g. Date.now() or Math.random()); use stable, deterministic identifiers instead.`
-        );
-      }
-    }
-    _u.pendingCreated++;
-    if (_u.pendingCreated > 100) {
-      throw new Error(
-        `[hadars] useServerData: more than 100 async keys created in a single render. This usually means a key is not stable between renders (e.g. it contains Date.now() or Math.random()). Currently offending key: ${JSON.stringify(cacheKey)}.`
-      );
-    }
-    _u.lastPendingKey = cacheKey;
-    _u.lastPendingKeyAccessed = false;
     const promise = result.then(
       (value) => {
         unsuspend.cache.set(cacheKey, { status: "fulfilled", value });
@@ -297,18 +280,8 @@ function useServerData(key, fn) {
   if (existing.status === "rejected") throw existing.reason;
   return existing.value;
 }
-function toCacheKey(doc) {
-  if (typeof doc === "string") return doc.trim();
-  for (const def of doc?.definitions ?? []) {
-    if (def.kind === "OperationDefinition" && def.name?.value) {
-      return `op:${def.name.value}`;
-    }
-  }
-  return JSON.stringify(doc?.definitions ?? doc);
-}
 function useGraphQL(query, variables) {
-  const key = ["__gql", toCacheKey(query), JSON.stringify(variables ?? {})];
-  return useServerData(key, async () => {
+  return useServerData(async () => {
     const executor = globalThis.__hadarsGraphQL;
     if (!executor) {
       throw new Error(

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { b as HadarsDocumentNode } from './hadars-CSWWhlQC.cjs';
-export { G as GraphQLExecutor, c as HadarsApp, H as HadarsEntryModule, d as HadarsGetClientProps, e as HadarsGetFinalProps, f as HadarsGetInitialProps, a as HadarsOptions, g as HadarsProps, h as HadarsRequest, i as HadarsSourceEntry, j as HadarsStaticContext } from './hadars-CSWWhlQC.cjs';
+import { b as HadarsDocumentNode } from './hadars-CPplIz_z.cjs';
+export { G as GraphQLExecutor, c as HadarsApp, H as HadarsEntryModule, d as HadarsGetClientProps, e as HadarsGetFinalProps, f as HadarsGetInitialProps, a as HadarsOptions, g as HadarsProps, h as HadarsRequest, i as HadarsSourceEntry, j as HadarsStaticContext } from './hadars-CPplIz_z.cjs';
 import React from 'react';
 
 /** Call this before hydrating to seed the client cache from the server's data.
@@ -14,9 +14,8 @@ declare function initServerDataCache(data: Record<string, unknown>): void;
  * On the client the pre-resolved value is read from the hydration cache
  * serialised into the page by the server, so no fetch is issued in the browser.
  *
- * The `key` (string or array of strings) uniquely identifies the cached value
- * across all SSR render passes and client hydration — it must be stable and
- * unique within the page.
+ * The cache key is derived automatically from the call-site's position in the
+ * component tree via `useId()` — no manual key is required.
  *
  * `fn` may return a `Promise<T>` (async usage) or return `T` synchronously.
  * The resolved value is serialised into `__serverData` and returned from cache
@@ -28,11 +27,16 @@ declare function initServerDataCache(data: Record<string, unknown>): void;
  * React Suspense until the server returns the JSON map of resolved values.
  *
  * @example
- * const user = useServerData('current_user', () => db.getUser(id));
- * const post = useServerData(['post', postId], () => db.getPost(postId));
+ * const user = useServerData(() => db.getUser(id));
+ * const post = useServerData(() => db.getPost(postId));
  * if (!user) return null; // undefined while pending on the first SSR pass
+ *
+ * // cache: false — evicts the entry on unmount so the next mount fetches fresh data
+ * const stats = useServerData(() => getServerStats(), { cache: false });
  */
-declare function useServerData<T>(key: string | string[], fn: () => Promise<T> | T): T | undefined;
+declare function useServerData<T>(fn: () => Promise<T> | T, options?: {
+    cache?: boolean;
+}): T | undefined;
 /**
  * Execute a GraphQL query server-side and return the result.
  *

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { b as HadarsDocumentNode } from './hadars-CSWWhlQC.js';
-export { G as GraphQLExecutor, c as HadarsApp, H as HadarsEntryModule, d as HadarsGetClientProps, e as HadarsGetFinalProps, f as HadarsGetInitialProps, a as HadarsOptions, g as HadarsProps, h as HadarsRequest, i as HadarsSourceEntry, j as HadarsStaticContext } from './hadars-CSWWhlQC.js';
+import { b as HadarsDocumentNode } from './hadars-CPplIz_z.js';
+export { G as GraphQLExecutor, c as HadarsApp, H as HadarsEntryModule, d as HadarsGetClientProps, e as HadarsGetFinalProps, f as HadarsGetInitialProps, a as HadarsOptions, g as HadarsProps, h as HadarsRequest, i as HadarsSourceEntry, j as HadarsStaticContext } from './hadars-CPplIz_z.js';
 import React from 'react';
 
 /** Call this before hydrating to seed the client cache from the server's data.
@@ -14,9 +14,8 @@ declare function initServerDataCache(data: Record<string, unknown>): void;
  * On the client the pre-resolved value is read from the hydration cache
  * serialised into the page by the server, so no fetch is issued in the browser.
  *
- * The `key` (string or array of strings) uniquely identifies the cached value
- * across all SSR render passes and client hydration — it must be stable and
- * unique within the page.
+ * The cache key is derived automatically from the call-site's position in the
+ * component tree via `useId()` — no manual key is required.
  *
  * `fn` may return a `Promise<T>` (async usage) or return `T` synchronously.
  * The resolved value is serialised into `__serverData` and returned from cache
@@ -28,11 +27,16 @@ declare function initServerDataCache(data: Record<string, unknown>): void;
  * React Suspense until the server returns the JSON map of resolved values.
  *
  * @example
- * const user = useServerData('current_user', () => db.getUser(id));
- * const post = useServerData(['post', postId], () => db.getPost(postId));
+ * const user = useServerData(() => db.getUser(id));
+ * const post = useServerData(() => db.getPost(postId));
  * if (!user) return null; // undefined while pending on the first SSR pass
+ *
+ * // cache: false — evicts the entry on unmount so the next mount fetches fresh data
+ * const stats = useServerData(() => getServerStats(), { cache: false });
  */
-declare function useServerData<T>(key: string | string[], fn: () => Promise<T> | T): T | undefined;
+declare function useServerData<T>(fn: () => Promise<T> | T, options?: {
+    cache?: boolean;
+}): T | undefined;
 /**
  * Execute a GraphQL query server-side and return the result.
  *

package/dist/index.js

@@ -142,42 +142,46 @@ function getCtx() {
 var clientServerDataCache = /* @__PURE__ */ new Map();
 var pendingDataFetch = /* @__PURE__ */ new Map();
 var fetchedPaths = /* @__PURE__ */ new Set();
-var ssrInitialKeys = null;
-var unclaimedKeyCheckScheduled = false;
-function scheduleUnclaimedKeyCheck() {
-  if (unclaimedKeyCheckScheduled) return;
-  unclaimedKeyCheckScheduled = true;
-  setTimeout(() => {
-    unclaimedKeyCheckScheduled = false;
-    if (ssrInitialKeys && ssrInitialKeys.size > 0) {
-      console.warn(
-        `[hadars] useServerData: ${ssrInitialKeys.size} server-resolved key(s) were never claimed during client hydration: ${[...ssrInitialKeys].map((k) => JSON.stringify(k)).join(", ")}. This usually means the key passed to useServerData was different on the server than on the client (e.g. it contains Date.now(), Math.random(), or another value that changes between renders). Keys must be stable and deterministic.`
-      );
-    }
-    ssrInitialKeys = null;
-  }, 0);
-}
+var _navValues = [];
+var _navIdx = 0;
 function initServerDataCache(data) {
   clientServerDataCache.clear();
-  ssrInitialKeys = /* @__PURE__ */ new Set();
+  _navValues = [];
+  _navIdx = 0;
   for (const [k, v] of Object.entries(data)) {
     clientServerDataCache.set(k, v);
-    ssrInitialKeys.add(k);
   }
 }
-function useServerData(key, fn) {
-  const cacheKey = Array.isArray(key) ? JSON.stringify(key) : key;
+function useServerData(fn, options) {
+  const cacheKey = React.useId();
+  const evictTimerRef = React.useRef(null);
+  React.useEffect(() => {
+    if (options?.cache !== false) return;
+    if (evictTimerRef.current !== null) {
+      clearTimeout(evictTimerRef.current);
+      evictTimerRef.current = null;
+    }
+    return () => {
+      evictTimerRef.current = setTimeout(() => {
+        clientServerDataCache.delete(cacheKey);
+        evictTimerRef.current = null;
+      }, 0);
+    };
+  }, []);
   if (typeof window !== "undefined") {
     if (clientServerDataCache.has(cacheKey)) {
-      ssrInitialKeys?.delete(cacheKey);
       return clientServerDataCache.get(cacheKey);
     }
-    if (ssrInitialKeys !== null && ssrInitialKeys.size > 0) {
-      scheduleUnclaimedKeyCheck();
-    }
     const pathKey = window.location.pathname + window.location.search;
     if (fetchedPaths.has(pathKey)) {
-      return void 0;
+      if (_navIdx < _navValues.length) {
+        const value = _navValues[_navIdx++];
+        clientServerDataCache.set(cacheKey, value);
+        return value;
+      }
+      fetchedPaths.delete(pathKey);
+      _navValues = [];
+      _navIdx = 0;
     }
     if (!pendingDataFetch.has(pathKey)) {
       let resolve;
@@ -196,9 +200,9 @@ function useServerData(key, fn) {
             const res = await fetch(pathKey, { headers: { "Accept": "application/json" } });
             if (res.ok) json = await res.json();
           }
-          for (const [k, v] of Object.entries(json?.serverData ?? {})) {
-            clientServerDataCache.set(k, v);
-          }
+          _navValues = Object.values(json?.serverData ?? {});
+          _navIdx = 0;
+          fetchedPaths.clear();
         } finally {
           fetchedPaths.add(pathKey);
           pendingDataFetch.delete(pathKey);
@@ -210,12 +214,7 @@ function useServerData(key, fn) {
   }
   const unsuspend = globalThis.__hadarsUnsuspend;
   if (!unsuspend) return void 0;
-  const _u = unsuspend;
-  if (!_u.pendingCreated) _u.pendingCreated = 0;
   const existing = unsuspend.cache.get(cacheKey);
-  if (existing?.status === "fulfilled" && _u.lastPendingKey === cacheKey) {
-    _u.lastPendingKeyAccessed = true;
-  }
   if (!existing) {
     const result = fn();
     const isThenable = result !== null && typeof result === "object" && typeof result.then === "function";
@@ -224,22 +223,6 @@ function useServerData(key, fn) {
       unsuspend.cache.set(cacheKey, { status: "fulfilled", value });
       return value;
     }
-    if (_u.lastPendingKey != null && !_u.lastPendingKeyAccessed) {
-      const prev = unsuspend.cache.get(_u.lastPendingKey);
-      if (prev?.status === "fulfilled") {
-        throw new Error(
-          `[hadars] useServerData: key ${JSON.stringify(cacheKey)} is not stable between render passes. The previous pass resolved ${JSON.stringify(_u.lastPendingKey)} but it was not requested in this pass \u2014 the key is changing between renders. Avoid dynamic values in keys (e.g. Date.now() or Math.random()); use stable, deterministic identifiers instead.`
-        );
-      }
-    }
-    _u.pendingCreated++;
-    if (_u.pendingCreated > 100) {
-      throw new Error(
-        `[hadars] useServerData: more than 100 async keys created in a single render. This usually means a key is not stable between renders (e.g. it contains Date.now() or Math.random()). Currently offending key: ${JSON.stringify(cacheKey)}.`
-      );
-    }
-    _u.lastPendingKey = cacheKey;
-    _u.lastPendingKeyAccessed = false;
     const promise = result.then(
       (value) => {
         unsuspend.cache.set(cacheKey, { status: "fulfilled", value });
@@ -257,18 +240,8 @@ function useServerData(key, fn) {
   if (existing.status === "rejected") throw existing.reason;
   return existing.value;
 }
-function toCacheKey(doc) {
-  if (typeof doc === "string") return doc.trim();
-  for (const def of doc?.definitions ?? []) {
-    if (def.kind === "OperationDefinition" && def.name?.value) {
-      return `op:${def.name.value}`;
-    }
-  }
-  return JSON.stringify(doc?.definitions ?? doc);
-}
 function useGraphQL(query, variables) {
-  const key = ["__gql", toCacheKey(query), JSON.stringify(variables ?? {})];
-  return useServerData(key, async () => {
+  return useServerData(async () => {
     const executor = globalThis.__hadarsGraphQL;
     if (!executor) {
       throw new Error(

package/dist/lambda.cjs

@@ -323,7 +323,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();
@@ -332,6 +341,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;
@@ -445,6 +458,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",
@@ -888,11 +909,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);
         });
       }
@@ -929,17 +948,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;
         }
@@ -968,11 +984,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);
       });
     }
@@ -984,30 +998,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);
@@ -1019,8 +1028,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;
@@ -1028,19 +1036,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);
@@ -1065,11 +1070,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);
       });
@@ -1093,11 +1096,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);
@@ -1111,11 +1112,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("<!--/$-->");
@@ -1140,9 +1139,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);
@@ -1167,9 +1166,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 {
@@ -1285,18 +1284,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) {
@@ -1456,14 +1455,8 @@ function createLambdaHandler(options, bundled) {
   const fetchHandler = options.fetch;
   const handleProxy = createProxyHandler(options);
   const getPrecontentHtml = bundled ? makePrecontentHtmlGetter(Promise.resolve(bundled.outHtml)) : makePrecontentHtmlGetter(import_promises2.default.readFile(import_node_path.default.join(cwd, StaticPath, "out.html"), "utf-8"));
-  let ssrModulePromise = null;
-  const getSsrModule = () => {
-    if (bundled) return Promise.resolve(bundled.ssrModule);
-    if (!ssrModulePromise) {
-      ssrModulePromise = import((0, import_node_url.pathToFileURL)(import_node_path.default.resolve(cwd, HadarsFolder, SSR_FILENAME)).href);
-    }
-    return ssrModulePromise;
-  };
+  const ssrModulePromise = bundled ? Promise.resolve(bundled.ssrModule) : import((0, import_node_url.pathToFileURL)(import_node_path.default.resolve(cwd, HadarsFolder, SSR_FILENAME)).href);
+  const getSsrModule = () => ssrModulePromise;
   const runHandler = async (req) => {
     const request = parseRequest(req);
     if (fetchHandler) {
@@ -1517,6 +1510,8 @@ function createLambdaHandler(options, bundled) {
       });
     } catch (err) {
       console.error("[hadars] SSR render error:", err);
+      options.onError?.(err, request)?.catch?.(() => {
+      });
       return new Response("Internal Server Error", { status: 500 });
     }
   };

package/dist/lambda.d.cts

@@ -1,4 +1,4 @@
-import { H as HadarsEntryModule, a as HadarsOptions } from './hadars-CSWWhlQC.cjs';
+import { H as HadarsEntryModule, a as HadarsOptions } from './hadars-CPplIz_z.cjs';
 
 /**
  * AWS Lambda adapter for hadars.

package/dist/lambda.d.ts

@@ -1,4 +1,4 @@
-import { H as HadarsEntryModule, a as HadarsOptions } from './hadars-CSWWhlQC.js';
+import { H as HadarsEntryModule, a as HadarsOptions } from './hadars-CPplIz_z.js';
 
 /**
  * AWS Lambda adapter for hadars.