@solidjs/web 2.0.0-beta.23 → 2.0.0-beta.24

package/dist/server.cjs

@@ -313,7 +313,8 @@ function renderToStream(code, options = {}) {
     }
     tasks += task + ";";
     if (!timer && firstFlushed) {
-      timer = setTimeout(writeTasks);
+      timer = true;
+      queue(() => queue(writeTasks));
     }
   };
   const onDone = () => {
@@ -396,7 +397,6 @@ function renderToStream(code, options = {}) {
       buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>${tasks}</script>`);
       tasks = "";
     }
-    timer && clearTimeout(timer);
     timer = null;
   };
   let context;
@@ -648,6 +648,26 @@ function renderToStream(code, options = {}) {
     });
     shellCompleted = true;
   }
+  const MIN_DRAIN_TURNS = 8;
+  let lastBlockingSize = -1;
+  let lastRegistrySize = -1;
+  let drainTurn = 0;
+  const scheduleFlush = fn => {
+    const attempt = () => {
+      if (registry.size !== lastRegistrySize || drainTurn++ < MIN_DRAIN_TURNS) {
+        if (registry.size !== lastRegistrySize) drainTurn = 0;
+        lastRegistrySize = registry.size;
+        queue(attempt);
+        return;
+      }
+      fn();
+    };
+    const progressed = blockingPromises.size !== lastBlockingSize;
+    lastBlockingSize = blockingPromises.size;
+    lastRegistrySize = -1;
+    drainTurn = 0;
+    progressed ? queue(attempt) : setTimeout(attempt);
+  };
   return {
     then(fn) {
       function complete() {
@@ -663,7 +683,7 @@ function renderToStream(code, options = {}) {
       } else onCompleteAll = complete;
       function flush() {
         allSettled(blockingPromises).then(() => {
-          setTimeout(() => {
+          scheduleFlush(() => {
             if (!resolveRootHoles()) return flush();
             queue(flushEnd);
           });
@@ -674,7 +694,7 @@ function renderToStream(code, options = {}) {
     pipe(w) {
       function flush() {
         allSettled(blockingPromises).then(() => {
-          setTimeout(() => {
+          scheduleFlush(() => {
             doShell();
             if (!shellCompleted) return flush();
             buffer = writable = w;
@@ -694,7 +714,7 @@ function renderToStream(code, options = {}) {
       const p = new Promise(r => resolve = r);
       function flush() {
         allSettled(blockingPromises).then(() => {
-          setTimeout(() => {
+          scheduleFlush(() => {
             doShell();
             if (!shellCompleted) return flush();
             const encoder = new TextEncoder();
@@ -997,14 +1017,12 @@ function escape(s, attr) {
     }
     return s;
   }
-  const delimCode = attr ? 34 : 60;
-  const len = s.length;
-  for (let i = 0; i < len; i++) {
-    const c = s.charCodeAt(i);
-    if (c === 38 || c === delimCode) return escapeSlow(s, attr, i);
-  }
-  return s;
+  const i = s.search(attr ? ESCAPE_ATTR : ESCAPE_CONTENT);
+  if (i < 0) return s;
+  return escapeSlow(s, attr, i);
 }
+const ESCAPE_CONTENT = /[&<]/;
+const ESCAPE_ATTR = /[&"]/;
 function escapeSlow(s, attr, start) {
   const delim = attr ? '"' : "<";
   const delimCode = attr ? 34 : 60;

package/dist/server.js

@@ -312,7 +312,8 @@ function renderToStream(code, options = {}) {
     }
     tasks += task + ";";
     if (!timer && firstFlushed) {
-      timer = setTimeout(writeTasks);
+      timer = true;
+      queue(() => queue(writeTasks));
     }
   };
   const onDone = () => {
@@ -395,7 +396,6 @@ function renderToStream(code, options = {}) {
       buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>${tasks}</script>`);
       tasks = "";
     }
-    timer && clearTimeout(timer);
     timer = null;
   };
   let context;
@@ -647,6 +647,26 @@ function renderToStream(code, options = {}) {
     });
     shellCompleted = true;
   }
+  const MIN_DRAIN_TURNS = 8;
+  let lastBlockingSize = -1;
+  let lastRegistrySize = -1;
+  let drainTurn = 0;
+  const scheduleFlush = fn => {
+    const attempt = () => {
+      if (registry.size !== lastRegistrySize || drainTurn++ < MIN_DRAIN_TURNS) {
+        if (registry.size !== lastRegistrySize) drainTurn = 0;
+        lastRegistrySize = registry.size;
+        queue(attempt);
+        return;
+      }
+      fn();
+    };
+    const progressed = blockingPromises.size !== lastBlockingSize;
+    lastBlockingSize = blockingPromises.size;
+    lastRegistrySize = -1;
+    drainTurn = 0;
+    progressed ? queue(attempt) : setTimeout(attempt);
+  };
   return {
     then(fn) {
       function complete() {
@@ -662,7 +682,7 @@ function renderToStream(code, options = {}) {
       } else onCompleteAll = complete;
       function flush() {
         allSettled(blockingPromises).then(() => {
-          setTimeout(() => {
+          scheduleFlush(() => {
             if (!resolveRootHoles()) return flush();
             queue(flushEnd);
           });
@@ -673,7 +693,7 @@ function renderToStream(code, options = {}) {
     pipe(w) {
       function flush() {
         allSettled(blockingPromises).then(() => {
-          setTimeout(() => {
+          scheduleFlush(() => {
             doShell();
             if (!shellCompleted) return flush();
             buffer = writable = w;
@@ -693,7 +713,7 @@ function renderToStream(code, options = {}) {
       const p = new Promise(r => resolve = r);
       function flush() {
         allSettled(blockingPromises).then(() => {
-          setTimeout(() => {
+          scheduleFlush(() => {
             doShell();
             if (!shellCompleted) return flush();
             const encoder = new TextEncoder();
@@ -996,14 +1016,12 @@ function escape(s, attr) {
     }
     return s;
   }
-  const delimCode = attr ? 34 : 60;
-  const len = s.length;
-  for (let i = 0; i < len; i++) {
-    const c = s.charCodeAt(i);
-    if (c === 38 || c === delimCode) return escapeSlow(s, attr, i);
-  }
-  return s;
+  const i = s.search(attr ? ESCAPE_ATTR : ESCAPE_CONTENT);
+  if (i < 0) return s;
+  return escapeSlow(s, attr, i);
 }
+const ESCAPE_CONTENT = /[&<]/;
+const ESCAPE_ATTR = /[&"]/;
 function escapeSlow(s, attr, start) {
   const delim = attr ? '"' : "<";
   const delimCode = attr ? 34 : 60;

package/frames/dist/client.cjs

@@ -126,7 +126,20 @@ function createFrameHost(options = {}) {
       const buffered = pending.get(id);
       if (buffered) {
         pending.delete(id);
-        for (const chunk of buffered) deliver(frame, chunk);
+        const records = {};
+        let version;
+        for (const chunk of buffered) {
+          if (chunk.type === "data") {
+            options.applyData && options.applyData(chunk);
+            continue;
+          }
+          version = chunk.version;
+          Object.assign(records, chunkToRecords(chunk));
+        }
+        if (version !== undefined) frame.apply({
+          version,
+          r: records
+        });
       }
     },
     unregister(id, frame) {
@@ -346,11 +359,11 @@ class FrameImpl {
         this.#runSlotCleanups(occurrence);
       }
       if (!this.#mountedSlots.has(occurrence)) {
-        const nodes = this.#invokeSlot(occurrence, callback, record, start);
+        const nodes = this.#invokeSlot(occurrence, callback, record, start, this.#options.adopt);
         if (nodes) this.#replaceRange(occurrence, start, nodes);
         this.#slotNodes.set(occurrence, nodes);
         this.#mountedSlots.add(occurrence);
-        if (!record) this.#discoverRegions(occurrence, start);
+        this.#discoverRegions(occurrence, start);
         this.#bindRegions(occurrence);
       } else if (record !== this.#slotArgs.get(occurrence)) {
         if (this.#refArgsUnchanged(occurrence, record)) {
@@ -367,11 +380,12 @@ class FrameImpl {
       if (!found.has(occurrence)) this.#unmountSlot(occurrence);
     }
   }
-  #invokeSlot(occurrence, callback, record, start) {
+  #invokeSlot(occurrence, callback, record, start, adopted) {
     const cleanups = this.#slotCleanups.get(occurrence) ?? [];
     const ctx = {
       frame: this.#options.claimScope ?? this.#options.id,
       key: occurrence,
+      adopted: !!adopted,
       onCleanup: fn => cleanups.push(fn),
       existing: start ? rangeInterior(start, slotEnd(occurrence)) : []
     };
@@ -514,11 +528,22 @@ class FrameImpl {
   }
   #refArgsUnchanged(occurrence, record) {
     const old = this.#slotArgs.get(occurrence);
-    if (!old || old.kind !== "slot" || !record || record.kind !== "slot") return false;
-    const a = old.args || {};
+    if (!record || record.kind !== "slot") return false;
+    if (old && old.kind !== "slot") return false;
+    const a = old && old.args || {};
     const b = record.args || {};
     const ka = Object.keys(a);
-    if (ka.length !== Object.keys(b).length) return false;
+    const kb = Object.keys(b);
+    if (kb.length < ka.length) return false;
+    if (kb.length !== ka.length) {
+      const regions = this.#slotRegions.get(occurrence);
+      for (const key of kb) {
+        if (key in a) continue;
+        const vb = b[key];
+        if (!vb || typeof vb !== "object" || typeof vb.$frame !== "string") return false;
+        if (!regions || !regions.has(vb.$frame)) return false;
+      }
+    }
     const cache = this.#slotResolvedRefs.get(occurrence);
     for (const key of ka) {
       const va = a[key];
@@ -1322,7 +1347,7 @@ function slotsFor(props) {
           const v = props[prop];
           return settle(normalizeSlotContent(typeof v === "function" ? v(slotProps) : v));
         };
-        if (ctx && ctx.frame && ctx.existing && ctx.existing.length) {
+        if (ctx && ctx.frame && ctx.adopted && ctx.existing && ctx.existing.length) {
           return claimRender(`sc-${ctx.frame}-${ctx.key}-`, ctx.existing, render);
         }
         return render();

package/frames/dist/client.js

@@ -124,7 +124,20 @@ function createFrameHost(options = {}) {
       const buffered = pending.get(id);
       if (buffered) {
         pending.delete(id);
-        for (const chunk of buffered) deliver(frame, chunk);
+        const records = {};
+        let version;
+        for (const chunk of buffered) {
+          if (chunk.type === "data") {
+            options.applyData && options.applyData(chunk);
+            continue;
+          }
+          version = chunk.version;
+          Object.assign(records, chunkToRecords(chunk));
+        }
+        if (version !== undefined) frame.apply({
+          version,
+          r: records
+        });
       }
     },
     unregister(id, frame) {
@@ -344,11 +357,11 @@ class FrameImpl {
         this.#runSlotCleanups(occurrence);
       }
       if (!this.#mountedSlots.has(occurrence)) {
-        const nodes = this.#invokeSlot(occurrence, callback, record, start);
+        const nodes = this.#invokeSlot(occurrence, callback, record, start, this.#options.adopt);
         if (nodes) this.#replaceRange(occurrence, start, nodes);
         this.#slotNodes.set(occurrence, nodes);
         this.#mountedSlots.add(occurrence);
-        if (!record) this.#discoverRegions(occurrence, start);
+        this.#discoverRegions(occurrence, start);
         this.#bindRegions(occurrence);
       } else if (record !== this.#slotArgs.get(occurrence)) {
         if (this.#refArgsUnchanged(occurrence, record)) {
@@ -365,11 +378,12 @@ class FrameImpl {
       if (!found.has(occurrence)) this.#unmountSlot(occurrence);
     }
   }
-  #invokeSlot(occurrence, callback, record, start) {
+  #invokeSlot(occurrence, callback, record, start, adopted) {
     const cleanups = this.#slotCleanups.get(occurrence) ?? [];
     const ctx = {
       frame: this.#options.claimScope ?? this.#options.id,
       key: occurrence,
+      adopted: !!adopted,
       onCleanup: fn => cleanups.push(fn),
       existing: start ? rangeInterior(start, slotEnd(occurrence)) : []
     };
@@ -512,11 +526,22 @@ class FrameImpl {
   }
   #refArgsUnchanged(occurrence, record) {
     const old = this.#slotArgs.get(occurrence);
-    if (!old || old.kind !== "slot" || !record || record.kind !== "slot") return false;
-    const a = old.args || {};
+    if (!record || record.kind !== "slot") return false;
+    if (old && old.kind !== "slot") return false;
+    const a = old && old.args || {};
     const b = record.args || {};
     const ka = Object.keys(a);
-    if (ka.length !== Object.keys(b).length) return false;
+    const kb = Object.keys(b);
+    if (kb.length < ka.length) return false;
+    if (kb.length !== ka.length) {
+      const regions = this.#slotRegions.get(occurrence);
+      for (const key of kb) {
+        if (key in a) continue;
+        const vb = b[key];
+        if (!vb || typeof vb !== "object" || typeof vb.$frame !== "string") return false;
+        if (!regions || !regions.has(vb.$frame)) return false;
+      }
+    }
     const cache = this.#slotResolvedRefs.get(occurrence);
     for (const key of ka) {
       const va = a[key];
@@ -1320,7 +1345,7 @@ function slotsFor(props) {
           const v = props[prop];
           return settle(normalizeSlotContent(typeof v === "function" ? v(slotProps) : v));
         };
-        if (ctx && ctx.frame && ctx.existing && ctx.existing.length) {
+        if (ctx && ctx.frame && ctx.adopted && ctx.existing && ctx.existing.length) {
           return claimRender(`sc-${ctx.frame}-${ctx.key}-`, ctx.existing, render);
         }
         return render();

package/frames/dist/server.cjs

@@ -266,7 +266,8 @@ function renderToStream(code, options = {}) {
     }
     tasks += task + ";";
     if (!timer && firstFlushed) {
-      timer = setTimeout(writeTasks);
+      timer = true;
+      queue(() => queue(writeTasks));
     }
   };
   const onDone = () => {
@@ -349,7 +350,6 @@ function renderToStream(code, options = {}) {
       buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>${tasks}</script>`);
       tasks = "";
     }
-    timer && clearTimeout(timer);
     timer = null;
   };
   let context;
@@ -601,6 +601,26 @@ function renderToStream(code, options = {}) {
     });
     shellCompleted = true;
   }
+  const MIN_DRAIN_TURNS = 8;
+  let lastBlockingSize = -1;
+  let lastRegistrySize = -1;
+  let drainTurn = 0;
+  const scheduleFlush = fn => {
+    const attempt = () => {
+      if (registry.size !== lastRegistrySize || drainTurn++ < MIN_DRAIN_TURNS) {
+        if (registry.size !== lastRegistrySize) drainTurn = 0;
+        lastRegistrySize = registry.size;
+        queue(attempt);
+        return;
+      }
+      fn();
+    };
+    const progressed = blockingPromises.size !== lastBlockingSize;
+    lastBlockingSize = blockingPromises.size;
+    lastRegistrySize = -1;
+    drainTurn = 0;
+    progressed ? queue(attempt) : setTimeout(attempt);
+  };
   return {
     then(fn) {
       function complete() {
@@ -616,7 +636,7 @@ function renderToStream(code, options = {}) {
       } else onCompleteAll = complete;
       function flush() {
         allSettled(blockingPromises).then(() => {
-          setTimeout(() => {
+          scheduleFlush(() => {
             if (!resolveRootHoles()) return flush();
             queue(flushEnd);
           });
@@ -627,7 +647,7 @@ function renderToStream(code, options = {}) {
     pipe(w) {
       function flush() {
         allSettled(blockingPromises).then(() => {
-          setTimeout(() => {
+          scheduleFlush(() => {
             doShell();
             if (!shellCompleted) return flush();
             buffer = writable = w;
@@ -647,7 +667,7 @@ function renderToStream(code, options = {}) {
       const p = new Promise(r => resolve = r);
       function flush() {
         allSettled(blockingPromises).then(() => {
-          setTimeout(() => {
+          scheduleFlush(() => {
             doShell();
             if (!shellCompleted) return flush();
             const encoder = new TextEncoder();
@@ -861,14 +881,12 @@ function escape(s, attr) {
     }
     return s;
   }
-  const delimCode = attr ? 34 : 60;
-  const len = s.length;
-  for (let i = 0; i < len; i++) {
-    const c = s.charCodeAt(i);
-    if (c === 38 || c === delimCode) return escapeSlow(s, attr, i);
-  }
-  return s;
+  const i = s.search(attr ? ESCAPE_ATTR : ESCAPE_CONTENT);
+  if (i < 0) return s;
+  return escapeSlow(s, attr, i);
 }
+const ESCAPE_CONTENT = /[&<]/;
+const ESCAPE_ATTR = /[&"]/;
 function escapeSlow(s, attr, start) {
   const delim = attr ? '"' : "<";
   const delimCode = attr ? 34 : 60;
@@ -1516,7 +1534,7 @@ function renderedHtmlOf(out) {
   try {
     const res = solidJs.sharedConfig.context.resolve(out);
     if (res && res.t && (!res.h || !res.h.length)) {
-      return res.t[0].replace(/<!--[^>]*-->/g, "");
+      return res.t[0].replace(/<!--[^>]*-->/g, "").replace(/ _hk=("[^"]*"|[^\s>]+)/g, "");
     }
   } catch (e) {}
   return null;

package/frames/dist/server.js

@@ -264,7 +264,8 @@ function renderToStream(code, options = {}) {
     }
     tasks += task + ";";
     if (!timer && firstFlushed) {
-      timer = setTimeout(writeTasks);
+      timer = true;
+      queue(() => queue(writeTasks));
     }
   };
   const onDone = () => {
@@ -347,7 +348,6 @@ function renderToStream(code, options = {}) {
       buffer.write(`<script${nonce ? ` nonce="${nonce}"` : ""}>${tasks}</script>`);
       tasks = "";
     }
-    timer && clearTimeout(timer);
     timer = null;
   };
   let context;
@@ -599,6 +599,26 @@ function renderToStream(code, options = {}) {
     });
     shellCompleted = true;
   }
+  const MIN_DRAIN_TURNS = 8;
+  let lastBlockingSize = -1;
+  let lastRegistrySize = -1;
+  let drainTurn = 0;
+  const scheduleFlush = fn => {
+    const attempt = () => {
+      if (registry.size !== lastRegistrySize || drainTurn++ < MIN_DRAIN_TURNS) {
+        if (registry.size !== lastRegistrySize) drainTurn = 0;
+        lastRegistrySize = registry.size;
+        queue(attempt);
+        return;
+      }
+      fn();
+    };
+    const progressed = blockingPromises.size !== lastBlockingSize;
+    lastBlockingSize = blockingPromises.size;
+    lastRegistrySize = -1;
+    drainTurn = 0;
+    progressed ? queue(attempt) : setTimeout(attempt);
+  };
   return {
     then(fn) {
       function complete() {
@@ -614,7 +634,7 @@ function renderToStream(code, options = {}) {
       } else onCompleteAll = complete;
       function flush() {
         allSettled(blockingPromises).then(() => {
-          setTimeout(() => {
+          scheduleFlush(() => {
             if (!resolveRootHoles()) return flush();
             queue(flushEnd);
           });
@@ -625,7 +645,7 @@ function renderToStream(code, options = {}) {
     pipe(w) {
       function flush() {
         allSettled(blockingPromises).then(() => {
-          setTimeout(() => {
+          scheduleFlush(() => {
             doShell();
             if (!shellCompleted) return flush();
             buffer = writable = w;
@@ -645,7 +665,7 @@ function renderToStream(code, options = {}) {
       const p = new Promise(r => resolve = r);
       function flush() {
         allSettled(blockingPromises).then(() => {
-          setTimeout(() => {
+          scheduleFlush(() => {
             doShell();
             if (!shellCompleted) return flush();
             const encoder = new TextEncoder();
@@ -859,14 +879,12 @@ function escape(s, attr) {
     }
     return s;
   }
-  const delimCode = attr ? 34 : 60;
-  const len = s.length;
-  for (let i = 0; i < len; i++) {
-    const c = s.charCodeAt(i);
-    if (c === 38 || c === delimCode) return escapeSlow(s, attr, i);
-  }
-  return s;
+  const i = s.search(attr ? ESCAPE_ATTR : ESCAPE_CONTENT);
+  if (i < 0) return s;
+  return escapeSlow(s, attr, i);
 }
+const ESCAPE_CONTENT = /[&<]/;
+const ESCAPE_ATTR = /[&"]/;
 function escapeSlow(s, attr, start) {
   const delim = attr ? '"' : "<";
   const delimCode = attr ? 34 : 60;
@@ -1514,7 +1532,7 @@ function renderedHtmlOf(out) {
   try {
     const res = sharedConfig.context.resolve(out);
     if (res && res.t && (!res.h || !res.h.length)) {
-      return res.t[0].replace(/<!--[^>]*-->/g, "");
+      return res.t[0].replace(/<!--[^>]*-->/g, "").replace(/ _hk=("[^"]*"|[^\s>]+)/g, "");
     }
   } catch (e) {}
   return null;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@solidjs/web",
   "description": "Solid's web runtime: client rendering, hydration, SSR, and DOM-specific control flow (Portal, Dynamic).",
-  "version": "2.0.0-beta.23",
+  "version": "2.0.0-beta.24",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -296,10 +296,10 @@
     "seroval-plugins": "~1.5.4"
   },
   "peerDependencies": {
-    "solid-js": "^2.0.0-beta.23"
+    "solid-js": "^2.0.0-beta.24"
   },
   "devDependencies": {
-    "solid-js": "2.0.0-beta.23"
+    "solid-js": "2.0.0-beta.24"
   },
   "scripts": {
     "build": "npm-run-all -nl build:clean types:copy-jsx build:js",

package/server-functions/dist/server.cjs

@@ -332,18 +332,21 @@ async function decodeResponse(response, codecOptions) {
 const config = {
   provideEvent: undefined,
   collectFlightData: undefined,
+  transformResult: undefined,
   transformDirectResult: undefined,
   endpoint: "/_server"
 };
 function configureServerFunctionsServer({
   provideEvent,
   collectFlightData,
+  transformResult,
   transformDirectResult,
   endpoint,
   codec
 } = {}) {
   if (provideEvent !== undefined) config.provideEvent = provideEvent;
   if (collectFlightData !== undefined) config.collectFlightData = collectFlightData;
+  if (transformResult !== undefined) config.transformResult = transformResult;
   if (transformDirectResult !== undefined) config.transformDirectResult = transformDirectResult;
   if (endpoint !== undefined) config.endpoint = endpoint;
   if (codec !== undefined) configureServerFunctionsCodec(codec);
@@ -526,6 +529,7 @@ async function handleServerFunctionRequest(request, options = {}) {
   };
   const provide = options.provideEvent || provideEvent;
   const flightHook = options.collectFlightData !== undefined ? options.collectFlightData : config.collectFlightData;
+  const transformResult = options.transformResult !== undefined ? options.transformResult : config.transformResult;
   const collectsFlight = !!(flightHook && instance && request.headers.has(SINGLE_FLIGHT_HEADER));
   const parsed = await parseArguments(request, url, instance, codec);
   const headers = new Headers();
@@ -536,8 +540,8 @@ async function handleServerFunctionRequest(request, options = {}) {
       };
       return serverFunction(...parsed);
     });
-    if (options.transformResult) {
-      result = await options.transformResult(event, result, {
+    if (transformResult) {
+      result = await transformResult(event, result, {
         instance,
         request
       });
@@ -592,8 +596,8 @@ async function handleServerFunctionRequest(request, options = {}) {
     return encodeResult(result, headers, status, codec);
   } catch (x) {
     if (x instanceof Response || isResponseEnvelope(x)) {
-      if (options.transformResult) {
-        x = await options.transformResult(event, x, {
+      if (transformResult) {
+        x = await transformResult(event, x, {
           instance,
           request,
           thrown: true

package/server-functions/dist/server.js

@@ -330,18 +330,21 @@ async function decodeResponse(response, codecOptions) {
 const config = {
   provideEvent: undefined,
   collectFlightData: undefined,
+  transformResult: undefined,
   transformDirectResult: undefined,
   endpoint: "/_server"
 };
 function configureServerFunctionsServer({
   provideEvent,
   collectFlightData,
+  transformResult,
   transformDirectResult,
   endpoint,
   codec
 } = {}) {
   if (provideEvent !== undefined) config.provideEvent = provideEvent;
   if (collectFlightData !== undefined) config.collectFlightData = collectFlightData;
+  if (transformResult !== undefined) config.transformResult = transformResult;
   if (transformDirectResult !== undefined) config.transformDirectResult = transformDirectResult;
   if (endpoint !== undefined) config.endpoint = endpoint;
   if (codec !== undefined) configureServerFunctionsCodec(codec);
@@ -524,6 +527,7 @@ async function handleServerFunctionRequest(request, options = {}) {
   };
   const provide = options.provideEvent || provideEvent;
   const flightHook = options.collectFlightData !== undefined ? options.collectFlightData : config.collectFlightData;
+  const transformResult = options.transformResult !== undefined ? options.transformResult : config.transformResult;
   const collectsFlight = !!(flightHook && instance && request.headers.has(SINGLE_FLIGHT_HEADER));
   const parsed = await parseArguments(request, url, instance, codec);
   const headers = new Headers();
@@ -534,8 +538,8 @@ async function handleServerFunctionRequest(request, options = {}) {
       };
       return serverFunction(...parsed);
     });
-    if (options.transformResult) {
-      result = await options.transformResult(event, result, {
+    if (transformResult) {
+      result = await transformResult(event, result, {
         instance,
         request
       });
@@ -590,8 +594,8 @@ async function handleServerFunctionRequest(request, options = {}) {
     return encodeResult(result, headers, status, codec);
   } catch (x) {
     if (x instanceof Response || isResponseEnvelope(x)) {
-      if (options.transformResult) {
-        x = await options.transformResult(event, x, {
+      if (transformResult) {
+        x = await transformResult(event, x, {
           instance,
           request,
           thrown: true

package/types/frames/frame-client.d.ts

@@ -72,6 +72,14 @@ export interface FrameWrite {
 
 /** Context passed to a slot callback. */
 export interface SlotContext {
+  /**
+   * True only for the hydration-attach invocation of an adopted
+   * document-SSR range — the one call a consumer may answer with a claim
+   * (`existing` IS the server-rendered output for these args). Unset on
+   * stream-driven re-calls: those must render for real, or content the
+   * re-call displaced (e.g. `{$frame}` region ranges) is dropped.
+   */
+  adopted?: boolean;
   /**
    * Register cleanup for when this occurrence's range is removed from the
    * server content, or the owning frame is disposed.
@@ -203,3 +211,12 @@ export function createFrameInsertable(options: FrameOptions): {
   readonly frame: Frame | null;
   dispose(): void;
 };
+
+/**
+ * Binds a frame to an EXISTING marker range — the document-SSR adoption
+ * path: the page already holds the server-rendered boundary between
+ * `frame:<id>:start`/`:end` comments; the frame constructed over it treats
+ * that content as its own (first stream morphs rather than materializes)
+ * and slots sync immediately, claiming their server-rendered DOM.
+ */
+export function adoptFrameRange(start: Comment, end: Comment, options?: FrameOptions): Frame;

package/types/frames/frame-transport.d.ts

@@ -96,10 +96,11 @@ export interface ServerComponentHandlerOptions<C = unknown> {
  * key a WeakMap of boundaries (dying with their call sites); ownerless calls
  * fall back to one boundary per function id.
  */
-export function createServerComponentHandler<C>(
-  options: ServerComponentHandlerOptions<C>
-): {
+export function createServerComponentHandler<C>(options: ServerComponentHandlerOptions<C>): {
   capture?(info: { id: string; meta: unknown }): unknown;
   intercept?(info: { id: string; meta: unknown; args: unknown[] }): C | undefined;
-  handle(response: Response, ctx: { id: string; meta: unknown; args: unknown[]; context: unknown }): C | undefined;
+  handle(
+    response: Response,
+    ctx: { id: string; meta: unknown; args: unknown[]; context: unknown }
+  ): C | undefined;
 };

package/types/server-functions/server.d.ts

@@ -102,6 +102,23 @@ export interface ServerFunctionsServerConfig {
    * router); per-handler `collectFlightData` options override it.
    */
   collectFlightData?: CollectFlightDataHook;
+  /**
+   * Server-wide default for the handler's `transformResult` (same contract
+   * — see `HandleServerFunctionRequestOptions`); a per-request option
+   * overrides it. Registering it here makes result policies (e.g. frames'
+   * `frameTransformResult`) work through generic dispatchers that call
+   * `handleServerFunctionRequest(request)` with no options.
+   */
+  transformResult?(
+    event: ServerFunctionEvent,
+    result: unknown,
+    context: { instance: string | null; request: Request; thrown?: boolean }
+  ): unknown | ResponseEnvelope | Promise<unknown | ResponseEnvelope>;
+  /**
+   * The in-process mirror of `transformResult` for direct (same-server)
+   * calls during document SSR — e.g. frames' `frameTransformDirectResult`.
+   */
+  transformDirectResult?(value: unknown, options: { id: string }): unknown;
   /**
    * Endpoint the HTTP handler is mounted on, used for the `url` of SSR'd
    * references (e.g. form actions) — must match the client configuration.

package/types/server-functions/shared.d.ts

@@ -369,3 +369,20 @@ export function decodeResponse<T = unknown>(
   response: Response,
   codecOptions?: JSONCodecOptions
 ): Promise<T | undefined>;
+
+/**
+ * Frame one payload for the server-function wire: a `;0x<len32>;` length
+ * prefix followed by the utf-8 data. Both transports (server-function
+ * responses and frame streams) share this framing.
+ */
+export function createChunk(data: string): Uint8Array;
+
+/**
+ * Incremental decoder for `createChunk` framing over a byte stream: `next()`
+ * yields one complete payload string per call (async-iterator result shape),
+ * buffering partial frames internally until their length prefix is satisfied.
+ */
+export class ChunkReader {
+  constructor(stream: ReadableStream<Uint8Array>);
+  next(): Promise<{ done: boolean; value: string | undefined }>;
+}

package/types-cjs/frames/frame-client.d.cts

@@ -72,6 +72,14 @@ export interface FrameWrite {
 
 /** Context passed to a slot callback. */
 export interface SlotContext {
+  /**
+   * True only for the hydration-attach invocation of an adopted
+   * document-SSR range — the one call a consumer may answer with a claim
+   * (`existing` IS the server-rendered output for these args). Unset on
+   * stream-driven re-calls: those must render for real, or content the
+   * re-call displaced (e.g. `{$frame}` region ranges) is dropped.
+   */
+  adopted?: boolean;
   /**
    * Register cleanup for when this occurrence's range is removed from the
    * server content, or the owning frame is disposed.
@@ -203,3 +211,12 @@ export function createFrameInsertable(options: FrameOptions): {
   readonly frame: Frame | null;
   dispose(): void;
 };
+
+/**
+ * Binds a frame to an EXISTING marker range — the document-SSR adoption
+ * path: the page already holds the server-rendered boundary between
+ * `frame:<id>:start`/`:end` comments; the frame constructed over it treats
+ * that content as its own (first stream morphs rather than materializes)
+ * and slots sync immediately, claiming their server-rendered DOM.
+ */
+export function adoptFrameRange(start: Comment, end: Comment, options?: FrameOptions): Frame;

package/types-cjs/frames/frame-transport.d.cts

@@ -96,10 +96,11 @@ export interface ServerComponentHandlerOptions<C = unknown> {
  * key a WeakMap of boundaries (dying with their call sites); ownerless calls
  * fall back to one boundary per function id.
  */
-export function createServerComponentHandler<C>(
-  options: ServerComponentHandlerOptions<C>
-): {
+export function createServerComponentHandler<C>(options: ServerComponentHandlerOptions<C>): {
   capture?(info: { id: string; meta: unknown }): unknown;
   intercept?(info: { id: string; meta: unknown; args: unknown[] }): C | undefined;
-  handle(response: Response, ctx: { id: string; meta: unknown; args: unknown[]; context: unknown }): C | undefined;
+  handle(
+    response: Response,
+    ctx: { id: string; meta: unknown; args: unknown[]; context: unknown }
+  ): C | undefined;
 };

package/types-cjs/server-functions/server.d.cts

@@ -102,6 +102,23 @@ export interface ServerFunctionsServerConfig {
    * router); per-handler `collectFlightData` options override it.
    */
   collectFlightData?: CollectFlightDataHook;
+  /**
+   * Server-wide default for the handler's `transformResult` (same contract
+   * — see `HandleServerFunctionRequestOptions`); a per-request option
+   * overrides it. Registering it here makes result policies (e.g. frames'
+   * `frameTransformResult`) work through generic dispatchers that call
+   * `handleServerFunctionRequest(request)` with no options.
+   */
+  transformResult?(
+    event: ServerFunctionEvent,
+    result: unknown,
+    context: { instance: string | null; request: Request; thrown?: boolean }
+  ): unknown | ResponseEnvelope | Promise<unknown | ResponseEnvelope>;
+  /**
+   * The in-process mirror of `transformResult` for direct (same-server)
+   * calls during document SSR — e.g. frames' `frameTransformDirectResult`.
+   */
+  transformDirectResult?(value: unknown, options: { id: string }): unknown;
   /**
    * Endpoint the HTTP handler is mounted on, used for the `url` of SSR'd
    * references (e.g. form actions) — must match the client configuration.

package/types-cjs/server-functions/shared.d.cts

@@ -369,3 +369,20 @@ export function decodeResponse<T = unknown>(
   response: Response,
   codecOptions?: JSONCodecOptions
 ): Promise<T | undefined>;
+
+/**
+ * Frame one payload for the server-function wire: a `;0x<len32>;` length
+ * prefix followed by the utf-8 data. Both transports (server-function
+ * responses and frame streams) share this framing.
+ */
+export function createChunk(data: string): Uint8Array;
+
+/**
+ * Incremental decoder for `createChunk` framing over a byte stream: `next()`
+ * yields one complete payload string per call (async-iterator result shape),
+ * buffering partial frames internally until their length prefix is satisfied.
+ */
+export class ChunkReader {
+  constructor(stream: ReadableStream<Uint8Array>);
+  next(): Promise<{ done: boolean; value: string | undefined }>;
+}