Decorators updated to use latest TypeDI version.

Added IDEA to gitignore.
Updated dependencies.

Author: Slava Fomin II

.gitignore

@@ -1,2 +1,3 @@
+.idea/
 node_modules/
 build/

package.json

@@ -23,6 +23,7 @@
     "typeorm-typedi"
   ],
   "devDependencies": {
+    "@types/node": "^7.0.4",
     "chai": "^3.5.0",
     "del": "^2.2.2",
     "gulp": "^3.9.1",
@@ -33,16 +34,16 @@
     "gulpclass": "^0.1.1",
     "pg": "^6.1.0",
     "reflect-metadata": "^0.1.9",
+    "sinon-chai": "^2.9.0",
     "ts-node": "^1.3.0",
     "tslint": "^3.15.1",
     "tslint-stylish": "^2.1.0-beta",
-    "typedi": "^0.4.2",
+    "typedi": "^0.5.0",
     "typeorm": "^0.0.11",
-    "typescript": "^2.1.5",
-    "@types/node": "^7.0.4"
+    "typescript": "^2.1.5"
   },
   "peerDependencies": {
     "typeorm": "^0.0.11",
-    "typedi": "^0.4.2"
+    "typedi": "^0.5.0"
   }
 }

src/decorators/OrmConnection.ts

@@ -1,5 +1,6 @@
 import {ConnectionManager} from "typeorm";
 import {Container} from "typedi";
+import {Handler} from "typedi/types/Handler";
 
 /**
  * Allows to inject an Connection using typedi's Container.
@@ -17,10 +18,20 @@ export function OrmConnection(connectionName: string = "default"): Function {
             return connectionManager.get(connectionName);
         };
 
+        let handler = <Handler> {
+            object: target,
+            value: getValue
+        };
+
         if (index !== undefined) {
-            Container.registerParamHandler({ type: target as Function, index: index, getValue: getValue });
-        } else {
-            Container.registerPropertyHandler({ target: target as Function /* todo: looks like typedi wrong type here */, key: propertyName, getValue: getValue });
+            handler.index = index;
+        }
+
+        if (propertyName !== undefined) {
+            handler.propertyName = propertyName;
         }
+
+        Container.registerHandler(handler);
+
     };
 }

src/decorators/OrmCustomRepository.ts

@@ -1,5 +1,6 @@
 import { ConnectionManager } from "typeorm";
 import { Container } from "typedi";
+import {Handler} from "typedi/types/Handler";
 
 /**
  * Allows to inject a custom Repository using typedi's Container.
@@ -19,10 +20,20 @@ export function OrmCustomRepository(cls: Function, connectionName: string = "def
             return connection.getCustomRepository(cls as any);
         };
 
+        let handler = <Handler> {
+            object: target,
+            value: getValue
+        };
+
         if (index !== undefined) {
-            Container.registerParamHandler({ type: target as Function, index: index, getValue: getValue });
-        } else {
-            Container.registerPropertyHandler({ target: target as Function /* todo: looks like typedi wrong type here */, key: propertyName, getValue: getValue });
+            handler.index = index;
+        }
+
+        if (propertyName !== undefined) {
+            handler.propertyName = propertyName;
         }
+
+        Container.registerHandler(handler);
+
     };
 }

src/decorators/OrmEntityManager.ts

@@ -1,5 +1,6 @@
 import {ConnectionManager} from "typeorm";
 import {Container} from "typedi";
+import {Handler} from "typedi/types/Handler";
 
 /**
  * Allows to inject an EntityManager using typedi's Container.
@@ -23,10 +24,20 @@ export function OrmEntityManager(connectionName: string = "default"): Function {
             return entityManager;
         };
 
+        let handler = <Handler> {
+            object: target,
+            value: getValue
+        };
+
         if (index !== undefined) {
-            Container.registerParamHandler({ type: target as Function, index: index, getValue: getValue });
-        } else {
-            Container.registerPropertyHandler({ target: target as Function /* todo: looks like typedi wrong type here */, key: propertyName, getValue: getValue });
+            handler.index = index;
+        }
+
+        if (propertyName !== undefined) {
+            handler.propertyName = propertyName;
         }
+
+        Container.registerHandler(handler);
+
     };
 }

src/decorators/OrmRepository.ts

@@ -1,5 +1,6 @@
 import {ConnectionManager} from "typeorm";
 import {Container} from "typedi";
+import {Handler} from "typedi/types/Handler";
 
 /**
  * Allows to inject a Repository using typedi's Container.
@@ -19,10 +20,20 @@ export function OrmRepository(cls: Function, connectionName: string = "default")
             return connection.getRepository(cls as any);
         };
 
+        let handler = <Handler> {
+            object: target,
+            value: getValue
+        };
+
         if (index !== undefined) {
-            Container.registerParamHandler({ type: target as Function, index: index, getValue: getValue });
-        } else {
-            Container.registerPropertyHandler({ target: target as Function /* todo: looks like typedi wrong type here */, key: propertyName, getValue: getValue });
+            handler.index = index;
+        }
+
+        if (propertyName !== undefined) {
+            handler.propertyName = propertyName;
         }
+
+        Container.registerHandler(handler);
+
     };
 }

src/decorators/OrmSpecificRepository.ts

@@ -1,5 +1,6 @@
 import {ConnectionManager} from "typeorm";
 import {Container} from "typedi";
+import {Handler} from "typedi/types/Handler";
 
 /**
  * Allows to inject a SpecificRepository using typedi's Container.
@@ -18,10 +19,20 @@ export function OrmSpecificRepository(cls: Function, connectionName: string = "d
             return connection.getSpecificRepository(cls as any);
         };
 
+        let handler = <Handler> {
+            object: target,
+            value: getValue
+        };
+
         if (index !== undefined) {
-            Container.registerParamHandler({ type: target as Function, index: index, getValue: getValue });
-        } else {
-            Container.registerPropertyHandler({ target: target as Function /* todo: looks like typedi wrong type here */, key: propertyName, getValue: getValue });
+            handler.index = index;
+        }
+
+        if (propertyName !== undefined) {
+            handler.propertyName = propertyName;
         }
+
+        Container.registerHandler(handler);
+
     };
 }

src/decorators/OrmTreeRepository.ts

@@ -1,5 +1,6 @@
 import {ConnectionManager} from "typeorm";
 import {Container} from "typedi";
+import {Handler} from "typedi/types/Handler";
 
 /**
  * Allows to inject a TreeRepository using typedi's Container.
@@ -18,10 +19,20 @@ export function OrmTreeRepository(cls: Function, connectionName: string = "defau
             return connection.getTreeRepository(cls as any);
         };
 
+        let handler = <Handler> {
+            object: target,
+            value: getValue
+        };
+
         if (index !== undefined) {
-            Container.registerParamHandler({ type: target as Function, index: index, getValue: getValue });
-        } else {
-            Container.registerPropertyHandler({ target: target as Function /* todo: looks like typedi wrong type here */, key: propertyName, getValue: getValue });
+            handler.index = index;
+        }
+
+        if (propertyName !== undefined) {
+            handler.propertyName = propertyName;
         }
+
+        Container.registerHandler(handler);
+
     };
 }