fixed issue #53, version bump

Author: Umed Khudoiberdiev

package.json

@@ -1,6 +1,6 @@
 {
   "name": "typedi",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "Dependency injection for TypeScript",
   "license": "MIT",
   "readmeFilename": "README.md",

src/ContainerInstance.ts

@@ -94,8 +94,19 @@ export class ContainerInstance {
 
         const globalContainer = Container.of(undefined);
         let service = globalContainer.findService(identifier);
-        if ((!service || service.global !== true) && globalContainer !== this)
-            service = this.findService(identifier);
+        let scopedService = this.findService(identifier);
+
+        if (service && service.global === true)
+            return this.getServiceValue(identifier, service);
+
+        if (scopedService)
+            return this.getServiceValue(identifier, scopedService);
+
+        if (service && this !== globalContainer) {
+            const clonedService = Object.assign({}, service);
+            clonedService.value = undefined;
+            return this.getServiceValue(identifier, clonedService);
+        }
 
         return this.getServiceValue(identifier, service);
     }

src/decorators/Service.ts

@@ -36,14 +36,14 @@ export function Service<T, K extends keyof T>(optionsOrServiceName?: ServiceOpti
         if (typeof optionsOrServiceName === "string" || optionsOrServiceName instanceof Token) {
             service.id = optionsOrServiceName;
             service.multiple = (optionsOrServiceName as ServiceOptions<T, K>).multiple;
-            service.global = true;
+            service.global = (optionsOrServiceName as ServiceOptions<T, K>).global || false;
             service.transient = (optionsOrServiceName as ServiceOptions<T, K>).transient;
 
         } else if (optionsOrServiceName) { // ServiceOptions
             service.id = (optionsOrServiceName as ServiceOptions<T, K>).id;
             service.factory = (optionsOrServiceName as ServiceOptions<T, K>).factory;
             service.multiple = (optionsOrServiceName as ServiceOptions<T, K>).multiple;
-            service.global = true;
+            service.global = (optionsOrServiceName as ServiceOptions<T, K>).global || false;
             service.transient = (optionsOrServiceName as ServiceOptions<T, K>).transient;
         }
 

test/github-issues/53/issue-53.spec.ts

@@ -0,0 +1,51 @@
+import "reflect-metadata";
+import {Container} from "../../../src/Container";
+import {Service} from "../../../src/decorators/Service";
+import {Token} from "../../../src";
+
+describe("github issues > #53 Token-based services are cached in the Global container even when fetched via a subcontainer", function() {
+
+    beforeEach(() => Container.reset());
+
+    it("should work properly", function() {
+
+        @Service()
+        class QuestionRepository {
+            userName: string;
+
+            save() {
+                // console.log(`saving question. author is ${this.userName}`);
+            }
+
+        }
+
+        const QuestionController = new Token<QuestionControllerImpl>("QCImpl");
+
+        @Service({ id: QuestionController })
+        class QuestionControllerImpl {
+
+            constructor(protected questionRepository: QuestionRepository) {
+            }
+
+            save(name: string) {
+                if (name)
+                    this.questionRepository.userName = name;
+                this.questionRepository.save();
+            }
+        }
+
+        const request1 = { param: "Timber" };
+        const controller1 = Container.of(request1).get(QuestionController);
+        controller1.save("Timber");
+        Container.reset(request1);
+
+        const request2 = { param: "Guest" };
+        const controller2 = Container.of(request2).get(QuestionController);
+        controller2.save("");
+        Container.reset(request2);
+
+        controller1.should.not.be.equal(controller2);
+        controller1.should.not.be.equal(Container.get(QuestionController));
+    });
+
+});