@enshou/di 0.1.3 → 0.2.0

package/dist/index.d.ts

@@ -9,15 +9,32 @@ declare function createToken<T>(description: string): Token<T>;
 //#endregion
 //#region src/container.d.ts
 type Scope = "singleton" | "transient";
+type ProviderToken<T> = Token<T> | string | Class<T>;
+interface ClassProvider<T> {
+  provide: ProviderToken<T>;
+  useClass: Class<T>;
+  scope?: Scope;
+}
+interface ValueProvider<T> {
+  provide: ProviderToken<T>;
+  useValue: T;
+}
+interface FactoryProvider<T> {
+  provide: ProviderToken<T>;
+  useFactory: (container: Container) => T;
+  scope?: Scope;
+}
+type Provider<T> = ClassProvider<T> | ValueProvider<T> | FactoryProvider<T>;
 declare class Container {
   private readonly providers;
   private readonly singletonCache;
-  registerValue(token: Token<unknown> | string, value: unknown): void;
-  registerClass(token: Token<unknown> | string | Class<any>, value: Class<any>, scope?: Scope): void;
-  resolve<T>(token: Token<T> | string | Class<any>): T;
+  register<T>(provider: Provider<T>): void;
+  registerValue(token: ProviderToken<unknown>, value: unknown): void;
+  registerClass(token: ProviderToken<unknown>, value: Class<any>, scope?: Scope): void;
+  resolve<T>(token: ProviderToken<T>): T;
 }
 //#endregion
 //#region src/inject.d.ts
 declare function Inject(tokens: Array<Token<any> | string | Class<any>>): (target: any, _context?: ClassDecoratorContext) => void;
 //#endregion
-export { Container, Inject, type Scope, type Token, createToken };
+export { type ClassProvider, Container, type FactoryProvider, Inject, type Provider, type ProviderToken, type Scope, type Token, type ValueProvider, createToken };

package/dist/index.js

@@ -10,12 +10,35 @@ function Inject(tokens) {
 var Container = class {
 	providers = /* @__PURE__ */ new Map();
 	singletonCache = /* @__PURE__ */ new Map();
+	register(provider) {
+		this.singletonCache.delete(provider.provide);
+		if ("useValue" in provider) {
+			this.singletonCache.set(provider.provide, provider.useValue);
+			return;
+		}
+		if ("useFactory" in provider) {
+			this.providers.set(provider.provide, {
+				kind: "factory",
+				useFactory: provider.useFactory,
+				scope: provider.scope ?? "singleton"
+			});
+			return;
+		}
+		this.providers.set(provider.provide, {
+			kind: "class",
+			useClass: provider.useClass,
+			scope: provider.scope ?? "singleton"
+		});
+	}
 	registerValue(token, value) {
-		this.singletonCache.set(token, value);
+		this.register({
+			provide: token,
+			useValue: value
+		});
 	}
 	registerClass(token, value, scope = "singleton") {
-		this.providers.set(token, {
-			kind: "class",
+		this.register({
+			provide: token,
 			useClass: value,
 			scope
 		});
@@ -24,8 +47,12 @@ var Container = class {
 		if (this.singletonCache.has(token)) return this.singletonCache.get(token);
 		const provider = this.providers.get(token);
 		if (!provider) throw Error(`No provider for ${String(token)}`);
-		const deps = (provider.useClass[INJECTS_KEY] ?? []).map(this.resolve.bind(this));
-		const value = new provider.useClass(...deps);
+		let value;
+		if (provider.kind === "factory") value = provider.useFactory(this);
+		else {
+			const deps = (provider.useClass[INJECTS_KEY] ?? []).map(this.resolve.bind(this));
+			value = new provider.useClass(...deps);
+		}
 		if (provider.scope === "singleton") this.singletonCache.set(token, value);
 		return value;
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enshou/di",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "private": false,
   "license": "Apache-2.0",
   "author": "Ivan Popov <iiivanpopov999@gmail.com>",