@solidjs/router 0.10.2 → 0.10.3

package/dist/index.d.ts

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

package/dist/index.js

@@ -239,13 +239,15 @@ function createRoutes(routeDef, base = "") {
   const {
     component,
     load,
-    children
+    children,
+    metadata
   } = routeDef;
   const isLeaf = !children || Array.isArray(children) && !children.length;
   const shared = {
     key: routeDef,
     component,
-    load
+    load,
+    metadata
   };
   return asArray(routeDef.path).reduce((acc, path) => {
     for (const originalPath of expandOptionals(path)) {
@@ -612,6 +614,20 @@ const createRouterComponent = router => props => {
 };
 function Routes(props) {
   const matches = createMemo(() => getRouteMatches(props.branches, props.routerState.location.pathname));
+  if (isServer) {
+    const e = getRequestEvent();
+    e && (e.routerMatches || (e.routerMatches = [])).push(matches().map(({
+      route,
+      path,
+      params
+    }) => ({
+      path: route.originalPath,
+      pattern: route.pattern,
+      match: path,
+      params,
+      metadata: route.metadata
+    })));
+  }
   const params = createMemoObject(() => {
     const m = matches();
     const params = {};

package/dist/routers/components.d.ts

@@ -12,5 +12,6 @@ export type RouteProps<S extends string> = {
     load?: RouteLoadFunc;
     matchFilters?: MatchFilters<S>;
     component?: Component;
+    metadata?: Record<string, any>;
 };
 export declare const Route: <S extends string>(props: RouteProps<S>) => JSX.Element;

package/dist/routers/components.jsx

@@ -1,4 +1,5 @@
 /*@refresh skip*/
+import { getRequestEvent, isServer } from "solid-js/web";
 import { children, createMemo, createRoot, mergeProps, on, Show } from "solid-js";
 import { createBranches, createRouteContext, createRouterContext, getRouteMatches, RouteContextObj, RouterContextObj } from "../routing";
 import { createMemoObject } from "../utils";
@@ -14,6 +15,17 @@ export const createRouterComponent = (router) => (props) => {
 };
 function Routes(props) {
     const matches = createMemo(() => getRouteMatches(props.branches, props.routerState.location.pathname));
+    if (isServer) {
+        const e = getRequestEvent();
+        e &&
+            (e.routerMatches || (e.routerMatches = [])).push(matches().map(({ route, path, params }) => ({
+                path: route.originalPath,
+                pattern: route.pattern,
+                match: path,
+                params,
+                metadata: route.metadata
+            })));
+    }
     const params = createMemoObject(() => {
         const m = matches();
         const params = {};

package/dist/routing.js

@@ -56,12 +56,13 @@ export const useBeforeLeave = (listener) => {
     onCleanup(s);
 };
 export function createRoutes(routeDef, base = "") {
-    const { component, load, children } = routeDef;
+    const { component, load, children, metadata } = routeDef;
     const isLeaf = !children || (Array.isArray(children) && !children.length);
     const shared = {
         key: routeDef,
         component,
-        load
+        load,
+        metadata
     };
     return asArray(routeDef.path).reduce((acc, path) => {
         for (const originalPath of expandOptionals(path)) {

package/dist/types.d.ts

@@ -2,6 +2,7 @@ import type { Component, JSX, Signal } from "solid-js";
 declare module "solid-js/web" {
     interface RequestEvent {
         response?: Response;
+        routerMatches?: OutputMatch[][];
         routerCache?: Map<any, any>;
         initialSubmission?: Submission<any, any>;
         serverOnly?: boolean;
@@ -60,6 +61,7 @@ export type RouteDefinition<S extends string | string[] = any, T = unknown> = {
     load?: RouteLoadFunc<T>;
     children?: RouteDefinition | RouteDefinition[];
     component?: Component<RouteSectionProps<T>>;
+    metadata?: Record<string, any>;
 };
 export type MatchFilter = readonly string[] | RegExp | ((s: string) => boolean);
 export type PathParams<P extends string | readonly string[]> = P extends `${infer Head}/${infer Tail}` ? [...PathParams<Head>, ...PathParams<Tail>] : P extends `:${infer S}?` ? [S] : P extends `:${infer S}` ? [S] : P extends `*${infer S}` ? [S] : [];
@@ -74,10 +76,11 @@ export interface RouteMatch extends PathMatch {
     route: Route;
 }
 export interface OutputMatch {
-    originalPath: string;
-    pattern: string;
     path: string;
+    pattern: string;
+    match: string;
     params: Params;
+    metadata?: Record<string, any>;
 }
 export interface Route {
     key: unknown;
@@ -87,6 +90,7 @@ export interface Route {
     load?: RouteLoadFunc;
     matcher: (location: string) => PathMatch | null;
     matchFilters?: MatchFilters;
+    metadata?: Record<string, any>;
 }
 export interface Branch {
     routes: Route[];
@@ -108,16 +112,6 @@ export interface RouterUtils {
     go(delta: number): void;
     beforeLeave: BeforeLeaveLifecycle;
 }
-export interface OutputMatch {
-    originalPath: string;
-    pattern: string;
-    path: string;
-    params: Params;
-}
-export interface RouterOutput {
-    url?: string;
-    matches: OutputMatch[][];
-}
 export interface RouterContext {
     base: RouteContext;
     location: Location;

package/package.json

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