solid-js 1.3.0-beta.2 → 1.3.0-beta.6

package/web/dist/server.js

@@ -229,25 +229,32 @@ function stringifyString(str) {
   return result;
 }
 
-const REPLACE_SCRIPT = `function $df(e,t){t=document.getElementById(e),document.getElementById("pl"+e).replaceWith(...t.childNodes),_$HY.set(e)}`;
+const REPLACE_SCRIPT = `function $df(e,y,t){t=document.getElementById(e),document.getElementById("pl"+e).replaceWith(...t.childNodes),_$HY.set(e,y)}`;
+const FRAGMENT_REPLACE = /<!\[([\d.]+)\]>/;
 function renderToString(code, options = {}) {
+  let scripts = "";
   sharedConfig.context = {
-    id: "",
+    id: options.renderId || "",
     count: 0,
     suspense: {},
     assets: [],
-    nonce: options.nonce
+    nonce: options.nonce,
+    writeResource(id, p, error) {
+      if (error) scripts += `_$HY.set("${id}", ${serializeError(p)});`;
+    }
   };
-  let html = resolveSSRNode(escape(code()));
-  return injectAssets(sharedConfig.context.assets, html);
+  let html = injectAssets(sharedConfig.context.assets, resolveSSRNode(escape(code())));
+  if (scripts.length) html = injectScripts(html, scripts, options.nonce);
+  return html;
 }
 function renderToStringAsync(code, options = {}) {
   const {
     nonce,
+    renderId,
     timeoutMs = 30000
   } = options;
   const context = sharedConfig.context = {
-    id: "",
+    id: renderId || "",
     count: 0,
     resources: {},
     suspense: {},
@@ -256,23 +263,56 @@ function renderToStringAsync(code, options = {}) {
     nonce
   };
   let scripts = "";
-  sharedConfig.context.writeResource = (id, p) => p.then(d => scripts += `_$HY.set("${id}", ${devalue(d)});`);
+  sharedConfig.context.writeResource = (id, p, error) => {
+    if (error) return scripts += `_$HY.set("${id}", ${serializeError(p)});`;
+    p.then(d => scripts += `_$HY.set("${id}", ${devalue(d)});`).catch(() => scripts += `_$HY.set("${id}", null);`);
+  };
   const timeout = new Promise((_, reject) => setTimeout(() => reject("renderToString timed out"), timeoutMs));
+  function asyncWrap(fn) {
+    return new Promise(resolve => {
+      const registry = new Set();
+      const cache = Object.create(null);
+      sharedConfig.context.registerFragment = register;
+      const rendered = fn();
+      if (!registry.size) resolve(rendered);
+      function register(key) {
+        registry.add(key);
+        return (value = "", error) => {
+          cache[key] = value;
+          registry.delete(key);
+          if (error) return scripts += `_$HY.set("${key}", Promise.resolve(${serializeError(error)}));`;
+          if (!registry.size) Promise.resolve().then(() => {
+            let source = resolveSSRNode(rendered);
+            let final = "";
+            let match;
+            while (match = source.match(FRAGMENT_REPLACE)) {
+              final += source.substring(0, match.index);
+              source = cache[match[1]] + source.substring(match.index + match[0].length);
+            }
+            resolve(final + source);
+          });
+          return true;
+        };
+      }
+    });
+  }
   return Promise.race([asyncWrap(() => escape(code())), timeout]).then(res => {
     let html = injectAssets(context.assets, resolveSSRNode(res));
     if (scripts.length) html = injectScripts(html, scripts, nonce);
     return html;
   });
 }
-function renderToPipeableStream(code, options) {
+function renderToStream(code, options = {}) {
   const {
     nonce,
     onCompleteShell,
-    onCompleteAll
+    onCompleteAll,
+    dataOnly,
+    renderId
   } = options;
   const tmp = [];
   const tasks = [];
-  const registry = new Set();
+  const registry = new Map();
   const checkEnd = () => {
     if (!registry.size && !completed) {
       onCompleteAll && onCompleteAll(result);
@@ -281,7 +321,7 @@ function renderToPipeableStream(code, options) {
     }
   };
   const writeInitialScript = () => {
-    if (tasks.length) {
+    if (tasks.length && !completed) {
       buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>${tasks.join(";")}</script>`);
       tasks.length = 0;
     }
@@ -297,41 +337,47 @@ function renderToPipeableStream(code, options) {
     }
   };
   sharedConfig.context = {
-    id: "",
+    id: renderId || "",
     count: 0,
     async: true,
     streaming: true,
+    dataOnly,
     resources: {},
     suspense: {},
     assets: [],
     nonce,
-    writeResource(id, p) {
+    writeResource(id, p, error) {
       if (!scheduled) {
         Promise.resolve().then(writeInitialScript);
         scheduled = true;
       }
+      if (error) return tasks.push(`_$HY.set("${id}", ${serializeError(p)})`);
       tasks.push(`_$HY.init("${id}")`);
       p.then(d => {
-        buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>_$HY.set("${id}", ${devalue(d)})</script>`);
+        !completed && buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>_$HY.set("${id}", ${devalue(d)})</script>`);
+      }).catch(() => {
+        !completed && buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>_$HY.set("${id}", null)</script>`);
       });
     },
     registerFragment(key) {
-      registry.add(key);
-      Promise.resolve().then(() => {
-        if (registry.has(key)) {
-          if (!scheduled) {
-            Promise.resolve().then(writeInitialScript);
-            scheduled = true;
-          }
-          tasks.push(`_$HY.init("${key}")`);
+      registry.set(key, []);
+      if (!dataOnly) {
+        if (!scheduled) {
+          Promise.resolve().then(writeInitialScript);
+          scheduled = true;
         }
-      });
-      return value => {
+        tasks.push(`_$HY.init("${key}")`);
+      }
+      return (value, error) => {
+        const keys = registry.get(key);
         registry.delete(key);
-        if (!value) return;
-        buffer.write(`<div hidden id="${key}">${value}</div><script${nonce ? ` nonce="${nonce}"` : ""}>${!scriptFlushed ? REPLACE_SCRIPT : ""}$df("${key}")</script>`);
-        scriptFlushed = true;
+        if (waitForFragments(registry, key)) return;
+        if ((value !== undefined || error) && !completed) {
+          buffer.write(`<div hidden id="${key}">${value !== undefined ? value : " "}</div><script${nonce ? ` nonce="${nonce}"` : ""}>${!scriptFlushed ? REPLACE_SCRIPT : ""}${keys.length ? keys.map(k => `_$HY.unset("${k}");`) : ""}$df("${key}"${error ? "," + serializeError(error) : ""})</script>`);
+          scriptFlushed = true;
+        }
         checkEnd();
+        return true;
       };
     }
   };
@@ -349,109 +395,24 @@ function renderToPipeableStream(code, options) {
       buffer = writable = w;
       tmp.forEach(chunk => buffer.write(chunk));
       if (completed) writable.end();else setTimeout(checkEnd);
-    }
-  };
-}
-function pipeToWritable(code, writable, options = {}) {
-  const {
-    nonce,
-    onCompleteShell = ({
-      startWriting
-    }) => startWriting(),
-    onCompleteAll
-  } = options;
-  const tmp = [];
-  const tasks = [];
-  const writer = writable.getWriter();
-  const encoder = new TextEncoder();
-  const registry = new Set();
-  const checkEnd = () => {
-    if (!registry.size && !completed) {
-      onCompleteAll && onCompleteAll(result);
-      writable && writable.close();
-      completed = true;
-    }
-  };
-  const writeInitialScript = () => {
-    if (tasks.length) {
-      buffer.write(encoder.encode(`<script${nonce ? ` nonce="${nonce}"` : ""}>${tasks.join(";")}</script>`));
-      tasks.length = 0;
-    }
-    scheduled = false;
-  };
-  let completed = false;
-  let scriptFlushed = false;
-  let scheduled = true;
-  let buffer = {
-    write(payload) {
-      tmp.push(payload);
-    }
-  };
-  const result = {
-    startWriting() {
-      buffer = writer;
-      tmp.forEach(chunk => writer.write(chunk));
-      setTimeout(checkEnd);
-    },
-    write(c) {
-      writer.write(encoder.encode(c));
     },
-    abort() {
-      registry.clear();
-      checkEnd();
-    }
-  };
-  sharedConfig.context = {
-    id: "",
-    count: 0,
-    async: true,
-    streaming: true,
-    resources: {},
-    suspense: {},
-    assets: [],
-    nonce,
-    writeResource(id, p) {
-      if (!scheduled) {
-        Promise.resolve().then(writeInitialScript);
-        scheduled = true;
-      }
-      tasks.push(`_$HY.init("${id}")`);
-      p.then(d => {
-        buffer.write(encoder.encode(`<script${nonce ? ` nonce="${nonce}"` : ""}>_$HY.set("${id}", ${devalue(d)})</script>`));
-      });
-    },
-    registerFragment(key) {
-      registry.add(key);
-      Promise.resolve().then(() => {
-        if (registry.has(key)) {
-          if (!scheduled) {
-            Promise.resolve().then(writeInitialScript);
-            scheduled = true;
-          }
-          tasks.push(`_$HY.init("${key}")`);
+    pipeTo(w) {
+      const encoder = new TextEncoder();
+      const writer = w.getWriter();
+      writable = {
+        end() {
+          w.close();
+        }
+      };
+      buffer = {
+        write(payload) {
+          writer.write(encoder.encode(payload));
         }
-      });
-      return value => {
-        registry.delete(key);
-        if (!value) return;
-        buffer.write(encoder.encode(`<div hidden id="${key}">${value}</div><script${nonce ? ` nonce="${nonce}"` : ""}>${!scriptFlushed ? REPLACE_SCRIPT : ""}$df("${key}")</script>`));
-        scriptFlushed = true;
-        checkEnd();
       };
+      tmp.forEach(chunk => buffer.write(chunk));
+      if (completed) writable.end();else setTimeout(checkEnd);
     }
   };
-  let html = resolveSSRNode(escape(code()));
-  html = injectAssets(sharedConfig.context.assets, html);
-  Promise.resolve().then(() => {
-    if (tasks.length) html = injectScripts(html, tasks.join(";"), nonce);
-    buffer.write(encoder.encode(html));
-    tasks.length = 0;
-    scheduled = false;
-    onCompleteShell && onCompleteShell(result);
-  });
-}
-function pipeToNodeWritable(code, writable, options = {}) {
-  renderToPipeableStream(code, options).pipe(writable);
 }
 function Assets(props) {
   sharedConfig.context.assets.push(() => NoHydration({
@@ -609,7 +570,7 @@ function generateHydrationScript({
   eventNames = ["click", "input"],
   nonce
 }) {
-  return `<script${nonce ? ` nonce="${nonce}"` : ""}>((e,t,o={})=>{t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host instanceof Node?e.host:e.parentNode)),["${eventNames.join('","')}"].forEach((o=>document.addEventListener(o,(o=>{let n=o.composedPath&&o.composedPath()[0]||o.target,s=t(n);s&&!e.completed.has(s)&&e.events.push([s,o])})))),e.init=(e,t)=>{o[e]=[new Promise((e=>t=e)),t]},e.set=(e,t,n)=>{if(!(n=o[e]))return o[e]=[t];n[1](t)},e.load=(e,t)=>{if(t=o[e])return t[0]}})(window._$HY||(_$HY={events:[],completed:new WeakSet}));</script><!xs>`;
+  return `<script${nonce ? ` nonce="${nonce}"` : ""}>((e,t,o={})=>{t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host instanceof Node?e.host:e.parentNode)),["${eventNames.join('","')}"].forEach((o=>document.addEventListener(o,(o=>{let n=o.composedPath&&o.composedPath()[0]||o.target,s=t(n);s&&!e.completed.has(s)&&e.events.push([s,o])})))),e.init=(e,t)=>{o[e]=[new Promise((e=>t=e)),t]},e.set=(e,t,n)=>{if(!(n=o[e]))return o[e]=[t];n[1](t)},e.unset=(e)=>{delete o[e]},e.load=(e,t)=>{if(t=o[e])return t[0]}})(window._$HY||(_$HY={events:[],completed:new WeakSet}))</script><!xs>`;
 }
 function injectAssets(assets, html) {
   for (let i = 0; i < assets.length; i++) {
@@ -625,32 +586,43 @@ function injectScripts(html, scripts, nonce) {
   }
   return html + tag;
 }
-const FRAGMENT_REPLACE = /<!\[([\d.]+)\]>/;
-function asyncWrap(fn) {
-  return new Promise(resolve => {
-    const registry = new Set();
-    const cache = Object.create(null);
-    sharedConfig.context.registerFragment = register;
-    const rendered = fn();
-    if (!registry.size) resolve(rendered);
-    function register(key) {
-      registry.add(key);
-      return value => {
-        if (value) cache[key] = value;
-        registry.delete(key);
-        if (!registry.size) Promise.resolve().then(() => {
-          let source = resolveSSRNode(rendered);
-          let final = "";
-          let match;
-          while (match = source.match(FRAGMENT_REPLACE)) {
-            final += source.substring(0, match.index);
-            source = cache[match[1]] + source.substring(match.index + match[0].length);
-          }
-          resolve(final + source);
-        });
-      };
+function serializeError(error) {
+  return error.message ? `new Error(${devalue(error.message)})` : devalue(error);
+}
+function waitForFragments(registry, key) {
+  for (const k of [...registry.keys()].reverse()) {
+    if (key.startsWith(k)) {
+      registry.get(k).push(key);
+      return true;
     }
-  });
+  }
+  return false;
+}
+function pipeToNodeWritable(code, writable, options = {}) {
+  if (options.onReady) {
+    options.onCompleteShell = () => {
+      options.onReady({
+        startWriting() {
+          stream.pipe(writable);
+        }
+      });
+    };
+  }
+  const stream = renderToStream(code, options);
+  if (!options.onReady) stream.pipe(writable);
+}
+function pipeToWritable(code, writable, options = {}) {
+  if (options.onReady) {
+    options.onCompleteShell = () => {
+      options.onReady({
+        startWriting() {
+          stream.pipeTo(writable);
+        }
+      });
+    };
+  }
+  const stream = renderToStream(code, options);
+  if (!options.onReady) stream.pipeTo(writable);
 }
 
 const isServer = true;
@@ -670,4 +642,4 @@ function Portal(props) {
   return "";
 }
 
-export { Assets, Dynamic, HydrationScript, NoHydration, Portal, escape, generateHydrationScript, getHydrationKey, isServer, pipeToNodeWritable, pipeToWritable, renderToPipeableStream, renderToString, renderToStringAsync, resolveSSRNode, spread, ssr, ssrBoolean, ssrClassList, ssrHydrationKey, ssrSpread, ssrStyle };
+export { Assets, Dynamic, HydrationScript, NoHydration, Portal, escape, generateHydrationScript, getHydrationKey, isServer, pipeToNodeWritable, pipeToWritable, renderToStream, renderToString, renderToStringAsync, resolveSSRNode, spread, ssr, ssrBoolean, ssrClassList, ssrHydrationKey, ssrSpread, ssrStyle };

package/web/dist/web.cjs

@@ -98,7 +98,7 @@ function render(code, element, init) {
   let disposer;
   solidJs.createRoot(dispose => {
     disposer = dispose;
-    insert(element, code(), element.firstChild ? null : undefined, init);
+    element === document ? code() : insert(element, code(), element.firstChild ? null : undefined, init);
   });
   return () => {
     disposer();
@@ -217,17 +217,17 @@ function assign(node, props, isSVG, skipChildren, prevProps = {}) {
     prevProps[prop] = assignProp(node, prop, value, prevProps[prop], isSVG);
   }
 }
-function hydrate(code, element) {
+function hydrate$1(code, element, options = {}) {
   solidJs.sharedConfig.completed = globalThis._$HY.completed;
   solidJs.sharedConfig.events = globalThis._$HY.events;
   solidJs.sharedConfig.load = globalThis._$HY.load;
   solidJs.sharedConfig.gather = root => gatherHydratable(element, root);
   solidJs.sharedConfig.registry = new Map();
   solidJs.sharedConfig.context = {
-    id: "",
+    id: options.renderId || "",
     count: 0
   };
-  gatherHydratable(element);
+  gatherHydratable(element, options.renderId);
   const dispose = render(code, element, [...element.childNodes]);
   solidJs.sharedConfig.context = null;
   return dispose;
@@ -381,8 +381,8 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
       return () => current;
     }
     if (solidJs.sharedConfig.context && current && current.length) {
-      for (let i; i < array.length; i++) {
-        if (array[i].parentNode) return array;
+      for (let i = 0; i < array.length; i++) {
+        if (array[i].parentNode) return current = array;
       }
       return current;
     }
@@ -474,8 +474,7 @@ function NoHydration(props) {
 
 function renderToString(fn, options) {}
 function renderToStringAsync(fn, options) {}
-function pipeToNodeWritable(fn, writable, options) {}
-function pipeToWritable(fn, writable, options) {}
+function renderToStream(fn, options) {}
 function ssr(template, ...nodes) {}
 function resolveSSRNode(node) {}
 function ssrClassList(value) {}
@@ -491,6 +490,10 @@ const SVG_NAMESPACE = "http://www.w3.org/2000/svg";
 function createElement(tagName, isSVG = false) {
   return isSVG ? document.createElementNS(SVG_NAMESPACE, tagName) : document.createElement(tagName);
 }
+const hydrate = (...args) => {
+  solidJs.enableHydration();
+  return hydrate$1(...args);
+};
 function Portal(props) {
   const {
     useShadow
@@ -644,9 +647,8 @@ exports.hydrate = hydrate;
 exports.insert = insert;
 exports.isServer = isServer;
 exports.memo = memo;
-exports.pipeToNodeWritable = pipeToNodeWritable;
-exports.pipeToWritable = pipeToWritable;
 exports.render = render;
+exports.renderToStream = renderToStream;
 exports.renderToString = renderToString;
 exports.renderToStringAsync = renderToStringAsync;
 exports.resolveSSRNode = resolveSSRNode;

package/web/dist/web.js

@@ -1,4 +1,4 @@
-import { createMemo, createRoot, createRenderEffect, sharedConfig, createSignal, onCleanup, splitProps, untrack } from 'solid-js';
+import { createMemo, createRoot, createRenderEffect, sharedConfig, enableHydration, createSignal, onCleanup, splitProps, untrack } from 'solid-js';
 export { ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, createComponent, createRenderEffect as effect, getOwner, mergeProps } from 'solid-js';
 
 const booleans = ["allowfullscreen", "async", "autofocus", "autoplay", "checked", "controls", "default", "disabled", "formnovalidate", "hidden", "indeterminate", "ismap", "loop", "multiple", "muted", "nomodule", "novalidate", "open", "playsinline", "readonly", "required", "reversed", "seamless", "selected"];
@@ -95,7 +95,7 @@ function render(code, element, init) {
   let disposer;
   createRoot(dispose => {
     disposer = dispose;
-    insert(element, code(), element.firstChild ? null : undefined, init);
+    element === document ? code() : insert(element, code(), element.firstChild ? null : undefined, init);
   });
   return () => {
     disposer();
@@ -214,17 +214,17 @@ function assign(node, props, isSVG, skipChildren, prevProps = {}) {
     prevProps[prop] = assignProp(node, prop, value, prevProps[prop], isSVG);
   }
 }
-function hydrate(code, element) {
+function hydrate$1(code, element, options = {}) {
   sharedConfig.completed = globalThis._$HY.completed;
   sharedConfig.events = globalThis._$HY.events;
   sharedConfig.load = globalThis._$HY.load;
   sharedConfig.gather = root => gatherHydratable(element, root);
   sharedConfig.registry = new Map();
   sharedConfig.context = {
-    id: "",
+    id: options.renderId || "",
     count: 0
   };
-  gatherHydratable(element);
+  gatherHydratable(element, options.renderId);
   const dispose = render(code, element, [...element.childNodes]);
   sharedConfig.context = null;
   return dispose;
@@ -378,8 +378,8 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
       return () => current;
     }
     if (sharedConfig.context && current && current.length) {
-      for (let i; i < array.length; i++) {
-        if (array[i].parentNode) return array;
+      for (let i = 0; i < array.length; i++) {
+        if (array[i].parentNode) return current = array;
       }
       return current;
     }
@@ -471,8 +471,7 @@ function NoHydration(props) {
 
 function renderToString(fn, options) {}
 function renderToStringAsync(fn, options) {}
-function pipeToNodeWritable(fn, writable, options) {}
-function pipeToWritable(fn, writable, options) {}
+function renderToStream(fn, options) {}
 function ssr(template, ...nodes) {}
 function resolveSSRNode(node) {}
 function ssrClassList(value) {}
@@ -488,6 +487,10 @@ const SVG_NAMESPACE = "http://www.w3.org/2000/svg";
 function createElement(tagName, isSVG = false) {
   return isSVG ? document.createElementNS(SVG_NAMESPACE, tagName) : document.createElement(tagName);
 }
+const hydrate = (...args) => {
+  enableHydration();
+  return hydrate$1(...args);
+};
 function Portal(props) {
   const {
     useShadow
@@ -541,4 +544,4 @@ function Dynamic(props) {
   });
 }
 
-export { Aliases, Assets, ChildProperties, DelegatedEvents, Dynamic, Assets as HydrationScript, NoHydration, Portal, PropAliases, Properties, SVGElements, SVGNamespace, addEventListener, assign, classList, clearDelegatedEvents, delegateEvents, dynamicProperty, escape, generateHydrationScript, getHydrationKey, getNextElement, getNextMarker, getNextMatch, hydrate, insert, isServer, memo, pipeToNodeWritable, pipeToWritable, render, renderToString, renderToStringAsync, resolveSSRNode, runHydrationEvents, setAttribute, setAttributeNS, spread, ssr, ssrBoolean, ssrClassList, ssrHydrationKey, ssrSpread, ssrStyle, style, template };
+export { Aliases, Assets, ChildProperties, DelegatedEvents, Dynamic, Assets as HydrationScript, NoHydration, Portal, PropAliases, Properties, SVGElements, SVGNamespace, addEventListener, assign, classList, clearDelegatedEvents, delegateEvents, dynamicProperty, escape, generateHydrationScript, getHydrationKey, getNextElement, getNextMarker, getNextMatch, hydrate, insert, isServer, memo, render, renderToStream, renderToString, renderToStringAsync, resolveSSRNode, runHydrationEvents, setAttribute, setAttributeNS, spread, ssr, ssrBoolean, ssrClassList, ssrHydrationKey, ssrSpread, ssrStyle, style, template };

package/web/types/client.d.ts

@@ -30,7 +30,12 @@ export function spread<T>(
 export function assign(node: Element, props: any, isSVG?: Boolean, skipChildren?: Boolean): void;
 export function setAttribute(node: Element, name: string, value: string): void;
 export function setAttributeNS(node: Element, namespace: string, name: string, value: string): void;
-export function addEventListener(node: Element, name: string, handler: () => void, delegate: boolean): void;
+export function addEventListener(
+  node: Element,
+  name: string,
+  handler: () => void,
+  delegate: boolean
+): void;
 export function classList(
   node: Element,
   value: { [k: string]: boolean },
@@ -45,7 +50,11 @@ export function getOwner(): unknown;
 export function mergeProps(...sources: unknown[]): unknown;
 export function dynamicProperty(props: unknown, key: string): unknown;
 
-export function hydrate(fn: () => JSX.Element, node: MountableElement): () => void;
+export function hydrate(
+  fn: () => JSX.Element,
+  node: MountableElement,
+  options: { renderId?: string }
+): () => void;
 export function getHydrationKey(): string;
 export function getNextElement(template?: HTMLTemplateElement): Element;
 export function getNextMatch(start: Node, elementName: string): Element;

package/web/types/index.d.ts

@@ -1,8 +1,10 @@
+import { hydrate as hydrateCore } from "./client";
 import { Component, JSX, Accessor } from "../..";
 export * from "./client";
 export { For, Show, Suspense, SuspenseList, Switch, Match, Index, ErrorBoundary, mergeProps } from "../..";
 export * from "./server-mock";
 export declare const isServer = false;
+export declare const hydrate: typeof hydrateCore;
 /**
  * renders components somewhere else in the DOM
  *

package/web/types/server-mock.d.ts

@@ -1,31 +1,24 @@
-export declare type PipeToWritableResults = {
-    startWriting: () => void;
-    write: (v: string) => void;
-    abort: () => void;
-};
 export declare function renderToString<T>(fn: () => T, options?: {
-    eventNames?: string[];
     nonce?: string;
+    renderId?: string;
 }): string;
 export declare function renderToStringAsync<T>(fn: () => T, options?: {
-    eventNames?: string[];
     timeoutMs?: number;
     nonce?: string;
+    renderId?: string;
 }): Promise<string>;
-export declare function pipeToNodeWritable<T>(fn: () => T, writable: {
-    write: (v: string) => void;
-}, options?: {
-    eventNames?: string[];
+export declare function renderToStream<T>(fn: () => T, options?: {
     nonce?: string;
-    onReady?: (r: PipeToWritableResults) => void;
-    onComplete?: (r: PipeToWritableResults) => void | Promise<void>;
-}): void;
-export declare function pipeToWritable<T>(fn: () => T, writable: WritableStream, options?: {
-    eventNames?: string[];
-    nonce?: string;
-    onReady?: (r: PipeToWritableResults) => void;
-    onComplete?: (r: PipeToWritableResults) => void | Promise<void>;
-}): void;
+    dataOnly?: boolean;
+    renderId?: string;
+    onCompleteShell?: () => void;
+    onCompleteAll?: () => void;
+}): {
+    pipe: (writable: {
+        write: (v: string) => void;
+    }) => void;
+    pipeTo: (writable: WritableStream) => void;
+};
 export declare function ssr(template: string[] | string, ...nodes: any[]): {
     t: string;
 };
@@ -41,3 +34,26 @@ export declare function ssrBoolean(key: string, value: boolean): string;
 export declare function ssrHydrationKey(): string;
 export declare function escape(html: string): string;
 export declare function generateHydrationScript(): string;
+export declare type LegacyResults = {
+    startWriting: () => void;
+};
+/**
+ * @deprecated Replaced by renderToStream
+ */
+export declare function pipeToWritable<T>(fn: () => T, writable: WritableStream, options?: {
+    nonce?: string;
+    dataOnly?: boolean;
+    onReady?: (res: LegacyResults) => void;
+    onCompleteAll?: () => void;
+}): void;
+/**
+ * @deprecated Replaced by renderToStream
+ */
+export declare function pipeToNodeWritable<T>(fn: () => T, writable: {
+    write: (v: string) => void;
+}, options?: {
+    nonce?: string;
+    dataOnly?: boolean;
+    onReady?: (res: LegacyResults) => void;
+    onCompleteAll?: () => void;
+}): void;