Refactored and simplified the decorators.

Author: Slava Fomin II

src/decorators/OrmConnection.ts

@@ -1,37 +1,19 @@
 import {ConnectionManager} from "typeorm";
 import {Container} from "typedi";
-import {Handler} from "typedi/types/Handler";
 
 /**
  * Allows to inject an Connection using typedi's Container.
  */
 export function OrmConnection(connectionName: string = "default"): Function {
-    return function(target: Object|Function, propertyName: string, index?: number) {
-
-        const getValue = () => {
+    return function(object: Object|Function, propertyName: string, index?: number) {
+        Container.registerHandler({ object, index, propertyName, value: () => {
             const connectionManager = Container.get(ConnectionManager);
             if (!connectionManager.has(connectionName))
                 throw new Error(`Cannot get connection "${connectionName}" from the connection manager. ` +
-                `Make sure you have created such connection. Also make sure you have called useContainer(Container) ` +
-                `in your application before you established a connection and importing any entity.`);
+                  `Make sure you have created such connection. Also make sure you have called useContainer(Container) ` +
+                  `in your application before you established a connection and importing any entity.`);
 
             return connectionManager.get(connectionName);
-        };
-
-        let handler = <Handler> {
-            object: target,
-            value: getValue
-        };
-
-        if (index !== undefined) {
-            handler.index = index;
-        }
-
-        if (propertyName !== undefined) {
-            handler.propertyName = propertyName;
-        }
-
-        Container.registerHandler(handler);
-
+        }});
     };
 }

src/decorators/OrmCustomRepository.ts

@@ -1,39 +1,21 @@
 import { ConnectionManager } from "typeorm";
 import { Container } from "typedi";
-import {Handler} from "typedi/types/Handler";
 
 /**
  * Allows to inject a custom Repository using typedi's Container.
  * Use it to get the repository class decorated with @EntityRepository decorator.
  */
 export function OrmCustomRepository(cls: Function, connectionName: string = "default"): Function {
-    return function(target: Object|Function, propertyName: string, index?: number) {
-
-        const getValue = () => {
+    return function(object: Object|Function, propertyName: string, index?: number) {
+        Container.registerHandler({ object, index, propertyName, value: () => {
             const connectionManager = Container.get(ConnectionManager);
             if (!connectionManager.has(connectionName))
                 throw new Error(`Cannot get connection "${connectionName}" from the connection manager. ` +
-                    `Make sure you have created such connection. Also make sure you have called useContainer(Container) ` +
-                    `in your application before you established a connection and importing any entity.`);
+                  `Make sure you have created such connection. Also make sure you have called useContainer(Container) ` +
+                  `in your application before you established a connection and importing any entity.`);
 
             const connection = connectionManager.get(connectionName);
             return connection.getCustomRepository(cls as any);
-        };
-
-        let handler = <Handler> {
-            object: target,
-            value: getValue
-        };
-
-        if (index !== undefined) {
-            handler.index = index;
-        }
-
-        if (propertyName !== undefined) {
-            handler.propertyName = propertyName;
-        }
-
-        Container.registerHandler(handler);
-
+        }});
     };
 }

src/decorators/OrmEntityManager.ts

@@ -1,43 +1,25 @@
 import {ConnectionManager} from "typeorm";
 import {Container} from "typedi";
-import {Handler} from "typedi/types/Handler";
 
 /**
  * Allows to inject an EntityManager using typedi's Container.
  */
 export function OrmEntityManager(connectionName: string = "default"): Function {
-    return function(target: Object|Function, propertyName: string, index?: number) {
-
-        const getValue = () => {
+    return function(object: Object|Function, propertyName: string, index?: number) {
+        Container.registerHandler({ object, index, propertyName, value: () => {
             const connectionManager = Container.get(ConnectionManager);
             if (!connectionManager.has(connectionName))
                 throw new Error(`Cannot get connection "${connectionName}" from the connection manager. ` +
-                `Make sure you have created such connection. Also make sure you have called useContainer(Container) ` +
-                `in your application before you established a connection and importing any entity.`);
+                  `Make sure you have created such connection. Also make sure you have called useContainer(Container) ` +
+                  `in your application before you established a connection and importing any entity.`);
 
             const connection = connectionManager.get(connectionName);
             const entityManager = connection.entityManager;
             if (!entityManager)
                 throw new Error(`Entity manager was not found on "${connectionName}" connection. ` +
-                    `Make sure you correctly setup connection and container usage.`);
+                  `Make sure you correctly setup connection and container usage.`);
 
             return entityManager;
-        };
-
-        let handler = <Handler> {
-            object: target,
-            value: getValue
-        };
-
-        if (index !== undefined) {
-            handler.index = index;
-        }
-
-        if (propertyName !== undefined) {
-            handler.propertyName = propertyName;
-        }
-
-        Container.registerHandler(handler);
-
+        }});
     };
 }

src/decorators/OrmRepository.ts

@@ -1,39 +1,21 @@
 import {ConnectionManager} from "typeorm";
 import {Container} from "typedi";
-import {Handler} from "typedi/types/Handler";
 
 /**
  * Allows to inject a Repository using typedi's Container.
  * If you want to inject custom Repository class decorated with @EntityRepository decorator, use OrmCustomRepository instead.
  */
 export function OrmRepository(cls: Function, connectionName: string = "default"): Function {
-    return function(target: Object|Function, propertyName: string, index?: number) {
-
-        const getValue = () => {
+    return function(object: Object|Function, propertyName: string, index?: number) {
+        Container.registerHandler({ object, index, propertyName, value: () => {
             const connectionManager = Container.get(ConnectionManager);
             if (!connectionManager.has(connectionName))
                 throw new Error(`Cannot get connection "${connectionName}" from the connection manager. ` +
-                    `Make sure you have created such connection. Also make sure you have called useContainer(Container) ` +
-                    `in your application before you established a connection and importing any entity.`);
+                  `Make sure you have created such connection. Also make sure you have called useContainer(Container) ` +
+                  `in your application before you established a connection and importing any entity.`);
 
             const connection = connectionManager.get(connectionName);
             return connection.getRepository(cls as any);
-        };
-
-        let handler = <Handler> {
-            object: target,
-            value: getValue
-        };
-
-        if (index !== undefined) {
-            handler.index = index;
-        }
-
-        if (propertyName !== undefined) {
-            handler.propertyName = propertyName;
-        }
-
-        Container.registerHandler(handler);
-
+        }});
     };
 }

src/decorators/OrmSpecificRepository.ts

@@ -1,38 +1,20 @@
 import {ConnectionManager} from "typeorm";
 import {Container} from "typedi";
-import {Handler} from "typedi/types/Handler";
 
 /**
  * Allows to inject a SpecificRepository using typedi's Container.
  */
 export function OrmSpecificRepository(cls: Function, connectionName: string = "default"): Function {
-    return function(target: Object|Function, propertyName: string, index?: number) {
-
-        const getValue = () => {
+    return function(object: Object|Function, propertyName: string, index?: number) {
+        Container.registerHandler({ object, index, propertyName, value: () => {
             const connectionManager = Container.get(ConnectionManager);
             if (!connectionManager.has(connectionName))
                 throw new Error(`Cannot get connection "${connectionName}" from the connection manager. ` +
-                    `Make sure you have created such connection. Also make sure you have called useContainer(Container) ` +
-                    `in your application before you established a connection and importing any entity.`);
+                  `Make sure you have created such connection. Also make sure you have called useContainer(Container) ` +
+                  `in your application before you established a connection and importing any entity.`);
 
             const connection = connectionManager.get(connectionName);
             return connection.getSpecificRepository(cls as any);
-        };
-
-        let handler = <Handler> {
-            object: target,
-            value: getValue
-        };
-
-        if (index !== undefined) {
-            handler.index = index;
-        }
-
-        if (propertyName !== undefined) {
-            handler.propertyName = propertyName;
-        }
-
-        Container.registerHandler(handler);
-
+        }});
     };
-}
+}

src/decorators/OrmTreeRepository.ts

@@ -1,38 +1,20 @@
 import {ConnectionManager} from "typeorm";
 import {Container} from "typedi";
-import {Handler} from "typedi/types/Handler";
 
 /**
  * Allows to inject a TreeRepository using typedi's Container.
  */
 export function OrmTreeRepository(cls: Function, connectionName: string = "default"): Function {
-    return function(target: Object|Function, propertyName: string, index?: number) {
-
-        const getValue = () => {
+    return function(object: Object|Function, propertyName: string, index?: number) {
+        Container.registerHandler({ object, index, propertyName, value: () => {
             const connectionManager = Container.get(ConnectionManager);
             if (!connectionManager.has(connectionName))
                 throw new Error(`Cannot get connection "${connectionName}" from the connection manager. ` +
-                    `Make sure you have created such connection. Also make sure you have called useContainer(Container) ` +
-                    `in your application before you established a connection and importing any entity.`);
+                  `Make sure you have created such connection. Also make sure you have called useContainer(Container) ` +
+                  `in your application before you established a connection and importing any entity.`);
 
             const connection = connectionManager.get(connectionName);
             return connection.getTreeRepository(cls as any);
-        };
-
-        let handler = <Handler> {
-            object: target,
-            value: getValue
-        };
-
-        if (index !== undefined) {
-            handler.index = index;
-        }
-
-        if (propertyName !== undefined) {
-            handler.propertyName = propertyName;
-        }
-
-        Container.registerHandler(handler);
-
+        }});
     };
-}
+}