@ereo/server 0.1.23 → 0.1.25

package/dist/bun-server.d.ts

@@ -95,6 +95,14 @@ export declare class BunServer {
      * Handle a matched route.
      */
     private handleRoute;
+    /**
+     * Execute inline middleware exported from the route module.
+     */
+    private executeInlineMiddleware;
+    /**
+     * Inner route handler (after middleware).
+     */
+    private handleRouteInner;
     /**
      * Render a full HTML page with the route component and layouts.
      */
@@ -102,6 +110,10 @@ export declare class BunServer {
     /**
      * Render page using React 18 streaming SSR.
      * Uses renderToReadableStream for Bun environments with native Web Streams API.
+     *
+     * Bytes flow progressively: shell head → React chunks as they render → tail.
+     * The browser can parse the head (CSS, meta) and start rendering immediately
+     * while React continues resolving Suspense boundaries on the server.
      */
     private renderStreamingPage;
     /**
@@ -111,6 +123,9 @@ export declare class BunServer {
     /**
      * Render page directly using streaming when layout provides HTML structure.
      * The layout component is expected to render the full HTML document.
+     *
+     * React content streams progressively. Hydration scripts are appended
+     * after the stream completes (browsers tolerate post-body scripts).
      */
     private renderStreamingPageDirect;
     /**
@@ -137,6 +152,21 @@ export declare class BunServer {
      * Extract meta tags from meta descriptors (excluding title).
      */
     private extractMetaTags;
+    /**
+     * Build matches data for useMatches hook.
+     * Returns array of matched routes from outermost layout to page.
+     */
+    private buildMatchesData;
+    /**
+     * Build merged response headers from route and layout headers functions.
+     * Cascades from outermost layout → innermost layout → route.
+     * Each headers function receives the parent headers from the layout above it.
+     */
+    private buildRouteHeaders;
+    /**
+     * Apply custom route headers to a Response, preserving required headers.
+     */
+    private applyRouteHeaders;
     /**
      * Escape HTML special characters.
      */

package/dist/bun-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bun-server.d.ts","sourceRoot":"","sources":["../src/bun-server.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bun-server.d.ts","sourceRoot":"","sources":["../src/bun-server.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -2,7 +2,7 @@
 var __require = import.meta.require;
 
 // src/bun-server.ts
-import { createContext } from "@ereo/core";
+import { createContext, NotFoundError } from "@ereo/core";
 import { matchWithLayouts } from "@ereo/router";
 
 // src/middleware.ts
@@ -422,7 +422,7 @@ function staticMiddleware(options) {
 }
 
 // src/streaming.ts
-import { serializeLoaderData } from "@ereo/data";
+import { serializeLoaderData, hasDeferredData, resolveAllDeferred } from "@ereo/data";
 function createShell(options) {
   const { shell = {}, scripts = [], styles = [], loaderData } = options;
   const htmlAttrs = Object.entries(shell.htmlAttrs || {}).map(([k, v]) => `${k}="${v}"`).join(" ");
@@ -435,6 +435,11 @@ function createShell(options) {
     `);
   const styleLinks = styles.map((href) => `<link rel="stylesheet" href="${href}">`).join(`
     `);
+  const linkTags = (shell.links || []).map((link) => {
+    const attrs = Object.entries(link).filter(([, v]) => v !== undefined).map(([k, v]) => `${k}="${escapeAttr(String(v))}"`).join(" ");
+    return `<link ${attrs}>`;
+  }).join(`
+    `);
   const scriptTags = scripts.map((src) => `<script type="module" src="${src}"></script>`).join(`
     `);
   const loaderScript = loaderData ? `<script>window.__EREO_DATA__=${serializeLoaderData(loaderData)}</script>` : "";
@@ -445,6 +450,7 @@ function createShell(options) {
     <meta name="viewport" content="width=device-width, initial-scale=1">
     ${shell.title ? `<title>${shell.title}</title>` : ""}
     ${metaTags}
+    ${linkTags}
     ${styleLinks}
     ${shell.head || ""}
 </head>
@@ -468,6 +474,9 @@ async function renderToStream(element, options) {
       context: options.context
     });
   }
+  if (hasDeferredData(loaderData)) {
+    loaderData = await resolveAllDeferred(loaderData);
+  }
   const { head, tail } = createShell({ shell, scripts, styles, loaderData });
   return new Promise((resolve2, reject) => {
     const { PassThrough } = __require("stream");
@@ -522,6 +531,9 @@ async function renderToString(element, options) {
       context: options.context
     });
   }
+  if (hasDeferredData(loaderData)) {
+    loaderData = await resolveAllDeferred(loaderData);
+  }
   const { head, tail } = createShell({ shell, scripts, styles, loaderData });
   const content = reactRenderToString(element);
   const html = head + content + tail;
@@ -560,8 +572,9 @@ function createSuspenseStream() {
 }
 
 // src/bun-server.ts
-import { serializeLoaderData as serializeLoaderData2 } from "@ereo/data";
+import { serializeLoaderData as serializeLoaderData2, hasDeferredData as hasDeferredData2, resolveAllDeferred as resolveAllDeferred2 } from "@ereo/data";
 import { createElement } from "react";
+import { OutletProvider } from "@ereo/client";
 async function getStreamingRenderer() {
   try {
     const browserServer = await import("react-dom/server.browser");
@@ -679,7 +692,7 @@ class BunServer {
             if (typeof this.router.loadModule === "function") {
               await this.router.loadModule(match.route);
             }
-            return this.handleRoute(request, { ...match, layouts: [] }, context);
+            return this.handleRoute(request, { ...match, layouts: match.layouts || [] }, context);
           }
         }
         if (this.app) {
@@ -713,6 +726,50 @@ class BunServer {
     if (!module) {
       return new Response("Route module not loaded", { status: 500 });
     }
+    if (module.middleware && module.middleware.length > 0) {
+      return this.executeInlineMiddleware(request, context, module.middleware, () => this.handleRouteInner(request, match, context));
+    }
+    return this.handleRouteInner(request, match, context);
+  }
+  async executeInlineMiddleware(request, context, middleware, handler) {
+    let index = 0;
+    const next = async () => {
+      if (index >= middleware.length) {
+        return handler();
+      }
+      const mw = middleware[index++];
+      return mw(request, context, next);
+    };
+    return next();
+  }
+  async handleRouteInner(request, match, context) {
+    const module = match.route.module;
+    const httpMethod = request.method.toUpperCase();
+    const HTTP_METHODS = ["GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS", "HEAD"];
+    if (HTTP_METHODS.includes(httpMethod)) {
+      const methodHandler = module[httpMethod];
+      if (typeof methodHandler === "function") {
+        const result = await methodHandler({ request, params: match.params, context });
+        if (result instanceof Response) {
+          const routeHeaders3 = this.buildRouteHeaders(match);
+          return this.applyRouteHeaders(result, routeHeaders3);
+        }
+        const jsonResponse = new Response(JSON.stringify(result), {
+          headers: { "Content-Type": "application/json" }
+        });
+        const routeHeaders2 = this.buildRouteHeaders(match);
+        return this.applyRouteHeaders(jsonResponse, routeHeaders2);
+      }
+    }
+    const layouts = match.layouts || [];
+    for (const layout of layouts) {
+      if (layout.module?.beforeLoad) {
+        await layout.module.beforeLoad({ request, params: match.params, context });
+      }
+    }
+    if (module.beforeLoad) {
+      await module.beforeLoad({ request, params: match.params, context });
+    }
     if (request.method !== "GET" && request.method !== "HEAD") {
       if (module.action) {
         const result = await module.action({
@@ -721,43 +778,85 @@ class BunServer {
           context
         });
         if (result instanceof Response) {
-          return result;
+          const actionHeaders = new Headers(result.headers);
+          const routeHeaders3 = this.buildRouteHeaders(match, actionHeaders);
+          return this.applyRouteHeaders(result, routeHeaders3);
         }
-        return new Response(JSON.stringify(result), {
+        const actionResponse = new Response(JSON.stringify(result), {
           headers: { "Content-Type": "application/json" }
         });
+        const routeHeaders2 = this.buildRouteHeaders(match);
+        return this.applyRouteHeaders(actionResponse, routeHeaders2);
       }
       return new Response("Method Not Allowed", { status: 405 });
     }
-    let loaderData = null;
-    if (module.loader) {
-      loaderData = await module.loader({
-        request,
-        params: match.params,
-        context
-      });
-      if (loaderData instanceof Response) {
-        return loaderData;
+    const loaderArgs = { request, params: match.params, context };
+    const loaderPromises = [];
+    loaderPromises.push(module.loader ? Promise.resolve(module.loader(loaderArgs)) : Promise.resolve(null));
+    for (const layout of layouts) {
+      loaderPromises.push(layout.module?.loader ? Promise.resolve(layout.module.loader(loaderArgs)) : Promise.resolve(null));
+    }
+    const loaderResults = await Promise.all(loaderPromises);
+    const loaderData = loaderResults[0];
+    if (loaderData instanceof Response) {
+      return loaderData;
+    }
+    const layoutLoaderData = new Map;
+    for (let i = 0;i < layouts.length; i++) {
+      const layoutData = loaderResults[i + 1];
+      if (layoutData instanceof Response) {
+        return layoutData;
+      }
+      if (layoutData !== null) {
+        layoutLoaderData.set(layouts[i].id, layoutData);
       }
     }
+    const routeHeaders = this.buildRouteHeaders(match);
     if (request.headers.get("Accept")?.includes("application/json")) {
-      return new Response(JSON.stringify({ data: loaderData, params: match.params }), {
+      const resolvedLoaderData = hasDeferredData2(loaderData) ? await resolveAllDeferred2(loaderData) : loaderData;
+      const jsonPayload = {
+        data: resolvedLoaderData,
+        params: match.params
+      };
+      if (layoutLoaderData.size > 0) {
+        const layoutDataObj = {};
+        for (const [id, data] of layoutLoaderData) {
+          layoutDataObj[id] = hasDeferredData2(data) ? await resolveAllDeferred2(data) : data;
+        }
+        jsonPayload.layoutData = layoutDataObj;
+      }
+      const module2 = match.route.module;
+      const routeLinks = module2?.links ? module2.links() : [];
+      const layoutLinksList = (match.layouts || []).flatMap((layout) => layout.module?.links ? layout.module.links() : []);
+      const allLinks = [...layoutLinksList, ...routeLinks];
+      if (allLinks.length > 0) {
+        jsonPayload.links = allLinks;
+      }
+      const matchesData = this.buildMatchesData(match, loaderData, layoutLoaderData);
+      jsonPayload.matches = matchesData;
+      const jsonResponse = new Response(JSON.stringify(jsonPayload), {
         headers: { "Content-Type": "application/json" }
       });
+      return this.applyRouteHeaders(jsonResponse, routeHeaders);
     }
-    return this.renderPage(request, match, context, loaderData);
+    const htmlResponse = await this.renderPage(request, match, context, loaderData, layoutLoaderData);
+    return this.applyRouteHeaders(htmlResponse, routeHeaders);
   }
-  async renderPage(request, match, context, loaderData) {
+  async renderPage(request, match, context, loaderData, layoutLoaderData = new Map) {
     const module = match.route.module;
     if (!module?.default) {
       return this.renderMinimalPage(match, loaderData);
     }
     const url = new URL(request.url);
     const metaDescriptors = this.buildMeta(module, loaderData, match.params, url);
+    const routeLinks = module.links ? module.links() : [];
+    const layoutLinks = (match.layouts || []).flatMap((layout) => layout.module?.links ? layout.module.links() : []);
+    const allLinks = [...layoutLinks, ...routeLinks];
     const shell = {
       ...this.options.shell,
       title: this.extractTitle(metaDescriptors) || this.options.shell?.title,
-      meta: this.extractMetaTags(metaDescriptors)
+      meta: this.extractMetaTags(metaDescriptors),
+      links: allLinks.length > 0 ? allLinks : undefined
     };
     const PageComponent = module.default;
     let element = createElement(PageComponent, {
@@ -769,25 +868,27 @@ class BunServer {
       const layout = layouts[i];
       if (layout.module?.default) {
         const LayoutComponent = layout.module.default;
-        element = createElement(LayoutComponent, {
-          loaderData: null,
+        const childElement = element;
+        element = createElement(OutletProvider, { element: childElement }, createElement(LayoutComponent, {
+          loaderData: layoutLoaderData.get(layout.id) ?? null,
           params: match.params,
-          children: element
-        });
+          children: childElement
+        }));
       }
     }
+    const allLoaderData = layoutLoaderData.size > 0 ? { __routeData: loaderData, __layoutData: Object.fromEntries(layoutLoaderData) } : loaderData;
     const hasRootLayout = layouts.length > 0 && layouts[0].module?.default;
     if (hasRootLayout) {
       if (this.options.renderMode === "streaming") {
-        return this.renderStreamingPageDirect(element, loaderData);
+        return this.renderStreamingPageDirect(element, allLoaderData);
       } else {
-        return this.renderStringPageDirect(element, loaderData);
+        return this.renderStringPageDirect(element, allLoaderData);
       }
     }
     if (this.options.renderMode === "streaming") {
-      return this.renderStreamingPage(element, shell, loaderData);
+      return this.renderStreamingPage(element, shell, allLoaderData);
     } else {
-      return this.renderStringPage(element, shell, loaderData);
+      return this.renderStringPage(element, shell, allLoaderData);
     }
   }
   async renderStreamingPage(element, shell, loaderData) {
@@ -796,38 +897,64 @@ class BunServer {
       if (!renderToReadableStream) {
         return this.renderStringPage(element, shell, loaderData);
       }
+      const hasDeferred = hasDeferredData2(loaderData);
       const scripts = [this.options.clientEntry];
-      const { head, tail } = createShell({ shell, scripts, loaderData });
+      const { head, tail } = createShell({
+        shell,
+        scripts,
+        loaderData: hasDeferred ? null : loaderData
+      });
       const encoder = new TextEncoder;
       const headBytes = encoder.encode(head);
-      const tailBytes = encoder.encode(tail);
+      const tailBytes = hasDeferred ? null : encoder.encode(tail);
       const reactStream = await renderToReadableStream(element, {
         onError(error) {
           console.error("Streaming render error:", error);
         }
       });
-      await reactStream.allReady;
+      const clientEntry = this.options.clientEntry;
       const reader = reactStream.getReader();
-      const chunks = [headBytes];
-      while (true) {
-        const { done, value } = await reader.read();
-        if (done)
-          break;
-        chunks.push(value);
-      }
-      chunks.push(tailBytes);
-      const totalLength = chunks.reduce((acc, chunk) => acc + chunk.length, 0);
-      const fullHtml = new Uint8Array(totalLength);
-      let offset = 0;
-      for (const chunk of chunks) {
-        fullHtml.set(chunk, offset);
-        offset += chunk.length;
-      }
-      return new Response(fullHtml, {
+      let phase = "head";
+      const stream = new ReadableStream({
+        async pull(controller) {
+          switch (phase) {
+            case "head":
+              controller.enqueue(headBytes);
+              phase = "body";
+              break;
+            case "body": {
+              const { done, value } = await reader.read();
+              if (done) {
+                if (hasDeferred) {
+                  const resolved = await resolveAllDeferred2(loaderData);
+                  const loaderScript = `<script>window.__EREO_DATA__=${serializeLoaderData2(resolved)}</script>`;
+                  const scriptTag = `<script type="module" src="${clientEntry}"></script>`;
+                  const resolvedTail = `</div>
+    ${loaderScript}
+    ${scriptTag}
+</body>
+</html>`;
+                  controller.enqueue(encoder.encode(resolvedTail));
+                } else {
+                  controller.enqueue(tailBytes);
+                }
+                controller.close();
+                phase = "done";
+              } else {
+                controller.enqueue(value);
+              }
+              break;
+            }
+          }
+        },
+        cancel() {
+          reader.cancel();
+        }
+      });
+      return new Response(stream, {
         status: 200,
         headers: {
-          "Content-Type": "text/html; charset=utf-8",
-          "Content-Length": totalLength.toString()
+          "Content-Type": "text/html; charset=utf-8"
         }
       });
     } catch (error) {
@@ -838,8 +965,9 @@ class BunServer {
   async renderStringPage(element, shell, loaderData) {
     try {
       const { renderToString: reactRenderToString } = await import("react-dom/server");
+      const resolvedData = hasDeferredData2(loaderData) ? await resolveAllDeferred2(loaderData) : loaderData;
       const scripts = [this.options.clientEntry];
-      const { head, tail } = createShell({ shell, scripts, loaderData });
+      const { head, tail } = createShell({ shell, scripts, loaderData: resolvedData });
       const content = reactRenderToString(element);
       const html = head + content + tail;
       const encoder = new TextEncoder;
@@ -867,32 +995,40 @@ class BunServer {
           console.error("Streaming render error:", error);
         }
       });
-      await reactStream.allReady;
-      const reader = reactStream.getReader();
-      const chunks = [];
-      while (true) {
-        const { done, value } = await reader.read();
-        if (done)
-          break;
-        chunks.push(value);
-      }
       const encoder = new TextEncoder;
-      const loaderScript = loaderData ? `<script>window.__EREO_DATA__=${serializeLoaderData2(loaderData)}</script>` : "";
-      const clientScript = `<script type="module" src="${this.options.clientEntry}"></script>`;
-      const injectedScripts = encoder.encode(loaderScript + clientScript);
-      const totalLength = chunks.reduce((acc, chunk) => acc + chunk.length, 0) + injectedScripts.length;
-      const fullHtml = new Uint8Array(totalLength);
-      let offset = 0;
-      for (const chunk of chunks) {
-        fullHtml.set(chunk, offset);
-        offset += chunk.length;
-      }
-      fullHtml.set(injectedScripts, offset);
-      return new Response(fullHtml, {
+      const hasDeferred = hasDeferredData2(loaderData);
+      const clientEntry = this.options.clientEntry;
+      const injectedScripts = hasDeferred ? null : encoder.encode((loaderData ? `<script>window.__EREO_DATA__=${serializeLoaderData2(loaderData)}</script>` : "") + `<script type="module" src="${clientEntry}"></script>`);
+      const reader = reactStream.getReader();
+      let done = false;
+      const stream = new ReadableStream({
+        async pull(controller) {
+          if (done)
+            return;
+          const result = await reader.read();
+          if (result.done) {
+            if (hasDeferred) {
+              const resolved = await resolveAllDeferred2(loaderData);
+              const loaderScript = resolved ? `<script>window.__EREO_DATA__=${serializeLoaderData2(resolved)}</script>` : "";
+              const clientScript = `<script type="module" src="${clientEntry}"></script>`;
+              controller.enqueue(encoder.encode(loaderScript + clientScript));
+            } else {
+              controller.enqueue(injectedScripts);
+            }
+            controller.close();
+            done = true;
+          } else {
+            controller.enqueue(result.value);
+          }
+        },
+        cancel() {
+          reader.cancel();
+        }
+      });
+      return new Response(stream, {
         status: 200,
         headers: {
-          "Content-Type": "text/html; charset=utf-8",
-          "Content-Length": totalLength.toString()
+          "Content-Type": "text/html; charset=utf-8"
         }
       });
     } catch (error) {
@@ -903,8 +1039,9 @@ class BunServer {
   async renderStringPageDirect(element, loaderData) {
     try {
       const { renderToString: reactRenderToString } = await import("react-dom/server");
+      const resolvedData = hasDeferredData2(loaderData) ? await resolveAllDeferred2(loaderData) : loaderData;
       let html = reactRenderToString(element);
-      const loaderScript = loaderData ? `<script>window.__EREO_DATA__=${serializeLoaderData2(loaderData)}</script>` : "";
+      const loaderScript = resolvedData ? `<script>window.__EREO_DATA__=${serializeLoaderData2(resolvedData)}</script>` : "";
       const clientScript = `<script type="module" src="${this.options.clientEntry}"></script>`;
       html = html.replace("</body>", `${loaderScript}${clientScript}</body>`);
       const encoder = new TextEncoder;
@@ -921,9 +1058,10 @@ class BunServer {
       return this.renderErrorPage(error);
     }
   }
-  renderMinimalPage(match, loaderData) {
+  async renderMinimalPage(match, loaderData) {
+    const resolvedData = hasDeferredData2(loaderData) ? await resolveAllDeferred2(loaderData) : loaderData;
     const serializedData = serializeLoaderData2({
-      loaderData,
+      loaderData: resolvedData,
       params: match.params
     });
     const html = `<!DOCTYPE html>
@@ -1015,6 +1153,79 @@ class BunServer {
     }
     return tags;
   }
+  buildMatchesData(match, loaderData, layoutLoaderData) {
+    const matches = [];
+    for (const layout of match.layouts || []) {
+      matches.push({
+        id: layout.id,
+        pathname: match.pathname,
+        params: match.params,
+        data: layoutLoaderData.get(layout.id) ?? null,
+        handle: layout.module?.handle ?? undefined
+      });
+    }
+    matches.push({
+      id: match.route.id,
+      pathname: match.pathname,
+      params: match.params,
+      data: loaderData,
+      handle: match.route.module?.handle ?? undefined
+    });
+    return matches;
+  }
+  buildRouteHeaders(match, actionHeaders = new Headers) {
+    const layouts = match.layouts || [];
+    const module = match.route.module;
+    let parentHeaders = new Headers;
+    for (const layout of layouts) {
+      const headersFn = layout.module?.headers;
+      if (headersFn) {
+        try {
+          const result = headersFn({
+            loaderHeaders: new Headers,
+            actionHeaders,
+            parentHeaders
+          });
+          parentHeaders = result instanceof Headers ? result : new Headers(result);
+        } catch (error) {
+          console.error(`Error in layout headers function (${layout.id}):`, error);
+        }
+      }
+    }
+    if (module?.headers) {
+      try {
+        const result = module.headers({
+          loaderHeaders: new Headers,
+          actionHeaders,
+          parentHeaders
+        });
+        return result instanceof Headers ? result : new Headers(result);
+      } catch (error) {
+        console.error("Error in route headers function:", error);
+      }
+    }
+    return parentHeaders;
+  }
+  applyRouteHeaders(response, routeHeaders) {
+    let hasHeaders = false;
+    routeHeaders.forEach(() => {
+      hasHeaders = true;
+    });
+    if (!hasHeaders)
+      return response;
+    const newHeaders = new Headers(response.headers);
+    routeHeaders.forEach((value, key) => {
+      const lower = key.toLowerCase();
+      if (lower === "content-type" || lower === "content-length")
+        return;
+      newHeaders.set(key, value);
+    });
+    return new Response(response.body, {
+      status: response.status,
+      statusText: response.statusText,
+      headers: newHeaders
+    });
+  }
   escapeHtml(str) {
     return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#039;");
   }
@@ -1022,6 +1233,16 @@ class BunServer {
     if (error instanceof Response) {
       return error;
     }
+    if (error instanceof NotFoundError) {
+      return new Response(JSON.stringify({
+        error: "Not Found",
+        status: 404,
+        data: error.data
+      }), {
+        status: 404,
+        headers: { "Content-Type": "application/json" }
+      });
+    }
     const message = error instanceof Error ? error.message : "Internal Server Error";
     const stack = error instanceof Error ? error.stack : undefined;
     console.error("Server error:", error);

package/dist/streaming.d.ts

@@ -4,7 +4,7 @@
  * Server-side rendering with streaming support for React 18+.
  */
 import type { ReactElement } from 'react';
-import type { RouteMatch, AppContext } from '@ereo/core';
+import type { RouteMatch, AppContext, LinkDescriptor } from '@ereo/core';
 /**
  * Render options.
  */
@@ -34,6 +34,8 @@ export interface ShellTemplate {
         property?: string;
         content: string;
     }>;
+    /** Link descriptors for stylesheets, preloads, etc. */
+    links?: LinkDescriptor[];
     /** Head content */
     head?: string;
     /** Body attributes */

package/dist/streaming.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"streaming.d.ts","sourceRoot":"","sources":["../src/streaming.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,KAAK,EAAS,UAAU,EAAE,UAAU,EAAkB,MAAM,YAAY,CAAC;AAGhF;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,kBAAkB;IAClB,KAAK,EAAE,UAAU,CAAC;IAClB,sBAAsB;IACtB,OAAO,EAAE,UAAU,CAAC;IACpB,qBAAqB;IACrB,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,uBAAuB;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,wBAAwB;IACxB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,kBAAkB;IAClB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,qBAAqB;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gBAAgB;IAChB,IAAI,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACpE,mBAAmB;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,sBAAsB;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,sBAAsB;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,6BAA6B;IAC7B,IAAI,EAAE,MAAM,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC;IAC1C,uBAAuB;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE;IACnC,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAmDjC;AAED;;;GAGG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,YAAY,CAAC,CAmEvB;AAED;;GAEG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,YAAY,CAAC,CA2BvB;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,YAAY,GAAG,QAAQ,CAK7D;AAED;;GAEG;AACH,wBAAgB,oBAAoB,IAAI;IACtC,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC,CAAC;IACnC,IAAI,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9B,KAAK,EAAE,MAAM,IAAI,CAAC;CACnB,CAmBA"}
+{"version":3,"file":"streaming.d.ts","sourceRoot":"","sources":["../src/streaming.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,KAAK,EAAS,UAAU,EAAE,UAAU,EAAkB,cAAc,EAAE,MAAM,YAAY,CAAC;AAGhG;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,kBAAkB;IAClB,KAAK,EAAE,UAAU,CAAC;IAClB,sBAAsB;IACtB,OAAO,EAAE,UAAU,CAAC;IACpB,qBAAqB;IACrB,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,uBAAuB;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,wBAAwB;IACxB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,kBAAkB;IAClB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,qBAAqB;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gBAAgB;IAChB,IAAI,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACpE,uDAAuD;IACvD,KAAK,CAAC,EAAE,cAAc,EAAE,CAAC;IACzB,mBAAmB;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,sBAAsB;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,sBAAsB;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,6BAA6B;IAC7B,IAAI,EAAE,MAAM,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC;IAC1C,uBAAuB;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE;IACnC,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CA8DjC;AAED;;;GAGG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,YAAY,CAAC,CAwEvB;AAED;;GAEG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,YAAY,CAAC,CAgCvB;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,YAAY,GAAG,QAAQ,CAK7D;AAED;;GAEG;AACH,wBAAgB,oBAAoB,IAAI;IACtC,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC,CAAC;IACnC,IAAI,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9B,KAAK,EAAE,MAAM,IAAI,CAAC;CACnB,CAmBA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ereo/server",
-  "version": "0.1.23",
+  "version": "0.1.25",
   "license": "MIT",
   "author": "Ereo Team",
   "homepage": "https://ereo.dev",
@@ -25,16 +25,17 @@
     "dist"
   ],
   "scripts": {
-    "build": "bun build ./src/index.ts --outdir ./dist --target bun --external @ereo/core --external @ereo/router --external @ereo/data --external react --external react-dom && bun run build:types",
+    "build": "bun build ./src/index.ts --outdir ./dist --target bun --external @ereo/core --external @ereo/client --external @ereo/router --external @ereo/data --external react --external react-dom && bun run build:types",
     "build:types": "tsc --emitDeclarationOnly --outDir dist",
     "dev": "bun build ./src/index.ts --outdir ./dist --target bun --watch",
     "test": "bun test",
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@ereo/core": "^0.1.23",
-    "@ereo/router": "^0.1.23",
-    "@ereo/data": "^0.1.23"
+    "@ereo/core": "^0.1.25",
+    "@ereo/client": "^0.1.25",
+    "@ereo/router": "^0.1.25",
+    "@ereo/data": "^0.1.25"
   },
   "devDependencies": {
     "@types/bun": "^1.1.0",