@solidjs/router 0.5.1 → 0.6.0

package/dist/components.d.ts

@@ -10,7 +10,7 @@ declare module "solid-js" {
         }
     }
 }
-export declare type RouterProps = {
+export type RouterProps = {
     base?: string;
     data?: RouteDataFunc;
     children: JSX.Element;
@@ -29,7 +29,7 @@ export interface RoutesProps {
 }
 export declare const Routes: (props: RoutesProps) => JSX.Element;
 export declare const useRoutes: (routes: RouteDefinition | RouteDefinition[], base?: string) => () => JSX.Element;
-export declare type RouteProps = {
+export type RouteProps = {
     path: string | string[];
     children?: JSX.Element;
     data?: RouteDataFunc;

package/dist/index.js

@@ -185,9 +185,6 @@ function extractSearchParams(url) {
   });
   return params;
 }
-function urlDecode(str, isQuery) {
-  return decodeURIComponent(isQuery ? str.replace(/\+/g, " ") : str);
-}
 function createMatcher(path, partial) {
   const [pattern, splat] = path.split("/*", 2);
   const segments = pattern.split("/").filter(Boolean);
@@ -299,8 +296,13 @@ const useLocation = () => useRouter().location;
 const useIsRouting = () => useRouter().isRouting;
 const useMatch = path => {
   const location = useLocation();
-  const matcher = createMemo(() => createMatcher(path()));
-  return createMemo(() => matcher()(location.pathname));
+  const matchers = createMemo(() => expandOptionals(path()).map(path => createMatcher(path)));
+  return createMemo(() => {
+    for (const matcher of matchers()) {
+      const match = matcher(location.pathname);
+      if (match) return match;
+    }
+  });
 };
 const useParams = () => useRoute().params;
 const useRouteData = () => useRoute().data;
@@ -426,9 +428,9 @@ function createLocation(path, state) {
   }, origin, {
     equals: (a, b) => a.href === b.href
   });
-  const pathname = createMemo(() => urlDecode(url().pathname));
-  const search = createMemo(() => urlDecode(url().search, true));
-  const hash = createMemo(() => urlDecode(url().hash));
+  const pathname = createMemo(() => url().pathname);
+  const search = createMemo(() => url().search, true);
+  const hash = createMemo(() => url().hash);
   const key = createMemo(() => "");
   return {
     get pathname() {
@@ -612,8 +614,7 @@ function createRouterContext(integration, base = "", data, out) {
       const rel = (a.getAttribute("rel") || "").split(/\s+/);
       if (a.hasAttribute("download") || rel && rel.includes("external")) return;
       const url = new URL(href);
-      const pathname = urlDecode(url.pathname);
-      if (url.origin !== window.location.origin || basePath && pathname && !pathname.toLowerCase().startsWith(basePath.toLowerCase())) return;
+      if (url.origin !== window.location.origin || basePath && url.pathname && !url.pathname.toLowerCase().startsWith(basePath.toLowerCase())) return;
       const to = parsePath(url.pathname + url.search + url.hash);
       const state = a.getAttribute("state");
       evt.preventDefault();

package/dist/routing.d.ts

@@ -9,9 +9,9 @@ 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 useMatch: (path: () => string) => Accessor<import("./types").PathMatch | null>;
+export declare const useMatch: (path: () => string) => Accessor<import("./types").PathMatch | undefined>;
 export declare const useParams: <T extends Params>() => T;
-declare type MaybeReturnType<T> = T extends (...args: any) => infer R ? R : T;
+type MaybeReturnType<T> = T extends (...args: any) => infer R ? R : T;
 export declare const useRouteData: <T>() => MaybeReturnType<T>;
 export declare const useSearchParams: <T extends Params>() => [T, (params: SetParams, options?: Partial<NavigateOptions>) => void];
 export declare const useBeforeLeave: (listener: (e: BeforeLeaveEventArgs) => void) => void;

package/dist/routing.js

@@ -2,7 +2,7 @@ import { createComponent, createContext, createMemo, createRenderEffect, createS
 import { isServer, delegateEvents } from "solid-js/web";
 import { normalizeIntegration } from "./integration";
 import { createBeforeLeave } from "./lifecycle";
-import { createMemoObject, extractSearchParams, invariant, resolvePath, createMatcher, joinPaths, scoreRoute, mergeSearchString, urlDecode, expandOptionals } from "./utils";
+import { createMemoObject, extractSearchParams, invariant, resolvePath, createMatcher, joinPaths, scoreRoute, mergeSearchString, expandOptionals } from "./utils";
 const MAX_REDIRECTS = 100;
 export const RouterContextObj = createContext();
 export const RouteContextObj = createContext();
@@ -25,8 +25,14 @@ export const useLocation = () => useRouter().location;
 export const useIsRouting = () => useRouter().isRouting;
 export const useMatch = (path) => {
     const location = useLocation();
-    const matcher = createMemo(() => createMatcher(path()));
-    return createMemo(() => matcher()(location.pathname));
+    const matchers = createMemo(() => expandOptionals(path()).map((path) => createMatcher(path)));
+    return createMemo(() => {
+        for (const matcher of matchers()) {
+            const match = matcher(location.pathname);
+            if (match)
+                return match;
+        }
+    });
 };
 export const useParams = () => useRoute().params;
 export const useRouteData = () => useRoute().data;
@@ -145,9 +151,9 @@ export function createLocation(path, state) {
     }, origin, {
         equals: (a, b) => a.href === b.href
     });
-    const pathname = createMemo(() => urlDecode(url().pathname));
-    const search = createMemo(() => urlDecode(url().search, true));
-    const hash = createMemo(() => urlDecode(url().hash));
+    const pathname = createMemo(() => url().pathname);
+    const search = createMemo(() => url().search, true);
+    const hash = createMemo(() => url().hash);
     const key = createMemo(() => "");
     return {
         get pathname() {
@@ -328,9 +334,8 @@ export function createRouterContext(integration, base = "", data, out) {
             if (a.hasAttribute("download") || (rel && rel.includes("external")))
                 return;
             const url = new URL(href);
-            const pathname = urlDecode(url.pathname);
             if (url.origin !== window.location.origin ||
-                (basePath && pathname && !pathname.toLowerCase().startsWith(basePath.toLowerCase())))
+                (basePath && url.pathname && !url.pathname.toLowerCase().startsWith(basePath.toLowerCase())))
                 return;
             const to = parsePath(url.pathname + url.search + url.hash);
             const state = a.getAttribute("state");

package/dist/types.d.ts

@@ -1,6 +1,6 @@
 import { Component, JSX } from "solid-js";
-export declare type Params = Record<string, string>;
-export declare type SetParams = Record<string, string | number | boolean | null | undefined>;
+export type Params = Record<string, string>;
+export type SetParams = Record<string, string | number | boolean | null | undefined>;
 export interface Path {
     pathname: string;
     search: string;
@@ -21,14 +21,14 @@ export interface Navigator {
     (to: string, options?: Partial<NavigateOptions>): void;
     (delta: number): void;
 }
-export declare type NavigatorFactory = (route?: RouteContext) => Navigator;
+export type NavigatorFactory = (route?: RouteContext) => Navigator;
 export interface LocationChange<S = unknown> {
     value: string;
     replace?: boolean;
     scroll?: boolean;
     state?: S;
 }
-export declare type LocationChangeSignal = [() => LocationChange, (next: LocationChange) => void];
+export type LocationChangeSignal = [() => LocationChange, (next: LocationChange) => void];
 export interface RouterIntegration {
     signal: LocationChangeSignal;
     utils?: Partial<RouterUtils>;
@@ -39,8 +39,8 @@ export interface RouteDataFuncArgs<T = unknown> {
     location: Location;
     navigate: Navigator;
 }
-export declare type RouteDataFunc<T = unknown, R = unknown> = (args: RouteDataFuncArgs<T>) => R;
-export declare type RouteDefinition = {
+export type RouteDataFunc<T = unknown, R = unknown> = (args: RouteDataFuncArgs<T>) => R;
+export type RouteDefinition = {
     path: string | string[];
     data?: RouteDataFunc;
     children?: RouteDefinition | RouteDefinition[];

package/dist/utils.d.ts

@@ -4,7 +4,6 @@ export declare function resolvePath(base: string, path: string, from?: string):
 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 urlDecode(str: string, isQuery?: boolean): string;
 export declare function createMatcher(path: string, partial?: boolean): (location: string) => PathMatch | null;
 export declare function scoreRoute(route: Route): number;
 export declare function createMemoObject<T extends Record<string | symbol, unknown>>(fn: () => T): T;

package/dist/utils.js

@@ -39,9 +39,6 @@ export function extractSearchParams(url) {
     });
     return params;
 }
-export function urlDecode(str, isQuery) {
-    return decodeURIComponent(isQuery ? str.replace(/\+/g, " ") : str);
-}
 export function createMatcher(path, partial) {
     const [pattern, splat] = path.split("/*", 2);
     const segments = pattern.split("/").filter(Boolean);

package/package.json

@@ -6,7 +6,7 @@
     "Ryan Turnquist"
   ],
   "license": "MIT",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "homepage": "https://github.com/solidjs/solid-router#readme",
   "repository": {
     "type": "git",
@@ -28,36 +28,36 @@
     "dist"
   ],
   "sideEffects": false,
-  "scripts": {
-    "build": "tsc && rollup -c",
-    "prepublishOnly": "npm run build",
-    "test": "jest && npm run test:types",
-    "test:watch": "jest --watch",
-    "test:coverage": "jest --coverage && npm run test:types",
-    "test:types": "tsc --project tsconfig.test.json",
-    "pretty": "prettier --write \"{src,test}/**/*.{ts,tsx}\""
-  },
   "devDependencies": {
     "@babel/core": "^7.18.13",
     "@babel/preset-typescript": "^7.18.6",
-    "@rollup/plugin-babel": "5.3.1",
-    "@rollup/plugin-node-resolve": "13.3.0",
+    "@rollup/plugin-babel": "6.0.3",
+    "@rollup/plugin-node-resolve": "15.0.1",
+    "@rollup/plugin-terser": "0.2.0",
     "@types/jest": "^29.0.0",
     "@types/node": "^18.7.14",
-    "babel-preset-solid": "^1.5.3",
+    "babel-jest": "^29.0.1",
+    "babel-preset-solid": "^1.6.6",
     "jest": "^29.0.1",
     "jest-environment-jsdom": "^29.2.1",
     "prettier": "^2.7.1",
-    "rollup": "^2.79.0",
-    "rollup-plugin-terser": "^7.0.2",
+    "rollup": "^3.7.5",
     "solid-jest": "^0.2.0",
-    "solid-js": "^1.5.3",
-    "typescript": "^4.8.2"
+    "solid-js": "^1.6.6",
+    "typescript": "^4.9.4"
   },
   "peerDependencies": {
     "solid-js": "^1.5.3"
   },
   "jest": {
     "preset": "solid-jest/preset/browser"
+  },
+  "scripts": {
+    "build": "tsc && rollup -c",
+    "test": "jest && npm run test:types",
+    "test:watch": "jest --watch",
+    "test:coverage": "jest --coverage && npm run test:types",
+    "test:types": "tsc --project tsconfig.test.json",
+    "pretty": "prettier --write \"{src,test}/**/*.{ts,tsx}\""
   }
-}
+}