@solidjs/web 2.0.0-beta.27 → 2.0.0-beta.28

package/dist/server.cjs

@@ -199,7 +199,24 @@ function createAssetTracking() {
     }
   };
 }
-function applyAssetTracking(context, tracking, manifest) {
+function warnUnresolvedModuleAssets(moduleUrl, warned) {
+  if (warned.has(moduleUrl)) return;
+  warned.add(moduleUrl);
+  console.error(`Asset manifest returned no client assets for module "${moduleUrl}". ` + "If this module is a server-rendered lazy() component, its entry will be missing from " + "the serialized hydration asset map, the client will be unable to preload it, and " + "hydration will fail with 'lazy() module \"…\" was not preloaded before hydration'. " + "This means the integration's asset resolver (dev manifest bridge or build client " + "manifest) failed to answer for this module — check the integration's server logs, " + "restart the dev server, or verify the module is included in the client build.");
+}
+function guardResolvedAssets(moduleUrl, result, warned) {
+  if (result && typeof result.then === "function") {
+    return result.then(assets => {
+      if (!assets || !assets.js || !assets.js.length) warnUnresolvedModuleAssets(moduleUrl, warned);
+      return assets;
+    });
+  }
+  if (!result || !result.js || !result.js.length) warnUnresolvedModuleAssets(moduleUrl, warned);
+  return result;
+}
+function applyAssetTracking(context, tracking, manifest, noScripts) {
+  const warned = new Set();
+  const guard = noScripts ? resolve => resolve : resolve => moduleUrl => guardResolvedAssets(moduleUrl, resolve(moduleUrl), warned);
   Object.defineProperty(context, "_currentBoundaryId", {
     get() {
       return tracking.currentBoundaryId;
@@ -213,15 +230,15 @@ function applyAssetTracking(context, tracking, manifest) {
   context.registerModule = tracking.registerModule;
   context.getBoundaryModules = tracking.getBoundaryModules;
   if (typeof manifest === "function") {
-    context.resolveAssets = manifest;
+    context.resolveAssets = guard(manifest);
   } else if (manifest && typeof manifest.resolve === "function") {
-    context.resolveAssets = key => manifest.resolve(key);
+    context.resolveAssets = guard(key => manifest.resolve(key));
     if (typeof manifest.resolveSync === "function") {
       context.resolveAssetsSync = key => manifest.resolveSync(key);
     }
   } else if (manifest) {
     const resolve = moduleUrl => resolveAssets(moduleUrl, manifest);
-    context.resolveAssets = resolve;
+    context.resolveAssets = guard(resolve);
     context.resolveAssetsSync = resolve;
   }
 }
@@ -277,7 +294,7 @@ function renderToString(code, options = {}) {
       tracking.emittedAssets.add(value);
     }
   };
-  applyAssetTracking(solidJs.sharedConfig.context, tracking, manifest);
+  applyAssetTracking(solidJs.sharedConfig.context, tracking, manifest, noScripts);
   registerEntryAssets(manifest);
   let html = solidJs.createRoot(d => {
     setTimeout(d);
@@ -565,7 +582,7 @@ function renderToStream(code, options = {}) {
       });
     }
   };
-  applyAssetTracking(context, tracking, manifest);
+  applyAssetTracking(context, tracking, manifest, noScripts);
   registerEntryAssets(manifest);
   let html = solidJs.createRoot(d => {
     dispose = d;

package/dist/server.js

@@ -198,7 +198,24 @@ function createAssetTracking() {
     }
   };
 }
-function applyAssetTracking(context, tracking, manifest) {
+function warnUnresolvedModuleAssets(moduleUrl, warned) {
+  if (warned.has(moduleUrl)) return;
+  warned.add(moduleUrl);
+  console.error(`Asset manifest returned no client assets for module "${moduleUrl}". ` + "If this module is a server-rendered lazy() component, its entry will be missing from " + "the serialized hydration asset map, the client will be unable to preload it, and " + "hydration will fail with 'lazy() module \"…\" was not preloaded before hydration'. " + "This means the integration's asset resolver (dev manifest bridge or build client " + "manifest) failed to answer for this module — check the integration's server logs, " + "restart the dev server, or verify the module is included in the client build.");
+}
+function guardResolvedAssets(moduleUrl, result, warned) {
+  if (result && typeof result.then === "function") {
+    return result.then(assets => {
+      if (!assets || !assets.js || !assets.js.length) warnUnresolvedModuleAssets(moduleUrl, warned);
+      return assets;
+    });
+  }
+  if (!result || !result.js || !result.js.length) warnUnresolvedModuleAssets(moduleUrl, warned);
+  return result;
+}
+function applyAssetTracking(context, tracking, manifest, noScripts) {
+  const warned = new Set();
+  const guard = noScripts ? resolve => resolve : resolve => moduleUrl => guardResolvedAssets(moduleUrl, resolve(moduleUrl), warned);
   Object.defineProperty(context, "_currentBoundaryId", {
     get() {
       return tracking.currentBoundaryId;
@@ -212,15 +229,15 @@ function applyAssetTracking(context, tracking, manifest) {
   context.registerModule = tracking.registerModule;
   context.getBoundaryModules = tracking.getBoundaryModules;
   if (typeof manifest === "function") {
-    context.resolveAssets = manifest;
+    context.resolveAssets = guard(manifest);
   } else if (manifest && typeof manifest.resolve === "function") {
-    context.resolveAssets = key => manifest.resolve(key);
+    context.resolveAssets = guard(key => manifest.resolve(key));
     if (typeof manifest.resolveSync === "function") {
       context.resolveAssetsSync = key => manifest.resolveSync(key);
     }
   } else if (manifest) {
     const resolve = moduleUrl => resolveAssets(moduleUrl, manifest);
-    context.resolveAssets = resolve;
+    context.resolveAssets = guard(resolve);
     context.resolveAssetsSync = resolve;
   }
 }
@@ -276,7 +293,7 @@ function renderToString(code, options = {}) {
       tracking.emittedAssets.add(value);
     }
   };
-  applyAssetTracking(sharedConfig.context, tracking, manifest);
+  applyAssetTracking(sharedConfig.context, tracking, manifest, noScripts);
   registerEntryAssets(manifest);
   let html = createRoot(d => {
     setTimeout(d);
@@ -564,7 +581,7 @@ function renderToStream(code, options = {}) {
       });
     }
   };
-  applyAssetTracking(context, tracking, manifest);
+  applyAssetTracking(context, tracking, manifest, noScripts);
   registerEntryAssets(manifest);
   let html = createRoot(d => {
     dispose = d;

package/frames/dist/server.cjs

@@ -220,7 +220,24 @@ function createAssetTracking() {
     }
   };
 }
-function applyAssetTracking(context, tracking, manifest) {
+function warnUnresolvedModuleAssets(moduleUrl, warned) {
+  if (warned.has(moduleUrl)) return;
+  warned.add(moduleUrl);
+  console.error(`Asset manifest returned no client assets for module "${moduleUrl}". ` + "If this module is a server-rendered lazy() component, its entry will be missing from " + "the serialized hydration asset map, the client will be unable to preload it, and " + "hydration will fail with 'lazy() module \"…\" was not preloaded before hydration'. " + "This means the integration's asset resolver (dev manifest bridge or build client " + "manifest) failed to answer for this module — check the integration's server logs, " + "restart the dev server, or verify the module is included in the client build.");
+}
+function guardResolvedAssets(moduleUrl, result, warned) {
+  if (result && typeof result.then === "function") {
+    return result.then(assets => {
+      if (!assets || !assets.js || !assets.js.length) warnUnresolvedModuleAssets(moduleUrl, warned);
+      return assets;
+    });
+  }
+  if (!result || !result.js || !result.js.length) warnUnresolvedModuleAssets(moduleUrl, warned);
+  return result;
+}
+function applyAssetTracking(context, tracking, manifest, noScripts) {
+  const warned = new Set();
+  const guard = noScripts ? resolve => resolve : resolve => moduleUrl => guardResolvedAssets(moduleUrl, resolve(moduleUrl), warned);
   Object.defineProperty(context, "_currentBoundaryId", {
     get() {
       return tracking.currentBoundaryId;
@@ -234,15 +251,15 @@ function applyAssetTracking(context, tracking, manifest) {
   context.registerModule = tracking.registerModule;
   context.getBoundaryModules = tracking.getBoundaryModules;
   if (typeof manifest === "function") {
-    context.resolveAssets = manifest;
+    context.resolveAssets = guard(manifest);
   } else if (manifest && typeof manifest.resolve === "function") {
-    context.resolveAssets = key => manifest.resolve(key);
+    context.resolveAssets = guard(key => manifest.resolve(key));
     if (typeof manifest.resolveSync === "function") {
       context.resolveAssetsSync = key => manifest.resolveSync(key);
     }
   } else if (manifest) {
     const resolve = moduleUrl => resolveAssets(moduleUrl, manifest);
-    context.resolveAssets = resolve;
+    context.resolveAssets = guard(resolve);
     context.resolveAssetsSync = resolve;
   }
 }
@@ -521,7 +538,7 @@ function renderToStream(code, options = {}) {
       });
     }
   };
-  applyAssetTracking(context, tracking, manifest);
+  applyAssetTracking(context, tracking, manifest, noScripts);
   registerEntryAssets(manifest);
   let html = solidJs.createRoot(d => {
     dispose = d;

package/frames/dist/server.js

@@ -218,7 +218,24 @@ function createAssetTracking() {
     }
   };
 }
-function applyAssetTracking(context, tracking, manifest) {
+function warnUnresolvedModuleAssets(moduleUrl, warned) {
+  if (warned.has(moduleUrl)) return;
+  warned.add(moduleUrl);
+  console.error(`Asset manifest returned no client assets for module "${moduleUrl}". ` + "If this module is a server-rendered lazy() component, its entry will be missing from " + "the serialized hydration asset map, the client will be unable to preload it, and " + "hydration will fail with 'lazy() module \"…\" was not preloaded before hydration'. " + "This means the integration's asset resolver (dev manifest bridge or build client " + "manifest) failed to answer for this module — check the integration's server logs, " + "restart the dev server, or verify the module is included in the client build.");
+}
+function guardResolvedAssets(moduleUrl, result, warned) {
+  if (result && typeof result.then === "function") {
+    return result.then(assets => {
+      if (!assets || !assets.js || !assets.js.length) warnUnresolvedModuleAssets(moduleUrl, warned);
+      return assets;
+    });
+  }
+  if (!result || !result.js || !result.js.length) warnUnresolvedModuleAssets(moduleUrl, warned);
+  return result;
+}
+function applyAssetTracking(context, tracking, manifest, noScripts) {
+  const warned = new Set();
+  const guard = noScripts ? resolve => resolve : resolve => moduleUrl => guardResolvedAssets(moduleUrl, resolve(moduleUrl), warned);
   Object.defineProperty(context, "_currentBoundaryId", {
     get() {
       return tracking.currentBoundaryId;
@@ -232,15 +249,15 @@ function applyAssetTracking(context, tracking, manifest) {
   context.registerModule = tracking.registerModule;
   context.getBoundaryModules = tracking.getBoundaryModules;
   if (typeof manifest === "function") {
-    context.resolveAssets = manifest;
+    context.resolveAssets = guard(manifest);
   } else if (manifest && typeof manifest.resolve === "function") {
-    context.resolveAssets = key => manifest.resolve(key);
+    context.resolveAssets = guard(key => manifest.resolve(key));
     if (typeof manifest.resolveSync === "function") {
       context.resolveAssetsSync = key => manifest.resolveSync(key);
     }
   } else if (manifest) {
     const resolve = moduleUrl => resolveAssets(moduleUrl, manifest);
-    context.resolveAssets = resolve;
+    context.resolveAssets = guard(resolve);
     context.resolveAssetsSync = resolve;
   }
 }
@@ -519,7 +536,7 @@ function renderToStream(code, options = {}) {
       });
     }
   };
-  applyAssetTracking(context, tracking, manifest);
+  applyAssetTracking(context, tracking, manifest, noScripts);
   registerEntryAssets(manifest);
   let html = createRoot(d => {
     dispose = d;

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.27",
+  "version": "2.0.0-beta.28",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -316,10 +316,10 @@
     "seroval-plugins": "~1.5.4"
   },
   "peerDependencies": {
-    "solid-js": "^2.0.0-beta.27"
+    "solid-js": "^2.0.0-beta.28"
   },
   "devDependencies": {
-    "solid-js": "2.0.0-beta.27"
+    "solid-js": "2.0.0-beta.28"
   },
   "scripts": {
     "build": "npm-run-all -nl build:clean types:copy-jsx build:js",

package/server-functions/dist/client.cjs

@@ -287,6 +287,18 @@ async function decodeResponse(response, codecOptions) {
   if (!response.body) return undefined;
   return await extractBody(response, codecOptions === undefined ? codecConfig.codec : codecOptions);
 }
+async function decodeResponsePayload(response, codecOptions) {
+  const decoded = await decodeResponse(response, codecOptions);
+  if (decoded !== undefined && response.headers.has(SINGLE_FLIGHT_HEADER)) {
+    return {
+      value: decoded.value,
+      flightData: decoded.data
+    };
+  }
+  return {
+    value: decoded
+  };
+}
 
 const config = {
   endpoint: "/_server",
@@ -507,6 +519,7 @@ exports.configureServerFunctionsClient = configureServerFunctionsClient;
 exports.createServerReference = createServerReference;
 exports.decodeErrorHeaderValue = decodeErrorHeaderValue;
 exports.decodeResponse = decodeResponse;
+exports.decodeResponsePayload = decodeResponsePayload;
 exports.encodeErrorHeaderValue = encodeErrorHeaderValue;
 exports.getServerFunctionMetadata = getServerFunctionMetadata;
 exports.hasFlashCookie = hasFlashCookie;

package/server-functions/dist/client.js

@@ -285,6 +285,18 @@ async function decodeResponse(response, codecOptions) {
   if (!response.body) return undefined;
   return await extractBody(response, codecOptions === undefined ? codecConfig.codec : codecOptions);
 }
+async function decodeResponsePayload(response, codecOptions) {
+  const decoded = await decodeResponse(response, codecOptions);
+  if (decoded !== undefined && response.headers.has(SINGLE_FLIGHT_HEADER)) {
+    return {
+      value: decoded.value,
+      flightData: decoded.data
+    };
+  }
+  return {
+    value: decoded
+  };
+}
 
 const config = {
   endpoint: "/_server",
@@ -494,4 +506,4 @@ function registerServerReference() {
   throw new Error("registerServerReference must not be called in the client build");
 }
 
-export { ERROR_HEADER, FLASH_COOKIE, FUNCTION_HEADER, GET, INSTANCE_HEADER, SINGLE_FLIGHT_HEADER, clearFlashCookie, configureServerFunctionsClient, createServerReference, decodeErrorHeaderValue, decodeResponse, encodeErrorHeaderValue, getServerFunctionMetadata, hasFlashCookie, isServerFunction, registerServerReference, subscribeFlightData, withMeta };
+export { ERROR_HEADER, FLASH_COOKIE, FUNCTION_HEADER, GET, INSTANCE_HEADER, SINGLE_FLIGHT_HEADER, clearFlashCookie, configureServerFunctionsClient, createServerReference, decodeErrorHeaderValue, decodeResponse, decodeResponsePayload, encodeErrorHeaderValue, getServerFunctionMetadata, hasFlashCookie, isServerFunction, registerServerReference, subscribeFlightData, withMeta };

package/server-functions/dist/server.cjs

@@ -8,6 +8,7 @@ const ENVELOPE = Symbol.for("solid.ResponseEnvelope");
 function isResponseEnvelope(value) {
   return !!(value && typeof value === "object" && value[ENVELOPE]);
 }
+const REVALIDATE_HEADER = "X-Revalidate";
 
 seroval.Feature.AggregateError | seroval.Feature.BigIntTypedArray;
 const serializeOnlyDisabledFeatures = () => process.env.NODE_ENV === "development" ? 0 : seroval.Feature.ErrorPrototypeStack;
@@ -343,6 +344,18 @@ async function decodeResponse(response, codecOptions) {
   if (!response.body) return undefined;
   return await extractBody(response, codecOptions === undefined ? codecConfig.codec : codecOptions);
 }
+async function decodeResponsePayload(response, codecOptions) {
+  const decoded = await decodeResponse(response, codecOptions);
+  if (decoded !== undefined && response.headers.has(SINGLE_FLIGHT_HEADER)) {
+    return {
+      value: decoded.value,
+      flightData: decoded.data
+    };
+  }
+  return {
+    value: decoded
+  };
+}
 
 function encodeInputValue(value) {
   if (value instanceof FormData) return {
@@ -532,6 +545,8 @@ async function parseArguments(request, url, instance, codec) {
   return parsed;
 }
 async function foldFlightData(hook, event, headers, outcome) {
+  if (outcome.value instanceof Response && outcome.value.body) return outcome.value;
+  digestOutcome(event, outcome);
   const data = await hook(event, outcome);
   if (data === undefined) return outcome.value;
   headers.set(SINGLE_FLIGHT_HEADER, "true");
@@ -540,6 +555,23 @@ async function foldFlightData(hook, event, headers, outcome) {
     data
   };
 }
+function digestOutcome(event, outcome) {
+  const {
+    request,
+    response
+  } = outcome;
+  outcome.revalidateKeys = response?.headers.get(REVALIDATE_HEADER)?.split(",");
+  outcome.foldedHeaders = foldSetCookies(request.headers, [...(event.response?.headers?.getSetCookie() ?? []), ...(response?.headers?.getSetCookie() ?? [])]);
+  try {
+    const referrer = request.headers.get("referer");
+    if (referrer) {
+      const location = response?.headers.get("Location");
+      const target = location ? new URL(location, request.url) : new URL(referrer);
+      if (target.origin === new URL(request.url).origin) outcome.targetUrl = target.toString();
+    }
+  } catch {
+  }
+}
 function parseSetCookie(setCookie) {
   const [pair, ...attributes] = setCookie.split(";");
   const eq = pair.indexOf("=");
@@ -821,6 +853,7 @@ exports.createServerReference = createServerReference;
 exports.decodeErrorHeaderValue = decodeErrorHeaderValue;
 exports.decodeFlashCookie = decodeFlashCookie;
 exports.decodeResponse = decodeResponse;
+exports.decodeResponsePayload = decodeResponsePayload;
 exports.encodeErrorHeaderValue = encodeErrorHeaderValue;
 exports.encodeFlashCookie = encodeFlashCookie;
 exports.foldSetCookies = foldSetCookies;

package/server-functions/dist/server.js

@@ -6,6 +6,7 @@ const ENVELOPE = Symbol.for("solid.ResponseEnvelope");
 function isResponseEnvelope(value) {
   return !!(value && typeof value === "object" && value[ENVELOPE]);
 }
+const REVALIDATE_HEADER = "X-Revalidate";
 
 Feature.AggregateError | Feature.BigIntTypedArray;
 const serializeOnlyDisabledFeatures = () => process.env.NODE_ENV === "development" ? 0 : Feature.ErrorPrototypeStack;
@@ -341,6 +342,18 @@ async function decodeResponse(response, codecOptions) {
   if (!response.body) return undefined;
   return await extractBody(response, codecOptions === undefined ? codecConfig.codec : codecOptions);
 }
+async function decodeResponsePayload(response, codecOptions) {
+  const decoded = await decodeResponse(response, codecOptions);
+  if (decoded !== undefined && response.headers.has(SINGLE_FLIGHT_HEADER)) {
+    return {
+      value: decoded.value,
+      flightData: decoded.data
+    };
+  }
+  return {
+    value: decoded
+  };
+}
 
 function encodeInputValue(value) {
   if (value instanceof FormData) return {
@@ -530,6 +543,8 @@ async function parseArguments(request, url, instance, codec) {
   return parsed;
 }
 async function foldFlightData(hook, event, headers, outcome) {
+  if (outcome.value instanceof Response && outcome.value.body) return outcome.value;
+  digestOutcome(event, outcome);
   const data = await hook(event, outcome);
   if (data === undefined) return outcome.value;
   headers.set(SINGLE_FLIGHT_HEADER, "true");
@@ -538,6 +553,23 @@ async function foldFlightData(hook, event, headers, outcome) {
     data
   };
 }
+function digestOutcome(event, outcome) {
+  const {
+    request,
+    response
+  } = outcome;
+  outcome.revalidateKeys = response?.headers.get(REVALIDATE_HEADER)?.split(",");
+  outcome.foldedHeaders = foldSetCookies(request.headers, [...(event.response?.headers?.getSetCookie() ?? []), ...(response?.headers?.getSetCookie() ?? [])]);
+  try {
+    const referrer = request.headers.get("referer");
+    if (referrer) {
+      const location = response?.headers.get("Location");
+      const target = location ? new URL(location, request.url) : new URL(referrer);
+      if (target.origin === new URL(request.url).origin) outcome.targetUrl = target.toString();
+    }
+  } catch {
+  }
+}
 function parseSetCookie(setCookie) {
   const [pair, ...attributes] = setCookie.split(";");
   const eq = pair.indexOf("=");
@@ -806,4 +838,4 @@ async function handleServerFunctionRequest(request, options = {}) {
   }
 }
 
-export { ERROR_HEADER, FLASH_COOKIE, FUNCTION_HEADER, GET, INSTANCE_HEADER, SINGLE_FLIGHT_HEADER, clearFlashCookie, configureServerFunctionsServer, createNoJSHandler, createServerReference, decodeErrorHeaderValue, decodeFlashCookie, decodeResponse, encodeErrorHeaderValue, encodeFlashCookie, foldSetCookies, getServerFunction, getServerFunctionMeta, getServerFunctionMetadata, handleServerFunctionRequest, hasFlashCookie, isServerFunction, registerServerFunction, registerServerReference, subscribeFlightData, withMeta };
+export { ERROR_HEADER, FLASH_COOKIE, FUNCTION_HEADER, GET, INSTANCE_HEADER, SINGLE_FLIGHT_HEADER, clearFlashCookie, configureServerFunctionsServer, createNoJSHandler, createServerReference, decodeErrorHeaderValue, decodeFlashCookie, decodeResponse, decodeResponsePayload, encodeErrorHeaderValue, encodeFlashCookie, foldSetCookies, getServerFunction, getServerFunctionMeta, getServerFunctionMetadata, handleServerFunctionRequest, hasFlashCookie, isServerFunction, registerServerFunction, registerServerReference, subscribeFlightData, withMeta };

package/types/frames/client.d.ts

@@ -1,6 +1,7 @@
 export { createFrame, createFrameHost, createFrameElement, FRAME_APPLIED_EVENT } from "./frame-client.js";
 export { FRAME_STREAM_HEADER, applyFrameResponse, isFrameStreamResponse, createServerComponentHandler } from "./frame-transport.js";
 export { createJSONDataTable } from "./serializer.js";
+export type { Slot } from "./server.js";
 export declare function getFrameHost(): any;
 /**
  * Installs the server-component transport policy on the server-function

package/types/frames/server.d.ts

@@ -1,2 +1,30 @@
+import type { Element as SolidElement } from "solid-js";
+/**
+ * A client position in a server component: a prop the server renders (as JSX
+ * or by calling it) where client-owned markup belongs. `P` is the client
+ * component's own props, so a server component can reference the client
+ * component's type directly instead of restating it.
+ *
+ * Arguments are classified by VALUE, not by name — any prop may carry any of
+ * these:
+ *
+ * - primitives ride the chunk;
+ * - server JSX streams as a nested region (html once, never data);
+ * - anything else serializes as a data record.
+ *
+ * Async server JSX in an argument needs its own boundary: the region is
+ * emitted as one finished string, so a bare async read has no fallback to
+ * show and no fragment to reveal into.
+ *
+ * `$key` names the occurrence so client state follows an entity across
+ * responses rather than being positional — the slot-level analogue of `For`'s
+ * `keyed`, for when references can't carry identity because every response
+ * re-creates everything. It is occurrence identity, not client data: it is
+ * stripped before the client component sees its props. Positional identity is
+ * the right default; `$key` matters when a live list reorders.
+ */
+export type Slot<P = {}> = (props: P & {
+    $key?: string | number;
+}) => SolidElement;
 export { renderToFrameStream, renderServerComponent, serverComponentResponse, frameTransformResult, createFrameSink, frameTransformDirectResult, ServerComponentPlugin, SERVER_COMPONENT_BOOTSTRAP } from "./frame-sink.js";
 export { FRAME_STREAM_HEADER, isFrameStreamResponse } from "./frame-transport.js";

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

@@ -10,6 +10,7 @@ export {
   clearFlashCookie,
   decodeErrorHeaderValue,
   decodeResponse,
+  decodeResponsePayload,
   encodeErrorHeaderValue,
   getServerFunctionMetadata,
   hasFlashCookie,

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

@@ -11,6 +11,7 @@ export {
   clearFlashCookie,
   decodeErrorHeaderValue,
   decodeResponse,
+  decodeResponsePayload,
   encodeErrorHeaderValue,
   getServerFunctionMetadata,
   hasFlashCookie,
@@ -68,6 +69,29 @@ export interface ServerFunctionOutcome {
   request: Request;
   /** Whether the result was thrown rather than returned. */
   thrown: boolean;
+  /**
+   * The URL the client will show after the mutation — the redirect
+   * `Location` when the outcome carries one (resolved against the request
+   * URL, as a browser would), the referring page otherwise. Undefined
+   * without a usable referer (a non-browser caller has no page to produce
+   * data for) and for redirects leaving the app's origin: produce no data
+   * when this is undefined.
+   */
+  targetUrl: string | undefined;
+  /**
+   * The outcome's `X-Revalidate` keys, split — the invalidation scope the
+   * mutation declared. Undefined when the outcome carries none (integrations
+   * typically collect everything for the target in that case).
+   */
+  revalidateKeys: string[] | undefined;
+  /**
+   * The request headers with the mutation's cookie effects applied: the
+   * event response's `Set-Cookie`s (set during the call), then the
+   * outcome's own (e.g. `redirect(to, { headers })`), later winning on
+   * conflict, deletions honored. Build the data-collection request from
+   * these so re-run reads observe post-mutation cookie state.
+   */
+  foldedHeaders: Headers;
 }
 
 /**
@@ -82,8 +106,12 @@ export interface ServerFunctionOutcome {
  * Runs after `transformResult`, only for scripted calls that sent
  * `SINGLE_FLIGHT_HEADER` on the request, on returned results and thrown
  * `Response`/`ResponseEnvelope` control-flow signals alike (plain thrown
- * errors never collect). The handler owns the enveloping: contributed data
- * ships as `{ value, data }` under the single-flight response header.
+ * errors never collect, and neither do raw body-carrying `Response` values
+ * — those are the caller's verbatim payload). The handler owns the
+ * enveloping: contributed data ships as `{ value, data }` under the
+ * single-flight response header. The generic halves of collection arrive
+ * pre-digested on the outcome (`targetUrl`, `revalidateKeys`,
+ * `foldedHeaders`); the hook supplies only the data strategy.
  */
 export type CollectFlightDataHook = (
   event: ServerFunctionEvent,

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

@@ -405,6 +405,19 @@ export function decodeResponse<T = unknown>(
   codecOptions?: JSONCodecOptions
 ): Promise<T | undefined>;
 
+/**
+ * `decodeResponse` plus the single-flight envelope split: when the response
+ * carries the single-flight header the decoded `{ value, data }` payload is
+ * unwrapped into `{ value, flightData }`; otherwise the decoded body (or
+ * undefined for body-less responses) rides as `{ value }`. Integrations
+ * that apply response metadata themselves use this so the payload shape
+ * stays core's own.
+ */
+export function decodeResponsePayload<T = unknown, D = unknown>(
+  response: Response,
+  codecOptions?: JSONCodecOptions
+): Promise<{ value: T | undefined; flightData?: D }>;
+
 /**
  * Frame one payload for the server-function wire: a `;0x<len32>;` length
  * prefix followed by the utf-8 data. Both transports (server-function

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

@@ -1,6 +1,7 @@
 export { createFrame, createFrameHost, createFrameElement, FRAME_APPLIED_EVENT } from "./frame-client.cjs";
 export { FRAME_STREAM_HEADER, applyFrameResponse, isFrameStreamResponse, createServerComponentHandler } from "./frame-transport.cjs";
 export { createJSONDataTable } from "./serializer.cjs";
+export type { Slot } from "./server.cjs";
 export declare function getFrameHost(): any;
 /**
  * Installs the server-component transport policy on the server-function

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

@@ -1,2 +1,30 @@
+import type { Element as SolidElement } from "solid-js";
+/**
+ * A client position in a server component: a prop the server renders (as JSX
+ * or by calling it) where client-owned markup belongs. `P` is the client
+ * component's own props, so a server component can reference the client
+ * component's type directly instead of restating it.
+ *
+ * Arguments are classified by VALUE, not by name — any prop may carry any of
+ * these:
+ *
+ * - primitives ride the chunk;
+ * - server JSX streams as a nested region (html once, never data);
+ * - anything else serializes as a data record.
+ *
+ * Async server JSX in an argument needs its own boundary: the region is
+ * emitted as one finished string, so a bare async read has no fallback to
+ * show and no fragment to reveal into.
+ *
+ * `$key` names the occurrence so client state follows an entity across
+ * responses rather than being positional — the slot-level analogue of `For`'s
+ * `keyed`, for when references can't carry identity because every response
+ * re-creates everything. It is occurrence identity, not client data: it is
+ * stripped before the client component sees its props. Positional identity is
+ * the right default; `$key` matters when a live list reorders.
+ */
+export type Slot<P = {}> = (props: P & {
+    $key?: string | number;
+}) => SolidElement;
 export { renderToFrameStream, renderServerComponent, serverComponentResponse, frameTransformResult, createFrameSink, frameTransformDirectResult, ServerComponentPlugin, SERVER_COMPONENT_BOOTSTRAP } from "./frame-sink.cjs";
 export { FRAME_STREAM_HEADER, isFrameStreamResponse } from "./frame-transport.cjs";

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

@@ -10,6 +10,7 @@ export {
   clearFlashCookie,
   decodeErrorHeaderValue,
   decodeResponse,
+  decodeResponsePayload,
   encodeErrorHeaderValue,
   getServerFunctionMetadata,
   hasFlashCookie,

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

@@ -11,6 +11,7 @@ export {
   clearFlashCookie,
   decodeErrorHeaderValue,
   decodeResponse,
+  decodeResponsePayload,
   encodeErrorHeaderValue,
   getServerFunctionMetadata,
   hasFlashCookie,
@@ -68,6 +69,29 @@ export interface ServerFunctionOutcome {
   request: Request;
   /** Whether the result was thrown rather than returned. */
   thrown: boolean;
+  /**
+   * The URL the client will show after the mutation — the redirect
+   * `Location` when the outcome carries one (resolved against the request
+   * URL, as a browser would), the referring page otherwise. Undefined
+   * without a usable referer (a non-browser caller has no page to produce
+   * data for) and for redirects leaving the app's origin: produce no data
+   * when this is undefined.
+   */
+  targetUrl: string | undefined;
+  /**
+   * The outcome's `X-Revalidate` keys, split — the invalidation scope the
+   * mutation declared. Undefined when the outcome carries none (integrations
+   * typically collect everything for the target in that case).
+   */
+  revalidateKeys: string[] | undefined;
+  /**
+   * The request headers with the mutation's cookie effects applied: the
+   * event response's `Set-Cookie`s (set during the call), then the
+   * outcome's own (e.g. `redirect(to, { headers })`), later winning on
+   * conflict, deletions honored. Build the data-collection request from
+   * these so re-run reads observe post-mutation cookie state.
+   */
+  foldedHeaders: Headers;
 }
 
 /**
@@ -82,8 +106,12 @@ export interface ServerFunctionOutcome {
  * Runs after `transformResult`, only for scripted calls that sent
  * `SINGLE_FLIGHT_HEADER` on the request, on returned results and thrown
  * `Response`/`ResponseEnvelope` control-flow signals alike (plain thrown
- * errors never collect). The handler owns the enveloping: contributed data
- * ships as `{ value, data }` under the single-flight response header.
+ * errors never collect, and neither do raw body-carrying `Response` values
+ * — those are the caller's verbatim payload). The handler owns the
+ * enveloping: contributed data ships as `{ value, data }` under the
+ * single-flight response header. The generic halves of collection arrive
+ * pre-digested on the outcome (`targetUrl`, `revalidateKeys`,
+ * `foldedHeaders`); the hook supplies only the data strategy.
  */
 export type CollectFlightDataHook = (
   event: ServerFunctionEvent,

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

@@ -405,6 +405,19 @@ export function decodeResponse<T = unknown>(
   codecOptions?: JSONCodecOptions
 ): Promise<T | undefined>;
 
+/**
+ * `decodeResponse` plus the single-flight envelope split: when the response
+ * carries the single-flight header the decoded `{ value, data }` payload is
+ * unwrapped into `{ value, flightData }`; otherwise the decoded body (or
+ * undefined for body-less responses) rides as `{ value }`. Integrations
+ * that apply response metadata themselves use this so the payload shape
+ * stays core's own.
+ */
+export function decodeResponsePayload<T = unknown, D = unknown>(
+  response: Response,
+  codecOptions?: JSONCodecOptions
+): Promise<{ value: T | undefined; flightData?: D }>;
+
 /**
  * Frame one payload for the server-function wire: a `;0x<len32>;` length
  * prefix followed by the utf-8 data. Both transports (server-function