added support for function DI

Author: Umed Khudoiberdiev

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.8.0
+
+* added new type of dependency injection - function DI
+
 ## 0.7.2
 
 * fixed bug with inherited services

README.md

@@ -77,7 +77,7 @@ coffeeMaker.make();
 
 With TypeDI you can use a named services. Example:
 
-```typescript
+```javascript
 var Container = require("typedi").Container;
 
 class BeanFactory implements Factory {
@@ -127,7 +127,7 @@ coffeeMaker.make();
 This feature especially useful if you want to store (and inject later on) some settings or configuration options.
 For example:
 
-```typescript
+```javascript
 var Container = require("typedi").Container;
 
 // somewhere in your global app parameters
@@ -144,7 +144,7 @@ class UserRepository {
 
 When you write tests you can easily provide your own "fake" dependencies to classes you are testing using `set` method:
 
-```typescript
+```javascript
 Container.set(CoffeeMaker, new FakeCoffeeMaker());
 
 // or for named services
@@ -156,6 +156,47 @@ Container.set([
 ]);
 ```
 
+TypeDI also supports a function dependency injection. Here is how it looks like:
+
+
+```javascript
+var Service = require("typedi").Service;
+var Container = require("typedi").Container;
+
+var PostRepository = Service(() => ({
+    getName() {
+        return "hello from post repository";
+    }
+}));
+
+var PostManager = Service(() => ({
+    getId() {
+        return "some post id";
+    }
+}));
+
+class PostQueryBuilder {
+    build() {
+        return "SUPER * QUERY";
+    }
+}
+
+var PostController = Service([
+    PostManager,
+    PostRepository,
+    PostQueryBuilder
+], (manager, repository, queryBuilder) => {
+    return {
+        id: manager.getId(),
+        name: repository.getName(),
+        query: queryBuilder.build()
+    };
+});
+
+var postController = Container.get(PostController);
+console.log(postController);
+```
+
 ## Usage with TypeScript
 
 1. Install module:
@@ -715,6 +756,44 @@ export class QuestionUtils {
 
 And this global service will be the same instance across all containers.
 
+TypeDI also supports a function dependency injection. Here is how it looks like:
+
+
+```javascript
+export const PostRepository = Service(() => ({
+    getName() {
+        return "hello from post repository";
+    }
+}));
+
+export const PostManager = Service(() => ({
+    getId() {
+        return "some post id";
+    }
+}));
+
+export class PostQueryBuilder {
+    build() {
+        return "SUPER * QUERY";
+    }
+}
+
+export const PostController = Service([
+    PostManager,
+    PostRepository,
+    PostQueryBuilder
+], (manager, repository, queryBuilder) => {
+    return {
+        id: manager.getId(),
+        name: repository.getName(),
+        query: queryBuilder.build()
+    };
+});
+
+const postController = Container.get(PostController);
+console.log(postController);
+```
+
 ### Remove registered services or reset container state
 
 If you need to remove registered service from container simply use `Container.remove(...)` method.

sample/sample15-function-inject/PostController.ts

@@ -0,0 +1,16 @@
+import {Service} from "../../src/decorators/Service";
+import {PostManager} from "./PostManager";
+import {PostQueryBuilder} from "./PostQueryBuilder";
+import {PostRepository} from "./PostRepository";
+
+export const PostController = Service([
+    PostManager,
+    PostRepository,
+    PostQueryBuilder
+], (manager, repository, queryBuilder) => {
+    return {
+        id: manager.getId(),
+        name: repository.getName(),
+        query: queryBuilder.build()
+    };
+});

sample/sample15-function-inject/PostManager.ts

@@ -0,0 +1,7 @@
+import {Service} from "../../src/decorators/Service";
+
+export const PostManager = Service(() => ({
+    getId() {
+        return "some post id";
+    }
+}));

sample/sample15-function-inject/PostQueryBuilder.ts

@@ -0,0 +1,6 @@
+
+export class PostQueryBuilder {
+    build() {
+        return "SUPER * QUERY";
+    }
+}

sample/sample15-function-inject/PostRepository.ts

@@ -0,0 +1,7 @@
+import {Service} from "../../src/decorators/Service";
+
+export const PostRepository = Service(() => ({
+    getName() {
+        return "hello from post repository";
+    }
+}));

sample/sample15-function-inject/app.ts

@@ -0,0 +1,5 @@
+import {Container} from "../../src";
+import {PostController} from "./PostController";
+
+const postController = Container.get(PostController);
+console.log(postController);

src/Container.ts

@@ -1,9 +1,9 @@
-import {ServiceMetadata} from "./types/ServiceMetadata";
-import {ObjectType} from "./types/ObjectType";
-import {Handler} from "./types/Handler";
+import {ContainerInstance} from "./ContainerInstance";
 import {Token} from "./Token";
+import {Handler} from "./types/Handler";
+import {ObjectType} from "./types/ObjectType";
 import {ServiceIdentifier} from "./types/ServiceIdentifier";
-import {ContainerInstance} from "./ContainerInstance";
+import {ServiceMetadata} from "./types/ServiceMetadata";
 
 /**
  * Service container.
@@ -97,7 +97,13 @@ export class Container {
      * Retrieves the service with given name or type from the service container.
      * Optionally, parameters can be passed in case if instance is initialized in the container for the first time.
      */
-    static get<T>(identifier: ServiceIdentifier): T {
+    static get<T>(service: { service: T }): T;
+
+    /**
+     * Retrieves the service with given name or type from the service container.
+     * Optionally, parameters can be passed in case if instance is initialized in the container for the first time.
+     */
+    static get<T>(identifier: ServiceIdentifier<T>): T {
         return this.globalInstance.get(identifier as any);
     }
 

src/ContainerInstance.ts

@@ -1,10 +1,10 @@
-import {ServiceMetadata} from "./types/ServiceMetadata";
-import {ObjectType} from "./types/ObjectType";
+import {Container} from "./Container";
+import {MissingProvidedServiceTypeError} from "./error/MissingProvidedServiceTypeError";
+import {ServiceNotFoundError} from "./error/ServiceNotFoundError";
 import {Token} from "./Token";
+import {ObjectType} from "./types/ObjectType";
 import {ServiceIdentifier} from "./types/ServiceIdentifier";
-import {ServiceNotFoundError} from "./error/ServiceNotFoundError";
-import {MissingProvidedServiceTypeError} from "./error/MissingProvidedServiceTypeError";
-import {Container} from "./Container";
+import {ServiceMetadata} from "./types/ServiceMetadata";
 
 /**
  * TypeDI can have multiple containers.
@@ -90,7 +90,13 @@ export class ContainerInstance {
      * Retrieves the service with given name or type from the service container.
      * Optionally, parameters can be passed in case if instance is initialized in the container for the first time.
      */
-    get<T>(identifier: ServiceIdentifier): T {
+    get<T>(id: { service: T }): T;
+
+    /**
+     * Retrieves the service with given name or type from the service container.
+     * Optionally, parameters can be passed in case if instance is initialized in the container for the first time.
+     */
+    get<T>(identifier: ServiceIdentifier<T>): T {
 
         const globalContainer = Container.of(undefined);
         let service = globalContainer.findService(identifier);
@@ -174,12 +180,15 @@ export class ContainerInstance {
         if (typeof identifierOrServiceMetadata === "string" || identifierOrServiceMetadata instanceof Token) {
             return this.set({ id: identifierOrServiceMetadata, value: value });
         }
+        if (typeof identifierOrServiceMetadata === "object" && (identifierOrServiceMetadata as { service: Token<any> }).service) {
+            return this.set({ id: (identifierOrServiceMetadata as { service: Token<any> }).service, value: value });
+        }
         if (identifierOrServiceMetadata instanceof Function) {
             return this.set({ type: identifierOrServiceMetadata, id: identifierOrServiceMetadata, value: value });
         }
 
         // const newService: ServiceMetadata<any, any> = arguments.length === 1 && typeof identifierOrServiceMetadata === "object"  && !(identifierOrServiceMetadata instanceof Token) ? identifierOrServiceMetadata : undefined;
-        const newService: ServiceMetadata<any, any> = identifierOrServiceMetadata;
+        const newService: ServiceMetadata<any, any> = identifierOrServiceMetadata as any;
         const service = this.findService(newService.id);
         if (service && service.multiple !== true) {
             Object.assign(service, newService);
@@ -234,8 +243,15 @@ export class ContainerInstance {
      */
     private findService(identifier: ServiceIdentifier): ServiceMetadata<any, any>|undefined {
         return this.services.find(service => {
-            if (service.id)
+            if (service.id) {
+                if (identifier instanceof Object &&
+                    service.id instanceof Token &&
+                    (identifier as any).service instanceof Token) {
+                    return service.id === (identifier as any).service;
+                }
+
                 return service.id === identifier;
+            }
 
             if (service.type && identifier instanceof Function)
                 return service.type === identifier; // todo: not sure why it was here || identifier.prototype instanceof service.type;
@@ -270,6 +286,9 @@ export class ContainerInstance {
 
         } else if (identifier instanceof Function) {
             type = identifier;
+
+        // } else if (identifier instanceof Object && (identifier as { service: Token<any> }).service instanceof Token) {
+        //     type = (identifier as { service: Token<any> }).service;
         }
 
         // if service was not found then create a new one and register it
@@ -300,7 +319,7 @@ export class ContainerInstance {
                 value = (this.get(service.factory[0]) as any)[service.factory[1]](...params);
 
             } else { // regular factory function
-                value = service.factory(...params);
+                value = service.factory(...params, this);
             }
 
         } else {  // otherwise simply create a new object instance