feat(container): remove tcontainer symbol and resolve as class type as per pr comments

Author: Tolowe

examples/javascript/resolving-container.js

@@ -1,8 +1,8 @@
-import { Container, TContainer, Injectable } from 'container-ioc';
+import { Container, Injectable } from 'container-ioc';
 
 const container = new Container();
 
-@Injectable([TContainer])
+@Injectable([Container])
 class Builder {
     constructor(container) {}
 }

examples/typescript/resolving-container.ts

@@ -1,10 +1,10 @@
-import { IContainer, Container, TContainer, Injectable, Inject } from 'container-ioc';
+import { IContainer, Container, Injectable, Inject } from 'container-ioc';
 
 const container = new Container();
 
 @Injectable()
 class Builder {
-    constructor(@Inject(TContainer) private container: IContainer) {}
+    constructor(@Inject(Container) private container: IContainer) {}
 }
 
 container.register({ token: Builder, useClass: Builder });

src/lib/container.interface.ts

@@ -18,6 +18,4 @@ export interface IContainer {
     createChild(): IContainer;
 
     setParent(parent: IContainer): void;
-}
-
-export const TContainer = Symbol('IContainer');
+}

src/lib/container.ts

@@ -1,6 +1,6 @@
 import { IConstructor, IInjectionInstance, IInjectionMd, IProvider, LifeTime, ProviderToken, RegistrationProvider } from './interfaces';
 import { FactoryFunction, IFactory, IRegistryData, RegistryData } from './registry-data';
-import { IContainer, IContainerOptions, TContainer } from './container.interface';
+import { IContainer, IContainerOptions } from './container.interface';
 import { ClassNotInjectableError, InvalidProviderProvidedError, NoProviderError } from './exceptions';
 import { INJECTABLE_MD_KEY, INJECTIONS_MD_KEY } from './metadata/keys';
 import { IMetadataAnnotator } from './metadata/metadata-annotator.interface';
@@ -21,7 +21,7 @@ export class Container implements IContainer {
             this.parent = <IContainer> options.parent;
             this.defaultLifeTime = options.defaultLifeTime || this.defaultLifeTime;
         }
-        this.register({ token: TContainer, useValue: this });
+        this.register({ token: Container, useValue: this });
     }
 
     public register(provider: RegistrationProvider|RegistrationProvider[]): void {

src/lib/index.ts

@@ -1,5 +1,5 @@
 export { Container } from './container';
-export { IContainer, TContainer } from './container.interface';
+export { IContainer } from './container.interface';
 export { Inject, Injectable, Component } from './decorators';
 export { InjectionToken } from './injection-token';
 export { IMetadataAnnotator } from './metadata/metadata-annotator.interface';

src/tests/container.spec.ts

@@ -1,4 +1,4 @@
-import { IContainer, TContainer } from '../lib/container.interface';
+import { IContainer } from '../lib/container.interface';
 import { Container } from '../lib/index';
 
 import 'mocha';
@@ -360,7 +360,7 @@ describe('Container', () => {
             it('should resolve container instance when injected into class Literal', () => {
                 @Injectable()
                 class TestClass {
-                    constructor(@Inject(TContainer) public a: IContainer) {}
+                    constructor(@Inject(Container) public a: IContainer) {}
                 }
 
                 container.register({ token: TestClass, useClass: TestClass });
@@ -465,7 +465,7 @@ describe('Container', () => {
         });
 
         it('should register itself for injection', () => {
-            const actual = container.resolve(TContainer);
+            const actual = container.resolve(Container);
 
             expect(actual).to.be.ok;
             expect(actual).to.equal(container);