Merge pull request #62 from LeetCode-OpenSource/fix/di

fix(di): should get instance by token if @Inject param decorator used

Author: Brooooooklyn

src/core/scope/utils.ts

@@ -1,4 +1,4 @@
-import { InjectableFactory } from '@asuka/di'
+import { InjectableFactory, Inject } from '@asuka/di'
 import { Request } from 'express'
 
 import { ConstructorOf } from '../types'
@@ -25,16 +25,29 @@ export function createOrGetInstanceInScope<T>(constructor: ConstructorOf<T>, sco
 }
 
 function createInstanceInScope<T>(constructor: ConstructorOf<T>, scope: Scope): T {
-  const constructorParams: ConstructorOf<any>[] =
+  const paramTypes: ConstructorOf<any>[] =
     Reflect.getMetadata('design:paramtypes', constructor) || []
 
+  // parameters decorated by @Inject
+  const paramAnnotations = Reflect.getMetadata('parameters', constructor) || []
+
   const sameScopeParams: number[] = Reflect.getMetadata(SameScopeMetadataKey, constructor) || []
-  const deps = constructorParams.map((paramConstructor, index) => {
+
+  const deps = paramTypes.map((type, index) => {
     if (sameScopeParams[index]) {
-      return createOrGetInstanceInScope(paramConstructor, scope)
-    } else {
-      return InjectableFactory.getInstance(paramConstructor)
+      return createOrGetInstanceInScope(type, scope)
     }
+
+    if (paramAnnotations[index] !== null) {
+      let metadata: any[] = paramAnnotations[index]
+      metadata = Array.isArray(metadata) ? metadata : [metadata]
+      const inject: Inject | undefined = metadata.find((factory) => factory instanceof Inject)
+      if (inject && inject.token) {
+        return InjectableFactory.getInstanceByToken(inject.token)
+      }
+    }
+
+    return InjectableFactory.getInstance(type)
   })
 
   const newInstance = new constructor(...deps)

test/specs/hooks.spec.tsx

@@ -1,4 +1,4 @@
-import { Injectable } from '@asuka/di'
+import { Injectable, ValueProvider, Inject } from '@asuka/di'
 import * as React from 'react'
 import { act, create, ReactTestInstance, ReactTestRenderer } from 'react-test-renderer'
 import { Observable } from 'rxjs'
@@ -16,10 +16,22 @@ enum CountAction {
   MINUS = 'minus',
 }
 
-@Injectable()
+const numberProvider: ValueProvider = {
+  provide: 'token',
+  useValue: 0,
+}
+
+@Injectable({
+  providers: [numberProvider],
+})
 class Count extends Ayanami<State> {
   defaultState = {
-    count: 0,
+    count: -1,
+  }
+
+  constructor(@Inject(numberProvider.provide) number: number) {
+    super()
+    this.defaultState.count = number
   }
 
   @Reducer()