Make @optional, @optional(), fix tests

Gruntfile.js

@@ -12,6 +12,9 @@ module.exports = function(grunt) {
         },
 
         ts: {
+            options: {
+                compiler: "./node_modules/typescript/bin/tsc"
+            },
             default: {
                 src: ['src/**/*.ts'],
                 tsconfig: './tsconfig.json'

Readme.md

@@ -11,8 +11,8 @@ This DI container supports:
 * Property and constructor dependencies autowiring
 * Simple API, just 3 methods and few decorators to go
 * Optional injection (from version 1.2)
-* Injecting container as factory (**new** 1.3 version)
-* Auto-Creating object factories! (**new** 1.3 version)
+* Injecting container as factory (from 1.3 version)
+* Auto-Creating object factories! (from 1.3 version)
 
 ## Todo
 * Lazy injection
@@ -234,7 +234,7 @@ You can specify dependencies by using decorators:
 @ConstructorInject(literal: string, method?: FactoryMethod)
 // Use before class property/constructor argument with either @Inject or @ConstructorInject. Specified optional (non-strict) resolution
 // If dependency wasn't found then leave original value (for property injection) or pass null (for constructor injection)
-@Optional
+@Optional()
 // Used for creating auto factories (See below)
 @Factory
 ```
@@ -286,8 +286,8 @@ import {Optional} from 'huject';
 class Test {
     public constructor(
         service: MyService, 
-        @Optional @ConstructorInject('token') param1: string, 
-        @Optional @ConstructorInject('seed') param2: number)
+        @Optional() @ConstructorInject('token') param1: string, 
+        @Optional() @ConstructorInject('seed') param2: number)
     {
         if (param1 !== null) {
             ....
@@ -304,11 +304,11 @@ import {Optional, Inject} from 'huject';
 container.register('classToken', 'mytoken');
 
 class Test {
-    @Optional
+    @Optional()
     @Inject('classToken')
     public classParam1: string = "default string";
 
-    @Optional
+    @Optional()
     @Inject('servicePort')
     public port: number = 80;
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "huject",
-  "version": "1.3.4",
+  "version": "1.4.0",
   "description": "Typescript dependency injection container for humans",
   "main": "./src/index.js",
   "scripts": {

src/decorators.ts

@@ -103,23 +103,15 @@ export function Inject(targetOrFactoryMethodOrLiteral: any, propertyKeyOrFactory
  * @constructor
  */
 export function Optional(...args: any[]): any {
-    let target;
-    switch (args.length) {
-        // Property @Optional
-        case 2:
-            target = args[0];
-            let propertyKey = args[1];
+    return function (target: Object, propertyKey: string, parameterIndex: number) {
+        if (typeof parameterIndex === "undefined") {
+            // Property @Optional()
             Reflect.defineMetadata("inject:property:optional", true, target, propertyKey);
-            break;
-        // Constructor @Optional
-        case 3:
-            target = args[0];
-            let parameterIndex = args[2];
+        } else {
+            // Constructor @Optional()
             let metadataName = 'inject:constructor:param' + parameterIndex + ':optional';
             Reflect.defineMetadata(metadataName, true, target);
-            break;
-        default:
-            throw new Error("@Optional decorator is not allowed here");
+        }
     }
 }
 

tests/decorators.spec.ts

@@ -142,8 +142,8 @@ class ConstructorInjectionOptional {
     public num: number;
 
     public constructor(
-        @ConstructorInject(FactoryMethod.SINGLETON) @Optional service: TestInterface,
-        @Optional @ConstructorInject('nonexist') num: number
+        @ConstructorInject(FactoryMethod.SINGLETON) @Optional() service: TestInterface,
+        @Optional() @ConstructorInject('nonexist') num: number
     ) {
         this.test = service;
         this.num = num;
@@ -152,11 +152,11 @@ class ConstructorInjectionOptional {
 
 class PropertyInjectionOptional {
     @Inject('nonexiststring')
-    @Optional
+    @Optional()
     public str: string = "default";
 
     @Inject('nonexistnumber')
-    @Optional
+    @Optional()
     public num: number = 25;
 }
 
@@ -264,10 +264,8 @@ describe("Testing container's autowiring by using decorators", function () {
     });
 
     describe("When property injection has @Optional decorator", () => {
-        let containerSpy;
         beforeEach(() => {
             container.register(PropertyInjectionOptional);
-            containerSpy = sinon.spy(container, 'resolve');
         });
         it("Should leave property original specified value", () => {
             let impl: PropertyInjectionOptional = container.resolve(PropertyInjectionOptional);