@solidjs/web 2.0.0-beta.20 → 2.0.0-beta.22

package/server-functions/dist/server.cjs

@@ -67,9 +67,55 @@ function configureServerFunctionsCodec(codec) {
 function getServerFunctionsCodec() {
   return codecConfig.codec;
 }
+function subscribeFlightData(consumer) {
+  return () => {
+  };
+}
+const SERVER_FUNCTION_METADATA = Symbol.for("solid.ServerFunctionMetadata");
+function getServerFunctionMetadata(fn) {
+  if (typeof fn !== "function") return undefined;
+  return fn[SERVER_FUNCTION_METADATA] || undefined;
+}
+function isServerFunction(fn) {
+  return typeof fn === "function" && !!fn[SERVER_FUNCTION_METADATA];
+}
+function withMeta(fn, meta) {
+  const metadata = getServerFunctionMetadata(fn);
+  if (!metadata) {
+    throw new Error("withMeta expects a server function reference");
+  }
+  Object.assign(metadata, 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";
 const FILE_FORM_KEY = "__server_function_file__";
 const BodyFormat = {
   Serialized: "0",
@@ -282,14 +328,17 @@ async function decodeResponse(response, codecOptions) {
 
 const config = {
   provideEvent: undefined,
+  collectFlightData: undefined,
   endpoint: "/_server"
 };
 function configureServerFunctionsServer({
   provideEvent,
+  collectFlightData,
   endpoint,
   codec
 } = {}) {
   if (provideEvent !== undefined) config.provideEvent = provideEvent;
+  if (collectFlightData !== undefined) config.collectFlightData = collectFlightData;
   if (endpoint !== undefined) config.endpoint = endpoint;
   if (codec !== undefined) configureServerFunctionsCodec(codec);
 }
@@ -300,6 +349,7 @@ function provideEvent(event, fn) {
   throw new Error("No request event provider. Configure one with configureServerFunctionsServer({ provideEvent }).");
 }
 const REGISTRATIONS = new Map();
+const METHODS = new Map();
 function registerServerFunction(id, callback) {
   REGISTRATIONS.set(id, callback);
   return callback;
@@ -311,24 +361,30 @@ function getServerFunction(id) {
   }
   throw new Error("invalid server function: " + id);
 }
-function registerServerReference(id, fn) {
+function registerServerReference(id, fn, name) {
   registerServerFunction(id, fn);
   return {
     id,
-    fn
+    fn,
+    name
   };
 }
 function createServerReference({
   id,
-  fn
+  fn,
+  name
 }) {
   if (typeof fn !== "function") throw new Error("Export from a 'use server' module must be a function");
+  const metadata = name === undefined ? {} : {
+    name
+  };
   return new Proxy(fn, {
-    get(target, prop, receiver) {
+    get(target, prop) {
+      if (prop === "id") return id;
       if (prop === "url") {
         return `${config.endpoint}?id=${encodeURIComponent(id)}`;
       }
-      if (prop === "GET") return receiver;
+      if (prop === SERVER_FUNCTION_METADATA) return metadata;
       return target[prop];
     },
     apply(target, thisArg, args) {
@@ -347,6 +403,15 @@ function createServerReference({
     }
   });
 }
+function GET(fn) {
+  if (!isServerFunction(fn) || typeof fn.id !== "string") {
+    throw new Error("GET expects a server function reference");
+  }
+  METHODS.set(fn.id, "GET");
+  return withMeta(fn, {
+    method: "GET"
+  });
+}
 function getServerFunctionMeta() {
   const event = getRequestEvent();
   return event && event.locals.serverFunctionMeta;
@@ -360,7 +425,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);
@@ -370,15 +436,23 @@ 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) {
       return decoded;
     }
     parsed.push(decoded);
   }
   return parsed;
 }
+async function foldFlightData(hook, event, headers, outcome) {
+  const data = await hook(event, outcome);
+  if (data === undefined) return outcome.value;
+  headers.set(SINGLE_FLIGHT_HEADER, "true");
+  return {
+    value: outcome.value,
+    data
+  };
+}
 function serializedResponse(value, headers, codec) {
   headers.set(BODY_FORMAT_HEADER, BodyFormat.Serialized);
   headers.set("Content-Type", "text/plain");
@@ -421,11 +495,21 @@ async function handleServerFunctionRequest(request, options = {}) {
       status: 404
     });
   }
+  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: "POST"
+      }
+    });
+  }
   const event = options.createEvent ? options.createEvent(request) : {
     request,
     locals: {}
   };
   const provide = options.provideEvent || provideEvent;
+  const flightHook = options.collectFlightData !== undefined ? options.collectFlightData : config.collectFlightData;
+  const collectsFlight = !!(flightHook && instance && request.headers.has(SINGLE_FLIGHT_HEADER));
   const parsed = await parseArguments(request, url, instance, codec);
   const headers = new Headers();
   try {
@@ -442,6 +526,7 @@ async function handleServerFunctionRequest(request, options = {}) {
       });
     }
     let status = 200;
+    let metadata;
     if (isResponseEnvelope(result)) {
       const {
         response,
@@ -456,6 +541,7 @@ async function handleServerFunctionRequest(request, options = {}) {
       if (response && response.status && (response.status < 300 || response.status >= 400)) {
         status = response.status;
       }
+      metadata = response;
       result = value;
     } else if (result instanceof Response) {
       if (result.headers && result.headers.has("X-Content-Raw")) return result;
@@ -466,11 +552,21 @@ async function handleServerFunctionRequest(request, options = {}) {
         if (result.status && (result.status < 300 || result.status >= 400)) {
           status = result.status;
         }
+        metadata = result;
         if (result.body == null) {
           result = null;
         }
       }
     }
+    if (collectsFlight) {
+      result = await foldFlightData(flightHook, event, headers, {
+        id: functionId,
+        value: result,
+        response: metadata,
+        request,
+        thrown: false
+      });
+    }
     if (!instance) {
       if (options.handleNoJS) return options.handleNoJS(result, request, parsed);
       if (result instanceof Response) return result;
@@ -487,6 +583,7 @@ async function handleServerFunctionRequest(request, options = {}) {
         });
       }
       let status = 200;
+      let metadata;
       if (isResponseEnvelope(x)) {
         const {
           response,
@@ -498,6 +595,7 @@ async function handleServerFunctionRequest(request, options = {}) {
         if (response && response.status && (!instance || response.status < 300 || response.status >= 400)) {
           status = response.status;
         }
+        metadata = response;
         x = value;
       } else if (x instanceof Response) {
         if (x.headers) {
@@ -506,11 +604,21 @@ async function handleServerFunctionRequest(request, options = {}) {
         if (x.status && (!instance || x.status < 300 || x.status >= 400)) {
           status = x.status;
         }
+        metadata = x;
         if (x.body == null) {
           x = null;
         }
       }
-      headers.set("X-Server-Function-Error", "true");
+      if (collectsFlight) {
+        x = await foldFlightData(flightHook, event, headers, {
+          id: functionId,
+          value: x,
+          response: metadata,
+          request,
+          thrown: true
+        });
+      }
+      headers.set(ERROR_HEADER, "true");
       if (!instance) {
         if (options.handleNoJS) return options.handleNoJS(x, request, parsed, true);
         if (x instanceof Response) return x;
@@ -525,18 +633,27 @@ 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;
 exports.handleServerFunctionRequest = handleServerFunctionRequest;
+exports.isServerFunction = isServerFunction;
 exports.registerServerFunction = registerServerFunction;
 exports.registerServerReference = registerServerReference;
+exports.subscribeFlightData = subscribeFlightData;
+exports.withMeta = withMeta;

package/server-functions/dist/server.js

@@ -65,9 +65,55 @@ function configureServerFunctionsCodec(codec) {
 function getServerFunctionsCodec() {
   return codecConfig.codec;
 }
+function subscribeFlightData(consumer) {
+  return () => {
+  };
+}
+const SERVER_FUNCTION_METADATA = Symbol.for("solid.ServerFunctionMetadata");
+function getServerFunctionMetadata(fn) {
+  if (typeof fn !== "function") return undefined;
+  return fn[SERVER_FUNCTION_METADATA] || undefined;
+}
+function isServerFunction(fn) {
+  return typeof fn === "function" && !!fn[SERVER_FUNCTION_METADATA];
+}
+function withMeta(fn, meta) {
+  const metadata = getServerFunctionMetadata(fn);
+  if (!metadata) {
+    throw new Error("withMeta expects a server function reference");
+  }
+  Object.assign(metadata, 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";
 const FILE_FORM_KEY = "__server_function_file__";
 const BodyFormat = {
   Serialized: "0",
@@ -280,14 +326,17 @@ async function decodeResponse(response, codecOptions) {
 
 const config = {
   provideEvent: undefined,
+  collectFlightData: undefined,
   endpoint: "/_server"
 };
 function configureServerFunctionsServer({
   provideEvent,
+  collectFlightData,
   endpoint,
   codec
 } = {}) {
   if (provideEvent !== undefined) config.provideEvent = provideEvent;
+  if (collectFlightData !== undefined) config.collectFlightData = collectFlightData;
   if (endpoint !== undefined) config.endpoint = endpoint;
   if (codec !== undefined) configureServerFunctionsCodec(codec);
 }
@@ -298,6 +347,7 @@ function provideEvent(event, fn) {
   throw new Error("No request event provider. Configure one with configureServerFunctionsServer({ provideEvent }).");
 }
 const REGISTRATIONS = new Map();
+const METHODS = new Map();
 function registerServerFunction(id, callback) {
   REGISTRATIONS.set(id, callback);
   return callback;
@@ -309,24 +359,30 @@ function getServerFunction(id) {
   }
   throw new Error("invalid server function: " + id);
 }
-function registerServerReference(id, fn) {
+function registerServerReference(id, fn, name) {
   registerServerFunction(id, fn);
   return {
     id,
-    fn
+    fn,
+    name
   };
 }
 function createServerReference({
   id,
-  fn
+  fn,
+  name
 }) {
   if (typeof fn !== "function") throw new Error("Export from a 'use server' module must be a function");
+  const metadata = name === undefined ? {} : {
+    name
+  };
   return new Proxy(fn, {
-    get(target, prop, receiver) {
+    get(target, prop) {
+      if (prop === "id") return id;
       if (prop === "url") {
         return `${config.endpoint}?id=${encodeURIComponent(id)}`;
       }
-      if (prop === "GET") return receiver;
+      if (prop === SERVER_FUNCTION_METADATA) return metadata;
       return target[prop];
     },
     apply(target, thisArg, args) {
@@ -345,6 +401,15 @@ function createServerReference({
     }
   });
 }
+function GET(fn) {
+  if (!isServerFunction(fn) || typeof fn.id !== "string") {
+    throw new Error("GET expects a server function reference");
+  }
+  METHODS.set(fn.id, "GET");
+  return withMeta(fn, {
+    method: "GET"
+  });
+}
 function getServerFunctionMeta() {
   const event = getRequestEvent();
   return event && event.locals.serverFunctionMeta;
@@ -358,7 +423,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);
@@ -368,15 +434,23 @@ 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) {
       return decoded;
     }
     parsed.push(decoded);
   }
   return parsed;
 }
+async function foldFlightData(hook, event, headers, outcome) {
+  const data = await hook(event, outcome);
+  if (data === undefined) return outcome.value;
+  headers.set(SINGLE_FLIGHT_HEADER, "true");
+  return {
+    value: outcome.value,
+    data
+  };
+}
 function serializedResponse(value, headers, codec) {
   headers.set(BODY_FORMAT_HEADER, BodyFormat.Serialized);
   headers.set("Content-Type", "text/plain");
@@ -419,11 +493,21 @@ async function handleServerFunctionRequest(request, options = {}) {
       status: 404
     });
   }
+  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: "POST"
+      }
+    });
+  }
   const event = options.createEvent ? options.createEvent(request) : {
     request,
     locals: {}
   };
   const provide = options.provideEvent || provideEvent;
+  const flightHook = options.collectFlightData !== undefined ? options.collectFlightData : config.collectFlightData;
+  const collectsFlight = !!(flightHook && instance && request.headers.has(SINGLE_FLIGHT_HEADER));
   const parsed = await parseArguments(request, url, instance, codec);
   const headers = new Headers();
   try {
@@ -440,6 +524,7 @@ async function handleServerFunctionRequest(request, options = {}) {
       });
     }
     let status = 200;
+    let metadata;
     if (isResponseEnvelope(result)) {
       const {
         response,
@@ -454,6 +539,7 @@ async function handleServerFunctionRequest(request, options = {}) {
       if (response && response.status && (response.status < 300 || response.status >= 400)) {
         status = response.status;
       }
+      metadata = response;
       result = value;
     } else if (result instanceof Response) {
       if (result.headers && result.headers.has("X-Content-Raw")) return result;
@@ -464,11 +550,21 @@ async function handleServerFunctionRequest(request, options = {}) {
         if (result.status && (result.status < 300 || result.status >= 400)) {
           status = result.status;
         }
+        metadata = result;
         if (result.body == null) {
           result = null;
         }
       }
     }
+    if (collectsFlight) {
+      result = await foldFlightData(flightHook, event, headers, {
+        id: functionId,
+        value: result,
+        response: metadata,
+        request,
+        thrown: false
+      });
+    }
     if (!instance) {
       if (options.handleNoJS) return options.handleNoJS(result, request, parsed);
       if (result instanceof Response) return result;
@@ -485,6 +581,7 @@ async function handleServerFunctionRequest(request, options = {}) {
         });
       }
       let status = 200;
+      let metadata;
       if (isResponseEnvelope(x)) {
         const {
           response,
@@ -496,6 +593,7 @@ async function handleServerFunctionRequest(request, options = {}) {
         if (response && response.status && (!instance || response.status < 300 || response.status >= 400)) {
           status = response.status;
         }
+        metadata = response;
         x = value;
       } else if (x instanceof Response) {
         if (x.headers) {
@@ -504,11 +602,21 @@ async function handleServerFunctionRequest(request, options = {}) {
         if (x.status && (!instance || x.status < 300 || x.status >= 400)) {
           status = x.status;
         }
+        metadata = x;
         if (x.body == null) {
           x = null;
         }
       }
-      headers.set("X-Server-Function-Error", "true");
+      if (collectsFlight) {
+        x = await foldFlightData(flightHook, event, headers, {
+          id: functionId,
+          value: x,
+          response: metadata,
+          request,
+          thrown: true
+        });
+      }
+      headers.set(ERROR_HEADER, "true");
       if (!instance) {
         if (options.handleNoJS) return options.handleNoJS(x, request, parsed, true);
         if (x instanceof Response) return x;
@@ -523,9 +631,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, INSTANCE_HEADER, configureServerFunctionsServer, createServerReference, decodeResponse, getServerFunction, getServerFunctionMeta, handleServerFunctionRequest, registerServerFunction, registerServerReference };
+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,24 @@ 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;
 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/jsx.d.ts

@@ -1120,7 +1120,7 @@ export namespace JSX {
 
   interface AnchorHTMLAttributes<T> extends HTMLAttributes<T> {
     download?: string | EnumeratedAcceptsEmpty | RemoveAttribute;
-    href?: string | RemoveAttribute;
+    href?: string | SerializableAttributeValue | RemoveAttribute;
     hreflang?: string | RemoveAttribute;
     ping?: string | RemoveAttribute;
     referrerpolicy?: HTMLReferrerPolicy | RemoveAttribute;
@@ -1128,6 +1128,21 @@ export namespace JSX {
     target?: "_self" | "_blank" | "_parent" | "_top" | (string & {}) | RemoveAttribute;
     type?: string | RemoveAttribute;
 
+    // Client-side navigation contract. These attributes are inert markup on
+    // their own — a routing integration that delegates anchor clicks (e.g.
+    // @solidjs/router) reads them off the element at event time. Typed here
+    // so plain `<a>` elements participate without per-router augmentation.
+    /** Marks the anchor as a client-navigation link when the integration requires explicit opt-in. */
+    link?: BooleanAttribute | RemoveAttribute;
+    /** Serialized (JSON) history state pushed alongside the navigation. */
+    state?: string | RemoveAttribute;
+    /** Suppress scroll restoration/reset after the navigation. */
+    noScroll?: BooleanAttribute | RemoveAttribute;
+    /** Replace the current history entry instead of pushing a new one. */
+    replace?: BooleanAttribute | RemoveAttribute;
+    /** Route preload intent; `"false"` disables the integration's default eager preload. */
+    preload?: boolean | "false" | RemoveAttribute;
+
     /** @experimental */
     attributionsrc?: string | RemoveAttribute;
 
@@ -1147,7 +1162,7 @@ export namespace JSX {
     alt?: string | RemoveAttribute;
     coords?: string | RemoveAttribute;
     download?: string | EnumeratedAcceptsEmpty | RemoveAttribute;
-    href?: string | RemoveAttribute;
+    href?: string | SerializableAttributeValue | RemoveAttribute;
     ping?: string | RemoveAttribute;
     referrerpolicy?: HTMLReferrerPolicy | RemoveAttribute;
     rel?: string | RemoveAttribute;

package/types/response.d.ts

@@ -23,6 +23,32 @@ export class ResponseEnvelope<T = unknown> {
  */
 export function isResponseEnvelope(value: unknown): value is ResponseEnvelope;
 
+/**
+ * Registered-symbol brand (`Symbol.for("solid.Href")`) marking URL-bearing
+ * values. Declared `unique symbol` type-side; the runtime value is the
+ * registered symbol, so separately bundled copies agree on identity.
+ */
+export declare const HREF: unique symbol;
+
+/**
+ * A URL-bearing value: coerces to its URL via `toString()` and carries the
+ * `HREF` registered-symbol brand. Integrations mint these (e.g. a router's
+ * typed path objects answer the brand from their proxy) and URL-accepting
+ * APIs like `redirect()` accept them alongside plain strings. The brand is
+ * what makes the type meaningful — every object has `toString()`.
+ */
+export interface Href {
+  [HREF]: true;
+  toString(): string;
+}
+
+/**
+ * Whether `value` is an `Href`-branded URL-bearing value. Registered-symbol
+ * check, so it stays correct across duplicated module instances — same
+ * rationale as `isResponseEnvelope`.
+ */
+export function isHref(value: unknown): value is Href;
+
 /** `ResponseInit` accepted by the response helpers, plus `revalidate`. */
 export interface ResponseHelperInit extends ResponseInit {
   /**
@@ -51,7 +77,7 @@ export interface ResponseHelperInit extends ResponseInit {
  * }
  * ```
  */
-export function redirect(url: string, init?: number | ResponseHelperInit): Response;
+export function redirect(url: string | Href, init?: number | ResponseHelperInit): Response;
 
 /**
  * Empty response requesting revalidation of the named cache keys — all of