[WIP]Express

package.json

@@ -5,7 +5,8 @@
   "main": "dist",
   "scripts": {
     "start": "NODE_ENV=production NODE_PATH=./packages/hadron-demo/dist npm start --prefix packages/hadron-demo",
-    "start:test": "NODE_ENV=development NODE_PATH=./packages/hadron-demo ts-node packages/hadron-demo",
+    "start:dev": "NODE_ENV=development NODE_PATH=./packages/hadron-demo nodemon --watch 'packages/hadron-demo/**/*.ts' --watch .rebuild.ts --ignore 'packages/hadron-demo/**/*.spec.ts' --exec 'ts-node' packages/hadron-demo/index.ts",
+    "start:lerna": "nodemon --watch 'packages/**/*.ts' --exec 'npm run build && touch .rebuild.ts' -e ts",
     "build": "lerna bootstrap",
     "prestart": "npm run build",
     "precommit": "lint-staged",
@@ -20,7 +21,8 @@
     "docker:build": "docker build -t brainhub-framework-app .",
     "format": "prettier --write \"*/**/*.ts\"",
     "tsc": "lerna exec tsc --parallel",
-    "clean": "bash ./scripts/clean"
+    "clean": "bash ./scripts/clean",
+    "postinstall": "lerna bootstrap"
   },
   "author": "Brainhub",
   "license": "MIT",

packages/hadron-core/src/hadronCore.ts

@@ -20,22 +20,27 @@ export const prepareConfig = (
 };
 
 export default (
-  server: any,
   packages: any[] = [],
   config: any = {},
 ): Promise<IContainer> => {
-  container.register('server', server);
-
   const logger = createLogger({ name: 'hadron-logger' });
   container.register('hadronLogger', logger);
 
-  return prepareConfig(hadronDefaultConfig, config, logger).then(
-    (hadronConfig) => {
-      return Promise.all(
-        packages
-          .filter(({ register }) => !!register)
-          .map(({ register }) => register(container, hadronConfig)),
-      ).then(() => container);
-    },
-  );
+  return prepareConfig(hadronDefaultConfig, config, logger)
+    .then((hadronConfig) => {
+      const registers = packages
+        .filter(({ register }) => !!register)
+        .map(({ register }) => register);
+
+      let p = Promise.resolve();
+
+      registers.forEach((register) => {
+        p = p.then(() => {
+          register(container, hadronConfig);
+        });
+      });
+
+      return p;
+    })
+    .then(() => container);
 };

packages/hadron-demo/index.ts

@@ -1,10 +1,7 @@
-import * as bodyParser from 'body-parser';
-import * as express from 'express';
 import hadron, { IContainer } from '@brainhubeu/hadron-core';
 import * as hadronEvents from '@brainhubeu/hadron-events';
 import * as hadronSerialization from '@brainhubeu/hadron-serialization';
 import * as hadronExpress from '@brainhubeu/hadron-express';
-import * as hadronLogger from '@brainhubeu/hadron-logger';
 import * as hadronTypeORM from '@brainhubeu/hadron-typeorm';
 import jsonProvider from '@brainhubeu/hadron-json-provider';
 import expressConfig from './express-demo';
@@ -15,10 +12,6 @@ import serializationRoutes from './serialization/routing';
 import { setupSerializer } from './serialization/serialization-demo';
 import 'reflect-metadata';
 
-const port = process.env.PORT || 8080;
-const expressApp = express();
-expressApp.use(bodyParser.json());
-
 jsonProvider(['./routing/*'], ['js']).then((routes: any) => {
   const config = {
     ...typeormConfig,
@@ -32,16 +25,15 @@ jsonProvider(['./routing/*'], ['js']).then((routes: any) => {
   };
 
   hadron(
-    expressApp,
-    [hadronEvents, hadronSerialization, hadronExpress, hadronTypeORM],
+    [hadronExpress, hadronEvents, hadronSerialization, hadronTypeORM],
     config,
   ).then((container: IContainer) => {
-    expressApp.use((req, res, next) =>
-      res.status(404).json('Request not found.'),
-    );
+    container
+      .take('server')
+      .use((req: any, res: any) => res.status(404).json('Request not found.'));
     container.register('customValue', 'From Brainhub with ❤️');
     setupSerializer();
-    expressApp.listen(port);
+    container.take('serverListen')();
   });
 
   return;

packages/hadron-express/index.ts

@@ -1,4 +1,7 @@
 import hadronExpress from './src/hadronToExpress';
+import * as express from 'express';
+import * as bodyParser from 'body-parser';
+
 export {
   Callback,
   IRoutesConfig,
@@ -16,11 +19,22 @@ import {
 
 export default hadronExpress;
 
-export const register = (container: IContainer, config: IHadronExpressConfig) =>
-  hadronExpress(
+export const register = (
+  container: IContainer,
+  config: IHadronExpressConfig,
+) => {
+  const port = process.env.PORT || 8080;
+  const expressApp = express();
+  expressApp.use(bodyParser.json());
+  container.register('server', expressApp);
+  container.register('serverListen', () => {
+    expressApp.listen(port);
+  });
+  return hadronExpress(
     {
       routes: config.routes as IRoutesConfig,
       routePaths: config.routePaths as RoutePathsConfig,
     },
     container,
   );
+};

packages/hadron-express/src/types.ts

@@ -24,6 +24,7 @@ export type RoutePathsConfig = string[][];
 export interface IContainer {
   take: (key: string) => any;
   keys: () => string[];
+  register: (key: string, value: any) => any;
 }
 
 export interface IHeaders {