Renamed injectable wrapper. Added minor changes for factory support.

src/scripts/Decorators.ts

@@ -8,18 +8,18 @@ export function inject(type: Index) {
 }
 
 export function injectable<T extends IConstructor<any>>(Constructor: T): T {
-    class Wrapper extends Constructor {
+    class Injected extends Constructor {
         constructor(...args: any[]) {
             super(...ParameterInfo.getArgs(Constructor, args));
         }
     }
 
     // Change Wrapper name to match Constructor
-    Object.defineProperty(Wrapper, 'name', {
+    Object.defineProperty(Injected, 'name', {
         value: Constructor.name
     });
 
-    return Wrapper;
+    return Injected;
 }
 
 export function factory<T extends IFactory<any>>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) {

src/scripts/InjectionContext.ts

@@ -41,4 +41,8 @@ export default class InjectionContext {
     static inject<T>(constructor: IConstructor<T>): T {
         return new constructor(...ParameterInfo.getArgs(constructor));
     }
+
+    static injectFunction<T>(func: Function): T {
+        return func(...ParameterInfo.getArgs(func));
+    }
 }

src/scripts/Types.ts

@@ -1,7 +1,9 @@
 export enum InjectionBindingType {
-    value,
-    constructor
+    value = 'value',
+    constructor = 'constructor',
+    factory = 'factory'
 }
+
 export type Index = string | number | Symbol;
 
 export type IConstructor<T> = new (...args: any[]) => T;