@rhythmjs/cli 0.0.3 → 0.0.5

package/dist/rhythm-cli.d.ts

@@ -1,5 +1,5 @@
 import { t as RhythmCliContext } from "./context-DyXPT9sP.js";
-import { Middleware } from "@rhythmjs/rhythm/types";
+import { DeriveMiddleware, Middleware } from "@rhythmjs/rhythm/types";
 //#region src/rhythm-cli.d.ts
 export interface RhythmCliCommandContext {
   readonly args: Readonly<Record<string, string>>;
@@ -10,9 +10,10 @@ export interface RhythmCliOptions {
 export declare class RhythmCli<TContext extends RhythmCliContext = RhythmCliContext> {
   #private;
   constructor(options?: RhythmCliOptions);
-  use(child: RhythmCli<any>): this;
-  use<TExtra extends object = {}>(fn: Middleware<TContext>): RhythmCli<TContext & TExtra>;
+  use<TExtra extends object>(fn: DeriveMiddleware<TContext, TExtra>): RhythmCli<TContext & TExtra>;
+  use(fn: Middleware<TContext>): this;
+  command<TExtra extends object>(path: string, middleware: DeriveMiddleware<TContext & RhythmCliCommandContext, TExtra>, ...handlers: Middleware<TContext & RhythmCliCommandContext & TExtra>[]): this;
   command(path: string, ...handlers: Middleware<TContext & RhythmCliCommandContext>[]): this;
-  commands(): Middleware<TContext>;
+  middleware(): Middleware<TContext>;
 }
 //#endregion

package/dist/rhythm-cli.js

@@ -15,29 +15,21 @@ function matchCommand(pattern, positionals) {
 	}
 	return params;
 }
-var RhythmCli = class RhythmCli {
+var RhythmCli = class {
 	#options;
 	#entries = [];
-	#composed = null;
 	constructor(options = {}) {
 		this.#options = options;
 	}
 	get #prefixSegments() {
 		return this.#options.prefix ? toSegments(this.#options.prefix) : [];
 	}
-	use(arg) {
-		if (arg instanceof RhythmCli) for (const entry of arg.#entries) this.#entries.push(entry.kind === "command" ? {
-			...entry,
-			segments: [...this.#prefixSegments, ...entry.segments]
-		} : 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;
 	}
 	command(path, ...handlers) {
@@ -46,11 +38,9 @@ var RhythmCli = class RhythmCli {
 			segments: [...this.#prefixSegments, ...toSegments(path)],
 			handlers
 		});
-		this.#composed = null;
 		return this;
 	}
 	#compile() {
-		if (this.#composed) return this.#composed;
 		const dispatchFor = (compiled) => {
 			return async (ctx, next) => {
 				const { positionals } = parseArgv(ctx.argv);
@@ -87,12 +77,12 @@ var RhythmCli = class RhythmCli {
 			}
 			stack.push(dispatchFor(compiled));
 		}
-		this.#composed = compose(stack);
-		return this.#composed;
+		return compose(stack);
 	}
-	commands() {
+	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/cli",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "Command-line argument parsing, prompts, and command routing for the Rhythm middleware kernel.",
   "homepage": "https://rhythm.js.org/cli",
   "license": "ISC",
@@ -49,7 +49,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@rhythmjs/rhythm": "0.0.3"
+    "@rhythmjs/rhythm": "0.0.5"
   },
   "devDependencies": {
     "@types/bun": "^1.4.2",