@rhythmjs/rhythm 0.0.2 → 0.0.3

package/dist/compose.d.ts

@@ -0,0 +1,4 @@
+import { Middleware, NextFn } from "./types.js";
+//#region src/compose.d.ts
+export declare function compose<TContext extends object>(middleware: Middleware<TContext>[]): (context: TContext, next?: NextFn<TContext>) => Promise<TContext>;
+//#endregion

package/dist/compose.js

@@ -0,0 +1,24 @@
+//#region src/compose.ts
+function compose(middleware) {
+	if (!Array.isArray(middleware)) throw new TypeError("Middleware stack must be an array!");
+	for (const fn of middleware) if (typeof fn !== "function") throw new TypeError("Middleware must be composed of functions!");
+	return function(context, next) {
+		let index = -1;
+		return dispatch(0);
+		function dispatch(i) {
+			if (i <= index) return Promise.reject(/* @__PURE__ */ new Error("next() called multiple times"));
+			index = i;
+			const fn = i === middleware.length ? next : middleware[i];
+			if (!fn) return Promise.resolve(context);
+			const dispatchNext = () => dispatch(i + 1);
+			try {
+				const call = fn;
+				return Promise.resolve(call(context, dispatchNext)).then(() => context);
+			} catch (err) {
+				return Promise.reject(err);
+			}
+		}
+	};
+}
+//#endregion
+export { compose };

package/dist/rhythm.d.ts

@@ -1,26 +1,18 @@
+import { DeriveMiddleware, Middleware, OmitHashKeys } from "./types.js";
 //#region src/rhythm.d.ts
-export declare const RhythmMutable: unique symbol;
-export type DeepReadonly<T> = T extends ((...args: any[]) => any) ? T : T extends ReadonlyArray<infer U> ? readonly DeepReadonly<U>[] : T extends Map<infer K, infer V> ? ReadonlyMap<DeepReadonly<K>, DeepReadonly<V>> : T extends Set<infer U> ? ReadonlySet<DeepReadonly<U>> : T extends {
-  readonly [RhythmMutable]: true;
-} ? T : T extends object ? { readonly [K in keyof T]: DeepReadonly<T[K]>; } : T;
-export type OmitHashKeys<T> = { [K in keyof T as K extends `#${string}` ? never : K]: T[K]; };
-export type NextFn<TContext extends object> = {
-  (): Promise<DeepReadonly<TContext>>;
-  <TExtra extends object>(extra: TExtra): Promise<DeepReadonly<TContext & TExtra>>;
-};
-export type Middleware<TContext extends object> = (ctx: DeepReadonly<TContext>, next: NextFn<TContext>) => Promise<void> | void;
-export declare function compose<TContext extends object>(middleware: Middleware<TContext>[]): (context: TContext, next?: NextFn<TContext>) => Promise<TContext>;
 export interface RhythmOptions {
   name?: string;
   type?: string;
   [key: string]: unknown;
 }
+export declare function derive<TContext extends object, TExtra extends object>(fn: (ctx: TContext) => TExtra | Promise<TExtra>): DeriveMiddleware<TContext, OmitHashKeys<TExtra>>;
 export declare class Rhythm<TInput extends object = {}, TContext extends object = TInput, TProviders extends object = {}> {
   #private;
   constructor(options?: RhythmOptions);
-  use<TExtra extends object = {}>(fn: Middleware<TContext>): Rhythm<TInput, TContext & TExtra, TProviders>;
-  provide<TValue extends object>(factory: (deps: DeepReadonly<TProviders>) => TValue | Promise<TValue>, dispose?: (value: TValue) => void | Promise<void>): Rhythm<TInput, TContext & OmitHashKeys<TValue>, TProviders & OmitHashKeys<TValue>>;
-  register<TRegInput extends object, TRegContext extends object, TExported extends object = {}>(other: Rhythm<TRegInput, TRegContext, any> & (TContext extends TRegInput ? unknown : never), exportValue?: (result: DeepReadonly<TRegContext>) => TExported): Rhythm<TInput, TContext & TExported, TProviders>;
+  use<TExtra extends object>(fn: DeriveMiddleware<TContext, TExtra>): Rhythm<TInput, TContext & TExtra, TProviders>;
+  use(fn: Middleware<TContext>): this;
+  provide<TValue extends object>(factory: (deps: TProviders) => TValue | Promise<TValue>, dispose?: (value: TValue) => void | Promise<void>): Rhythm<TInput, TContext & OmitHashKeys<TValue>, TProviders & OmitHashKeys<TValue>>;
+  register<TRegInput extends object, TRegContext extends object, TExported extends object = {}>(other: Rhythm<TRegInput, TRegContext, any> & (TContext extends TRegInput ? unknown : never), exportValue?: (result: TRegContext) => TExported): Rhythm<TInput, TContext & TExported, TProviders>;
   setup(): Promise<void>;
   teardown(): Promise<void>;
   callback(): (input: TInput) => Promise<TContext>;

package/dist/rhythm.js

@@ -1,43 +1,30 @@
+import { compose } from "./compose.js";
 //#region src/rhythm.ts
-const RhythmMutable = Symbol("RhythmMutable");
-function compose(middleware) {
-	if (!Array.isArray(middleware)) throw new TypeError("Middleware stack must be an array!");
-	for (const fn of middleware) if (typeof fn !== "function") throw new TypeError("Middleware must be composed of functions!");
-	return function(context, next) {
-		let index = -1;
-		return dispatch(0);
-		function dispatch(i) {
-			if (i <= index) return Promise.reject(/* @__PURE__ */ new Error("next() called multiple times"));
-			index = i;
-			const fn = i === middleware.length ? next : middleware[i];
-			if (!fn) return Promise.resolve(context);
-			const dispatchNext = ((extra) => {
-				if (extra) Object.assign(context, extra);
-				return dispatch(i + 1);
-			});
-			try {
-				const call = fn;
-				return Promise.resolve(call(context, dispatchNext)).then(() => context);
-			} catch (err) {
-				return Promise.reject(err);
-			}
-		}
+function publicEntries(value) {
+	const exported = {};
+	for (const [key, val] of Object.entries(value)) if (!key.startsWith("#")) exported[key] = val;
+	return exported;
+}
+function derive(fn) {
+	if (typeof fn !== "function") throw new TypeError("derive factory must be a function!");
+	const middleware = async (ctx, next) => {
+		const value = await fn(ctx);
+		Object.assign(ctx, publicEntries(value));
+		await next();
 	};
+	return middleware;
 }
 var Rhythm = class {
 	#middleware = [];
 	#options;
 	#providers = [];
 	#setupPromise = null;
-	#composed = null;
-	#callbackFn = null;
 	constructor(options = {}) {
 		this.#options = options;
 	}
 	use(fn) {
 		if (typeof fn !== "function") throw new TypeError("middleware must be a function!");
 		this.#middleware.push(fn);
-		this.#invalidateCallback();
 		return this;
 	}
 	provide(factory, dispose) {
@@ -47,11 +34,9 @@ var Rhythm = class {
 		};
 		this.#providers.push(entry);
 		this.#middleware.push(async (ctx, next) => {
-			const exported = {};
-			for (const [key, value] of Object.entries(entry.resolved)) if (!key.startsWith("#")) exported[key] = value;
-			await next(exported);
+			Object.assign(ctx, publicEntries(entry.resolved));
+			await next();
 		});
-		this.#invalidateCallback();
 		return this;
 	}
 	register(other, exportValue) {
@@ -71,15 +56,11 @@ var Rhythm = class {
 				const { type = "module", name = "anonymous" } = module.#options;
 				throw new Error(`registered ${type} "${name}" failed`, { cause });
 			}
-			await next(exportValue ? exportValue(result) : {});
+			if (exportValue) Object.assign(ctx, exportValue(result));
+			await next();
 		});
-		this.#invalidateCallback();
 		return this;
 	}
-	#invalidateCallback() {
-		this.#composed = null;
-		this.#callbackFn = null;
-	}
 	setup() {
 		if (!this.#setupPromise) this.#setupPromise = this.#resolveProviders().catch((err) => {
 			this.#setupPromise = null;
@@ -91,33 +72,34 @@ var Rhythm = class {
 		const resolved = {};
 		for (const entry of this.#providers) {
 			entry.resolved = await entry.factory(resolved);
-			for (const [key, value] of Object.entries(entry.resolved)) if (!key.startsWith("#")) resolved[key] = value;
+			Object.assign(resolved, publicEntries(entry.resolved));
 		}
 	}
 	async teardown() {
-		for (const entry of [...this.#providers].reverse()) await entry.dispose?.(entry.resolved);
+		for (const entry of [...this.#providers].reverse()) {
+			if (entry.resolved === void 0) continue;
+			await entry.dispose?.(entry.resolved);
+			entry.resolved = void 0;
+		}
+		this.#setupPromise = null;
 	}
 	callback() {
-		if (!this.#callbackFn) {
-			if (!this.#composed) this.#composed = compose(this.#middleware);
-			const fn = this.#composed;
-			this.#callbackFn = async (input) => {
-				await this.setup();
-				return fn({ ...input });
-			};
-		}
-		return this.#callbackFn;
+		const fn = compose([...this.#middleware]);
+		return async (input) => {
+			await this.setup();
+			return fn({ ...input });
+		};
 	}
 	run(input) {
 		return this.callback()(input);
 	}
 	middleware() {
+		const fn = compose([...this.#middleware]);
 		return async (ctx, next) => {
 			await this.setup();
-			if (!this.#composed) this.#composed = compose(this.#middleware);
-			await this.#composed(ctx, next);
+			await fn(ctx, next);
 		};
 	}
 };
 //#endregion
-export { Rhythm, RhythmMutable, compose };
+export { Rhythm, derive };

package/dist/types.d.ts

@@ -0,0 +1,8 @@
+//#region src/types.d.ts
+export type OmitHashKeys<T> = { [K in keyof T as K extends `#${string}` ? never : K]: T[K]; };
+export type NextFn<TContext extends object> = () => Promise<TContext>;
+export type Middleware<TContext extends object> = (ctx: TContext, next: NextFn<TContext>) => Promise<void> | void;
+export type DeriveMiddleware<TContext extends object, TExtra extends object> = Middleware<TContext> & {
+  readonly "~derive": TExtra;
+};
+//#endregion

package/dist/types.js

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rhythmjs/rhythm",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "A minimal, type-safe onion-middleware and provider composition kernel.",
   "homepage": "https://rhythm.js.org/rhythm",
   "license": "ISC",
@@ -19,6 +19,14 @@
       "types": "./dist/rhythm.d.ts",
       "default": "./dist/rhythm.js"
     },
+    "./compose": {
+      "types": "./dist/compose.d.ts",
+      "default": "./dist/compose.js"
+    },
+    "./types": {
+      "types": "./dist/types.d.ts",
+      "default": "./dist/types.js"
+    },
     "./package.json": "./package.json"
   },
   "publishConfig": {