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

package/server-functions/dist/client.js

@@ -1,4 +1,4 @@
-import { fromCrossJSON, Feature, toCrossJSONStream } from 'seroval';
+import { fromCrossJSON, Feature } from 'seroval';
 import { AbortSignalPlugin, CustomEventPlugin, DOMExceptionPlugin, EventPlugin, FormDataPlugin, HeadersPlugin, ReadableStreamPlugin, RequestPlugin, ResponsePlugin, URLSearchParamsPlugin, URLPlugin } from 'seroval-plugins/web';
 
 Feature.AggregateError | Feature.BigIntTypedArray;
@@ -21,19 +21,6 @@ function resolveCodecOptions({
     depthLimit: depthLimit === undefined ? JSON_CODEC_DEPTH_LIMIT : depthLimit
   };
 }
-function serializeJSON(value, {
-  onParse,
-  onDone,
-  onError,
-  ...codecOptions
-}) {
-  return toCrossJSONStream(value, {
-    onParse,
-    onDone,
-    onError,
-    ...resolveCodecOptions(codecOptions)
-  });
-}
 function createJSONDeserializer(options) {
   const refs = new Map();
   const resolved = resolveCodecOptions(options);
@@ -51,9 +38,6 @@ const codecConfig = {
 function configureServerFunctionsCodec(codec) {
   codecConfig.codec = codec;
 }
-function getServerFunctionsCodec() {
-  return codecConfig.codec;
-}
 const flightConfig = {
   consumer: undefined
 };
@@ -83,6 +67,31 @@ function withMeta(fn, meta) {
   return fn;
 }
 const FUNCTION_HEADER = "X-Server-Function-Id";
+const ERROR_HEADER = "X-Server-Function-Error";
+const ERROR_HEADER_MARKER = "=?1?";
+const NEEDS_ENCODING = /[^\x20-\x7e\xa0-\xff]/;
+function encodeErrorHeaderValue(value) {
+  let stripped = String(value).replace(/[\r\n]+/g, "");
+  if (!NEEDS_ENCODING.test(stripped) && !stripped.startsWith(ERROR_HEADER_MARKER) && stripped === stripped.trim()) {
+    return stripped;
+  }
+  if (typeof stripped.toWellFormed === "function") {
+    stripped = stripped.toWellFormed();
+  } else {
+    stripped = stripped.replace(/[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/g, "\uFFFD");
+  }
+  return ERROR_HEADER_MARKER + encodeURIComponent(stripped);
+}
+function decodeErrorHeaderValue(value) {
+  if (typeof value !== "string" || !value.startsWith(ERROR_HEADER_MARKER)) {
+    return value;
+  }
+  try {
+    return decodeURIComponent(value.slice(ERROR_HEADER_MARKER.length));
+  } catch {
+    return value;
+  }
+}
 const INSTANCE_HEADER = "X-Server-Function-Instance";
 const BODY_FORMAT_HEADER = "X-Server-Function-Format";
 const SINGLE_FLIGHT_HEADER = "X-Single-Flight";
@@ -95,7 +104,8 @@ const BodyFormat = {
   Blob: "4",
   File: "5",
   ArrayBuffer: "6",
-  Uint8Array: "7"
+  Uint8Array: "7",
+  Json: "8"
 };
 function getHeadersAndBody(body) {
   switch (true) {
@@ -165,6 +175,8 @@ async function extractBody(source, codecOptions) {
   switch (true) {
     case format === BodyFormat.Serialized:
       return await deserializeStream(clone, codecOptions);
+    case format === BodyFormat.Json:
+      return JSON.parse(await clone.text());
     case format === BodyFormat.String:
       return await clone.text();
     case format === BodyFormat.File:
@@ -187,17 +199,6 @@ async function extractBody(source, codecOptions) {
   }
   return undefined;
 }
-function createChunk(data) {
-  const encodeData = new TextEncoder().encode(data);
-  const bytes = encodeData.length;
-  const baseHex = bytes.toString(16);
-  const totalHex = "00000000".substring(0, 8 - baseHex.length) + baseHex;
-  const head = new TextEncoder().encode(`;0x${totalHex};`);
-  const chunk = new Uint8Array(12 + bytes);
-  chunk.set(head);
-  chunk.set(encodeData, 12);
-  return chunk;
-}
 class ChunkReader {
   constructor(stream) {
     this.reader = stream.getReader();
@@ -254,28 +255,6 @@ class ChunkReader {
     }
   }
 }
-function serializeStream(value, codecOptions) {
-  return new ReadableStream({
-    start(controller) {
-      serializeJSON(value, {
-        ...codecOptions,
-        onParse(node) {
-          controller.enqueue(createChunk(JSON.stringify(node)));
-        },
-        onDone() {
-          controller.close();
-        },
-        onError(error) {
-          controller.error(error);
-        }
-      });
-    }
-  });
-}
-async function serializeString(value, codecOptions) {
-  const response = new Response(serializeStream(value, codecOptions));
-  return await response.text();
-}
 async function deserializeStream(source, codecOptions) {
   if (!source.body) {
     throw new Error("missing body");
@@ -299,16 +278,43 @@ async function decodeResponse(response, codecOptions) {
 
 const config = {
   endpoint: "/_server",
-  prepareRequest: undefined
+  prepareRequest: undefined,
+  responseHandler: undefined,
+  serializeArgs: undefined
 };
+function isJSONSafe(value) {
+  if (value === null) return true;
+  const t = typeof value;
+  if (t === "string" || t === "boolean") return true;
+  if (t === "number") return Number.isFinite(value);
+  if (t !== "object") return false;
+  if (Array.isArray(value)) {
+    for (const v of value) if (!isJSONSafe(v)) return false;
+    return true;
+  }
+  const proto = Object.getPrototypeOf(value);
+  if (proto !== Object.prototype && proto !== null) return false;
+  for (const k in value) if (!isJSONSafe(value[k])) return false;
+  return true;
+}
+function serializeArguments(args) {
+  if (!config.serializeArgs) {
+    throw new Error("Server function arguments are sent as JSON by default and these " + "arguments are not JSON-serializable. Call enableRichArguments() " + "(from the server-functions rich-args entry) once at startup to " + "send Dates, Maps, Sets, typed arrays, etc. through the codec — or " + "pass a single Blob/FormData/File argument, which has a native " + "HTTP encoding.");
+  }
+  return config.serializeArgs(args);
+}
 function configureServerFunctionsClient({
   endpoint,
   codec,
-  prepareRequest
+  prepareRequest,
+  responseHandler,
+  serializeArgs
 } = {}) {
   if (endpoint !== undefined) config.endpoint = endpoint;
   if (codec !== undefined) configureServerFunctionsCodec(codec);
   if (prepareRequest !== undefined) config.prepareRequest = prepareRequest;
+  if (responseHandler !== undefined) config.responseHandler = responseHandler;
+  if (serializeArgs !== undefined) config.serializeArgs = serializeArgs;
 }
 let INSTANCE = 0;
 async function createRequest(base, id, instance, options, meta) {
@@ -350,9 +356,20 @@ async function initializeResponse(base, id, instance, options, args, meta) {
       }, meta);
     }
   }
+  if (isJSONSafe(args)) {
+    return createRequest(base, id, instance, {
+      ...options,
+      body: JSON.stringify(args),
+      headers: {
+        ...options.headers,
+        "Content-Type": "application/json",
+        [BODY_FORMAT_HEADER]: BodyFormat.Json
+      }
+    }, meta);
+  }
   return createRequest(base, id, instance, {
     ...options,
-    body: await serializeString(args, getServerFunctionsCodec()),
+    body: await serializeArguments(args),
     headers: {
       ...options.headers,
       "Content-Type": "text/plain",
@@ -362,7 +379,21 @@ async function initializeResponse(base, id, instance, options, args, meta) {
 }
 async function fetchServerFunction(base, id, options, args, meta) {
   const instance = `server-function:${INSTANCE++}`;
+  const handler = config.responseHandler;
+  const context = handler && handler.capture ? handler.capture({
+    id,
+    meta
+  }) : undefined;
   const response = await initializeResponse(base, id, instance, options, args, meta);
+  if (handler) {
+    const handled = handler.handle(response, {
+      id,
+      meta,
+      args,
+      context
+    });
+    if (handled !== undefined) return handled;
+  }
   if (response.headers.has(SINGLE_FLIGHT_HEADER)) {
     const consumer = getFlightDataConsumer();
     if (consumer) {
@@ -370,7 +401,7 @@ async function fetchServerFunction(base, id, options, args, meta) {
       await consumer(payload.data, {
         response
       });
-      if (response.headers.has("X-Server-Function-Error") && !response.headers.has("Location") && !response.headers.has("X-Revalidate")) {
+      if (response.headers.has(ERROR_HEADER) && !response.headers.has("Location") && !response.headers.has("X-Revalidate")) {
         throw payload.value;
       }
       return payload.value;
@@ -380,22 +411,33 @@ async function fetchServerFunction(base, id, options, args, meta) {
     return response;
   }
   const result = await decodeResponse(response.clone());
-  if (response.headers.has("X-Server-Function-Error")) {
+  if (response.headers.has(ERROR_HEADER)) {
     throw result;
   }
   return result;
 }
-function createServerReference(id, name) {
+function createServerReference(id, name, base) {
   const metadata = name === undefined ? {} : {
     name
   };
-  const fn = (...args) => fetchServerFunction(config.endpoint, id, {}, args, metadata);
+  const fn = (...args) => {
+    const handler = config.responseHandler;
+    if (handler && handler.intercept) {
+      const hit = handler.intercept({
+        id,
+        meta: metadata,
+        args
+      });
+      if (hit !== undefined) return hit;
+    }
+    return fetchServerFunction(base || config.endpoint, id, {}, args, metadata);
+  };
   fn[SERVER_FUNCTION_METADATA] = metadata;
   return new Proxy(fn, {
     get(target, prop) {
       if (prop === "id") return id;
       if (prop === "url") {
-        return `${config.endpoint}?id=${encodeURIComponent(id)}`;
+        return base || `${config.endpoint}?id=${encodeURIComponent(id)}`;
       }
       return target[prop];
     }
@@ -410,9 +452,19 @@ function GET(fn) {
     ...getServerFunctionMetadata(fn)
   };
   const wrapped = async (...args) => {
+    const handler = config.responseHandler;
+    if (handler && handler.intercept) {
+      const hit = handler.intercept({
+        id,
+        meta: metadata,
+        args
+      });
+      if (hit !== undefined) return hit;
+    }
     let base = `${config.endpoint}?id=${encodeURIComponent(id)}`;
     if (args.length) {
-      base += `&args=${encodeURIComponent(await serializeString(args, getServerFunctionsCodec()))}`;
+      const encoded = isJSONSafe(args) ? JSON.stringify(args) : await serializeArguments(args);
+      base += `&args=${encodeURIComponent(encoded)}`;
     }
     return fetchServerFunction(base, id, {
       method: "GET"
@@ -432,4 +484,4 @@ function registerServerReference() {
   throw new Error("registerServerReference must not be called in the client build");
 }
 
-export { FUNCTION_HEADER, GET, INSTANCE_HEADER, SINGLE_FLIGHT_HEADER, configureServerFunctionsClient, createServerReference, decodeResponse, getServerFunctionMetadata, isServerFunction, registerServerReference, subscribeFlightData, withMeta };
+export { ERROR_HEADER, FUNCTION_HEADER, GET, INSTANCE_HEADER, SINGLE_FLIGHT_HEADER, configureServerFunctionsClient, createServerReference, decodeErrorHeaderValue, decodeResponse, encodeErrorHeaderValue, getServerFunctionMetadata, isServerFunction, registerServerReference, subscribeFlightData, withMeta };

package/server-functions/dist/server.cjs

@@ -88,6 +88,31 @@ function withMeta(fn, meta) {
   return fn;
 }
 const FUNCTION_HEADER = "X-Server-Function-Id";
+const ERROR_HEADER = "X-Server-Function-Error";
+const ERROR_HEADER_MARKER = "=?1?";
+const NEEDS_ENCODING = /[^\x20-\x7e\xa0-\xff]/;
+function encodeErrorHeaderValue(value) {
+  let stripped = String(value).replace(/[\r\n]+/g, "");
+  if (!NEEDS_ENCODING.test(stripped) && !stripped.startsWith(ERROR_HEADER_MARKER) && stripped === stripped.trim()) {
+    return stripped;
+  }
+  if (typeof stripped.toWellFormed === "function") {
+    stripped = stripped.toWellFormed();
+  } else {
+    stripped = stripped.replace(/[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/g, "\uFFFD");
+  }
+  return ERROR_HEADER_MARKER + encodeURIComponent(stripped);
+}
+function decodeErrorHeaderValue(value) {
+  if (typeof value !== "string" || !value.startsWith(ERROR_HEADER_MARKER)) {
+    return value;
+  }
+  try {
+    return decodeURIComponent(value.slice(ERROR_HEADER_MARKER.length));
+  } catch {
+    return value;
+  }
+}
 const INSTANCE_HEADER = "X-Server-Function-Instance";
 const BODY_FORMAT_HEADER = "X-Server-Function-Format";
 const SINGLE_FLIGHT_HEADER = "X-Single-Flight";
@@ -100,7 +125,8 @@ const BodyFormat = {
   Blob: "4",
   File: "5",
   ArrayBuffer: "6",
-  Uint8Array: "7"
+  Uint8Array: "7",
+  Json: "8"
 };
 function getHeadersAndBody(body) {
   switch (true) {
@@ -170,6 +196,8 @@ async function extractBody(source, codecOptions) {
   switch (true) {
     case format === BodyFormat.Serialized:
       return await deserializeStream(clone, codecOptions);
+    case format === BodyFormat.Json:
+      return JSON.parse(await clone.text());
     case format === BodyFormat.String:
       return await clone.text();
     case format === BodyFormat.File:
@@ -304,16 +332,19 @@ async function decodeResponse(response, codecOptions) {
 const config = {
   provideEvent: undefined,
   collectFlightData: undefined,
+  transformDirectResult: undefined,
   endpoint: "/_server"
 };
 function configureServerFunctionsServer({
   provideEvent,
   collectFlightData,
+  transformDirectResult,
   endpoint,
   codec
 } = {}) {
   if (provideEvent !== undefined) config.provideEvent = provideEvent;
   if (collectFlightData !== undefined) config.collectFlightData = collectFlightData;
+  if (transformDirectResult !== undefined) config.transformDirectResult = transformDirectResult;
   if (endpoint !== undefined) config.endpoint = endpoint;
   if (codec !== undefined) configureServerFunctionsCodec(codec);
 }
@@ -372,9 +403,20 @@ function createServerReference({
         id
       };
       evt.serverOnly = true;
-      return provideEvent(evt, () => {
+      const result = provideEvent(evt, () => {
         return fn.apply(thisArg, args);
       });
+      const transform = config.transformDirectResult;
+      if (transform && result && typeof result.then === "function") {
+        return result.then(value => transform(value, {
+          id,
+          event: evt
+        }));
+      }
+      return transform ? transform(result, {
+        id,
+        event: evt
+      }) : result;
     }
   });
 }
@@ -400,7 +442,8 @@ function resolveFunctionId(request, url) {
 }
 async function parseArguments(request, url, instance, codec) {
   const parsed = [];
-  if (!instance || request.method === "GET") {
+  const bodyFormat = request.method === "POST" ? request.headers.get(BODY_FORMAT_HEADER) : null;
+  if (!instance || request.method === "GET" || bodyFormat !== BodyFormat.Serialized) {
     const args = url.searchParams.get("args");
     if (args) {
       const result = args.startsWith(";0x") ? await deserializeString(args, codec) : JSON.parse(args);
@@ -410,9 +453,8 @@ async function parseArguments(request, url, instance, codec) {
     }
   }
   if (request.method === "POST" && request.body !== null) {
-    const format = request.headers.get(BODY_FORMAT_HEADER);
     const decoded = await extractBody(request.clone(), codec);
-    if (format === BodyFormat.Serialized) {
+    if (bodyFormat === BodyFormat.Serialized || bodyFormat === BodyFormat.Json) {
       return decoded;
     }
     parsed.push(decoded);
@@ -470,12 +512,11 @@ async function handleServerFunctionRequest(request, options = {}) {
       status: 404
     });
   }
-  const allowedMethod = METHODS.get(functionId) || "POST";
-  if (request.method === "GET" !== (allowedMethod === "GET")) {
+  if (request.method === "GET" && METHODS.get(functionId) !== "GET") {
     return new Response(process.env.NODE_ENV === "development" ? `Method not allowed for server function: ${functionId}` : null, {
       status: 405,
       headers: {
-        Allow: allowedMethod
+        Allow: "POST"
       }
     });
   }
@@ -594,7 +635,7 @@ async function handleServerFunctionRequest(request, options = {}) {
           thrown: true
         });
       }
-      headers.set("X-Server-Function-Error", "true");
+      headers.set(ERROR_HEADER, "true");
       if (!instance) {
         if (options.handleNoJS) return options.handleNoJS(x, request, parsed, true);
         if (x instanceof Response) return x;
@@ -609,18 +650,21 @@ async function handleServerFunctionRequest(request, options = {}) {
       });
     }
     const error = x instanceof Error ? x.message : typeof x === "string" ? x : "true";
-    headers.set("X-Server-Function-Error", error.replace(/[\r\n]+/g, ""));
+    headers.set(ERROR_HEADER, encodeErrorHeaderValue(error));
     return encodeResult(x, headers, 200, codec);
   }
 }
 
+exports.ERROR_HEADER = ERROR_HEADER;
 exports.FUNCTION_HEADER = FUNCTION_HEADER;
 exports.GET = GET;
 exports.INSTANCE_HEADER = INSTANCE_HEADER;
 exports.SINGLE_FLIGHT_HEADER = SINGLE_FLIGHT_HEADER;
 exports.configureServerFunctionsServer = configureServerFunctionsServer;
 exports.createServerReference = createServerReference;
+exports.decodeErrorHeaderValue = decodeErrorHeaderValue;
 exports.decodeResponse = decodeResponse;
+exports.encodeErrorHeaderValue = encodeErrorHeaderValue;
 exports.getServerFunction = getServerFunction;
 exports.getServerFunctionMeta = getServerFunctionMeta;
 exports.getServerFunctionMetadata = getServerFunctionMetadata;

package/server-functions/dist/server.js

@@ -86,6 +86,31 @@ function withMeta(fn, meta) {
   return fn;
 }
 const FUNCTION_HEADER = "X-Server-Function-Id";
+const ERROR_HEADER = "X-Server-Function-Error";
+const ERROR_HEADER_MARKER = "=?1?";
+const NEEDS_ENCODING = /[^\x20-\x7e\xa0-\xff]/;
+function encodeErrorHeaderValue(value) {
+  let stripped = String(value).replace(/[\r\n]+/g, "");
+  if (!NEEDS_ENCODING.test(stripped) && !stripped.startsWith(ERROR_HEADER_MARKER) && stripped === stripped.trim()) {
+    return stripped;
+  }
+  if (typeof stripped.toWellFormed === "function") {
+    stripped = stripped.toWellFormed();
+  } else {
+    stripped = stripped.replace(/[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/g, "\uFFFD");
+  }
+  return ERROR_HEADER_MARKER + encodeURIComponent(stripped);
+}
+function decodeErrorHeaderValue(value) {
+  if (typeof value !== "string" || !value.startsWith(ERROR_HEADER_MARKER)) {
+    return value;
+  }
+  try {
+    return decodeURIComponent(value.slice(ERROR_HEADER_MARKER.length));
+  } catch {
+    return value;
+  }
+}
 const INSTANCE_HEADER = "X-Server-Function-Instance";
 const BODY_FORMAT_HEADER = "X-Server-Function-Format";
 const SINGLE_FLIGHT_HEADER = "X-Single-Flight";
@@ -98,7 +123,8 @@ const BodyFormat = {
   Blob: "4",
   File: "5",
   ArrayBuffer: "6",
-  Uint8Array: "7"
+  Uint8Array: "7",
+  Json: "8"
 };
 function getHeadersAndBody(body) {
   switch (true) {
@@ -168,6 +194,8 @@ async function extractBody(source, codecOptions) {
   switch (true) {
     case format === BodyFormat.Serialized:
       return await deserializeStream(clone, codecOptions);
+    case format === BodyFormat.Json:
+      return JSON.parse(await clone.text());
     case format === BodyFormat.String:
       return await clone.text();
     case format === BodyFormat.File:
@@ -302,16 +330,19 @@ async function decodeResponse(response, codecOptions) {
 const config = {
   provideEvent: undefined,
   collectFlightData: undefined,
+  transformDirectResult: undefined,
   endpoint: "/_server"
 };
 function configureServerFunctionsServer({
   provideEvent,
   collectFlightData,
+  transformDirectResult,
   endpoint,
   codec
 } = {}) {
   if (provideEvent !== undefined) config.provideEvent = provideEvent;
   if (collectFlightData !== undefined) config.collectFlightData = collectFlightData;
+  if (transformDirectResult !== undefined) config.transformDirectResult = transformDirectResult;
   if (endpoint !== undefined) config.endpoint = endpoint;
   if (codec !== undefined) configureServerFunctionsCodec(codec);
 }
@@ -370,9 +401,20 @@ function createServerReference({
         id
       };
       evt.serverOnly = true;
-      return provideEvent(evt, () => {
+      const result = provideEvent(evt, () => {
         return fn.apply(thisArg, args);
       });
+      const transform = config.transformDirectResult;
+      if (transform && result && typeof result.then === "function") {
+        return result.then(value => transform(value, {
+          id,
+          event: evt
+        }));
+      }
+      return transform ? transform(result, {
+        id,
+        event: evt
+      }) : result;
     }
   });
 }
@@ -398,7 +440,8 @@ function resolveFunctionId(request, url) {
 }
 async function parseArguments(request, url, instance, codec) {
   const parsed = [];
-  if (!instance || request.method === "GET") {
+  const bodyFormat = request.method === "POST" ? request.headers.get(BODY_FORMAT_HEADER) : null;
+  if (!instance || request.method === "GET" || bodyFormat !== BodyFormat.Serialized) {
     const args = url.searchParams.get("args");
     if (args) {
       const result = args.startsWith(";0x") ? await deserializeString(args, codec) : JSON.parse(args);
@@ -408,9 +451,8 @@ async function parseArguments(request, url, instance, codec) {
     }
   }
   if (request.method === "POST" && request.body !== null) {
-    const format = request.headers.get(BODY_FORMAT_HEADER);
     const decoded = await extractBody(request.clone(), codec);
-    if (format === BodyFormat.Serialized) {
+    if (bodyFormat === BodyFormat.Serialized || bodyFormat === BodyFormat.Json) {
       return decoded;
     }
     parsed.push(decoded);
@@ -468,12 +510,11 @@ async function handleServerFunctionRequest(request, options = {}) {
       status: 404
     });
   }
-  const allowedMethod = METHODS.get(functionId) || "POST";
-  if (request.method === "GET" !== (allowedMethod === "GET")) {
+  if (request.method === "GET" && METHODS.get(functionId) !== "GET") {
     return new Response(process.env.NODE_ENV === "development" ? `Method not allowed for server function: ${functionId}` : null, {
       status: 405,
       headers: {
-        Allow: allowedMethod
+        Allow: "POST"
       }
     });
   }
@@ -592,7 +633,7 @@ async function handleServerFunctionRequest(request, options = {}) {
           thrown: true
         });
       }
-      headers.set("X-Server-Function-Error", "true");
+      headers.set(ERROR_HEADER, "true");
       if (!instance) {
         if (options.handleNoJS) return options.handleNoJS(x, request, parsed, true);
         if (x instanceof Response) return x;
@@ -607,9 +648,9 @@ async function handleServerFunctionRequest(request, options = {}) {
       });
     }
     const error = x instanceof Error ? x.message : typeof x === "string" ? x : "true";
-    headers.set("X-Server-Function-Error", error.replace(/[\r\n]+/g, ""));
+    headers.set(ERROR_HEADER, encodeErrorHeaderValue(error));
     return encodeResult(x, headers, 200, codec);
   }
 }
 
-export { FUNCTION_HEADER, GET, INSTANCE_HEADER, SINGLE_FLIGHT_HEADER, configureServerFunctionsServer, createServerReference, decodeResponse, getServerFunction, getServerFunctionMeta, getServerFunctionMetadata, handleServerFunctionRequest, isServerFunction, registerServerFunction, registerServerReference, subscribeFlightData, withMeta };
+export { ERROR_HEADER, FUNCTION_HEADER, GET, INSTANCE_HEADER, SINGLE_FLIGHT_HEADER, configureServerFunctionsServer, createServerReference, decodeErrorHeaderValue, decodeResponse, encodeErrorHeaderValue, getServerFunction, getServerFunctionMeta, getServerFunctionMetadata, handleServerFunctionRequest, isServerFunction, registerServerFunction, registerServerReference, subscribeFlightData, withMeta };

package/types/client.d.ts

@@ -66,6 +66,32 @@ export function assign(
 ): void;
 export function setAttribute(node: Element, name: string, value: string): void;
 export function setAttributeNS(node: Element, namespace: string, name: string, value: string): void;
+/**
+ * Register a consumer for compiler-emitted element claims. Compiled DOM
+ * output claims navigation-relevant elements (`a[href]`, `form[action]`) at
+ * creation, and compiler-owned writes to `href`/`action` re-invoke the same
+ * handlers — so handlers must be idempotent and must check the element's
+ * relevance themselves (rechecks can fire for any element whose
+ * `href`/`action` is written, e.g. `<link href>`). Handlers run under the
+ * reactive owner current at element creation; scope per-element state and
+ * cleanup through your own reactive system. Dormant until registered —
+ * without a handler the emitted claims are null checks. Returns an
+ * unregister function.
+ */
+export function registerElementClaim(handler: (element: Element) => void): () => void;
+/**
+ * Claim `node` for registered consumers (see `registerElementClaim`).
+ * Emitted by the compiler at element creation; idempotent by contract.
+ */
+export function claimElement<T extends Element>(node: T): T;
+/**
+ * Sweep-claim every navigation-relevant element (`a[href]`, `form[action]`)
+ * in `root` — the subtree equivalent of the per-element `claimElement`
+ * compiled output emits, for content that becomes live DOM without compiled
+ * creation code (frame streams, adopted SSR ranges). Dormant without a
+ * registered consumer.
+ */
+export function claimElementTree<T extends Node>(root: T): T;
 export function className(node: Element, value: JSX.ClassValue, prev?: JSX.ClassValue): void;
 export function setProperty(node: Element, name: string, value: any): void;
 export function setStyleProperty(node: Element, name: string, value: any): void;

package/types/core.d.ts

@@ -1,3 +1,4 @@
-export { getOwner, runWithOwner, createComponent, createRoot as root, sharedConfig, untrack, merge as mergeProps, flatten, ssrHandleError, ssrScope } from "solid-js";
+export { getOwner, runWithOwner, createComponent, createRoot as root, sharedConfig, untrack, merge as mergeProps, flatten, ssrHandleError, ssrScope, NoHydration, Hydration } from "solid-js";
 export declare const effect: (fn: any, effectFn: any, options: any) => void;
 export declare const memo: (fn: any) => import("solid-js").SourceAccessor<any>;
+export declare const runWithHydrationScope: (id: any, fn: any) => unknown;