huject - npm Package Compare versions

Comparing version 1.3.4 to 1.4.0

Changelog.md

@@ -0,0 +0,0 @@ # Version 1.3.4

example/bootstrap.ts

@@ -0,0 +0,0 @@ "use strict";

example/DeepService.ts

@@ -0,0 +0,0 @@ "use strict";

example/FirstService.ts

@@ -0,0 +0,0 @@ "use strict";

example/main.ts

@@ -0,0 +0,0 @@ "use strict";

example/SecondService.ts

@@ -0,0 +0,0 @@ "use strict";

example/ServiceInterface.ts

@@ -0,0 +0,0 @@ "use strict";

Gruntfile.js

@@ -15,2 +15,5 @@ module.exports = function(grunt) {
         ts: {
+            options: {
+                compiler: "./node_modules/typescript/bin/tsc"
+            },
             default: {
@@ -17,0 +20,0 @@ src: ['src/**/*.ts'],

huject.d.ts

@@ -121,3 +121,3 @@ declare module Huject {
      */
-    export function Inject(method: FactoryMethod);
+    export function Inject(method: FactoryMethod): any;
 
@@ -137,3 +137,3 @@ /**
      */
-    export function Inject(literal: string, method?: FactoryMethod);
+    export function Inject(literal: string, method?: FactoryMethod): any;
 
@@ -179,3 +179,3 @@ /**
      */
-    export function ConstructorInject(method: FactoryMethod);
+    export function ConstructorInject(method: FactoryMethod): any;
 
@@ -205,3 +205,3 @@ /**
      */
-    export function ConstructorInject(literal: string, method?: FactoryMethod);
+    export function ConstructorInject(literal: string, method?: FactoryMethod): any;
 
@@ -241,3 +241,3 @@ /**
      */
-    export function Optional(target: Object, propertyKey: string|symbol, parameterIndex: number);
+    export function Optional(target: Object, propertyKey: string|symbol, parameterIndex: number): any;
 
@@ -244,0 +244,0 @@ /**

package.json

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

Readme.md

@@ -14,4 +14,4 @@ # Typescript dependency injection for humans!
 * 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)
 
@@ -238,3 +238,3 @@ ## Todo
 // 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)
@@ -291,4 +291,4 @@ @Factory
         service: MyService, 
-        @Optional @ConstructorInject('token') param1: string, 
-        @Optional @ConstructorInject('seed') param2: number)
+        @Optional() @ConstructorInject('token') param1: string, 
+        @Optional() @ConstructorInject('seed') param2: number)
     {
@@ -310,7 +310,7 @@ if (param1 !== null) {
 class Test {
-    @Optional
+    @Optional()
     @Inject('classToken')
     public classParam1: string = "default string";
     
-    @Optional
+    @Optional()
     @Inject('servicePort')
@@ -317,0 +317,0 @@ public port: number = 80;

src/container.ts

@@ -0,0 +0,0 @@ import {Definition, FactoryMethod, DefinitionObjectType} from './definition';

src/containerfactory.ts

@@ -0,0 +0,0 @@

src/containerfactoryinterface.ts

@@ -0,0 +0,0 @@ /**

src/decorators.ts

@@ -16,3 +16,2 @@ import 'reflect-metadata';
             return targetOrFactoryMethodOrLiteral;
-            break;
         // constructor (@ConstructorInject(FactoryMethod) param1: class, ...);
@@ -28,3 +27,2 @@ case 'number':
             };
-            break;
         // constructor (@ConstructorInject('literal',FactoryMethod) param1: class, ...);
@@ -41,3 +39,2 @@ case 'string':
             };
-            break;
     }
@@ -89,3 +86,2 @@ }
             };
-            break;
         // @Inject(FactoryMethod)
@@ -105,3 +101,2 @@ case 'number':
             };
-            break;
     }
@@ -116,19 +111,11 @@ }
 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");
+        }
     }
@@ -148,3 +135,2 @@ }
             return target;
-            break;
         case 3:
@@ -155,6 +141,5 @@ target = args[0];
             return args[2];
-            break;
         default:
             throw new Error("@Factory decorator is not allowed here");
     }
-}
+}

src/definition.ts

@@ -0,0 +0,0 @@ export enum FactoryMethod {

src/factoryautoproxy.ts

@@ -0,0 +0,0 @@ import {ContainerResolver} from "./resolver";

src/index.js

@@ -1,4 +0,2 @@
-/**
- * Exporting library here
- */
+"use strict";
 var container_1 = require('./container');
@@ -5,0 +3,0 @@ exports.Container = container_1.Container;

src/index.ts

@@ -0,0 +0,0 @@ /**

src/resolver.ts

@@ -109,3 +109,2 @@ import 'es6-collections';
                 return this.singletonObjects.get(internalDefinition);
-                break;
             case FactoryMethod.FACTORY:
@@ -119,6 +118,4 @@ if (internalDefinition.definitionObjectType == DefinitionObjectType.CALLABLE) {
                 }
-                break;
             case FactoryMethod.OBJECT:
                 return constructor;
-                break;
         }
@@ -125,0 +122,0 @@ }

tests/autofactory.ts

@@ -0,0 +0,0 @@ import './bootstrap';

tests/bootstrap.ts

@@ -0,0 +0,0 @@ ///<reference path="../typings/tsd.d.ts"/>

tests/container.spec.ts

@@ -0,0 +0,0 @@ import './bootstrap';

tests/containerfactory.spec.ts

@@ -0,0 +0,0 @@ import './bootstrap';

tests/decorators.spec.ts

@@ -145,4 +145,4 @@ import './bootstrap';
     public constructor(
-        @ConstructorInject(FactoryMethod.SINGLETON) @Optional service: TestInterface,
-        @Optional @ConstructorInject('nonexist') num: number
+        @ConstructorInject(FactoryMethod.SINGLETON) @Optional() service: TestInterface,
+        @Optional() @ConstructorInject('nonexist') num: number
     ) {
@@ -156,7 +156,7 @@ this.test = service;
     @Inject('nonexiststring')
-    @Optional
+    @Optional()
     public str: string = "default";
 
     @Inject('nonexistnumber')
-    @Optional
+    @Optional()
     public num: number = 25;
@@ -269,6 +269,4 @@ }
     describe("When property injection has @Optional decorator", () => {
-        let containerSpy;
         beforeEach(() => {
             container.register(PropertyInjectionOptional);
-            containerSpy = sinon.spy(container, 'resolve');
         });
@@ -275,0 +273,0 @@ it("Should leave property original specified value", () => {

tsconfig.json

@@ -0,0 +0,0 @@ {

typings/chai/chai.d.ts

@@ -0,0 +0,0 @@ // Type definitions for chai 3.2.0

typings/es6-collections/es6-collections.d.ts

@@ -0,0 +0,0 @@ // Type definitions for es6-collections v0.5.1

typings/harmony-reflect/harmony-reflect.d.ts

@@ -0,0 +0,0 @@ declare module "harmony-reflect" {

No alert changes

Worsened metrics

Total package byte prevSize

222970

decreased by-34.36%

Number of package files

36

decreased by-40.98%

Lines of code

4717

decreased by-23.96%

No dependency changes