fixes #26

Author: Umed Khudoiberdiev

package.json

@@ -1,6 +1,6 @@
 {
   "name": "typedi",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "Dependency injection for TypeScript",
   "license": "MIT",
   "readmeFilename": "README.md",

src/decorators/Inject.ts

@@ -1,4 +1,5 @@
 import {Container} from "../Container";
+import {Token} from "../Token";
 
 /**
  * Injects a service into a class property or constructor parameter.
@@ -13,7 +14,12 @@ export function Inject(serviceName?: string): Function;
 /**
  * Injects a service into a class property or constructor parameter.
  */
-export function Inject(typeOrName?: ((type?: any) => Function)|string): Function {
+export function Inject(token: Token<any>): Function;
+
+/**
+ * Injects a service into a class property or constructor parameter.
+ */
+export function Inject(typeOrName?: ((type?: any) => Function)|string|Token<any>): Function {
     return function(target: Object, propertyName: string, index?: number) {
 
         if (!typeOrName)
@@ -23,7 +29,19 @@ export function Inject(typeOrName?: ((type?: any) => Function)|string): Function
             object: target,
             propertyName: propertyName,
             index: index,
-            value: () => Container.get<any>(typeof typeOrName === "string" ? typeOrName : typeOrName() as any)
+            value: () => {
+                let identifier: any;
+                if (typeof typeOrName === "string") {
+                    identifier = typeOrName;
+
+                } else if (typeOrName instanceof Token) {
+                    identifier = typeOrName;
+
+                } else {
+                    identifier = typeOrName();
+                }
+                return Container.get<any>(identifier);
+            }
         });
     };
 }

test/decorators/Inject.spec.ts

@@ -2,6 +2,7 @@ import "reflect-metadata";
 import {Container} from "../../src/Container";
 import {Service} from "../../src/decorators/Service";
 import {Inject} from "../../src/decorators/Inject";
+import {Token} from "../../src/Token";
 
 describe("Inject Decorator", function() {
 
@@ -19,6 +20,23 @@ describe("Inject Decorator", function() {
         Container.get(SecondTestService).testService.should.be.instanceOf(TestService);
     });
 
+    it("should inject token service properly", function() {
+        interface Test {
+
+        }
+        const ServiceToken = new Token<Test>();
+
+        @Service(ServiceToken)
+        class TestService {
+        }
+        @Service()
+        class SecondTestService {
+            @Inject(ServiceToken)
+            testService: Test;
+        }
+        Container.get(SecondTestService).testService.should.be.instanceOf(TestService);
+    });
+
     it("should inject named service into class property", function() {
         @Service("mega.service")
         class NamedService {