@solidjs/router 0.14.9 → 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/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();
@@ -1056,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();
@@ -1127,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) {
@@ -1138,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);

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;
@@ -15,7 +15,7 @@ export declare const usePreloadRoute: () => (url: string | URL, options?: {
 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/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;

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.9",
+  "version": "0.14.10",
   "homepage": "https://github.com/solidjs/solid-router#readme",
   "repository": {
     "type": "git",