made Handler to accept a container instance

Author: Umed Khudoiberdiev

CHANGELOG.md

@@ -8,3 +8,4 @@
 * deprecated `Require` decorator. Use es6 imports instead or named services
 * inherited classes don't need to be decorated with `@Service` decorator
 * other small api changes
+* now `Handler`'s `value` accepts a container which requests the value

README.md

@@ -441,7 +441,7 @@ For example:
 export function Logger() {
     return function(object: Object, propertyName: string, index?: number) {
         const logger = new ConsoleLogger();
-        Container.registerHandler({ object, propertyName, index, value: () => logger });
+        Container.registerHandler({ object, propertyName, index, value: containerInstance => logger });
     };
 }
 

sample/sample9-custom-decorator/Logger.ts

@@ -4,6 +4,6 @@ import {ConsoleLogger} from "./ConsoleLogger";
 export function Logger() {
     return function(object: Object, propertyName: string, index?: number) {
         const logger = new ConsoleLogger();
-        Container.registerHandler({ object, propertyName, index, value: () => logger });
+        Container.registerHandler({ object, propertyName, index, value: containerInstance => logger });
     };
 }

src/ContainerInstance.ts

@@ -282,7 +282,7 @@ export class ContainerInstance {
         return paramTypes.map((paramType, index) => {
             const paramHandler = Container.handlers.find(handler => handler.object === type && handler.index === index);
             if (paramHandler)
-                return paramHandler.value();
+                return paramHandler.value(this);
 
             if (paramType && paramType.name && !this.isTypePrimitive(paramType.name)) {
                 return this.get(paramType);
@@ -312,7 +312,7 @@ export class ContainerInstance {
                 enumerable: true,
                 writable: true,
                 configurable: true,
-                value: handler.value()
+                value: handler.value(this)
             });
         });
     }

src/decorators/Inject.ts

@@ -30,7 +30,7 @@ export function Inject(typeOrName?: ((type?: any) => Function)|string|Token<any>
             object: target,
             propertyName: propertyName,
             index: index,
-            value: () => {
+            value: containerInstance => {
                 let identifier: any;
                 if (typeof typeOrName === "string") {
                     identifier = typeOrName;
@@ -45,7 +45,7 @@ export function Inject(typeOrName?: ((type?: any) => Function)|string|Token<any>
                 if (identifier === Object)
                     throw new CannotInjectError(target, propertyName);
 
-                return Container.get<any>(identifier);
+                return containerInstance.get<any>(identifier);
             }
         });
     };

src/decorators/Require.ts

@@ -13,7 +13,7 @@ export function Require(name: string) {
             object: target,
             propertyName: propertyName,
             index: index,
-            value: () => require(name)
+            value: containerInstance => require(name)
         });
     };
 }

src/types/Handler.ts

@@ -1,3 +1,5 @@
+import {ContainerInstance} from "../ContainerInstance";
+
 /**
  * Used to register special "handler" which will be executed on a service class during its initialization.
  * It can be used to create custom decorators and set/replace service class properties and constructor parameters.
@@ -23,7 +25,8 @@ export interface Handler {
 
     /**
      * Factory function that produces value that will be set to class property or constructor parameter.
+     * Accepts container instance which requested the value.
      */
-    value: () => any;
+    value: (container: ContainerInstance) => any;
 
 }

test/Container.spec.ts

@@ -202,13 +202,13 @@ describe("Container", function() {
             Container.registerHandler({
                 object: ExtraService,
                 index: 0,
-                value: () => 777
+                value: containerInstance => 777
             });
 
             Container.registerHandler({
                 object: ExtraService,
                 index: 1,
-                value: () => "hello parameter"
+                value: containerInstance => "hello parameter"
             });
 
             Container.get(ExtraService).luckyNumber.should.be.equal(777);
@@ -223,7 +223,7 @@ describe("Container", function() {
                     Container.registerHandler({
                         object: target,
                         propertyName: propertyName,
-                        value: () => value
+                        value: containerInstance => value
                     });
                 };
             }