@mandujs/core 0.19.2 → 0.20.1

package/src/runtime/streaming-ssr.ts

@@ -15,12 +15,12 @@ import React, { Suspense } from "react";
 import type { BundleManifest } from "../bundler/types";
 import type { HydrationConfig, HydrationPriority } from "../spec/schema";
 import { serializeProps } from "../client/serialize";
-import type { Metadata, MetadataItem } from "../seo/types";
-import { injectSEOIntoOptions, resolveSEO, type SEOOptions } from "../seo/integration/ssr";
-import { PORTS, TIMEOUTS } from "../constants";
-import { escapeHtmlAttr, escapeHtmlText, escapeJsonForInlineScript, escapeJsString } from "./escape";
-import { REACT_INTERNALS_SHIM_SCRIPT } from "./shims";
-import { getRenderToString } from "./react-renderer";
+import type { Metadata, MetadataItem } from "../seo/types";
+import { injectSEOIntoOptions, resolveSEO, type SEOOptions } from "../seo/integration/ssr";
+import { PORTS, TIMEOUTS } from "../constants";
+import { escapeHtmlAttr, escapeHtmlText, escapeJsonForInlineScript, escapeJsString } from "./escape";
+import { REACT_INTERNALS_SHIM_SCRIPT } from "./shims";
+import { getRenderToString } from "./react-renderer";
 
 // ========== Types ==========
 
@@ -704,16 +704,35 @@ export async function renderToStream(
     streamingWarnings.markWarned();
   }
 
-  const encoder = new TextEncoder();
-  const collectedHeadTags = collectStreamingHeadTags(element);
-  const resolvedOptions = collectedHeadTags
-    ? { ...options, headTags: [options.headTags, collectedHeadTags].filter(Boolean).join("\n") }
-    : options;
-  const htmlShell = generateHTMLShell(resolvedOptions);
-  // _skipHtmlClose가 true이면 </body></html> 생략 (deferred 스크립트 삽입용)
-  const htmlTail = resolvedOptions._skipHtmlClose
-    ? generateHTMLTailContent(resolvedOptions)
-    : generateHTMLTail(resolvedOptions);
+  const encoder = new TextEncoder();
+  const collectedHeadTags = collectStreamingHeadTags(element);
+  const resolvedOptions = collectedHeadTags
+    ? { ...options, headTags: [options.headTags, collectedHeadTags].filter(Boolean).join("\n") }
+    : options;
+  const htmlShell = generateHTMLShell(resolvedOptions);
+
+  // Reset SSR head before real render so streaming components push fresh tags
+  try {
+    const headMod = require("../client/use-head") as { resetSSRHead?: () => void; getSSRHeadTags?: () => string };
+    headMod.resetSSRHead?.();
+  } catch {}
+
+  // Lazy tail: collect late head tags injected during streaming render
+  function buildHtmlTail(): string {
+    const baseTail = resolvedOptions._skipHtmlClose
+      ? generateHTMLTailContent(resolvedOptions)
+      : generateHTMLTail(resolvedOptions);
+    try {
+      const headMod = require("../client/use-head") as { getSSRHeadTags?: () => string };
+      const lateHeadTags = headMod.getSSRHeadTags?.() ?? "";
+      if (lateHeadTags) {
+        const escaped = escapeJsonForInlineScript(JSON.stringify(lateHeadTags));
+        const script = `<script>(function(){var t=${escaped},d=document.createElement('div');d.innerHTML=t;var h=document.head;while(d.firstChild)h.appendChild(d.firstChild);})()</script>`;
+        return script + baseTail;
+      }
+    } catch {}
+    return baseTail;
+  }
 
   let shellSent = false;
   let timedOut = false;
@@ -832,7 +851,7 @@ export async function renderToStream(
           controller.enqueue(encoder.encode(generateErrorScript(timeoutError, routeId)));
 
           if (!tailSent) {
-            controller.enqueue(encoder.encode(htmlTail));
+            controller.enqueue(encoder.encode(buildHtmlTail()));
             tailSent = true;
             metrics.allReadyTime = Date.now() - metrics.startTime;
             onMetrics?.(metrics);
@@ -851,7 +870,7 @@ export async function renderToStream(
 
         if (done) {
           if (!tailSent) {
-            controller.enqueue(encoder.encode(htmlTail));
+            controller.enqueue(encoder.encode(buildHtmlTail()));
             tailSent = true;
             // allReady가 아직 안 끝났을 수 있으므로 현재 시점으로 기록
             if (metrics.allReadyTime === 0) {
@@ -884,7 +903,7 @@ export async function renderToStream(
         controller.enqueue(encoder.encode(generateErrorScript(err, routeId)));
 
         if (!tailSent) {
-          controller.enqueue(encoder.encode(htmlTail));
+          controller.enqueue(encoder.encode(buildHtmlTail()));
           tailSent = true;
           metrics.allReadyTime = Date.now() - metrics.startTime;
           onMetrics?.(metrics);
@@ -901,23 +920,23 @@ export async function renderToStream(
         }
       } catch {}
     },
-  });
-}
-
-function collectStreamingHeadTags(element: ReactElement): string {
-  try {
-    const mod = require("../client/use-head") as {
-      resetSSRHead?: () => void;
-      getSSRHeadTags?: () => string;
-    };
-    mod.resetSSRHead?.();
-    const renderToString = getRenderToString();
-    renderToString(element);
-    return mod.getSSRHeadTags?.() ?? "";
-  } catch {
-    return "";
-  }
-}
+  });
+}
+
+function collectStreamingHeadTags(element: ReactElement): string {
+  try {
+    const mod = require("../client/use-head") as {
+      resetSSRHead?: () => void;
+      getSSRHeadTags?: () => string;
+    };
+    mod.resetSSRHead?.();
+    const renderToString = getRenderToString();
+    renderToString(element);
+    return mod.getSSRHeadTags?.() ?? "";
+  } catch {
+    return "";
+  }
+}
 
 /**
  * Streaming SSR Response 생성

package/src/testing/index.ts

@@ -5,6 +5,7 @@
 
 import { ManduContext } from "../filling/context";
 import type { ManduFilling } from "../filling/filling";
+import type { RouteSpec, RoutesManifest } from "../spec/schema";
 
 // ========== Types ==========
 
@@ -142,3 +143,47 @@ export function createTestContext(
   const request = createTestRequest(path, options);
   return new ManduContext(request, options.params);
 }
+
+// ========== Test Factories ==========
+
+/**
+ * Create a RoutesManifest from partial route definitions.
+ * Fills in sensible defaults so tests only specify the fields they care about.
+ *
+ * @example
+ * ```typescript
+ * const manifest = createTestManifest([
+ *   { id: "home", kind: "page", pattern: "/" },
+ *   { id: "api-users", kind: "api", pattern: "/api/users" },
+ * ]);
+ * ```
+ */
+export function createTestManifest(routes: Partial<RouteSpec>[]): RoutesManifest {
+  return {
+    version: 1,
+    routes: routes.map((r, i) => ({
+      id: r.id ?? `test-route-${i}`,
+      kind: r.kind ?? "page",
+      pattern: r.pattern ?? `/test-${i}`,
+      module: r.module ?? `app/test-${i}/page.tsx`,
+      componentModule:
+        (r.kind ?? "page") === "page"
+          ? (r.componentModule ?? r.module ?? `app/test-${i}/page.tsx`)
+          : undefined,
+      ...r,
+    })) as RouteSpec[],
+  };
+}
+
+/**
+ * Create a minimal island descriptor for testing hydration logic.
+ *
+ * @example
+ * ```typescript
+ * const island = createTestIsland("counter", "interaction");
+ * expect(island.__hydrate).toBe("interaction");
+ * ```
+ */
+export function createTestIsland(name: string, strategy: string = "visible") {
+  return { __island: true, __hydrate: strategy, __name: name };
+}