add more bootstrap magic

Author: hirsch88

src/api/controllers/UserController.ts

@@ -1,7 +1,7 @@
 import { injectable, inject, named } from 'inversify';
 import { Controller, Get, Post, Put, Delete, RequestParam, RequestBody, Response, Request } from 'inversify-express-utils';
 import { my } from 'my-express';
-import { UserService } from '../services/UsersService';
+import { UserService } from '../services/UserService';
 import { Types } from '../../constants/Types';
 import { Service } from '../../constants/Targets';
 import { authenticate, populateUser } from '../middlewares';

src/api/middlewares/index.ts

@@ -10,7 +10,7 @@ import { ioc } from '../../core/IoC';
 import { Log } from '../../core/log';
 import { Types } from '../../constants/Types';
 import { Service } from '../../constants/Targets';
-import { UserService } from '../services/UsersService';
+import { UserService } from '../services/UserService';
 
 import { authenticate as Authenticate } from './authenticate';
 import { populateUser as PopulateUser } from './populateUser';

src/api/middlewares/populateUser.ts

@@ -2,7 +2,7 @@ import * as request from 'request';
 import { Container } from 'inversify';
 import { my } from 'my-express';
 import { Log } from '../../core/log';
-import { UserService } from '../services/UsersService';
+import { UserService } from '../services/UserService';
 
 /**
  * populateUser middleware

src/api/services/UsersService.ts src/api/services/UserService.tssrc/api/services/UsersService.ts renamed to src/api/services/UserService.ts

@@ -20,6 +20,7 @@ import { Log } from './core/log';
 
 
 bootstrap.configureExpress((app: express.Application) => app
+
     // Report real time server metrics for Express-based node servers
     .use(monitor())
 

src/app.ts

@@ -6,54 +6,11 @@
  * will then be bonded to the express structure with their defined routes.
  */
 
-import { interfaces } from 'inversify-express-utils';
 import { Container } from 'inversify';
-import { Types } from './constants/Types';
-import { Core, Model, Controller, Service, Repository } from './constants/Targets';
-
-/**
- * Core Features
- */
-import { events, EventEmitter } from './core/api/events';
-import { Log } from './core/log';
 import { ioc } from './core/IoC';
 
-/**
- * User Resource
- */
-import { UserController } from './api/controllers/UserController';
-import { UserService } from './api/services/UsersService';
-import { UserRepository } from './api/repositories/UserRepository';
-import { User } from './api/models/User';
-
 ioc.configure((container: Container) => {
-    console.log('--> CONTAINER should be last');
-
-    /**
-     * Core
-     */
-    // container.bind<EventEmitter>(Types.Core).toConstantValue(events).whenTargetNamed(Core.Events);
-    // container.bind<typeof Log>(Types.Core).toConstantValue(Log).whenTargetNamed(Core.Log);
-
-    /**
-     * Model
-     */
-    // container.bind<any>(Types.Model).toConstantValue(User).whenTargetNamed(Model.User);
-
-    /**
-     * Controllers
-     */
-    container.bind<interfaces.Controller>(Types.Controller).to(UserController).whenTargetNamed(Controller.UserController);
-
-    /**
-     * Services
-     */
-    container.bind<UserService>(Types.Service).to(UserService).whenTargetNamed(Service.UserService);
 
-    /**
-     * Repositories
-     */
-    container.bind<UserRepository>(Types.Repository).to(UserRepository).whenTargetNamed(Repository.UserRepository);
 
     return container;
 });

src/container.ts

@@ -72,12 +72,7 @@ export class Bootstrap {
 
     private async bindIoC(): Promise<void> {
         log.info('Binding IoC modules...');
-        try {
-            await ioc.bindModules();
-        } catch (error) {
-            // TODO
-            console.error(error);
-        }
+        await ioc.bindModules();
     }
 
     private setupIoC(): void {

src/core/Bootstrap.ts

@@ -15,8 +15,7 @@ import { Core, Controller, Model, Service, Repository } from '../constants/Targe
 import { events, EventEmitter } from './api/events';
 import { Log } from './log';
 
-
-import { User } from '../api/models/User';
+const log = new Log('core:IoC');
 
 
 class IoC {
@@ -39,7 +38,9 @@ class IoC {
     public async bindModules(): Promise<void> {
         this.bindCore();
         await this.bindModels();
-        // this.bindControllers();
+        await this.bindRepositories();
+        await this.bindServices();
+        await this.bindControllers();
 
         this.container = this.customConfiguration(this.container);
     }
@@ -49,36 +50,68 @@ class IoC {
         this.container.bind<EventEmitter>(Types.Core).toConstantValue(events).whenTargetNamed(Core.Events);
     }
 
-    private async bindControllers(): Promise<void> {
-        this.getFiles('/controllers', (files: string[]) => {
-            files.forEach((file: any) => {
-                console.log(file);
-                const fileExport = require(`${file.path}/${file.fileName}`);
-                console.log(fileExport);
-                this.container
-                    .bind<interfaces.Controller>(Types.Controller)
-                    .to(fileExport[file.name])
-                    .whenTargetNamed(Controller[file.name]);
-            });
+    private bindModels(): Promise<void> {
+        return this.bindFiles('/models', Model, (name: any, value: any) => {
+            this.container
+                .bind<any>(Types.Model)
+                .toConstantValue(value)
+                .whenTargetNamed(name);
         });
     }
 
-    private bindModels(): Promise<void> {
-        return new Promise<void>((resolve, reject) => {
-            console.log('Models');
-            this.getFiles('/models', (files: string[]) => {
-                files.forEach((file: any) => {
-                    const fileExport = require(`${file.path}/${file.fileName}`);
-                    this.validateExport(fileExport[file.name]);
-                    this.validateTarget(Model, file.name);
+    private bindRepositories(): Promise<void> {
+        return this.bindFiles('/repositories', Repository, (name: any, value: any) => {
+            this.container
+                .bind<any>(Types.Repository)
+                .to(value)
+                .whenTargetNamed(name);
+        });
+    }
 
-                    this.container
-                        .bind<any>(Types.Model)
-                        .toConstantValue(fileExport[file.name])
-                        .whenTargetNamed(Model[file.name]);
+    private bindServices(): Promise<void> {
+        return this.bindFiles('/services', Service, (name: any, value: any) => {
+            this.container
+                .bind<any>(Types.Service)
+                .to(value)
+                .whenTargetNamed(name);
+        });
+    }
 
-                    resolve();
+    private bindControllers(): Promise<void> {
+        return this.bindFiles('/controllers', Controller, (name: any, value: any) => {
+            this.container
+                .bind<any>(Types.Controller)
+                .to(value)
+                .whenTargetNamed(name);
+        });
+    }
+
+    private bindFiles(path: string, target: any, callback: (name: any, value: any) => void): Promise<void> {
+        return new Promise<void>((resolve, reject) => {
+            this.getFiles(path, (files: string[]) => {
+                files.forEach((file: any) => {
+                    let fileExport;
+                    try {
+                        fileExport = require(`${file.path}/${file.fileName}`);
+                    } catch (e) {
+                        log.warn(e.message);
+                        return;
+                    }
+                    if (fileExport === undefined) {
+                        log.warn(`Could not find the file ${file.name}!`);
+                        return;
+                    }
+                    if (fileExport[file.name] === undefined) {
+                        log.warn(`Name of the file '${file.name}' does not match to the class name!`);
+                        return;
+                    }
+                    if (target && target[file.name] === undefined) {
+                        log.warn(`Please define your '${file.name}' class is in the target constants.`);
+                        return;
+                    }
+                    callback(target[file.name], fileExport[file.name]);
                 });
+                resolve();
             });
         });
     }
@@ -92,7 +125,8 @@ class IoC {
     private getFiles(path: string, done: (files: any[]) => void): void {
         fs.readdir(this.getBasePath() + path, (err: any, files: string[]): void => {
             if (err) {
-                console.error(err);
+                log.warn(`Could not read the folder ${path}!`);
+                return;
             }
             done(files.map((fileName: string) => ({
                 path: this.getBasePath() + path,
@@ -106,18 +140,6 @@ class IoC {
         return fileName.substring(0, fileName.length - 3);
     }
 
-    private validateExport(value: any): void {
-        if (!value) {
-            throw new Error(`${value} is not defined in the target constants`);
-        }
-    }
-
-    private validateTarget(target: any, value: any): void {
-        if (target && target[value] === undefined) {
-            throw new Error(`${value} is not defined in the target constants`);
-        }
-    }
-
 }
 
 export const ioc = new IoC();

src/core/IoC.ts

@@ -20,11 +20,3 @@ import './app';
 import { bootstrap } from './core/Bootstrap';
 
 bootstrap.main();
-
-// import { Server } from './core/Server';
-// Start our app and listen for it
-// const server = app.listen(app.get('port'));
-// Server.use(server, app);
-
-// console.log('app', app);
-// app.then(Server.use);