From e5e7c9210ee221b5a3b5d1c0446a85ff43a5196d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?He=CC=84sperus?= <hesprs@outlook.com>
Date: Mon, 22 Jun 2026 22:05:43 +0800
Subject: [PATCH] chore(context): clean up exports

---
 skill/example/index.ts |  6 +++---
 src/context.ts         | 18 +++++-------------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/skill/example/index.ts b/skill/example/index.ts
index d4d55e4..4c88297 100644
--- a/skill/example/index.ts
+++ b/skill/example/index.ts
@@ -20,9 +20,9 @@ class PolisAlert {
 	logs: Array<LogEntry>;
 
 	constructor(public options: MergeSingleKey<AllModules, 'options'>) {
-		this.ctx = createContext(allModules, { mergeKeys: ['options', 'root'] }).__assign__({
-			options,
-		});
+		this.ctx = createContext(allModules, {
+			mergeKeys: ['options', 'root'],
+		}).__assign__({ options });
 		for (const ctor of allModules) this.ctx.__getModule__(ctor).onStart();
 
 		// Augmentation
diff --git a/src/context.ts b/src/context.ts
index cf83f92..32df462 100644
--- a/src/context.ts
+++ b/src/context.ts
@@ -1,16 +1,10 @@
 type General = any;
 type GeneralObject = object;
-type GeneralConstructor =
-	| (new (...args: Array<General>) => General)
-	| (abstract new (...args: Array<General>) => General);
+type GeneralConstructor = new (...args: Array<General>) => General;
 type ModuleConstructor<C extends object> = new (context: C) => General;
 
 type GeneralModuleInput = ReadonlyArray<GeneralConstructor> | ReadonlyArray<GeneralObject>;
 
-export type ModuleInput<T extends GeneralConstructor> =
-	| ReadonlyArray<T>
-	| ReadonlyArray<InstanceType<T>>;
-
 type IsPlainObject<T> = T extends object
 	? T extends Function | Date | RegExp | Array<any> | Map<any, any> | Set<any>
 		? false
@@ -76,7 +70,7 @@ export type Context<
 > = MergeResult<M, K, Pr, Po> & {
 	__modules__: WeakMap<M[number], InstanceType<M[number]>>;
 	__getModule__: <C extends M[number]>(ctor: C) => InstanceType<C>;
-	__addModule__: <N extends ModuleConstructor<MergeResult<[...M, N], K, Pr, Po>>>(
+	__addModule__: <N extends ModuleConstructor<Context<[...M, N], K, Pr, Po>>>(
 		newModule: N,
 	) => Context<[...M, N], K, Pr, Po>;
 	__assign__: (obj: Partial<MergeResult<M, K, Pr, Po>>) => Context<M, K, Pr, Po>;
@@ -127,25 +121,23 @@ function mergeShallow(target: Record<string, unknown>, source: unknown) {
  * @param options Context build options.
  * @param options.preMerge Values merged before module construction.
  * @param options.postMerge Values merged after module merges.
- * @param options.assign Final values assigned after all other merges.
  * @param options.mergeKeys Instance keys merged into context.
  * @param options.injectKeys Instance keys updated from final context. Defaults to
  * `mergeKeys`.
  * @returns Context object containing merged values plus module helper methods.
  */
 export default function createContext<
-	Po extends object,
-	Pr extends object,
 	M extends ReadonlyArray<ModuleConstructor<Context<M, K, Pr, Po>>>,
 	K extends Keys<InstanceEach<M>[number]>,
-	I extends K = K,
+	Po extends object = {},
+	Pr extends object = {},
 >(
 	classes: M,
 	options: {
 		preMerge?: Pr;
 		postMerge?: Po;
 		mergeKeys: ReadonlyArray<K>;
-		injectKeys?: ReadonlyArray<I>;
+		injectKeys?: ReadonlyArray<NoInfer<K>>;
 	},
 ): Context<M, K, Pr, Po> {
 	const context: Record<string, unknown> = {};