@tanstack/redact 0.0.21 → 0.1.1

package/dist/server/resource-hints.js

@@ -0,0 +1,148 @@
+// src/server/resource-hints.ts
+import { resourceKind, resourceURL } from "../core/resource-hints.js";
+import { attrToHtml, escapeAttr } from "./escape.js";
+import { attributeName } from "../core/attributes.js";
+function styleText(props) {
+  const html = props.dangerouslySetInnerHTML;
+  if (html != null) {
+    if (typeof html !== "object" || !("__html" in html)) throw new Error("dangerouslySetInnerHTML must be an object with an __html field.");
+    if (props.children != null) throw new Error("Can only set one of children or dangerouslySetInnerHTML.");
+    return html.__html == null ? "" : "" + html.__html;
+  }
+  const child = Array.isArray(props.children) ? props.children.length < 2 ? props.children[0] : null : props.children;
+  return child == null || typeof child === "function" || typeof child === "symbol" ? "" : ("" + child).replace(/(<\/?)(s)(tyle)/gi, (_, prefix, s, suffix) => prefix + "\\" + s.charCodeAt(0).toString(16) + " " + suffix);
+}
+function markup(resource, late) {
+  const { kind, href, options } = resource;
+  const script = kind === "script" || kind === "module-script";
+  const style = kind === "stylesheet";
+  const props = script ? { src: href, ...kind === "module-script" ? { type: "module" } : {}, async: true, ...options } : style ? late ? { rel: "preload", as: "style", href, crossOrigin: options.crossOrigin, fetchPriority: options.fetchPriority, integrity: options.integrity, media: options.media, hrefLang: options.hrefLang, referrerPolicy: options.referrerPolicy } : { rel: "stylesheet", href, "data-precedence": options.precedence, ...options } : { rel: kind, ...options.as === "image" && options.imageSrcSet ? {} : { href }, ...options };
+  let output = script ? "<script" : "<link";
+  for (const name in props) {
+    if (name === "precedence" || late && name === "data-precedence") continue;
+    const value = name === "href" || name === "src" ? resourceURL(props[name]) : props[name];
+    output += attrToHtml(name, value).replace(/'/g, "&#x27;");
+  }
+  return output + (script ? "><\/script>" : "/>");
+}
+function createResourceHints(shellFlushed = false, styleNonce) {
+  const resources = /* @__PURE__ */ new Map();
+  const groups = [[], [], [], [], []];
+  const styles = /* @__PURE__ */ new Map();
+  const dependencies = /* @__PURE__ */ new Map();
+  const visibleInline = /* @__PURE__ */ new Set();
+  const collector = {
+    add(kind, href, options) {
+      let type = kind;
+      let source = href;
+      const init = kind === "style" || kind === "stylesheet" || kind === "script" || kind === "module-script";
+      if (kind === "preload") {
+        type = options.as;
+        if (type === "image" && options.imageSrcSet) source = options.imageSrcSet + "\n" + (options.imageSizes || "");
+      } else if (kind === "modulepreload") type = "module-" + (options.as || "script");
+      else if (kind === "stylesheet") type = "style";
+      else if (kind === "preconnect") type += ":" + (options.crossOrigin ?? "default");
+      const key = JSON.stringify([type, source]);
+      const prior = resources.get(key);
+      if (prior && (!init || prior.kind !== "preload" && prior.kind !== "modulepreload")) return prior;
+      const resource = { kind, href, options: { ...options } };
+      if (kind === "style" && (!styleNonce || options.nonce === styleNonce)) resource.css = styleText(options);
+      if (prior) {
+        prior.cancelled = true;
+        resource.preloaded = !!prior.sent;
+        for (const name of ["crossOrigin", "integrity"]) {
+          if (resource.options[name] == null && prior.options[name] != null) resource.options[name] = prior.options[name];
+        }
+      }
+      resources.set(key, resource);
+      if (kind === "stylesheet" || kind === "style") {
+        const precedence = options.precedence;
+        let group = styles.get(precedence);
+        if (!group) styles.set(precedence, group = []);
+        group.push(resource);
+      } else {
+        const group = kind === "dns-prefetch" || kind === "preconnect" ? 0 : kind === "preload" && options.as === "font" ? 1 : kind === "preload" && options.as === "image" && options.fetchPriority === "high" ? 2 : init ? 3 : 4;
+        groups[group].push(resource);
+      }
+      return resource;
+    },
+    addHost(type, props, scope) {
+      const kind = resourceKind(type, props);
+      if (!kind) return false;
+      const resource = collector.add(kind === "script" && props.type === "module" ? "module-script" : kind, kind === "script" ? props.src : props.href, props);
+      if (shellFlushed && kind === "stylesheet") {
+        const descriptor = [resourceURL(resource.href), resource.options.precedence];
+        for (const name in resource.options) {
+          if (name === "href" || name === "rel" || name === "precedence" || name === "data-precedence" || name === "children" || name === "dangerouslySetInnerHTML" || name === "innerHTML" || name === "style" || name === "suppressHydrationWarning" || name === "suppressContentEditableWarning" || name === "ref" || name === "key" || /^on/i.test(name) || !/^[a-zA-Z_:][a-zA-Z0-9:_.-]*$/.test(name)) continue;
+          const value = resource.options[name];
+          if (value == null || typeof value === "function" || typeof value === "symbol" || name === "hidden" && value === false) continue;
+          descriptor.push(attributeName(name), name === "hidden" ? "" : name === "src" ? resourceURL("" + value) : "" + value);
+        }
+        ;
+        (scope ? scope.stylesheets ||= /* @__PURE__ */ new Map() : dependencies).set(resource.href, descriptor);
+      } else if (shellFlushed && kind === "style") {
+        ;
+        (scope ? scope.inline ||= /* @__PURE__ */ new Set() : visibleInline).add(resource.options.precedence);
+      }
+      return true;
+    },
+    mergeScope(scope, parent) {
+      if (scope.stylesheets) for (const [href, descriptor] of scope.stylesheets) {
+        ;
+        (parent ? parent.stylesheets ||= /* @__PURE__ */ new Map() : dependencies).set(href, descriptor);
+      }
+      if (scope.inline) for (const precedence of scope.inline) {
+        ;
+        (parent ? parent.inline ||= /* @__PURE__ */ new Set() : visibleInline).add(precedence);
+      }
+    },
+    takeStylesheets() {
+      const result = Array.from(dependencies.values());
+      dependencies.clear();
+      return result;
+    },
+    drain() {
+      let output = "";
+      function flush(group, precedence) {
+        let remaining = 0;
+        let inline = false, hasStylesheets = false;
+        let hrefs = "", rules = "";
+        for (const resource of group) {
+          if (!resource.sent && !resource.cancelled) {
+            if (resource.kind === "style") {
+              if (shellFlushed && !visibleInline.has(precedence)) {
+                group[remaining++] = resource;
+                continue;
+              }
+              inline = true;
+              if (resource.css !== void 0) {
+                hrefs += (hrefs ? " " : "") + resource.href;
+                rules += resource.css;
+              }
+            } else {
+              if (resource.kind === "stylesheet") hasStylesheets = true;
+              if (!(shellFlushed && resource.kind === "stylesheet" && resource.preloaded)) output += markup(resource, shellFlushed);
+            }
+            resource.sent = true;
+          }
+        }
+        group.length = remaining;
+        if (hrefs || inline && !shellFlushed && !hasStylesheets) {
+          output += `<style${styleNonce !== void 0 ? ` nonce="${escapeAttr(styleNonce)}"` : ""}${shellFlushed ? ' media="not all"' : ""} data-precedence="${escapeAttr(precedence)}"${hrefs ? ` data-href="${escapeAttr(hrefs)}"` : ""}>${rules}</style>`;
+        }
+      }
+      for (let index = 0; index < groups.length; index++) {
+        if (index === 3) for (const [precedence, group] of styles) flush(group, precedence);
+        flush(groups[index]);
+      }
+      shellFlushed = true;
+      visibleInline.clear();
+      return output;
+    }
+  };
+  return collector;
+}
+export {
+  createResourceHints
+};
+//# sourceMappingURL=resource-hints.js.map

package/dist/server/resource-hints.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/server/resource-hints.ts"],
+  "sourcesContent": ["import { resourceKind, resourceURL, type ResourceHintKind, type ResourceHintOptions } from '../core/resource-hints'\nimport { attrToHtml, escapeAttr } from './escape'\nimport { attributeName } from '../core/attributes'\n\ninterface Resource {\n  kind: ResourceHintKind | 'style'\n  href: string\n  options: Record<string, any>\n  sent?: boolean\n  cancelled?: boolean\n  preloaded?: boolean\n  css?: string\n}\n\nexport interface ResourceScope {\n  stylesheets?: Map<string, string[]>\n  inline?: Set<string>\n}\n\nfunction styleText(props: any): string {\n  const html = props.dangerouslySetInnerHTML\n  if (html != null) {\n    if (typeof html !== 'object' || !('__html' in html)) throw new Error('dangerouslySetInnerHTML must be an object with an __html field.')\n    if (props.children != null) throw new Error('Can only set one of children or dangerouslySetInnerHTML.')\n    return html.__html == null ? '' : '' + html.__html\n  }\n  const child = Array.isArray(props.children) ? props.children.length < 2 ? props.children[0] : null : props.children\n  return child == null || typeof child === 'function' || typeof child === 'symbol' ? ''\n    : ('' + child).replace(/(<\\/?)(s)(tyle)/gi, (_, prefix: string, s: string, suffix: string) => prefix + '\\\\' + s.charCodeAt(0).toString(16) + ' ' + suffix)\n}\n\nfunction markup(resource: Resource, late: boolean): string {\n  const { kind, href, options } = resource\n  const script = kind === 'script' || kind === 'module-script'\n  const style = kind === 'stylesheet'\n  const props: Record<string, any> = script\n    ? { src: href, ...(kind === 'module-script' ? { type: 'module' } : {}), async: true, ...options }\n    : style\n      ? late\n        ? { rel: 'preload', as: 'style', href, crossOrigin: options.crossOrigin, fetchPriority: options.fetchPriority, integrity: options.integrity, media: options.media, hrefLang: options.hrefLang, referrerPolicy: options.referrerPolicy }\n        : { rel: 'stylesheet', href, 'data-precedence': options.precedence!, ...options }\n      : { rel: kind, ...(options.as === 'image' && options.imageSrcSet ? {} : { href }), ...options }\n  let output = script ? '<script' : '<link'\n  for (const name in props) {\n    if (name === 'precedence' || late && name === 'data-precedence') continue\n    const value = name === 'href' || name === 'src' ? resourceURL(props[name]!) : props[name]!\n    output += attrToHtml(name, value).replace(/'/g, '&#x27;')\n  }\n  return output + (script ? '></script>' : '/>')\n}\n\nexport function createResourceHints(shellFlushed = false, styleNonce?: string) {\n  const resources = new Map<string, Resource>()\n  const groups: Resource[][] = [[], [], [], [], []]\n  const styles = new Map<string, Resource[]>()\n  const dependencies = new Map<string, string[]>()\n  const visibleInline = new Set<string>()\n  const collector = {\n    add(kind: ResourceHintKind | 'style', href: string, options: ResourceHintOptions): Resource {\n      let type: string = kind\n      let source = href\n      const init = kind === 'style' || kind === 'stylesheet' || kind === 'script' || kind === 'module-script'\n      if (kind === 'preload') {\n        type = options.as!\n        if (type === 'image' && options.imageSrcSet) source = options.imageSrcSet + '\\n' + (options.imageSizes || '')\n      } else if (kind === 'modulepreload') type = 'module-' + (options.as || 'script')\n      else if (kind === 'stylesheet') type = 'style'\n      else if (kind === 'preconnect') type += ':' + (options.crossOrigin ?? 'default')\n      const key = JSON.stringify([type, source])\n      const prior = resources.get(key)\n      if (prior && (!init || prior.kind !== 'preload' && prior.kind !== 'modulepreload')) return prior\n\n      const resource: Resource = { kind, href, options: { ...options } }\n      if (kind === 'style' && (!styleNonce || options.nonce === styleNonce)) resource.css = styleText(options)\n      if (prior) {\n        prior.cancelled = true\n        resource.preloaded = !!prior.sent\n        for (const name of ['crossOrigin', 'integrity']) {\n          if (resource.options[name] == null && prior.options[name] != null) resource.options[name] = prior.options[name]!\n        }\n      }\n      resources.set(key, resource)\n      if (kind === 'stylesheet' || kind === 'style') {\n        const precedence = options.precedence!\n        let group = styles.get(precedence)\n        if (!group) styles.set(precedence, group = [])\n        group.push(resource)\n      } else {\n        const group = kind === 'dns-prefetch' || kind === 'preconnect' ? 0\n          : kind === 'preload' && options.as === 'font' ? 1\n          : kind === 'preload' && options.as === 'image' && options.fetchPriority === 'high' ? 2\n          : init ? 3 : 4\n        groups[group]!.push(resource)\n      }\n      return resource\n    },\n    addHost(type: string, props: any, scope?: ResourceScope): boolean {\n      const kind = resourceKind(type, props)\n      if (!kind) return false\n      const resource = collector.add(kind === 'script' && props.type === 'module' ? 'module-script' : kind, kind === 'script' ? props.src : props.href, props)\n      if (shellFlushed && kind === 'stylesheet') {\n        const descriptor = [resourceURL(resource.href), resource.options.precedence]\n        for (const name in resource.options) {\n          if (name === 'href' || name === 'rel' || name === 'precedence' || name === 'data-precedence' || name === 'children' || name === 'dangerouslySetInnerHTML' || name === 'innerHTML' || name === 'style' || name === 'suppressHydrationWarning' || name === 'suppressContentEditableWarning' || name === 'ref' || name === 'key' || /^on/i.test(name) || !/^[a-zA-Z_:][a-zA-Z0-9:_.-]*$/.test(name)) continue\n          const value = resource.options[name]\n          if (value == null || typeof value === 'function' || typeof value === 'symbol' || name === 'hidden' && value === false) continue\n          descriptor.push(attributeName(name), name === 'hidden' ? '' : name === 'src' ? resourceURL('' + value) : '' + value)\n        }\n        ;(scope ? scope.stylesheets ||= new Map() : dependencies).set(resource.href, descriptor)\n      } else if (shellFlushed && kind === 'style') {\n        ;(scope ? scope.inline ||= new Set() : visibleInline).add(resource.options.precedence)\n      }\n      return true\n    },\n    mergeScope(scope: ResourceScope, parent?: ResourceScope): void {\n      if (scope.stylesheets) for (const [href, descriptor] of scope.stylesheets) {\n        ;(parent ? parent.stylesheets ||= new Map() : dependencies).set(href, descriptor)\n      }\n      if (scope.inline) for (const precedence of scope.inline) {\n        ;(parent ? parent.inline ||= new Set() : visibleInline).add(precedence)\n      }\n    },\n    takeStylesheets(): string[][] {\n      const result = Array.from(dependencies.values())\n      dependencies.clear()\n      return result\n    },\n    drain(): string {\n      let output = ''\n      function flush(group: Resource[], precedence?: string) {\n        let remaining = 0\n        let inline = false, hasStylesheets = false\n        let hrefs = '', rules = ''\n        for (const resource of group) {\n          if (!resource.sent && !resource.cancelled) {\n            if (resource.kind === 'style') {\n              if (shellFlushed && !visibleInline.has(precedence!)) { group[remaining++] = resource; continue }\n              inline = true\n              if (resource.css !== undefined) {\n                hrefs += (hrefs ? ' ' : '') + resource.href\n                rules += resource.css\n              }\n            } else {\n              if (resource.kind === 'stylesheet') hasStylesheets = true\n              if (!(shellFlushed && resource.kind === 'stylesheet' && resource.preloaded)) output += markup(resource, shellFlushed)\n            }\n            resource.sent = true\n          }\n        }\n        group.length = remaining\n        if (hrefs || inline && !shellFlushed && !hasStylesheets) {\n          output += `<style${styleNonce !== undefined ? ` nonce=\"${escapeAttr(styleNonce)}\"` : ''}${shellFlushed ? ' media=\"not all\"' : ''} data-precedence=\"${escapeAttr(precedence!)}\"${hrefs ? ` data-href=\"${escapeAttr(hrefs)}\"` : ''}>${rules}</style>`\n        }\n      }\n      for (let index = 0; index < groups.length; index++) {\n        if (index === 3) for (const [precedence, group] of styles) flush(group, precedence)\n        flush(groups[index]!)\n      }\n      shellFlushed = true\n      visibleInline.clear()\n      return output\n    },\n  }\n  return collector\n}\n"],
+  "mappings": "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",
+  "names": []
+}

package/dist/server/stream.d.ts

@@ -1,7 +1,12 @@
-import type { ReactNode } from '../core';
+import type { ReactNode } from "../core/index.js";
+import { type SSRFrame } from "./dispatcher.js";
+import { type BrowserBailoutCallback } from "./walk.js";
 export interface StreamOptions {
     identifierPrefix?: string;
-    nonce?: string;
+    nonce?: string | {
+        script?: string;
+        style?: string;
+    };
     bootstrapScriptContent?: string | ReadonlyArray<string>;
     bootstrapScripts?: ReadonlyArray<string | {
         src: string;
@@ -13,6 +18,7 @@ export interface StreamOptions {
         nonce?: string;
     }>;
     onError?: (error: unknown) => string | void;
+    onBrowserBailout?: BrowserBailoutCallback;
     signal?: AbortSignal;
     progressiveChunkSize?: number;
 }
@@ -22,12 +28,19 @@ export interface ReadableStreamResult extends ReadableStream<Uint8Array> {
 export interface PipeableWritable {
     write(chunk: string): unknown;
     end(): unknown;
+    destroy?(error?: unknown): unknown;
 }
 export interface OrchestratorState {
     nextId: number;
     pending: Set<Promise<void>>;
     closed: boolean;
     errored: unknown | null;
+    aborted: boolean;
+    reason: unknown;
+    abort: (reason?: unknown) => void;
+    cancelled: Promise<void>;
+    onShellReady?: () => void;
+    frame?: SSRFrame;
 }
 type Emit = (chunk: string) => void;
 export declare function streamHtml(children: ReactNode, emit: Emit, options: StreamOptions, state: OrchestratorState): Promise<void>;

package/dist/server/stream.js

@@ -1,37 +1,70 @@
-// packages/redact/src/server/stream.ts
+// src/server/stream.ts
 import {
   beginSSR,
   endSSR,
-  installSSRDispatcher,
-  uninstallSSRDispatcher,
-  applyContextSnapshot
-} from "./dispatcher";
-import { walk } from "./walk";
-import { BOUNDARY_REVEAL_RUNTIME, revealScript } from "./bootstrap-script";
-import { escapeScript } from "./escape";
+  applyContextSnapshot,
+  currentSSRFrame
+} from "./dispatcher.js";
+import { walk } from "./walk.js";
+import { browserError, isBrowserToken, isBrowserError } from "../core/browser.js";
+import { BOUNDARY_REVEAL_RUNTIME, revealScript } from "./bootstrap-script.js";
+import { escapeAttr, escapeScript } from "./escape.js";
+import { resourceURL } from "../core/resource-hints.js";
+function createState() {
+  let wake;
+  const state = {
+    nextId: 0,
+    pending: /* @__PURE__ */ new Set(),
+    closed: false,
+    errored: null,
+    aborted: false,
+    reason: void 0,
+    cancelled: new Promise((resolve) => {
+      wake = resolve;
+    }),
+    abort(reason) {
+      if (state.closed || state.aborted) return;
+      state.aborted = true;
+      state.reason = isBrowserToken(reason) ? browserError(reason) : reason ?? new Error("The render was aborted by the server without a reason.");
+      wake();
+    }
+  };
+  return state;
+}
 async function streamHtml(children, emit, options, state) {
-  installSSRDispatcher();
-  beginSSR(options.identifierPrefix);
-  const nonce = options.nonce;
+  const nonce = scriptNonce(options);
   try {
     const boundaries = [];
     const shellChunks = [];
+    let head = 0;
     const bufferedEmit = (chunk) => {
       shellChunks.push(chunk);
     };
     let shellRendered = false;
     let rootRetries = 0;
+    let resources;
     while (!shellRendered) {
       const chunkCount = shellChunks.length;
       const boundaryCount = boundaries.length;
       const nextId = state.nextId;
+      head = 0;
+      const previous = beginSSR(options.identifierPrefix);
+      currentSSRFrame().styleNonce = typeof options.nonce === "object" ? options.nonce?.style : void 0;
+      if (resources) currentSSRFrame().resources = resources;
+      let suspended;
       try {
+        if (state.aborted) throw state.reason;
         walk(children, {
           emit: bufferedEmit,
           onSuspend: (b) => boundaries.push(b),
-          nextBoundaryId: () => state.nextId++
+          nextBoundaryId: () => state.nextId++,
+          onBrowserBailout: options.onBrowserBailout,
+          onHead: () => {
+            head = shellChunks.length;
+          }
         });
         shellRendered = true;
+        state.frame = currentSSRFrame();
       } catch (err) {
         shellChunks.length = chunkCount;
         boundaries.length = boundaryCount;
@@ -40,12 +73,19 @@ async function streamHtml(children, emit, options, state) {
         if (++rootRetries > 50) {
           throw new Error("renderToReadableStream exceeded 50 root suspension retries.");
         }
-        await err;
+        suspended = err;
+      } finally {
+        resources = currentSSRFrame().resources;
+        endSSR(previous);
       }
+      if (suspended) await Promise.race([suspended, state.cancelled]);
     }
+    const hints = state.frame?.resources?.drain();
+    if (hints) shellChunks.splice(head, 0, hints);
+    if (state.frame) state.frame.shellFlushed = true;
     const hasBootstrap = bootstrapScriptContentToArray(options.bootstrapScriptContent).length > 0 || (options.bootstrapScripts?.length ?? 0) > 0 || (options.bootstrapModules?.length ?? 0) > 0;
     if (boundaries.length > 0 || hasBootstrap) {
-      shellChunks.push(`<script${nonce ? ` nonce="${nonce}"` : ""}>${BOUNDARY_REVEAL_RUNTIME}<\/script>`);
+      shellChunks.push(`<script${nonce ? ` nonce="${escapeAttr(nonce)}"` : ""}>${BOUNDARY_REVEAL_RUNTIME}<\/script>`);
       for (const content of bootstrapScriptContentToArray(options.bootstrapScriptContent)) {
         shellChunks.push(inlineBootstrapTag(content, nonce));
       }
@@ -57,46 +97,74 @@ async function streamHtml(children, emit, options, state) {
       }
     }
     if (shellChunks.length) emit(normalizeDocumentShell(shellChunks.join("")));
+    state.onShellReady?.();
     for (const b of boundaries) streamBoundary(b, emit, options, state);
     await drain(state);
   } catch (err) {
+    if (isBrowserError(err)) {
+      err = new Error(
+        "The server render could not complete because client rendering was requested outside a Suspense boundary.",
+        Object.hasOwn(err, "cause") ? { cause: err.cause } : void 0
+      );
+    }
     state.errored = err;
     if (options.onError) options.onError(err);
     throw err;
   } finally {
-    endSSR();
-    uninstallSSRDispatcher();
     state.closed = true;
   }
 }
 function streamBoundary(b, emit, options, state) {
+  const nonce = scriptNonce(options);
   const task = (async () => {
     try {
-      await b.thenable;
-    } catch (err) {
-      if (options.onError) options.onError(err);
+      await Promise.race([b.thenable, state.cancelled]);
+    } catch {
     }
     if (state.closed) return;
+    const defer = (error) => {
+      if (isBrowserError(error)) options.onBrowserBailout?.(error, { componentStack: error.componentStack || b.componentStack });
+      else options.onError?.(error);
+      emit(`<script${nonce ? ` nonce="${escapeAttr(nonce)}"` : ""}>$RB(${b.id}${isBrowserError(error) ? "" : ",1"})<\/script>`);
+    };
+    if (state.aborted) {
+      defer(state.reason);
+      return;
+    }
     const parts = [];
     const sub = [];
+    const resourceScope = {};
+    let styles;
+    const previous = beginSSR(options.identifierPrefix, state.frame);
+    state.frame?.resources?.takeStylesheets();
     const restore = applyContextSnapshot(b.contextSnapshot);
     try {
       walk(b.children, {
         emit: (s) => parts.push(s),
         onSuspend: (n) => sub.push(n),
-        nextBoundaryId: () => state.nextId++
+        nextBoundaryId: () => state.nextId++,
+        onBrowserBailout: options.onBrowserBailout,
+        componentStack: b.componentStack,
+        resourceScope
       });
+      state.frame?.resources?.mergeScope(resourceScope);
     } catch (err) {
-      if (options.onError) options.onError(err);
-      restore();
+      if (isThenable(err)) {
+        streamBoundary({ ...b, thenable: err }, emit, options, state);
+      } else defer(err);
       return;
+    } finally {
+      restore();
+      endSSR(previous);
+      const hints = state.frame?.resources?.drain();
+      styles = state.frame?.resources?.takeStylesheets();
+      if (hints) emit(hints);
     }
-    restore();
-    emit(`<div hidden id="S:${b.id}">${parts.join("")}</div>${revealScript(b.id, options.nonce)}`);
+    emit(`<div hidden id="S:${b.id}">${parts.join("")}</div>${revealScript(b.id, nonce, styles)}`);
     for (const s of sub) streamBoundary(s, emit, options, state);
   })();
   state.pending.add(task);
-  task.finally(() => state.pending.delete(task));
+  task.then(() => state.pending.delete(task), () => state.pending.delete(task));
 }
 async function drain(state) {
   while (state.pending.size > 0) {
@@ -106,12 +174,15 @@ async function drain(state) {
 function isThenable(value) {
   return !!value && typeof value.then === "function";
 }
+function scriptNonce(options) {
+  return typeof options.nonce === "string" ? options.nonce : options.nonce?.script;
+}
 function bootstrapScriptContentToArray(content) {
   if (content === void 0) return [];
   return typeof content === "string" ? [content] : [...content];
 }
 function inlineBootstrapTag(content, defaultNonce) {
-  const nAttr = defaultNonce ? ` nonce="${defaultNonce}"` : "";
+  const nAttr = defaultNonce ? ` nonce="${escapeAttr(defaultNonce)}"` : "";
   return `<script${nAttr}>${escapeScript(content)}<\/script>`;
 }
 function normalizeDocumentShell(html) {
@@ -146,26 +217,37 @@ function stripLeadingHeadTags(value) {
   return rest;
 }
 function bootstrapTag(entry, kind, defaultNonce) {
-  const src = typeof entry === "string" ? entry : entry.src;
+  const src = escapeAttr(resourceURL(typeof entry === "string" ? entry : entry.src));
   const nonce = typeof entry === "string" ? defaultNonce : entry.nonce ?? defaultNonce;
-  const nAttr = nonce ? ` nonce="${nonce}"` : "";
+  const nAttr = nonce ? ` nonce="${escapeAttr(nonce)}"` : "";
   if (kind === "module") return `<script type="module"${nAttr} src="${src}"><\/script>`;
   return `<script async${nAttr} src="${src}"><\/script>`;
 }
 function renderToReadableStream(children, options = {}) {
-  const state = {
-    nextId: 0,
-    pending: /* @__PURE__ */ new Set(),
-    closed: false,
-    errored: null
-  };
+  const state = createState();
   const encoder = new TextEncoder();
+  let abortListener;
+  const detachAbortListener = () => {
+    if (abortListener) {
+      options.signal?.removeEventListener("abort", abortListener);
+      abortListener = void 0;
+    }
+  };
   let allReadyResolve;
   let allReadyReject;
   const allReady = new Promise((r, rej) => {
     allReadyResolve = r;
     allReadyReject = rej;
   });
+  allReady.catch(() => {
+  });
+  let shellResolve;
+  let shellReject;
+  const shell = new Promise((resolve, reject) => {
+    shellResolve = resolve;
+    shellReject = reject;
+  });
+  state.onShellReady = () => queueMicrotask(() => shellResolve(Object.assign(stream, { allReady })));
   const stream = new ReadableStream({
     start(controller) {
       const emit = (chunk) => {
@@ -174,8 +256,17 @@ function renderToReadableStream(children, options = {}) {
         } catch {
         }
       };
+      if (options.signal) {
+        abortListener = () => {
+          detachAbortListener();
+          state.abort(options.signal.reason);
+        };
+        options.signal.addEventListener("abort", abortListener);
+        if (options.signal.aborted) abortListener();
+      }
       streamHtml(children, emit, options, state).then(
         () => {
+          detachAbortListener();
           try {
             controller.close();
           } catch {
@@ -183,46 +274,51 @@ function renderToReadableStream(children, options = {}) {
           allReadyResolve();
         },
         (err) => {
+          detachAbortListener();
           try {
             controller.error(err);
           } catch {
           }
           allReadyReject(err);
+          shellReject(err);
         }
       );
-      options.signal?.addEventListener("abort", () => {
-        state.closed = true;
-        try {
-          controller.close();
-        } catch {
-        }
-      });
+    },
+    cancel(reason) {
+      state.abort(reason);
+      detachAbortListener();
     }
   });
-  return Promise.resolve(Object.assign(stream, { allReady }));
+  return shell;
 }
 function renderToPipeableStream(children, options = {}) {
-  const state = {
-    nextId: 0,
-    pending: /* @__PURE__ */ new Set(),
-    closed: false,
-    errored: null
-  };
+  const state = createState();
   const buffers = [];
   let dest = null;
   let shellReady = false;
+  let shellFailed = false;
   let finished = false;
-  let aborted = false;
+  let failed = false;
+  let failure;
+  const finishDestination = (target) => {
+    if (failed && target.destroy) target.destroy(failure);
+    else target.end();
+  };
   const flushTo = (w) => {
     if (!buffers.length) return;
     for (const b of buffers) w.write(b);
     buffers.length = 0;
   };
   const emit = (chunk) => {
-    if (aborted || finished) return;
+    if (finished) return;
     if (dest) dest.write(chunk);
     else buffers.push(chunk);
   };
+  state.onShellReady = () => queueMicrotask(() => {
+    if (shellFailed) return;
+    shellReady = true;
+    options.onShellReady?.();
+  });
   streamHtml(children, emit, options, state).then(
     () => {
       finished = true;
@@ -230,30 +326,26 @@ function renderToPipeableStream(children, options = {}) {
       options.onAllReady?.();
     },
     (err) => {
+      finished = true;
+      failed = true;
+      failure = err;
       if (!shellReady) {
+        shellFailed = true;
         options.onShellError?.(err);
       } else {
-        options.onError?.(err);
-        if (dest) dest.end();
+        if (dest) finishDestination(dest);
       }
     }
   );
-  queueMicrotask(() => {
-    if (aborted || finished) return;
-    shellReady = true;
-    options.onShellReady?.();
-  });
   return {
     pipe(target) {
       dest = target;
-      flushTo(target);
-      if (finished) target.end();
+      if (!failed) flushTo(target);
+      if (finished) finishDestination(target);
       return target;
     },
-    abort(_reason) {
-      aborted = true;
-      state.closed = true;
-      if (dest) dest.end();
+    abort(reason) {
+      state.abort(reason);
     }
   };
 }