@solidjs/router 0.14.8 → 0.14.10

package/dist/data/action.d.ts

@@ -1,13 +1,13 @@
 import { JSX } from "solid-js";
 import type { Submission, SubmissionStub, NarrowResponse } from "../types.js";
-export type Action<T extends Array<any>, U> = (T extends [FormData] | [] ? JSX.SerializableAttributeValue : unknown) & ((...vars: T) => Promise<NarrowResponse<U>>) & {
+export type Action<T extends Array<any>, U, V = T> = (T extends [FormData] | [] ? JSX.SerializableAttributeValue : unknown) & ((...vars: T) => Promise<NarrowResponse<U>>) & {
     url: string;
-    with<A extends any[], B extends any[]>(this: (this: any, ...args: [...A, ...B]) => Promise<NarrowResponse<U>>, ...args: A): Action<B, U>;
+    with<A extends any[], B extends any[]>(this: (this: any, ...args: [...A, ...B]) => Promise<NarrowResponse<U>>, ...args: A): Action<B, U, V>;
 };
-export declare const actions: Map<string, Action<any, any>>;
-export declare function useSubmissions<T extends Array<any>, U>(fn: Action<T, U>, filter?: (arg: T) => boolean): Submission<T, NarrowResponse<U>>[] & {
+export declare const actions: Map<string, Action<any, any, any>>;
+export declare function useSubmissions<T extends Array<any>, U, V>(fn: Action<T, U, V>, filter?: (input: V) => boolean): Submission<T, NarrowResponse<U>>[] & {
     pending: boolean;
 };
-export declare function useSubmission<T extends Array<any>, U>(fn: Action<T, U>, filter?: (arg: T) => boolean): Submission<T, NarrowResponse<U>> | SubmissionStub;
-export declare function useAction<T extends Array<any>, U>(action: Action<T, U>): (...args: Parameters<Action<T, U>>) => Promise<NarrowResponse<U>>;
-export declare function action<T extends Array<any>, U = void>(fn: (...args: T) => Promise<U>, name?: string): Action<T, U>;
+export declare function useSubmission<T extends Array<any>, U, V>(fn: Action<T, U, V>, filter?: (input: V) => boolean): Submission<T, NarrowResponse<U>> | SubmissionStub;
+export declare function useAction<T extends Array<any>, U, V>(action: Action<T, U, V>): (...args: Parameters<Action<T, U, V>>) => Promise<NarrowResponse<U>>;
+export declare function action<T extends Array<any>, U = void>(fn: (...args: T) => Promise<U>, name?: string): Action<T, U, T>;

package/dist/data/action.js

@@ -6,7 +6,7 @@ import { cacheKeyOp, hashKey, revalidate, cache } from "./cache.js";
 export const actions = /* #__PURE__ */ new Map();
 export function useSubmissions(fn, filter) {
     const router = useRouter();
-    const subs = createMemo(() => router.submissions[0]().filter(s => s.url === fn.toString() && (!filter || filter(s.input))));
+    const subs = createMemo(() => router.submissions[0]().filter(s => s.url === fn.base && (!filter || filter(s.input))));
     return new Proxy([], {
         get(_, property) {
             if (property === $TRACK)
@@ -83,6 +83,7 @@ export function action(fn, name) {
     const url = fn.url ||
         (name && `https://action/${name}`) ||
         (!isServer ? `https://action/${hashString(fn.toString())}` : "");
+    mutate.base = url;
     return toAction(mutate, url);
 }
 function toAction(fn, url) {
@@ -95,6 +96,7 @@ function toAction(fn, url) {
         const newFn = function (...passedArgs) {
             return fn.call(this, ...args, ...passedArgs);
         };
+        newFn.base = fn.base;
         const uri = new URL(url, mockBase);
         uri.searchParams.set("args", hashKey(args));
         return toAction(newFn, (uri.origin === "https://action" ? uri.origin : "") + uri.pathname + uri.search);

package/dist/data/cache.js

@@ -184,7 +184,7 @@ cache.set = (key, value) => {
 cache.clear = () => getCache().clear();
 function matchKey(key, keys) {
     for (let k of keys) {
-        if (key.startsWith(k))
+        if (k && key.startsWith(k))
             return true;
     }
     return false;

package/dist/data/events.js

@@ -59,7 +59,7 @@ export function setupNativeEvents(preload = true, explicitLinks = false, actionB
                 return;
             const [a, url] = res;
             transformUrl && (url.pathname = transformUrl(url.pathname));
-            router.preloadRoute(url, { preloadData: a.getAttribute("preload") !== "false" });
+            router.preloadRoute(url, a.getAttribute("preload") !== "false");
         }
         function handleAnchorMove(evt) {
             clearTimeout(preloadTimeout);
@@ -71,7 +71,7 @@ export function setupNativeEvents(preload = true, explicitLinks = false, actionB
                 return;
             transformUrl && (url.pathname = transformUrl(url.pathname));
             preloadTimeout = setTimeout(() => {
-                router.preloadRoute(url, { preloadData: a.getAttribute("preload") !== "false" });
+                router.preloadRoute(url, a.getAttribute("preload") !== "false");
                 lastElement = a;
             }, 20);
         }

package/dist/data/response.js

@@ -12,7 +12,7 @@ export function redirect(url, init = 302) {
     }
     const headers = new Headers(responseInit.headers);
     headers.set("Location", url);
-    revalidate && headers.set("X-Revalidate", revalidate.toString());
+    revalidate !== undefined && headers.set("X-Revalidate", revalidate.toString());
     const response = new Response(null, {
         ...responseInit,
         headers: headers
@@ -22,7 +22,7 @@ export function redirect(url, init = 302) {
 export function reload(init = {}) {
     const { revalidate, ...responseInit } = init;
     const headers = new Headers(responseInit.headers);
-    revalidate && headers.set("X-Revalidate", revalidate.toString());
+    revalidate !== undefined && headers.set("X-Revalidate", revalidate.toString());
     return new Response(null, {
         ...responseInit,
         headers
@@ -31,7 +31,7 @@ export function reload(init = {}) {
 export function json(data, init = {}) {
     const { revalidate, ...responseInit } = init;
     const headers = new Headers(responseInit.headers);
-    revalidate && headers.set("X-Revalidate", revalidate.toString());
+    revalidate !== undefined && headers.set("X-Revalidate", revalidate.toString());
     headers.set("Content-Type", "application/json");
     const response = new Response(JSON.stringify(data), {
         ...responseInit,

package/dist/index.js

@@ -111,7 +111,9 @@ function joinPaths(from, to) {
 function extractSearchParams(url) {
   const params = {};
   url.searchParams.forEach((value, key) => {
-    params[key] = value;
+    if (key in params) {
+      if (Array.isArray(params[key])) params[key].push(value);else params[key] = [params[key], value];
+    } else params[key] = value;
   });
   return params;
 }
@@ -197,10 +199,18 @@ function createMemoObject(fn) {
 function mergeSearchString(search, params) {
   const merged = new URLSearchParams(search);
   Object.entries(params).forEach(([key, value]) => {
-    if (value == null || value === "") {
+    if (value == null || value === "" || value instanceof Array && !value.length) {
       merged.delete(key);
     } else {
-      merged.set(key, String(value));
+      if (value instanceof Array) {
+        // Delete all instances of the key before appending
+        merged.delete(key);
+        value.forEach(v => {
+          merged.append(key, String(v));
+        });
+      } else {
+        merged.set(key, String(value));
+      }
     }
   });
   const s = merged.toString();
@@ -244,7 +254,10 @@ const useHref = to => {
 const useNavigate = () => useRouter().navigatorFactory();
 const useLocation = () => useRouter().location;
 const useIsRouting = () => useRouter().isRouting;
-const usePreloadRoute = () => useRouter().preloadRoute;
+const usePreloadRoute = () => {
+  const pre = useRouter().preloadRoute;
+  return (url, options = {}) => pre(url instanceof URL ? url : new URL(url, mockBase), options.preloadData);
+};
 const useMatch = (path, matchFilters) => {
   const location = useLocation();
   const matchers = createMemo(() => expandOptionals(path()).map(path => createMatcher(path, undefined, matchFilters)));
@@ -585,7 +598,7 @@ function createRouterContext(integration, branches, getContext, options = {}) {
       referrers.length = 0;
     }
   }
-  function preloadRoute(url, options = {}) {
+  function preloadRoute(url, preloadData) {
     const matches = getRouteMatches(branches(), url.pathname);
     const prevIntent = intent;
     intent = "preload";
@@ -599,7 +612,7 @@ function createRouterContext(integration, branches, getContext, options = {}) {
         preload
       } = route;
       inPreloadFn = true;
-      options.preloadData && preload && runWithOwner(getContext(), () => preload({
+      preloadData && preload && runWithOwner(getContext(), () => preload({
         params,
         location: {
           pathname: url.pathname,
@@ -1032,7 +1045,7 @@ cache.set = (key, value) => {
 cache.clear = () => getCache().clear();
 function matchKey(key, keys) {
   for (let k of keys) {
-    if (key.startsWith(k)) return true;
+    if (k && key.startsWith(k)) return true;
   }
   return false;
 }
@@ -1053,7 +1066,7 @@ function isPlainObject(obj) {
 const actions = /* #__PURE__ */new Map();
 function useSubmissions(fn, filter) {
   const router = useRouter();
-  const subs = createMemo(() => router.submissions[0]().filter(s => s.url === fn.toString() && (!filter || filter(s.input))));
+  const subs = createMemo(() => router.submissions[0]().filter(s => s.url === fn.base && (!filter || filter(s.input))));
   return new Proxy([], {
     get(_, property) {
       if (property === $TRACK) return subs();
@@ -1124,6 +1137,7 @@ function action(fn, name) {
     return p.then(handler(), handler(true));
   }
   const url = fn.url || name && `https://action/${name}` || (!isServer ? `https://action/${hashString(fn.toString())}` : "");
+  mutate.base = url;
   return toAction(mutate, url);
 }
 function toAction(fn, url) {
@@ -1135,6 +1149,7 @@ function toAction(fn, url) {
     const newFn = function (...passedArgs) {
       return fn.call(this, ...args, ...passedArgs);
     };
+    newFn.base = fn.base;
     const uri = new URL(url, mockBase);
     uri.searchParams.set("args", hashKey(args));
     return toAction(newFn, (uri.origin === "https://action" ? uri.origin : "") + uri.pathname + uri.search);
@@ -1226,9 +1241,7 @@ function setupNativeEvents(preload = true, explicitLinks = false, actionBase = "
       if (!res) return;
       const [a, url] = res;
       transformUrl && (url.pathname = transformUrl(url.pathname));
-      router.preloadRoute(url, {
-        preloadData: a.getAttribute("preload") !== "false"
-      });
+      router.preloadRoute(url, a.getAttribute("preload") !== "false");
     }
     function handleAnchorMove(evt) {
       clearTimeout(preloadTimeout);
@@ -1238,9 +1251,7 @@ function setupNativeEvents(preload = true, explicitLinks = false, actionBase = "
       if (lastElement === a) return;
       transformUrl && (url.pathname = transformUrl(url.pathname));
       preloadTimeout = setTimeout(() => {
-        router.preloadRoute(url, {
-          preloadData: a.getAttribute("preload") !== "false"
-        });
+        router.preloadRoute(url, a.getAttribute("preload") !== "false");
         lastElement = a;
       }, 20);
     }
@@ -1612,7 +1623,7 @@ function redirect(url, init = 302) {
   }
   const headers = new Headers(responseInit.headers);
   headers.set("Location", url);
-  revalidate && headers.set("X-Revalidate", revalidate.toString());
+  revalidate !== undefined && headers.set("X-Revalidate", revalidate.toString());
   const response = new Response(null, {
     ...responseInit,
     headers: headers
@@ -1625,7 +1636,7 @@ function reload(init = {}) {
     ...responseInit
   } = init;
   const headers = new Headers(responseInit.headers);
-  revalidate && headers.set("X-Revalidate", revalidate.toString());
+  revalidate !== undefined && headers.set("X-Revalidate", revalidate.toString());
   return new Response(null, {
     ...responseInit,
     headers
@@ -1637,7 +1648,7 @@ function json(data, init = {}) {
     ...responseInit
   } = init;
   const headers = new Headers(responseInit.headers);
-  revalidate && headers.set("X-Revalidate", revalidate.toString());
+  revalidate !== undefined && headers.set("X-Revalidate", revalidate.toString());
   headers.set("Content-Type", "application/json");
   const response = new Response(JSON.stringify(data), {
     ...responseInit,

package/dist/routing.d.ts

@@ -1,5 +1,5 @@
 import { JSX, Accessor } from "solid-js";
-import type { BeforeLeaveEventArgs, Branch, Intent, Location, MatchFilters, NavigateOptions, Navigator, Params, RouteDescription, RouteContext, RouteDefinition, RouteMatch, RouterContext, RouterIntegration, SetParams } from "./types.js";
+import type { BeforeLeaveEventArgs, Branch, Intent, Location, MatchFilters, NavigateOptions, Navigator, Params, RouteDescription, RouteContext, RouteDefinition, RouteMatch, RouterContext, RouterIntegration, SearchParams, SetSearchParams } from "./types.js";
 export declare const RouterContextObj: import("solid-js").Context<RouterContext | undefined>;
 export declare const RouteContextObj: import("solid-js").Context<RouteContext | undefined>;
 export declare const useRouter: () => RouterContext;
@@ -9,13 +9,13 @@ export declare const useHref: (to: () => string | undefined) => Accessor<string
 export declare const useNavigate: () => Navigator;
 export declare const useLocation: <S = unknown>() => Location<S>;
 export declare const useIsRouting: () => () => boolean;
-export declare const usePreloadRoute: () => (url: URL, options: {
-    preloadData?: boolean | undefined;
+export declare const usePreloadRoute: () => (url: string | URL, options?: {
+    preloadData?: boolean;
 }) => void;
 export declare const useMatch: <S extends string>(path: () => S, matchFilters?: MatchFilters<S> | undefined) => Accessor<import("./types.js").PathMatch | undefined>;
 export declare const useCurrentMatches: () => () => RouteMatch[];
 export declare const useParams: <T extends Params>() => T;
-export declare const useSearchParams: <T extends Params>() => [Partial<T>, (params: SetParams, options?: Partial<NavigateOptions>) => void];
+export declare const useSearchParams: <T extends SearchParams>() => [Partial<T>, (params: SetSearchParams, options?: Partial<NavigateOptions>) => void];
 export declare const useBeforeLeave: (listener: (e: BeforeLeaveEventArgs) => void) => void;
 export declare function createRoutes(routeDef: RouteDefinition, base?: string): RouteDescription[];
 export declare function createBranch(routes: RouteDescription[], index?: number): Branch;

package/dist/routing.js

@@ -23,7 +23,10 @@ export const useHref = (to) => {
 export const useNavigate = () => useRouter().navigatorFactory();
 export const useLocation = () => useRouter().location;
 export const useIsRouting = () => useRouter().isRouting;
-export const usePreloadRoute = () => useRouter().preloadRoute;
+export const usePreloadRoute = () => {
+    const pre = useRouter().preloadRoute;
+    return (url, options = {}) => pre(url instanceof URL ? url : new URL(url, mockBase), options.preloadData);
+};
 export const useMatch = (path, matchFilters) => {
     const location = useLocation();
     const matchers = createMemo(() => expandOptionals(path()).map(path => createMatcher(path, undefined, matchFilters)));
@@ -348,7 +351,7 @@ export function createRouterContext(integration, branches, getContext, options =
             referrers.length = 0;
         }
     }
-    function preloadRoute(url, options = {}) {
+    function preloadRoute(url, preloadData) {
         const matches = getRouteMatches(branches(), url.pathname);
         const prevIntent = intent;
         intent = "preload";
@@ -359,7 +362,7 @@ export function createRouterContext(integration, branches, getContext, options =
                 route.component.preload();
             const { preload } = route;
             inPreloadFn = true;
-            options.preloadData &&
+            preloadData &&
                 preload &&
                 runWithOwner(getContext(), () => preload({
                     params,

package/dist/types.d.ts

@@ -22,14 +22,16 @@ declare module "solid-js/web" {
     }
 }
 export type Params = Record<string, string>;
+export type SearchParams = Record<string, string | string[]>;
 export type SetParams = Record<string, string | number | boolean | null | undefined>;
+export type SetSearchParams = Record<string, string | string[] | number | number[] | boolean | boolean[] | null | undefined>;
 export interface Path {
     pathname: string;
     search: string;
     hash: string;
 }
 export interface Location<S = unknown> extends Path {
-    query: Params;
+    query: SearchParams;
     state: Readonly<Partial<S>> | null;
     key: string;
 }
@@ -127,7 +129,7 @@ export interface RouterUtils {
     go(delta: number): void;
     beforeLeave: BeforeLeaveLifecycle;
     paramsWrapper: (getParams: () => Params, branches: () => Branch[]) => Params;
-    queryWrapper: (getQuery: () => Params) => Params;
+    queryWrapper: (getQuery: () => SearchParams) => SearchParams;
 }
 export interface RouterContext {
     base: RouteContext;
@@ -139,9 +141,7 @@ export interface RouterContext {
     renderPath(path: string): string;
     parsePath(str: string): string;
     beforeLeave: BeforeLeaveLifecycle;
-    preloadRoute: (url: URL, options: {
-        preloadData?: boolean;
-    }) => void;
+    preloadRoute: (url: URL, preloadData?: boolean) => void;
     singleFlight: boolean;
     submissions: Signal<Submission<any, any>[]>;
 }

package/dist/utils.d.ts

@@ -1,12 +1,12 @@
-import type { MatchFilters, Params, PathMatch, RouteDescription, SetParams } from "./types.ts";
+import type { MatchFilters, PathMatch, RouteDescription, SearchParams, SetSearchParams } from "./types.ts";
 export declare const mockBase = "http://sr";
 export declare function normalizePath(path: string, omitSlash?: boolean): string;
 export declare function resolvePath(base: string, path: string, from?: string): string | undefined;
 export declare function invariant<T>(value: T | null | undefined, message: string): T;
 export declare function joinPaths(from: string, to: string): string;
-export declare function extractSearchParams(url: URL): Params;
+export declare function extractSearchParams(url: URL): SearchParams;
 export declare function createMatcher<S extends string>(path: S, partial?: boolean, matchFilters?: MatchFilters<S>): (location: string) => PathMatch | null;
 export declare function scoreRoute(route: RouteDescription): number;
 export declare function createMemoObject<T extends Record<string | symbol, unknown>>(fn: () => T): T;
-export declare function mergeSearchString(search: string, params: SetParams): string;
+export declare function mergeSearchString(search: string, params: SetSearchParams): string;
 export declare function expandOptionals(pattern: string): string[];

package/dist/utils.js

@@ -36,7 +36,14 @@ export function joinPaths(from, to) {
 export function extractSearchParams(url) {
     const params = {};
     url.searchParams.forEach((value, key) => {
-        params[key] = value;
+        if (key in params) {
+            if (Array.isArray(params[key]))
+                params[key].push(value);
+            else
+                params[key] = [params[key], value];
+        }
+        else
+            params[key] = value;
     });
     return params;
 }
@@ -128,11 +135,20 @@ export function createMemoObject(fn) {
 export function mergeSearchString(search, params) {
     const merged = new URLSearchParams(search);
     Object.entries(params).forEach(([key, value]) => {
-        if (value == null || value === "") {
+        if (value == null || value === "" || (value instanceof Array && !value.length)) {
             merged.delete(key);
         }
         else {
-            merged.set(key, String(value));
+            if (value instanceof Array) {
+                // Delete all instances of the key before appending
+                merged.delete(key);
+                value.forEach(v => {
+                    merged.append(key, String(v));
+                });
+            }
+            else {
+                merged.set(key, String(value));
+            }
         }
     });
     const s = merged.toString();

package/package.json

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