@fictjs/ssr 0.20.0 → 0.22.0

package/dist/index.cjs

@@ -22,18 +22,20 @@ var index_exports = {};
 __export(index_exports, {
   createSSRDocument: () => createSSRDocument,
   renderToDocument: () => renderToDocument,
-  renderToPartial: () => renderToPartial,
   renderToPipeableStream: () => renderToPipeableStream,
   renderToStream: () => renderToStream,
   renderToString: () => renderToString,
   renderToStringAsync: () => renderToStringAsync
 });
 module.exports = __toCommonJS(index_exports);
+
+// src/render-core.ts
 var import_runtime = require("@fictjs/runtime");
-var import_internal = require("@fictjs/runtime/internal");
+var import_internal2 = require("@fictjs/runtime/internal");
 var import_linkedom = require("linkedom");
 
 // src/globals.ts
+var import_internal = require("@fictjs/runtime/internal");
 function installGlobals(window, document) {
   const win = window;
   const required = {
@@ -83,6 +85,14 @@ function installManifest(manifest) {
   } else {
     resolved = manifest;
   }
+  const session = (0, import_internal.__fictGetCurrentSSRSession)();
+  if (session) {
+    const previous = session.manifest;
+    session.manifest = resolved;
+    return () => {
+      session.manifest = previous;
+    };
+  }
   const key = "__FICT_MANIFEST__";
   const snapshot = {
     exists: Object.prototype.hasOwnProperty.call(globalThis, key),
@@ -129,7 +139,7 @@ function readTextFileFromPath(path) {
     return fs.readFileSync(path, "utf8");
   }
   throw new Error(
-    "[fict/ssr] `manifest` as file path is only supported in Node.js or Deno. Pass a manifest object in edge runtimes."
+    "[fict/ssr] `manifest` as file path is only supported when Deno.readTextFileSync or CommonJS require is available. Pass a manifest object in Node ESM or edge runtimes."
   );
 }
 function getNodeRequire() {
@@ -146,84 +156,6 @@ function getNodeRequire() {
 }
 
 // src/stream-bridge.ts
-function createQueuedTextStream(options = {}) {
-  const encoder = new TextEncoder();
-  const queue = [];
-  let controller = null;
-  let closed = false;
-  let aborted;
-  const readyResolvers = [];
-  const resolveReady = () => {
-    if (!controller || (controller.desiredSize ?? 1) <= 0) return;
-    while (readyResolvers.length > 0) {
-      readyResolvers.shift()?.();
-    }
-  };
-  const drainReady = () => {
-    while (readyResolvers.length > 0) {
-      readyResolvers.shift()?.();
-    }
-  };
-  const abortQueue = (reason, notifyController = true) => {
-    if (closed || aborted !== void 0) return;
-    aborted = reason ?? new Error("Stream aborted");
-    queue.length = 0;
-    drainReady();
-    if (notifyController) {
-      controller?.error(aborted);
-    }
-  };
-  const stream = new ReadableStream({
-    start(ctrl) {
-      controller = ctrl;
-      for (const chunk of queue) {
-        ctrl.enqueue(chunk);
-      }
-      queue.length = 0;
-      if (aborted !== void 0) {
-        ctrl.error(aborted);
-        return;
-      }
-      if (closed) {
-        ctrl.close();
-      }
-    },
-    pull() {
-      resolveReady();
-    },
-    cancel(reason) {
-      abortQueue(reason, false);
-      options.onCancel?.(reason);
-    }
-  });
-  const writer = {
-    write(chunk) {
-      if (closed || aborted !== void 0) return;
-      const data = encoder.encode(chunk);
-      if (controller) {
-        controller.enqueue(data);
-        if ((controller.desiredSize ?? 1) <= 0) {
-          return new Promise((resolve) => {
-            readyResolvers.push(resolve);
-          });
-        }
-      } else {
-        queue.push(data);
-      }
-      return void 0;
-    },
-    close() {
-      if (closed || aborted !== void 0) return;
-      closed = true;
-      drainReady();
-      controller?.close();
-    },
-    abort(reason) {
-      abortQueue(reason);
-    }
-  };
-  return { stream, writer };
-}
 function createPipeBridge() {
   const nodeBridge = createNodePipeBridge();
   if (nodeBridge) return nodeBridge;
@@ -231,6 +163,7 @@ function createPipeBridge() {
   const buffer = [];
   let state = "open";
   let abortReason = null;
+  let sinkErrorHandler;
   const safeWrite = (target, chunk) => {
     try {
       const ready = target.write(chunk);
@@ -244,7 +177,8 @@ function createPipeBridge() {
           }
         });
       }
-    } catch {
+    } catch (error) {
+      sinkErrorHandler?.(error);
     }
     return void 0;
   };
@@ -266,8 +200,14 @@ function createPipeBridge() {
     safeEnd(target);
   };
   return {
-    pipe(writable) {
+    pipe(writable, options) {
       targets.add(writable);
+      if (options?.onError) {
+        sinkErrorHandler = options.onError;
+        if (typeof writable.on === "function") {
+          writable.on("error", options.onError);
+        }
+      }
       if (buffer.length > 0) {
         for (const chunk of buffer) {
           safeWrite(writable, chunk);
@@ -325,14 +265,24 @@ function createNodePipeBridge() {
     let piped = false;
     let state = "open";
     let abortReason = null;
+    const pendingDrains = /* @__PURE__ */ new Set();
+    const flushDrains = () => {
+      for (const resolve of pendingDrains) resolve();
+      pendingDrains.clear();
+    };
     const writeToPassThrough = (chunk) => {
       if (passThrough.write(chunk) === false) {
         return new Promise((resolve) => {
+          const settle = () => {
+            pendingDrains.delete(settle);
+            resolve();
+          };
+          pendingDrains.add(settle);
           const withOnce = passThrough;
           if (typeof withOnce.once === "function") {
-            withOnce.once("drain", resolve);
+            withOnce.once("drain", settle);
           } else {
-            resolve();
+            settle();
           }
         });
       }
@@ -356,9 +306,16 @@ function createNodePipeBridge() {
       }
     };
     return {
-      pipe(writable) {
+      pipe(writable, options) {
         piped = true;
         passThrough.pipe(writable);
+        const onError = options?.onError;
+        if (onError && typeof writable.on === "function") {
+          writable.on("error", (err) => {
+            flushDrains();
+            onError(err);
+          });
+        }
         if (state === "aborted") {
           destroyPassThrough(abortReason ?? new Error("Stream aborted"));
           return;
@@ -391,6 +348,7 @@ function createNodePipeBridge() {
         state = "aborted";
         abortReason = reason instanceof Error ? reason : new Error("Stream aborted");
         buffer.length = 0;
+        flushDrains();
         if (piped) {
           destroyPassThrough(abortReason);
         }
@@ -420,7 +378,7 @@ function createStreamRuntimeCode(options = {}) {
 }
 var FICT_STREAM_RUNTIME_CODE = createStreamRuntimeCode({ observerMode: true });
 
-// src/index.ts
+// src/render-core.ts
 var DEFAULT_HTML = "<!doctype html><html><head></head><body></body></html>";
 function createSSRDocument(html = DEFAULT_HTML) {
   const window = (0, import_linkedom.parseHTML)(html);
@@ -431,12 +389,12 @@ function createSSRDocument(html = DEFAULT_HTML) {
   return { window, document };
 }
 function renderToDocument(view, options = {}) {
-  const session = (0, import_internal.__fictCreateSSRSession)();
-  return (0, import_internal.__fictRunWithSSRSession)(session, () => renderToDocumentInSession(view, options));
+  const session = (0, import_internal2.__fictCreateSSRSession)();
+  return (0, import_internal2.__fictRunWithSSRSession)(session, () => renderToDocumentInSession(view, options));
 }
 function renderToDocumentInSession(view, options) {
   const includeSnapshot = options.includeSnapshot !== false;
-  (0, import_internal.__fictEnableSSR)();
+  (0, import_internal2.__fictEnableSSR)();
   let dom;
   let restoreGlobals2 = () => {
   };
@@ -448,23 +406,23 @@ function renderToDocumentInSession(view, options) {
   try {
     dom = resolveDom(options);
     const { document, window } = dom;
-    const shouldExpose = options.exposeGlobals !== false;
+    const shouldExpose = options.exposeGlobals === true;
     restoreGlobals2 = shouldExpose ? installGlobals(window, document) : () => {
     };
     restoreManifest = installManifest(options.manifest);
     container = resolveContainer(document, options);
     teardown = (0, import_runtime.render)(view, container);
     if (includeSnapshot) {
-      const state = (0, import_internal.__fictSerializeSSRState)();
+      const state = (0, import_internal2.__fictSerializeSSRState)();
       injectSnapshot(document, container, state, options);
     }
   } catch (error) {
-    (0, import_internal.__fictDisableSSR)();
+    (0, import_internal2.__fictDisableSSR)();
     restoreGlobals2();
     restoreManifest();
     throw error;
   }
-  (0, import_internal.__fictDisableSSR)();
+  (0, import_internal2.__fictDisableSSR)();
   const html = serializeOutput(dom.document, container, options);
   const dispose = () => {
     try {
@@ -571,61 +529,13 @@ function renderToPipeableStream(view, options = {}) {
   });
   return {
     pipe(writable) {
-      bridge.pipe(writable);
+      bridge.pipe(writable, { onError: abort });
     },
     abort,
     shellReady,
     allReady
   };
 }
-function renderToPartial(view, options = {}) {
-  const partialOptions = {
-    ...options,
-    mode: "shell",
-    fullDocument: options.fullDocument ?? true
-  };
-  let shell = "";
-  let shellPhase = true;
-  let abortPartial = null;
-  const queued = createQueuedTextStream({
-    onCancel(reason) {
-      abortPartial?.(reason ?? new Error("Stream canceled"));
-    }
-  });
-  const { shellReady, allReady, abort } = startStreamingRender(
-    view,
-    partialOptions,
-    {
-      write(chunk) {
-        if (shellPhase) {
-          shell += chunk;
-          return;
-        }
-        return queued.writer.write(chunk);
-      },
-      close() {
-        queued.writer.close();
-      },
-      abort(reason) {
-        queued.writer.abort(reason);
-      }
-    },
-    {
-      includeTailInShell: true,
-      onShellFlushed() {
-        shellPhase = false;
-      }
-    }
-  );
-  abortPartial = abort;
-  return {
-    shell,
-    stream: queued.stream,
-    shellReady,
-    allReady,
-    abort
-  };
-}
 function resolveDom(options) {
   if (options.dom) {
     return options.dom;
@@ -651,14 +561,14 @@ function isPromiseLike(value) {
   return typeof value === "object" && value !== null && typeof value.then === "function";
 }
 function startStreamingRender(view, options, writer, control = {}) {
-  const session = (0, import_internal.__fictCreateSSRSession)();
-  return (0, import_internal.__fictRunWithSSRSession)(
+  const session = (0, import_internal2.__fictCreateSSRSession)();
+  return (0, import_internal2.__fictRunWithSSRSession)(
     session,
     () => startStreamingRenderInSession(session, view, options, writer, control)
   );
 }
 function startStreamingRenderInSession(session, view, options, writer, control = {}) {
-  const runInSession = (fn) => (0, import_internal.__fictRunWithSSRSession)(session, fn);
+  const runInSession = (fn) => (0, import_internal2.__fictRunWithSSRSession)(session, fn);
   const resolvedOptions = {
     ...options,
     // Streaming requires a real document; default to fullDocument when unspecified.
@@ -779,10 +689,10 @@ function startStreamingRenderInSession(session, view, options, writer, control =
   const writeSnapshotForScopes = (scopeIds) => {
     runInSession(() => {
       if (!includeSnapshot || scopeIds.length === 0) return;
-      const registry = (0, import_internal.__fictGetScopeRegistry)();
+      const registry = (0, import_internal2.__fictGetScopeRegistry)();
       const pending = scopeIds.filter((id) => registry.has(id) && !sentScopes.has(id));
       if (pending.length === 0) return;
-      const snapshot = (0, import_internal.__fictSerializeSSRStateForScopes)(pending);
+      const snapshot = (0, import_internal2.__fictSerializeSSRStateForScopes)(pending);
       const ids = Object.keys(snapshot.scopes);
       if (ids.length === 0) return;
       const chunk = buildIncrementalSnapshotChunk(snapshot, resolvedOptions);
@@ -796,13 +706,13 @@ function startStreamingRenderInSession(session, view, options, writer, control =
   };
   const writeSnapshotForBoundary = (boundary) => {
     runInSession(() => {
-      const scopes = (0, import_internal.__fictGetScopesForBoundary)(boundary);
+      const scopes = (0, import_internal2.__fictGetScopesForBoundary)(boundary);
       writeSnapshotForScopes(scopes);
     });
   };
   const writeRemainingSnapshots = () => {
     runInSession(() => {
-      const scopes = Array.from((0, import_internal.__fictGetScopeRegistry)().keys());
+      const scopes = Array.from((0, import_internal2.__fictGetScopeRegistry)().keys());
       writeSnapshotForScopes(scopes);
     });
   };
@@ -811,14 +721,15 @@ function startStreamingRenderInSession(session, view, options, writer, control =
     removeAbortListener = () => {
     };
     runInSession(() => {
-      (0, import_internal.__fictSetSSRStreamHooks)(null);
-      (0, import_internal.__fictDisableSSR)();
+      (0, import_internal2.__fictSetSSRStreamHooks)(null);
+      (0, import_internal2.__fictDisableSSR)();
     });
-    restoreGlobals2();
-    restoreManifest();
     try {
       teardown();
     } catch {
+    } finally {
+      restoreGlobals2();
+      restoreManifest();
     }
   };
   const finalize = () => {
@@ -826,7 +737,7 @@ function startStreamingRenderInSession(session, view, options, writer, control =
     closed = true;
     if (mode === "all" && dom && container && !wroteShell) {
       if (includeSnapshot) {
-        const snapshot = (0, import_internal.__fictSerializeSSRState)();
+        const snapshot = (0, import_internal2.__fictSerializeSSRState)();
         injectSnapshot(dom.document, container, snapshot, resolvedOptions);
       }
       const fullHtml = serializeOutput(dom.document, container, resolvedOptions);
@@ -891,12 +802,13 @@ function startStreamingRenderInSession(session, view, options, writer, control =
     }
   };
   const abort = (reason) => {
-    if (closed) return;
-    closed = true;
-    writeFailed = true;
-    writer.abort(reason);
-    cleanup();
     const abortReason = reason ?? new Error("Stream aborted");
+    if (!closed) {
+      closed = true;
+      writeFailed = true;
+      writer.abort(reason);
+      cleanup();
+    }
     rejectShell(abortReason);
     rejectAll(abortReason);
   };
@@ -911,10 +823,10 @@ function startStreamingRenderInSession(session, view, options, writer, control =
     }
   }
   try {
-    (0, import_internal.__fictEnableSSR)();
-    (0, import_internal.__fictSetSSRStreamHooks)(hooks);
+    (0, import_internal2.__fictEnableSSR)();
+    (0, import_internal2.__fictSetSSRStreamHooks)(hooks);
     dom = resolveDom(resolvedOptions);
-    restoreGlobals2 = resolvedOptions.exposeGlobals !== false ? installGlobals(dom.window, dom.document) : () => {
+    restoreGlobals2 = resolvedOptions.exposeGlobals === true ? installGlobals(dom.window, dom.document) : () => {
     };
     restoreManifest = installManifest(resolvedOptions.manifest);
     container = resolveContainer(dom.document, resolvedOptions);
@@ -944,7 +856,7 @@ function startStreamingRenderInSession(session, view, options, writer, control =
       enqueueWrite(shellHtml + streamRuntime);
     }
     wroteShell = true;
-    writeSnapshotForScopes(Array.from((0, import_internal.__fictGetScopeRegistry)().keys()));
+    writeSnapshotForScopes(Array.from((0, import_internal2.__fictGetScopeRegistry)().keys()));
     if (shellCarriesTail && tailHtml) {
       enqueueWrite(tailHtml);
       tailHtml = "";
@@ -1107,7 +1019,6 @@ function serializeDoctype(document, override) {
 0 && (module.exports = {
   createSSRDocument,
   renderToDocument,
-  renderToPartial,
   renderToPipeableStream,
   renderToStream,
   renderToString,

package/dist/index.d.cts

@@ -1,154 +1,2 @@
-import { FictNode } from '@fictjs/runtime';
-
-interface SSRDom {
-    window: Window;
-    document: Document;
-}
-interface RenderToStringOptions {
-    /**
-     * Provide a pre-created DOM (document + window). If omitted, a new DOM is
-     * created per render using `html`.
-     */
-    dom?: SSRDom;
-    /**
-     * Provide a document directly. If `window` is omitted, `document.defaultView`
-     * will be used when available.
-     */
-    document?: Document;
-    /**
-     * Provide a window directly. If `document` is omitted, `window.document` is used.
-     */
-    window?: Window;
-    /**
-     * HTML template used when creating a new DOM.
-     */
-    html?: string;
-    /**
-     * Provide a container element to render into.
-     */
-    container?: HTMLElement;
-    /**
-     * Tag name for the auto-created container.
-     */
-    containerTag?: string;
-    /**
-     * id applied to the auto-created container.
-     */
-    containerId?: string;
-    /**
-     * Additional attributes applied to the auto-created container.
-     */
-    containerAttributes?: Record<string, string | number | boolean | null | undefined>;
-    /**
-     * Return the container element including its outer tag.
-     */
-    includeContainer?: boolean;
-    /**
-     * Return a full HTML document string (doctype + documentElement.outerHTML).
-     */
-    fullDocument?: boolean;
-    /**
-     * Override doctype when `fullDocument` is true. Use `null` to omit.
-     */
-    doctype?: string | null;
-    /**
-     * Expose DOM globals (window/document/Node/Element/etc) during render.
-     * Defaults to true.
-     */
-    exposeGlobals?: boolean;
-    /**
-     * Manifest mapping module URLs to built client chunk URLs.
-     * Can be an object or a path to a JSON file.
-     * File path mode requires Node.js or Deno filesystem access.
-     */
-    manifest?: Record<string, string> | string;
-    /**
-     * Include the SSR snapshot script for resumability.
-     * Defaults to true.
-     */
-    includeSnapshot?: boolean;
-    /**
-     * Script element id for the snapshot.
-     */
-    snapshotScriptId?: string;
-    /**
-     * Where to append the snapshot script when not returning full document.
-     * Defaults to 'container'.
-     */
-    snapshotTarget?: 'container' | 'body' | 'head';
-    /**
-     * Nonce applied to generated <script> tags for CSP compatibility.
-     */
-    scriptNonce?: string;
-}
-interface RenderToStreamOptions extends RenderToStringOptions {
-    /**
-     * Streaming mode:
-     * - 'shell': send fallback shell first, then patch resolved boundaries
-     * - 'all': wait for all suspense boundaries, then send full HTML
-     */
-    mode?: 'shell' | 'all';
-    /**
-     * Called once the initial shell has been written.
-     */
-    onShellReady?: () => void;
-    /**
-     * Called once all pending boundaries resolve and the stream completes.
-     */
-    onAllReady?: () => void;
-    /**
-     * Called when an error occurs during streaming.
-     */
-    onError?: (err: unknown) => void;
-    /**
-     * Abort signal to cancel the stream.
-     */
-    signal?: AbortSignal;
-    /**
-     * How to load the streaming patch runtime.
-     * Defaults to 'inline'. Use 'external' with streamRuntimeSrc for strict CSP.
-     */
-    streamRuntime?: 'inline' | 'external';
-    /**
-     * External streaming patch runtime URL when streamRuntime is 'external'.
-     */
-    streamRuntimeSrc?: string;
-    /**
-     * How resolved Suspense patch chunks are applied.
-     * Defaults to 'inline' for inline runtimes and 'observer' for external runtimes.
-     */
-    streamPatchMode?: 'inline' | 'observer';
-}
-interface PipeableStream {
-    pipe: (writable: NodeJS.WritableStream) => void;
-    abort: (reason?: unknown) => void;
-    shellReady: Promise<void>;
-    allReady: Promise<void>;
-}
-interface PartialPrerenderResult {
-    /**
-     * Complete shell HTML (fallbacks + markers + initial snapshot scripts).
-     */
-    shell: string;
-    /**
-     * Stream of deferred patch chunks and incremental snapshots.
-     */
-    stream: ReadableStream<Uint8Array>;
-    shellReady: Promise<void>;
-    allReady: Promise<void>;
-    abort: (reason?: unknown) => void;
-}
-interface RenderToDocumentResult extends SSRDom {
-    html: string;
-    container: HTMLElement;
-    dispose: () => void;
-}
-declare function createSSRDocument(html?: string): SSRDom;
-declare function renderToDocument(view: () => FictNode, options?: RenderToStringOptions): RenderToDocumentResult;
-declare function renderToString(view: () => FictNode, options?: RenderToStringOptions): string;
-declare function renderToStringAsync(view: () => FictNode, options?: RenderToStringOptions): Promise<string>;
-declare function renderToStream(view: () => FictNode, options?: RenderToStreamOptions): ReadableStream<Uint8Array>;
-declare function renderToPipeableStream(view: () => FictNode, options?: RenderToStreamOptions): PipeableStream;
-declare function renderToPartial(view: () => FictNode, options?: RenderToStreamOptions): PartialPrerenderResult;
-
-export { type PartialPrerenderResult, type PipeableStream, type RenderToDocumentResult, type RenderToStreamOptions, type RenderToStringOptions, type SSRDom, createSSRDocument, renderToDocument, renderToPartial, renderToPipeableStream, renderToStream, renderToString, renderToStringAsync };
+export { P as PipeableStream, g as RenderToDocumentResult, f as RenderToStreamOptions, R as RenderToStringOptions, S as SSRDom, c as createSSRDocument, r as renderToDocument, e as renderToPipeableStream, d as renderToStream, a as renderToString, b as renderToStringAsync } from './experimental.cjs';
+import '@fictjs/runtime';