hadars 0.2.0 → 0.2.2-rc.0

package/src/utils/response.tsx

@@ -1,5 +1,5 @@
 import type React from "react";
-import type { AppHead, HadarsRequest, HadarsEntryBase, HadarsEntryModule, HadarsProps, AppContext } from "../types/hadars";
+import type { AppHead, HadarsRequest, HadarsEntryBase, HadarsEntryModule, HadarsProps, AppContext, HadarsStaticContext } from "../types/hadars";
 import { renderToString, renderPreflight, createElement } from '../slim-react/index';
 
 interface ReactResponseOptions {
@@ -10,6 +10,7 @@ interface ReactResponseOptions {
         getInitProps: HadarsEntryModule<HadarsEntryBase>['getInitProps'];
         getFinalProps: HadarsEntryModule<HadarsEntryBase>['getFinalProps'];
     }
+    staticCtx?: HadarsStaticContext;
 }
 
 // ── Head HTML serialisation ────────────────────────────────────────────────
@@ -71,7 +72,7 @@ export const getReactResponse = async (
     };
 
     let props: HadarsEntryBase = {
-        ...(getInitProps ? await getInitProps(req) : {}),
+        ...(getInitProps ? await getInitProps(req, opts.staticCtx) : {}),
         location: req.location,
         context,
     } as HadarsEntryBase;
@@ -82,6 +83,9 @@ export const getReactResponse = async (
     // await continuations even when concurrent requests are in flight.
     const unsuspend = { cache: new Map<string, any>() };
     (globalThis as any).__hadarsUnsuspend = unsuspend;
+    // Expose the head context so HadarsHead can write into it without needing
+    // the user to manually wrap their App with HadarsContext.
+    (globalThis as any).__hadarsContext = context;
 
     const element = createElement(App as any, props as any);
 
@@ -94,6 +98,7 @@ export const getReactResponse = async (
         // Clear the global immediately — the closure-captured `unsuspend`
         // keeps the cache alive. Re-set inside getAppBody() for the second pass.
         (globalThis as any).__hadarsUnsuspend = null;
+        (globalThis as any).__hadarsContext = null;
     }
 
     // Head is fully populated — status is known.
@@ -104,15 +109,17 @@ export const getReactResponse = async (
     // (no async waits). The caller flushes head BEFORE calling this.
     const getAppBody = async (): Promise<string> => {
         (globalThis as any).__hadarsUnsuspend = unsuspend;
+        (globalThis as any).__hadarsContext = context;
         try {
             return await renderToString(element);
         } finally {
             (globalThis as any).__hadarsUnsuspend = null;
+            (globalThis as any).__hadarsContext = null;
         }
     };
 
     const finalize = async (): Promise<{ clientProps: Record<string, unknown> }> => {
-        const { context: _, ...restProps } = getFinalProps ? await getFinalProps(props) : props;
+        const restProps = getFinalProps ? await getFinalProps(props) : props;
         const serverData: Record<string, unknown> = {};
         let hasServerData = false;
         for (const [key, entry] of unsuspend.cache) {