@rhythmjs/router 0.0.3 → 0.0.4

package/dist/rhythm-router.d.ts

@@ -1,5 +1,5 @@
 import { t as RhythmHttpContext } from "./context-B0711qPV.js";
-import { Middleware } from "@rhythmjs/rhythm/types";
+import { DeriveMiddleware, Middleware } from "@rhythmjs/rhythm/types";
 //#region src/rhythm-router.d.ts
 export interface RhythmRouterContext {
   readonly params: Readonly<Record<string, string>>;
@@ -7,16 +7,22 @@ export interface RhythmRouterContext {
 export interface RhythmRouterOptions {
   prefix?: string;
 }
+type RouteHandler<TContext> = Middleware<TContext & RhythmRouterContext>;
 export declare class RhythmRouter<TContext extends RhythmHttpContext = RhythmHttpContext> {
   #private;
   constructor(options?: RhythmRouterOptions);
-  use(child: RhythmRouter<any>): this;
-  use<TExtra extends object = {}>(fn: Middleware<TContext>): RhythmRouter<TContext & TExtra>;
-  get<TExtra extends object = {}>(path: string, ...handlers: Middleware<TContext & RhythmRouterContext & TExtra>[]): this;
-  post<TExtra extends object = {}>(path: string, ...handlers: Middleware<TContext & RhythmRouterContext & TExtra>[]): this;
-  put<TExtra extends object = {}>(path: string, ...handlers: Middleware<TContext & RhythmRouterContext & TExtra>[]): this;
-  patch<TExtra extends object = {}>(path: string, ...handlers: Middleware<TContext & RhythmRouterContext & TExtra>[]): this;
-  delete<TExtra extends object = {}>(path: string, ...handlers: Middleware<TContext & RhythmRouterContext & TExtra>[]): this;
-  routes(): Middleware<TContext>;
+  use<TExtra extends object>(fn: DeriveMiddleware<TContext, TExtra>): RhythmRouter<TContext & TExtra>;
+  use(fn: Middleware<TContext>): this;
+  get<TExtra extends object>(path: string, middleware: DeriveMiddleware<TContext & RhythmRouterContext, TExtra>, ...handlers: RouteHandler<TContext & TExtra>[]): this;
+  get(path: string, ...handlers: RouteHandler<TContext>[]): this;
+  post<TExtra extends object>(path: string, middleware: DeriveMiddleware<TContext & RhythmRouterContext, TExtra>, ...handlers: RouteHandler<TContext & TExtra>[]): this;
+  post(path: string, ...handlers: RouteHandler<TContext>[]): this;
+  put<TExtra extends object>(path: string, middleware: DeriveMiddleware<TContext & RhythmRouterContext, TExtra>, ...handlers: RouteHandler<TContext & TExtra>[]): this;
+  put(path: string, ...handlers: RouteHandler<TContext>[]): this;
+  patch<TExtra extends object>(path: string, middleware: DeriveMiddleware<TContext & RhythmRouterContext, TExtra>, ...handlers: RouteHandler<TContext & TExtra>[]): this;
+  patch(path: string, ...handlers: RouteHandler<TContext>[]): this;
+  delete<TExtra extends object>(path: string, middleware: DeriveMiddleware<TContext & RhythmRouterContext, TExtra>, ...handlers: RouteHandler<TContext & TExtra>[]): this;
+  delete(path: string, ...handlers: RouteHandler<TContext>[]): this;
+  middleware(): Middleware<TContext>;
 }
 //#endregion

package/dist/rhythm-router.js

@@ -1,29 +1,21 @@
 import { createNode, insertRoute, joinPath, lookupRoute } from "./radix-tree.js";
 import { compose } from "@rhythmjs/rhythm/compose";
 //#region src/rhythm-router.ts
-var RhythmRouter = class RhythmRouter {
+var RhythmRouter = class {
 	#options;
 	#entries = [];
-	#composed = null;
 	constructor(options = {}) {
 		this.#options = options;
 	}
 	get #prefix() {
 		return this.#options.prefix ?? "";
 	}
-	use(arg) {
-		if (arg instanceof RhythmRouter) for (const entry of arg.#entries) this.#entries.push(entry.kind === "route" ? {
-			...entry,
-			path: joinPath(this.#prefix, entry.path)
-		} : entry);
-		else {
-			if (typeof arg !== "function") throw new TypeError("middleware must be a function!");
-			this.#entries.push({
-				kind: "middleware",
-				fn: arg
-			});
-		}
-		this.#composed = null;
+	use(fn) {
+		if (typeof fn !== "function") throw new TypeError("middleware must be a function!");
+		this.#entries.push({
+			kind: "middleware",
+			fn
+		});
 		return this;
 	}
 	#route(method, path, handlers) {
@@ -33,7 +25,6 @@ var RhythmRouter = class RhythmRouter {
 			path: joinPath(this.#prefix, path),
 			handlers
 		});
-		this.#composed = null;
 		return this;
 	}
 	get(path, ...handlers) {
@@ -52,7 +43,6 @@ var RhythmRouter = class RhythmRouter {
 		return this.#route("DELETE", path, handlers);
 	}
 	#compile() {
-		if (this.#composed) return this.#composed;
 		const dispatchFor = (tree) => {
 			return async (ctx, next) => {
 				const match = lookupRoute(tree, ctx.request.method, new URL(ctx.request.url).pathname);
@@ -84,12 +74,12 @@ var RhythmRouter = class RhythmRouter {
 			}
 			stack.push(dispatchFor(tree));
 		}
-		this.#composed = compose(stack);
-		return this.#composed;
+		return compose(stack);
 	}
-	routes() {
+	middleware() {
+		const fn = this.#compile();
 		return async (ctx, next) => {
-			await this.#compile()(ctx, next);
+			await fn(ctx, next);
 		};
 	}
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rhythmjs/router",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "Radix-tree HTTP router for the Rhythm middleware kernel, with Bun, Node, and Deno adapters.",
   "homepage": "https://rhythm.js.org/router",
   "license": "ISC",
@@ -49,7 +49,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@rhythmjs/rhythm": "0.0.3"
+    "@rhythmjs/rhythm": "0.0.4"
   },
   "devDependencies": {
     "@types/node": "^26.6.3",