refactor: use overload signatures

exuanbo · Oct 14, 2024 · 6d6614f · 6d6614f
1 parent 3c4bae7
commit 6d6614f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/src/container.ts b/src/container.ts
@@ -1,6 +1,6 @@
 import {type InjectionConfig, isConfigLike} from './config'
 import {assert, ErrorMessage, expectNever} from './errors'
-import type {Injections} from './injection'
+import type {Injection, Injections} from './injection'
 import {useInjectionContext, withInjectionContext} from './injection-context'
 import {getMetadata} from './metadata'
 import {type InjectionProvider, isClassProvider, isFactoryProvider, isProvider, isValueProvider} from './provider'
@@ -83,7 +83,7 @@ export class Container {
 
   register<Instance extends object>(Class: Constructor<Instance>): void
   register<Value>(provider: InjectionProvider<Value>): void
-  register<Value>(providable: InjectionProvider<Value> | Constructor<Value & object>): void {
+  register<Value>(providable: Constructor<Value & object> | InjectionProvider<Value>): void {
     if (isConstructor(providable)) {
       const Class = providable
       const metadata = getMetadata(Class)
@@ -104,7 +104,8 @@ export class Container {
     }
   }
 
-  resolve<Values extends unknown[]>(...injections: Injections<Values>): Values[number] {
+  resolve<Values extends unknown[]>(...injections: Injections<Values>): Values[number]
+  resolve<Value>(...injections: Injection<Value>[]): Value {
     for (const injection of injections) {
       if (isConfigLike(injection)) {
         if (isProvider(injection)) {

diff --git a/src/decorators.ts b/src/decorators.ts
@@ -1,5 +1,5 @@
 import {inject} from './inject'
-import type {Injections} from './injection'
+import type {Injection, Injections} from './injection'
 import {metadataRegistry} from './metadata'
 import type {InjectionScope} from './scope'
 import type {Constructor, InjectionToken} from './token'
@@ -33,7 +33,8 @@ export function Scoped<This extends object>(scope: InjectionScope): ClassDecorat
   }
 }
 
-export function Inject<Values extends unknown[]>(...injections: Injections<Values>): ClassFieldDecorator<Values[number]> {
+export function Inject<Values extends unknown[]>(...injections: Injections<Values>): ClassFieldDecorator<Values[number]>
+export function Inject<Value>(...injections: Injection<Value>[]): ClassFieldDecorator<Value> {
   return (_value, _context) =>
     function (this, _initialValue) {
       return inject.by(this, ...injections)

diff --git a/src/inject.ts b/src/inject.ts
@@ -1,16 +1,18 @@
 import {assert, ErrorMessage} from './errors'
-import type {Injections} from './injection'
+import type {Injection, Injections} from './injection'
 import {useInjectionContext} from './injection-context'
 
-export function inject<Values extends unknown[]>(...injections: Injections<Values>): Values[number] {
+export function inject<Values extends unknown[]>(...injections: Injections<Values>): Values[number]
+export function inject<Value>(...injections: Injection<Value>[]): Value {
   const context = useInjectionContext()
   assert(context, ErrorMessage.InjectOutsideOfContext)
   const container = context.container
   return container.resolve(...injections)
 }
 
 export namespace inject {
-  export function by<Values extends unknown[]>(thisArg: any, ...injections: Injections<Values>): Values[number] {
+  export function by<Values extends unknown[]>(thisArg: any, ...injections: Injections<Values>): Values[number]
+  export function by<Value>(thisArg: any, ...injections: Injection<Value>[]): Value {
     const context = useInjectionContext()
     assert(context, ErrorMessage.InjectOutsideOfContext)
     const resolution = context.resolution