@solidjs/router 2.0.0-next.29 → 2.0.0-next.30

package/dist/index.js

@@ -553,7 +553,6 @@ function serverRouteOf(component) {
  */
 function serverRouteArgs(route, params, query) {
   const schema = route.key?.search;
-  let search;
   if (schema) {
     const raw = {
       ...query
@@ -561,13 +560,22 @@ function serverRouteArgs(route, params, query) {
     const outcome = validateSearch(schema, raw);
     // Issues leave the raw values in place, matching useSearchParams: search
     // strings are user input, so defaults belong in the schema itself.
-    search = outcome.issues ? raw : outcome.value;
+    return {
+      params: {
+        ...params
+      },
+      search: outcome.issues ? raw : outcome.value
+    };
   }
+  // No schema: leave the key out rather than carrying `search: undefined` —
+  // the args are sent as plain JSON by default and the runtime's JSON-safety
+  // check rejects explicit `undefined` (#615). Destructuring on the server
+  // reads the same either way, and the args-memo equality treats an absent
+  // key and undefined alike.
   return {
     params: {
       ...params
-    },
-    search
+    }
   };
 }
 const shallowEqual = (a, b) => a === b || !!a && !!b && typeof a === "object" && typeof b === "object" && Object.keys(a).length === Object.keys(b).length && Object.keys(a).every(k => a[k] === b[k]);

package/dist/serverRouteShared.js

@@ -12,15 +12,19 @@ export function serverRouteOf(component) {
  */
 export function serverRouteArgs(route, params, query) {
     const schema = route.key?.search;
-    let search;
     if (schema) {
         const raw = { ...query };
         const outcome = validateSearch(schema, raw);
         // Issues leave the raw values in place, matching useSearchParams: search
         // strings are user input, so defaults belong in the schema itself.
-        search = outcome.issues ? raw : outcome.value;
+        return { params: { ...params }, search: outcome.issues ? raw : outcome.value };
     }
-    return { params: { ...params }, search };
+    // No schema: leave the key out rather than carrying `search: undefined` —
+    // the args are sent as plain JSON by default and the runtime's JSON-safety
+    // check rejects explicit `undefined` (#615). Destructuring on the server
+    // reads the same either way, and the args-memo equality treats an absent
+    // key and undefined alike.
+    return { params: { ...params } };
 }
 const shallowEqual = (a, b) => a === b ||
     (!!a &&

package/dist/types.d.ts

@@ -144,12 +144,21 @@ export type RouteSectionComponent<T = unknown, P extends Params = Params> = Comp
 /**
  * What a server component route is called with (experimental): the params
  * the route's pattern (and its ancestors') declares, plus — only when the
- * route declares a `search` schema — that schema's validated output.
+ * route declares a `search` schema — that schema's validated output. Without
+ * a schema the `search` key is ABSENT, not `undefined`: the args travel as
+ * plain JSON by default, and the runtime's JSON-safety check rejects
+ * explicit `undefined` (#615). The type mirrors that — optional exactly when
+ * the search type admits undefined, required when a schema narrows it.
  */
-export interface ServerRouteArgs<P extends Params | TypedRouteConfig = Params, S = undefined> {
+export type ServerRouteArgs<P extends Params | TypedRouteConfig = Params, S = undefined> = {
     params: ServerRouteParams<P>;
-    search: P extends TypedRouteConfig ? SearchOutputOf<P> : S;
-}
+} & (undefined extends ServerRouteSearch<P, S> ? {
+    search?: ServerRouteSearch<P, S>;
+} : {
+    search: ServerRouteSearch<P, S>;
+});
+/** The search half of {@link ServerRouteArgs}: schema output when declared. */
+export type ServerRouteSearch<P, S> = P extends TypedRouteConfig ? SearchOutputOf<P> : S;
 /**
  * `ServerRouteArgs<typeof route>`: a `defineFileRoute` config is a witness —
  * params from its pattern, search from its schema — the way

package/package.json

@@ -6,7 +6,7 @@
     "Ryan Turnquist"
   ],
   "license": "MIT",
-  "version": "2.0.0-next.29",
+  "version": "2.0.0-next.30",
   "homepage": "https://github.com/solidjs/solid-router#readme",
   "repository": {
     "type": "git",