hadars 0.3.2 → 0.4.0

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-03-25 · 120s · 100 connections · Bun runtime
-> hadars is **8.9x faster** in requests/sec
+> Last run: 2026-04-02 · 120s · 100 connections · Bun runtime
+> hadars is **9.3x faster** in requests/sec
 
 **Throughput** (autocannon, 120s)
 
 | Metric | hadars | Next.js |
 |---|---:|---:|
-| 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 |
+| Requests/sec | **158** | 17 |
+| Latency median | **634 ms** | 2754 ms |
+| Latency p99 | **1031 ms** | 4140 ms |
+| Throughput | **44.97** MB/s | 9.67 MB/s |
+| Peak RSS | 1001.1 MB | **477.2 MB** |
+| Avg RSS | 778.8 MB | **426.8 MB** |
+| Build time | 0.6 s | 6.0 s |
 
 **Page load** (Playwright · Chromium headless · median)
 
 | Metric | hadars | Next.js |
 |---|---:|---:|
-| 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** |
+| TTFB | **17 ms** | 45 ms |
+| FCP | **92 ms** | 140 ms |
+| DOMContentLoaded | **37 ms** | 127 ms |
+| Load | **118 ms** | 172 ms |
+| Peak RSS | 479.5 MB | **295.5 MB** |
 <!-- BENCHMARK_END -->
 
 ## Quick start
@@ -148,16 +148,28 @@ Fetch async data inside a component during SSR. The framework's render loop awai
 import { useServerData } from 'hadars';
 
 const UserCard = ({ userId }: { userId: string }) => {
-    const user = useServerData(['user', userId], () => db.getUser(userId));
+    const user = useServerData(() => db.getUser(userId));
     if (!user) return null; // undefined while pending on the first SSR pass
     return <p>{user.name}</p>;
 };
 ```
 
-- **`key`** - string or string array; 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 needed.
+
 - **Server (SSR)** - calls `fn()`, awaits the result across render iterations, returns `undefined` until resolved
 - **Client (hydration)** - reads the pre-resolved value from the hydration cache serialised by the server; `fn()` is never called in the browser
-- **Client (navigation)** - when a component mounts during client-side navigation and its key is not in the cache, hadars fires a single `GET <current-url>` with `Accept: application/json`; all `useServerData` calls within the same render are batched into one request and suspended via React Suspense until the server returns the JSON data map
+- **Client (navigation)** - when a component mounts during client-side navigation and its data is not in the cache, hadars fires a single `GET <current-url>` with `Accept: application/json`; all `useServerData` calls within the same render are batched into one request and suspended via React Suspense until the server returns the JSON data map
+
+### Options
+
+| Option | Type | Default | Description |
+|---|---|---|---|
+| `cache` | `boolean` | `true` | When `false`, the cached value is evicted when the component unmounts so the next mount fetches fresh data from the server. Safe with React Strict Mode. |
+
+```tsx
+// Uptime changes every request — evict on unmount so re-mounting always fetches fresh
+const uptime = useServerData(() => process.uptime(), { cache: false });
+```
 
 ## Data lifecycle hooks
 
@@ -192,6 +204,7 @@ const UserCard = ({ userId }: { userId: string }) => {
 | `paths` | `function` | - | Returns URL list to pre-render with `hadars export static`; receives `HadarsStaticContext` |
 | `sources` | `array` | - | Gatsby-compatible source plugins; hadars infers a GraphQL schema from their nodes |
 | `graphql` | `function` | - | Custom GraphQL executor passed to `paths()` and `getInitProps()` as `ctx.graphql` |
+| `onError` | `function` | - | Called on every SSR render error; use to forward to Sentry, Datadog, etc. |
 
 ### moduleRules example
 
@@ -227,6 +240,24 @@ const config: HadarsOptions = {
 export default config;
 ```
 
+### Error monitoring example
+
+```ts
+import * as Sentry from '@sentry/node';
+import type { HadarsOptions } from 'hadars';
+
+const config: HadarsOptions = {
+    entry: 'src/App.tsx',
+    onError: (err, req) => Sentry.captureException(err, {
+        extra: { url: req.url, method: req.method },
+    }),
+};
+
+export default config;
+```
+
+`onError` is called on every SSR render error in `dev()`, `run()`, Lambda, and Cloudflare adapters. The handler may be async — hadars fires it without awaiting so it never delays the error response to the browser.
+
 ## Static Export
 
 > **Experimental.** Static export and Gatsby-compatible source plugins are new features. The API — including config shape, context object, and schema inference behaviour — may change in future releases without a major version bump.

package/dist/cli.js

@@ -2737,6 +2737,8 @@ var dev = async (options) => {
       return buildSsrResponse(head, status, getAppBody, finalize, getPrecontentHtml);
     } catch (err) {
       console.error("[hadars] SSR render error:", err);
+      options.onError?.(err, request)?.catch?.(() => {
+      });
       const msg = (err?.stack ?? err?.message ?? String(err)).replace(/</g, "&lt;");
       return new Response(`<!doctype html><pre style="white-space:pre-wrap">${msg}</pre>`, {
         status: 500,
@@ -2896,6 +2898,8 @@ var run = async (options) => {
       return buildSsrResponse(head, status, getAppBody, finalize, getPrecontentHtml);
     } catch (err) {
       console.error("[hadars] SSR render error:", err);
+      options.onError?.(err, request)?.catch?.(() => {
+      });
       return new Response("Internal Server Error", { status: 500 });
     }
   };

package/dist/cloudflare.cjs

@@ -1387,6 +1387,8 @@ function createCloudflareHandler(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/cloudflare.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';
 
 /**
  * Cloudflare Workers adapter for hadars.

package/dist/cloudflare.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';
 
 /**
  * Cloudflare Workers adapter for hadars.

package/dist/cloudflare.js

@@ -53,6 +53,8 @@ function createCloudflareHandler(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/{hadars-CSWWhlQC.d.cts → hadars-CPplIz_z.d.cts}

@@ -257,6 +257,23 @@ interface HadarsOptions {
      * ]
      */
     sources?: HadarsSourceEntry[];
+    /**
+     * Called whenever an SSR render error is caught, in both `dev()` and `run()` mode
+     * as well as the Lambda and Cloudflare adapters.
+     *
+     * Use this to forward errors to your monitoring service (Sentry, Datadog, etc.)
+     * without affecting the response sent to the browser.
+     * The handler may be async — hadars fires it and does not await the result,
+     * so it never delays the error response.
+     *
+     * @example
+     * import * as Sentry from '@sentry/node';
+     * onError: (err, req) => Sentry.captureException(err, { extra: { url: req.url } })
+     *
+     * @example
+     * onError: (err, req) => console.error('[myapp]', req.method, req.url, err)
+     */
+    onError?: (err: Error, req: Request) => void | Promise<void>;
 }
 /**
  * A Gatsby-compatible source plugin entry, matching the format used in

package/dist/{hadars-CSWWhlQC.d.ts → hadars-CPplIz_z.d.ts}

@@ -257,6 +257,23 @@ interface HadarsOptions {
      * ]
      */
     sources?: HadarsSourceEntry[];
+    /**
+     * Called whenever an SSR render error is caught, in both `dev()` and `run()` mode
+     * as well as the Lambda and Cloudflare adapters.
+     *
+     * Use this to forward errors to your monitoring service (Sentry, Datadog, etc.)
+     * without affecting the response sent to the browser.
+     * The handler may be async — hadars fires it and does not await the result,
+     * so it never delays the error response.
+     *
+     * @example
+     * import * as Sentry from '@sentry/node';
+     * onError: (err, req) => Sentry.captureException(err, { extra: { url: req.url } })
+     *
+     * @example
+     * onError: (err, req) => console.error('[myapp]', req.method, req.url, err)
+     */
+    onError?: (err: Error, req: Request) => void | Promise<void>;
 }
 /**
  * A Gatsby-compatible source plugin entry, matching the format used in

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

@@ -1510,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.

package/dist/lambda.js

@@ -178,6 +178,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/loader.cjs

@@ -55,8 +55,8 @@ function swcTransform(swc, source, isServer, resourcePath) {
     const name = callee.value;
     if (!isServer && name === "useServerData") {
       const args2 = node.arguments;
-      if (!args2 || args2.length < 2) return;
-      const fnArg = args2[1].expression ?? args2[1];
+      if (!args2 || args2.length < 1) return;
+      const fnArg = args2[0].expression ?? args2[0];
       replacements.push({
         start: fnArg.span.start - fileOffset,
         end: fnArg.span.end - fileOffset,
@@ -187,13 +187,8 @@ function stripUseServerDataFns(source) {
   let match;
   CALL_RE.lastIndex = 0;
   while ((match = CALL_RE.exec(source)) !== null) {
-    const callStart = match.index;
     let i = match.index + match[0].length;
     while (i < source.length && /\s/.test(source[i])) i++;
-    i = scanExpressionEnd(source, i);
-    if (i >= source.length || source[i] !== ",") continue;
-    i++;
-    while (i < source.length && /\s/.test(source[i])) i++;
     const fnStart = i;
     const fnEnd = scanExpressionEnd(source, i);
     if (fnEnd <= fnStart) continue;