@solidjs/router 0.13.3 → 0.13.5

package/README.md

@@ -868,7 +868,7 @@ return <div classList={{ active: Boolean(match()) }} />;
 For example if you stored breadcrumbs on your route definition you could retrieve them like so:
 ```js
 const matches = useCurrentMatches();
-const breadcrumbs = createMemo(() => matches.map(m => m.route.info.breadcrumb))
+const breadcrumbs = createMemo(() => matches().map(m => m.route.info.breadcrumb))
 ```
 
 ### useBeforeLeave

package/dist/components.jsx

@@ -20,7 +20,7 @@ export function A(props) {
             return [false, false];
         const path = normalizePath(to_.split(/[?#]/, 1)[0]).toLowerCase();
         const loc = normalizePath(location.pathname).toLowerCase();
-        return [props.end ? path === loc : loc.startsWith(path), path === loc];
+        return [props.end ? path === loc : loc.startsWith(path + "/") || loc === path, path === loc];
     });
     return (<a {...rest} href={href() || props.href} state={JSON.stringify(props.state)} classList={{
             ...(props.class && { [props.class]: true }),

package/dist/index.d.ts

@@ -4,4 +4,4 @@ export * from "./lifecycle.js";
 export { useHref, useIsRouting, useLocation, useMatch, useCurrentMatches, useNavigate, useParams, useResolvedPath, useSearchParams, useBeforeLeave, } from "./routing.js";
 export { mergeSearchString as _mergeSearchString } from "./utils.js";
 export * from "./data/index.js";
-export type { Location, LocationChange, NavigateOptions, Navigator, OutputMatch, Params, RouteSectionProps, RouteLoadFunc, RouteLoadFuncArgs, RouteDefinition, RouterIntegration, RouterUtils, SetParams, BeforeLeaveEventArgs } from "./types.js";
+export type { Location, LocationChange, MatchFilter, MatchFilters, NavigateOptions, Navigator, OutputMatch, Params, PathMatch, RouteSectionProps, RouteLoadFunc, RouteLoadFuncArgs, RouteDefinition, RouteDescription, RouteMatch, RouterIntegration, RouterUtils, SetParams, BeforeLeaveEventArgs } from "./types.js";

package/dist/index.js

@@ -256,7 +256,7 @@ const useMatch = (path, matchFilters) => {
     }
   });
 };
-const useCurrentMatches = () => useRouter().matches();
+const useCurrentMatches = () => useRouter().matches;
 const useParams = () => useRouter().params;
 const useSearchParams = () => {
   const location = useLocation();
@@ -1374,7 +1374,7 @@ function HashRouter(props) {
       if (replace) {
         window.history.replaceState(keepDepth(state), "", "#" + value);
       } else {
-        window.location.hash = value;
+        window.history.pushState(state, "", "#" + value);
       }
       const hashIndex = value.indexOf("#");
       const hash = hashIndex >= 0 ? value.slice(hashIndex + 1) : "";
@@ -1466,7 +1466,7 @@ function A(props) {
     if (to_ === undefined) return [false, false];
     const path = normalizePath(to_.split(/[?#]/, 1)[0]).toLowerCase();
     const loc = normalizePath(location.pathname).toLowerCase();
-    return [props.end ? path === loc : loc.startsWith(path), path === loc];
+    return [props.end ? path === loc : loc.startsWith(path + "/") || loc === path, path === loc];
   });
   return (() => {
     const _el$ = _tmpl$();

package/dist/routers/HashRouter.js

@@ -22,7 +22,7 @@ export function HashRouter(props) {
                 window.history.replaceState(keepDepth(state), "", "#" + value);
             }
             else {
-                window.location.hash = value;
+                window.history.pushState(state, "", "#" + value);
             }
             const hashIndex = value.indexOf("#");
             const hash = hashIndex >= 0 ? value.slice(hashIndex + 1) : "";

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, Route, 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, SetParams } 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;
@@ -10,13 +10,13 @@ export declare const useNavigate: () => Navigator;
 export declare const useLocation: <S = unknown>() => Location<S>;
 export declare const useIsRouting: () => () => boolean;
 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 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 useBeforeLeave: (listener: (e: BeforeLeaveEventArgs) => void) => void;
-export declare function createRoutes(routeDef: RouteDefinition, base?: string): Route[];
-export declare function createBranch(routes: Route[], index?: number): Branch;
-export declare function createBranches(routeDef: RouteDefinition | RouteDefinition[], base?: string, stack?: Route[], branches?: Branch[]): Branch[];
+export declare function createRoutes(routeDef: RouteDefinition, base?: string): RouteDescription[];
+export declare function createBranch(routes: RouteDescription[], index?: number): Branch;
+export declare function createBranches(routeDef: RouteDefinition | RouteDefinition[], base?: string, stack?: RouteDescription[], branches?: Branch[]): Branch[];
 export declare function getRouteMatches(branches: Branch[], location: string): RouteMatch[];
 export declare function createLocation(path: Accessor<string>, state: Accessor<any>): Location;
 export declare function getIntent(): Intent | undefined;

package/dist/routing.js

@@ -34,7 +34,7 @@ export const useMatch = (path, matchFilters) => {
         }
     });
 };
-export const useCurrentMatches = () => useRouter().matches();
+export const useCurrentMatches = () => useRouter().matches;
 export const useParams = () => useRouter().params;
 export const useSearchParams = () => {
     const location = useLocation();

package/dist/types.d.ts

@@ -65,7 +65,7 @@ export type RouteLoadFunc<T = unknown> = (args: RouteLoadFuncArgs) => T;
 export interface RouteSectionProps<T = unknown> {
     params: Params;
     location: Location;
-    data?: T;
+    data: T;
     children?: JSX.Element;
 }
 export type RouteDefinition<S extends string | string[] = any, T = unknown> = {
@@ -86,7 +86,7 @@ export interface PathMatch {
     path: string;
 }
 export interface RouteMatch extends PathMatch {
-    route: Route;
+    route: RouteDescription;
 }
 export interface OutputMatch {
     path: string;
@@ -95,7 +95,7 @@ export interface OutputMatch {
     params: Params;
     info?: Record<string, any>;
 }
-export interface Route {
+export interface RouteDescription {
     key: unknown;
     originalPath: string;
     pattern: string;
@@ -106,7 +106,7 @@ export interface Route {
     info?: Record<string, any>;
 }
 export interface Branch {
-    routes: Route[];
+    routes: RouteDescription[];
     score: number;
     matcher: (location: string) => RouteMatch[] | null;
 }

package/dist/utils.d.ts

@@ -1,4 +1,4 @@
-import type { MatchFilters, Params, PathMatch, Route, SetParams } from "./types.ts";
+import type { MatchFilters, Params, PathMatch, RouteDescription, SetParams } 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;
@@ -6,7 +6,7 @@ export declare function invariant<T>(value: T | null | undefined, message: strin
 export declare function joinPaths(from: string, to: string): string;
 export declare function extractSearchParams(url: URL): Params;
 export declare function createMatcher<S extends string>(path: S, partial?: boolean, matchFilters?: MatchFilters<S>): (location: string) => PathMatch | null;
-export declare function scoreRoute(route: Route): number;
+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 expandOptionals(pattern: string): string[];

package/package.json

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