Merge pull request #104 from Tolowe/#58-provider-refactor

feat: changed provider interface to merged interfaces. fixed mispell …
typesoft · Feb 25, 2018 · ac23a57 · ac23a57
2 parents 327e534 + c39a6d5
commit ac23a57
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 22 deletions.
diff --git a/src/lib/container.ts b/src/lib/container.ts
@@ -25,14 +25,8 @@ export class Container implements IContainer {
     }
 
     public register(provider: RegistrationProvider|RegistrationProvider[]): void {
-        provider = this.nornalizeProvider(provider);
-
-        if (Array.isArray(provider)) {
-            this.registerAll(<RegistrationProvider[]> provider);
-        } else {
-            provider = this.nornalizeProvider(provider);
-            this.registerOne(<IProvider> provider);
-        }
+        const normalizedProvider = this.normalizeProvider(provider);
+        this.registerAll(normalizedProvider);
     }
 
     public resolve(token: ProviderToken): IInjectionInstance {
@@ -77,11 +71,11 @@ export class Container implements IContainer {
         return instance;
     }
 
-    private registerAll(providers: RegistrationProvider[]): void {
+    private registerAll(providers: IProvider[]): void {
         providers.forEach((p: IProvider) => this.registerOne(p));
     }
 
-    private registerOne(provider: IProvider) {
+    private registerOne(provider: IProvider): void {
         const registryData: IRegistryData = new RegistryData();
 
         if (provider.useValue) {
@@ -147,15 +141,10 @@ export class Container implements IContainer {
         }
     }
 
-    private nornalizeProvider(provider: RegistrationProvider|RegistrationProvider[]): IProvider {
-        let normalizedProvider: any;
-
-        if (Array.isArray(provider)) {
-            normalizedProvider = provider.map<IProvider>((p: IProvider|IConstructor) => this.normalizeSingleProvider(p));
-        } else {
-            normalizedProvider = this.normalizeSingleProvider(provider);
-        }
-        return normalizedProvider;
+    private normalizeProvider(provider: RegistrationProvider|RegistrationProvider[]): IProvider[] {
+        return Array.isArray(provider)
+            ? provider.map(p => this.normalizeSingleProvider(p))
+            : [ this.normalizeSingleProvider(provider) ];
     }
 
     private normalizeSingleProvider(provider: RegistrationProvider): IProvider {

diff --git a/src/lib/interfaces.ts b/src/lib/interfaces.ts
@@ -9,11 +9,20 @@ export enum LifeTime {
 
 export interface IProvider {
     token: ProviderToken;
-    useClass?: IConstructor;
+    lifeTime?: LifeTime;
+}
+
+export interface IProvider {
     useValue?: any;
+}
+
+export interface IProvider {
+    useClass?: IConstructor;    
+}
+
+export interface IProvider {
     useFactory?: any;
-    inject?: ProviderToken[];
-    lifeTime?: LifeTime;
+    inject?: ProviderToken[];  
 }
 
 export interface IInjectionMd {