@e280/sly 0.2.0-19 → 0.2.0-20

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@e280/sly",
-	"version": "0.2.0-19",
+	"version": "0.2.0-20",
 	"description": "web shadow views",
 	"license": "MIT",
 	"type": "module",

package/s/spa/index.barrel.ts

@@ -1,6 +1,6 @@
 
 export {route} from "./plumbing/braces.js"
 export type {Navigable} from "./plumbing/primitives.js"
-export {RouterOptions, Hasher, Route, Routes, Navigables} from "./plumbing/types.js"
+export {RouterOptions, Hasher, Route, Routes, Navigables, Params} from "./plumbing/types.js"
 export {Router} from "./router.js"
 

package/s/spa/plumbing/primitives.ts

@@ -1,7 +1,7 @@
 
 import {ev, ob} from "@e280/stz"
 import {Op} from "../../ops/op.js"
-import {ResolvedRoute, Route, Routes} from "./types.js"
+import {ResolvedRoute, Route, Params, Routes} from "./types.js"
 
 export function eraseWindowHash() {
 	const {pathname, search} = window.location
@@ -29,31 +29,31 @@ export class HashNormalizer {
 	}
 }
 
-export class Navigable<R extends Routes = any, K extends keyof R = any> {
+export class Navigable<P extends any[] = any[]> {
 	static all<R extends Routes>(
 			routes: R,
-			getRoute: () => Route<any> | null,
-			navigate: (hash: string) => Promise<ResolvedRoute<R>>,
-		): {[K in keyof R]: Navigable<R, K>} {
+			getRoute: () => Route | null,
+			navigate: (hash: string) => Promise<ResolvedRoute>,
+		): {[K in keyof R]: Navigable<Params<R[K]>>} {
 
 		return ob(routes).map(route => new this(
 			route,
 			() => (getRoute() === route),
 			async(...params: any[]) => navigate(route.hasher.make(...params)),
-		))
+		)) as any
 	}
 
 	constructor(
-		public route: Route<Parameters<R[K]["hasher"]["make"]>>,
+		public route: Route<P>,
 		private isActive: () => boolean,
-		public go: (...params: Parameters<R[K]["hasher"]["make"]>) => Promise<ResolvedRoute<R>>,
+		public go: (...params: P) => Promise<ResolvedRoute<P>>,
 	) {}
 
 	get active() {
 		return this.isActive()
 	}
 
-	hash(...params: Parameters<R[K]["hasher"]["make"]>) {
+	hash(...params: P) {
 		return this.route.hasher.make(...params)
 	}
 }
@@ -61,7 +61,7 @@ export class Navigable<R extends Routes = any, K extends keyof R = any> {
 export function resolveRoute<R extends Routes>(
 		hash: string,
 		routes: R,
-	): ResolvedRoute<R> | null {
+	): ResolvedRoute | null {
 
 	for (const key in routes) {
 		const route = routes[key]

package/s/spa/plumbing/router-core.ts

@@ -6,7 +6,7 @@ import {Hashbearer, Navigables, ResolvedRoute, Routes} from "./types.js"
 
 export class RouterCore<R extends Routes> {
 	readonly nav: Navigables<R>
-	readonly $resolved = signal<ResolvedRoute<R> | null>(null)
+	readonly $resolved = signal<ResolvedRoute | null>(null)
 
 	constructor(
 			public readonly routes: R,

package/s/spa/plumbing/types.ts

@@ -19,21 +19,27 @@ export type Hasher<Params extends any[]> = {
 	make: (...params: Params) => string
 }
 
-export type Route<Params extends any[]> = {
-	hasher: Hasher<Params>
-	fn: (...params: Params) => Promise<Content>
+export type Route<P extends any[] = any[]> = {
+	hasher: Hasher<P>
+	fn: (...params: P) => Promise<Content>
 }
 
-export type Routes = {[key: string]: Route<any>}
+export type Routes = {[key: string]: Route}
 
-export type ResolvedRoute<R extends Routes, K extends keyof R = keyof R> = {
-	key: K
-	route: R[K]
-	params: Parameters<R[K]["hasher"]["make"]>
+export type Params<X extends (Route | Navigable)> = (
+	X extends Route<infer P> ? P :
+	X extends Navigable<infer P> ? P :
+	never
+)
+
+export type ResolvedRoute<P extends any[] = any[]> = {
+	key: string
+	route: Route<P>
+	params: P
 	op: Op<Content>
 }
 
 export type Navigables<R extends Routes> = {
-	[K in keyof R]: Navigable<R, K>
+	[K in keyof R]: Navigable<Params<R[K]>>
 }
 

package/x/index.html

@@ -131,7 +131,7 @@ body {
 	<img class=icon alt="" src="/assets/favicon.png"/>
 	<h1>sly testing page</h1>
 	<p><a href="https://github.com/e280/sly">github.com/e280/sly</a></p>
-	<p class=lil>v0.2.0-19</p>
+	<p class=lil>v0.2.0-20</p>
 
 	<fastcount-element></fastcount-element>
 	<counter-component start=280 step=2>component</counter-component>

package/x/spa/index.barrel.d.ts

@@ -1,4 +1,4 @@
 export { route } from "./plumbing/braces.js";
 export type { Navigable } from "./plumbing/primitives.js";
-export { RouterOptions, Hasher, Route, Routes, Navigables } from "./plumbing/types.js";
+export { RouterOptions, Hasher, Route, Routes, Navigables, Params } from "./plumbing/types.js";
 export { Router } from "./router.js";

package/x/spa/plumbing/primitives.d.ts

@@ -1,4 +1,4 @@
-import { ResolvedRoute, Route, Routes } from "./types.js";
+import { ResolvedRoute, Route, Params, Routes } from "./types.js";
 export declare function eraseWindowHash(): void;
 export declare function normalizeHash(hash: string): string;
 export declare class HashNormalizer {
@@ -7,16 +7,16 @@ export declare class HashNormalizer {
     get hash(): string;
     set hash(hash: string);
 }
-export declare class Navigable<R extends Routes = any, K extends keyof R = any> {
-    route: Route<Parameters<R[K]["hasher"]["make"]>>;
+export declare class Navigable<P extends any[] = any[]> {
+    route: Route<P>;
     private isActive;
-    go: (...params: Parameters<R[K]["hasher"]["make"]>) => Promise<ResolvedRoute<R>>;
-    static all<R extends Routes>(routes: R, getRoute: () => Route<any> | null, navigate: (hash: string) => Promise<ResolvedRoute<R>>): {
-        [K in keyof R]: Navigable<R, K>;
+    go: (...params: P) => Promise<ResolvedRoute<P>>;
+    static all<R extends Routes>(routes: R, getRoute: () => Route | null, navigate: (hash: string) => Promise<ResolvedRoute>): {
+        [K in keyof R]: Navigable<Params<R[K]>>;
     };
-    constructor(route: Route<Parameters<R[K]["hasher"]["make"]>>, isActive: () => boolean, go: (...params: Parameters<R[K]["hasher"]["make"]>) => Promise<ResolvedRoute<R>>);
+    constructor(route: Route<P>, isActive: () => boolean, go: (...params: P) => Promise<ResolvedRoute<P>>);
     get active(): boolean;
-    hash(...params: Parameters<R[K]["hasher"]["make"]>): string;
+    hash(...params: P): string;
 }
-export declare function resolveRoute<R extends Routes>(hash: string, routes: R): ResolvedRoute<R> | null;
+export declare function resolveRoute<R extends Routes>(hash: string, routes: R): ResolvedRoute | null;
 export declare function onHashChange(fn: (event: HashChangeEvent) => void): () => void;

package/x/spa/plumbing/primitives.js.map

@@ -1 +1 @@
-{"version":3,"file":"primitives.js","sourceRoot":"","sources":["../../../s/spa/plumbing/primitives.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,EAAE,EAAE,EAAE,EAAC,MAAM,WAAW,CAAA;AAChC,OAAO,EAAC,EAAE,EAAC,MAAM,iBAAiB,CAAA;AAGlC,MAAM,UAAU,eAAe;IAC9B,MAAM,EAAC,QAAQ,EAAE,MAAM,EAAC,GAAG,MAAM,CAAC,QAAQ,CAAA;IAC1C,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,EAAE,QAAQ,GAAG,MAAM,CAAC,CAAA;AAClD,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,IAAY;IACzC,MAAM,eAAe,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;IAC9C,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACvD,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,IAAI,CAAA;AACR,CAAC;AAED,MAAM,OAAO,cAAc;IACP;IAAnB,YAAmB,QAAkB;QAAlB,aAAQ,GAAR,QAAQ,CAAU;IAAG,CAAC;IAEzC,IAAI,IAAI;QACP,MAAM,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QAC9C,IAAI,IAAI,KAAK,IAAI;YAAE,eAAe,EAAE,CAAA;QACpC,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,IAAI,IAAI,CAAC,IAAY;QACpB,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAA;IAC1B,CAAC;CACD;AAED,MAAM,OAAO,SAAS;IAeb;IACC;IACD;IAhBR,MAAM,CAAC,GAAG,CACR,MAAS,EACT,QAAiC,EACjC,QAAqD;QAGtD,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,IAAI,CACtC,KAAK,EACL,GAAG,EAAE,CAAC,CAAC,QAAQ,EAAE,KAAK,KAAK,CAAC,EAC5B,KAAK,EAAC,GAAG,MAAa,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC,CACjE,CAAC,CAAA;IACH,CAAC;IAED,YACQ,KAAgD,EAC/C,QAAuB,EACxB,EAAgF;QAFhF,UAAK,GAAL,KAAK,CAA2C;QAC/C,aAAQ,GAAR,QAAQ,CAAe;QACxB,OAAE,GAAF,EAAE,CAA8E;IACrF,CAAC;IAEJ,IAAI,MAAM;QACT,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAA;IACvB,CAAC;IAED,IAAI,CAAC,GAAG,MAA0C;QACjD,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAA;IACzC,CAAC;CACD;AAED,MAAM,UAAU,YAAY,CAC1B,IAAY,EACZ,MAAS;IAGV,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;QAC1B,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAA;QACzB,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACvC,IAAI,MAAM,EAAE,CAAC;YACZ,OAAO;gBACN,GAAG;gBACH,KAAK;gBACL,MAAM;gBACN,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC;aACnC,CAAA;QACF,CAAC;IACF,CAAC;IAED,OAAO,IAAI,CAAA;AACZ,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,EAAoC;IAChE,OAAO,EAAE,CAAC,MAAM,EAAE,EAAC,UAAU,EAAE,EAAE,EAAC,CAAC,CAAA;AACpC,CAAC"}
+{"version":3,"file":"primitives.js","sourceRoot":"","sources":["../../../s/spa/plumbing/primitives.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,EAAE,EAAE,EAAE,EAAC,MAAM,WAAW,CAAA;AAChC,OAAO,EAAC,EAAE,EAAC,MAAM,iBAAiB,CAAA;AAGlC,MAAM,UAAU,eAAe;IAC9B,MAAM,EAAC,QAAQ,EAAE,MAAM,EAAC,GAAG,MAAM,CAAC,QAAQ,CAAA;IAC1C,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,EAAE,QAAQ,GAAG,MAAM,CAAC,CAAA;AAClD,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,IAAY;IACzC,MAAM,eAAe,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;IAC9C,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACvD,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,IAAI,CAAA;AACR,CAAC;AAED,MAAM,OAAO,cAAc;IACP;IAAnB,YAAmB,QAAkB;QAAlB,aAAQ,GAAR,QAAQ,CAAU;IAAG,CAAC;IAEzC,IAAI,IAAI;QACP,MAAM,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QAC9C,IAAI,IAAI,KAAK,IAAI;YAAE,eAAe,EAAE,CAAA;QACpC,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,IAAI,IAAI,CAAC,IAAY;QACpB,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAA;IAC1B,CAAC;CACD;AAED,MAAM,OAAO,SAAS;IAeb;IACC;IACD;IAhBR,MAAM,CAAC,GAAG,CACR,MAAS,EACT,QAA4B,EAC5B,QAAkD;QAGnD,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,IAAI,CACtC,KAAK,EACL,GAAG,EAAE,CAAC,CAAC,QAAQ,EAAE,KAAK,KAAK,CAAC,EAC5B,KAAK,EAAC,GAAG,MAAa,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC,CACjE,CAAQ,CAAA;IACV,CAAC;IAED,YACQ,KAAe,EACd,QAAuB,EACxB,EAA+C;QAF/C,UAAK,GAAL,KAAK,CAAU;QACd,aAAQ,GAAR,QAAQ,CAAe;QACxB,OAAE,GAAF,EAAE,CAA6C;IACpD,CAAC;IAEJ,IAAI,MAAM;QACT,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAA;IACvB,CAAC;IAED,IAAI,CAAC,GAAG,MAAS;QAChB,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAA;IACzC,CAAC;CACD;AAED,MAAM,UAAU,YAAY,CAC1B,IAAY,EACZ,MAAS;IAGV,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;QAC1B,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAA;QACzB,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACvC,IAAI,MAAM,EAAE,CAAC;YACZ,OAAO;gBACN,GAAG;gBACH,KAAK;gBACL,MAAM;gBACN,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC;aACnC,CAAA;QACF,CAAC;IACF,CAAC;IAED,OAAO,IAAI,CAAA;AACZ,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,EAAoC;IAChE,OAAO,EAAE,CAAC,MAAM,EAAE,EAAC,UAAU,EAAE,EAAE,EAAC,CAAC,CAAA;AACpC,CAAC"}

package/x/spa/plumbing/router-core.d.ts

@@ -4,10 +4,10 @@ export declare class RouterCore<R extends Routes> {
     readonly routes: R;
     readonly location: Hashbearer;
     readonly nav: Navigables<R>;
-    readonly $resolved: import("@e280/strata").SignalFn<ResolvedRoute<R> | null>;
+    readonly $resolved: import("@e280/strata").SignalFn<ResolvedRoute | null>;
     constructor(routes: R, location: Hashbearer);
     get hash(): string;
     get content(): Content | null;
-    get route(): R[keyof R] | null;
-    refresh(hash?: string): Promise<ResolvedRoute<R> | null>;
+    get route(): import("./types.js").Route<any[]> | null;
+    refresh(hash?: string): Promise<ResolvedRoute | null>;
 }

package/x/spa/plumbing/router-core.js.map

@@ -1 +1 @@
-{"version":3,"file":"router-core.js","sourceRoot":"","sources":["../../../s/spa/plumbing/router-core.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,MAAM,EAAC,MAAM,cAAc,CAAA;AAEnC,OAAO,EAAC,SAAS,EAAE,aAAa,EAAE,YAAY,EAAC,MAAM,iBAAiB,CAAA;AAGtE,MAAM,OAAO,UAAU;IAKJ;IACA;IALT,GAAG,CAAe;IAClB,SAAS,GAAG,MAAM,CAA0B,IAAI,CAAC,CAAA;IAE1D,YACkB,MAAS,EACT,QAAoB;QADpB,WAAM,GAAN,MAAM,CAAG;QACT,aAAQ,GAAR,QAAQ,CAAY;QAGrC,IAAI,CAAC,GAAG,GAAG,SAAS,CAAC,GAAG,CACvB,MAAM,EACN,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAChB,KAAK,EAAC,IAAI,EAAC,EAAE;YACZ,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAA;YACzB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;YACrC,IAAI,CAAC,QAAQ;gBAAE,MAAM,IAAI,KAAK,CAAC,iBAAiB,IAAI,GAAG,CAAC,CAAA;YACxD,OAAO,QAAQ,CAAA;QAChB,CAAC,CACD,CAAA;IACF,CAAC;IAED,IAAI,IAAI;QACP,OAAO,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IACzC,CAAC;IAED,IAAI,OAAO;QACV,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,KAAK,IAAI,IAAI,CAAA;IAC9C,CAAC;IAED,IAAI,KAAK;QACR,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,KAAK,IAAI,IAAI,CAAA;IAC3C,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAAa;QAC1B,IAAI,IAAI,KAAK,SAAS;YAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAA;QACjD,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;QAChB,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAChD,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;QAClC,MAAM,QAAQ,EAAE,EAAE,CAAA;QAClB,OAAO,QAAQ,CAAA;IAChB,CAAC;CACD"}
+{"version":3,"file":"router-core.js","sourceRoot":"","sources":["../../../s/spa/plumbing/router-core.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,MAAM,EAAC,MAAM,cAAc,CAAA;AAEnC,OAAO,EAAC,SAAS,EAAE,aAAa,EAAE,YAAY,EAAC,MAAM,iBAAiB,CAAA;AAGtE,MAAM,OAAO,UAAU;IAKJ;IACA;IALT,GAAG,CAAe;IAClB,SAAS,GAAG,MAAM,CAAuB,IAAI,CAAC,CAAA;IAEvD,YACkB,MAAS,EACT,QAAoB;QADpB,WAAM,GAAN,MAAM,CAAG;QACT,aAAQ,GAAR,QAAQ,CAAY;QAGrC,IAAI,CAAC,GAAG,GAAG,SAAS,CAAC,GAAG,CACvB,MAAM,EACN,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAChB,KAAK,EAAC,IAAI,EAAC,EAAE;YACZ,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAA;YACzB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;YACrC,IAAI,CAAC,QAAQ;gBAAE,MAAM,IAAI,KAAK,CAAC,iBAAiB,IAAI,GAAG,CAAC,CAAA;YACxD,OAAO,QAAQ,CAAA;QAChB,CAAC,CACD,CAAA;IACF,CAAC;IAED,IAAI,IAAI;QACP,OAAO,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IACzC,CAAC;IAED,IAAI,OAAO;QACV,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,KAAK,IAAI,IAAI,CAAA;IAC9C,CAAC;IAED,IAAI,KAAK;QACR,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,KAAK,IAAI,IAAI,CAAA;IAC3C,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAAa;QAC1B,IAAI,IAAI,KAAK,SAAS;YAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAA;QACjD,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;QAChB,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAChD,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;QAClC,MAAM,QAAQ,EAAE,EAAE,CAAA;QAClB,OAAO,QAAQ,CAAA;IAChB,CAAC;CACD"}

package/x/spa/plumbing/types.d.ts

@@ -16,19 +16,20 @@ export type Hasher<Params extends any[]> = {
     parse: (hash: string) => (Params | null);
     make: (...params: Params) => string;
 };
-export type Route<Params extends any[]> = {
-    hasher: Hasher<Params>;
-    fn: (...params: Params) => Promise<Content>;
+export type Route<P extends any[] = any[]> = {
+    hasher: Hasher<P>;
+    fn: (...params: P) => Promise<Content>;
 };
 export type Routes = {
-    [key: string]: Route<any>;
+    [key: string]: Route;
 };
-export type ResolvedRoute<R extends Routes, K extends keyof R = keyof R> = {
-    key: K;
-    route: R[K];
-    params: Parameters<R[K]["hasher"]["make"]>;
+export type Params<X extends (Route | Navigable)> = (X extends Route<infer P> ? P : X extends Navigable<infer P> ? P : never);
+export type ResolvedRoute<P extends any[] = any[]> = {
+    key: string;
+    route: Route<P>;
+    params: P;
     op: Op<Content>;
 };
 export type Navigables<R extends Routes> = {
-    [K in keyof R]: Navigable<R, K>;
+    [K in keyof R]: Navigable<Params<R[K]>>;
 };