Merge branch 'release/1.3.0'

Author: hirsch88

.gitignore

@@ -7,7 +7,6 @@
 
 # Node files #
 node_modules/
-bower_components/
 npm-debug.log
 yarn-error.log
 .env
@@ -21,14 +20,6 @@ typings/
 
 # Dist #
 dist/
-releases/
-
-# Cordova #
-cordova/plugins/
-cordova/platforms/
-www/
-plugins/
-platforms/
 
 # IDE #
 .idea/
@@ -39,7 +30,3 @@ platforms/
 src/**/*.js
 test/**/*.js
 coverage/
-
-# Generated documentation #
-docs/
-old/

.travis.yml

@@ -2,7 +2,7 @@ language: node_js
 node_js:
   - "7.7.3"
 install:
-  - npm run install:dev
+  - yarn install
 scripts:
   - npm test
 notifications:

README.md

@@ -1,6 +1,16 @@
-# Express Typescript Boilerplate
-
-> Boilerplate for an restful express-application written in TypeScript
+# Express Typescript Boilerplate [![Build Status](https://travis-ci.org/w3tecch/express-typescript-boilerplate.svg?branch=master)](https://travis-ci.org/w3tecch/express-typescript-boilerplate)
+
+A delightful way to building a RESTful API with NodeJs & TypeScript.
+- **Beautiful Syntax** thanks to the awesome annotations from [Inversify Express Utils](https://github.com/inversify/inversify-express-utils).
+- **Easy API Testing** with included black-box testing.
+- **Dependency Injection** done with the nice framework from [Inversify](http://inversify.io/).
+- **Fast Database Building** with simple migration and seeding from [Knex](http://knexjs.org/).
+- **Simplified Database Query** with the ORM of [Knex](http://knexjs.org/) called [Bookshelf](http://bookshelfjs.org/).
+- **Clear Structure** with controllers, services, repositories, models, middlewares...
+- **Easy Exception Handling** with our own simple classes. You will see.
+- **Easy Data Seeding** with our own factories.
+- **Custom Commands** are also available in our setup and really easy to use.
+- **Smart Validation** thanks to [class-validator](https://github.com/pleerock/class-validator) with some nice annotations.
 
 ## Getting Started
 ### Prerequisites
@@ -12,8 +22,8 @@
 ## Installing
 * `fork` this repo
 * `clone` your fork
-* `install:dev` to install all dependencies and typings
-* Create new database. You will find the name in the `src/config.ts` file.
+* `yarn install` to install all dependencies and typings
+* Create new database. You will find the name in the .env files.
 * `npm run db:migrate` to create the schema
 * `npm run db:seed` to insert some test data
 * `npm run serve` to start the dev server in another tab
@@ -26,16 +36,14 @@ The port will be displayed to you as `http://0.0.0.0:3000` (or if you prefer IPv
 ## Scripts / Commands
 ### Install
 * Install all dependencies with `yarn install`
-* Install all typings with `npm run install:typings`
-* To install all dependencies and typings use `npm run install:dev`
-* Remove not needed libraries with `npm run install:clean`
 
 ### Linting
 * Run code analysis using `npm run lint`. This runs tslint.
 * There is also a vscode task for this called lint.
 
 ### Tests
 * Run the unit tests using `npm test`.
+* Run the black-box tests using `npm run test:black-box`.
 * There is also a vscode task for this called test.
 
 ### Running in dev mode
@@ -44,19 +52,20 @@ The port will be displayed to you as `http://0.0.0.0:3000` (or if you prefer IPv
 
 ### Cleaning the project
 * Run `npm run clean` to remove all generated JavaScript files.
-* Run `npm run db:clean` to drop all tables of the database.
 
 ### Building the project and run it
 * Run `npm run build` to generated all JavaScript files from your TypeScript sources. After this step you can deploy the app on any server.
 * There is also a vscode task for this called build.
 * To start the builded app use `npm start`.
 
-### Seed
-* Run `npm run db:seed` to seed some data into the database
-
-### Migration
+### Database
 * Run `npm run db:migrate` to migration the new schema to the database
 * Run `npm run db:migrate:rollback` to rollback one version
+* Run `npm run db:seed` to seed some data into the database
+* Run `npm run db:reset` to clean the database and migrate again
+
+### Console
+* To run your own created cli script enter `npm run console <command-name>`
 
 ## Related Projects
 * [express-graphql-typescript-boilerplate](https://github.com/w3tecch/express-graphql-typescript-boilerplate) - A starter kit for building amazing GraphQL API's with TypeScript and express by @w3tecch
@@ -69,6 +78,8 @@ The port will be displayed to you as `http://0.0.0.0:3000` (or if you prefer IPv
 * [Bookshelf Cheatsheet](http://ricostacruz.com/cheatsheets/bookshelf.html)
 * [Inversify](http://inversify.io/)
 * [Inversify Express Utils](https://github.com/inversify/inversify-express-utils)
+* [class-validator](https://github.com/pleerock/class-validator)
+* [Jest](http://facebook.github.io/jest/)
 * [Auth0 API Documentation](https://auth0.com/docs/api/management/v2#!/Users/get_users)
 
 ## License

build/paths.js

@@ -8,6 +8,5 @@ module.exports = {
     main: 'index.ts',
     src: 'src',
     test: 'test',
-    docs: 'docs',
     dist: 'dist'
 };

build/tasks/build.js

@@ -45,8 +45,7 @@ function transpiler(filePath, isTest, files) {
     let tsProject = !!isTest ? tsProjectTest : tsProjectSource;
     return gulp
         .src([
-            './typings/index.d.ts',
-            './typings_custom/**/*.d.ts',
+            './typings/*.d.ts',
             path.join(filePath, files)
         ])
         .pipe($.plumber({ errorHandler: $.notify.onError('Error: <%= error.message %>') }))

build/tasks/clean.js

@@ -9,7 +9,6 @@ const $ = require('gulp-load-plugins')({
 });
 
 gulp.task('clean', [
-    'clean:docs',
     'clean:build'
 ]);
 
@@ -20,7 +19,6 @@ gulp.task('clean:build', [
     'clean:test:map'
 ]);
 
-gulp.task('clean:docs', () => cleaner(paths.docs));
 gulp.task('clean:src:src', () => cleaner(paths.src, 'js'));
 gulp.task('clean:src:map', () => cleaner(paths.src, 'map'));
 gulp.task('clean:test:src', () => cleaner(paths.test, 'js'));

build/tasks/docs.js

@@ -23,7 +23,6 @@ function lint(files) {
 
 gulp.task('lint', () => lint([
     './typings/index.d.ts',
-    './typings_custom/**/*.d.ts',
     path.join(paths.src, '/**/*.ts'),
     path.join(paths.test, '/**/*.ts')
 ]));

build/tasks/lint.js

@@ -1,46 +1,16 @@
 'use strict';
 
-const gulp = require('gulp'),
-    path = require('path'),
-    paths = require('./paths'),
-    $ = require('gulp-load-plugins')({
-        lazy: true
-    });
+const gulp = require('gulp');
+const notifier = require('node-notifier');
 
 var util = {
-    notify: notify,
-    getPkg: getPkg,
-    getJs: getJs,
-    buildConfig: buildConfig
+    notify: function notify(title, message) {
+        notifier.notify({
+            'title': title || 'Gulp',
+            'message': message || 'Please check your log or open your browser.',
+            icon: process.cwd() + '/icon.png'
+        });
+    }
 };
 
 module.exports = util;
-
-function getPkg() {
-    return require(path.join(process.cwd(), 'package.json'));
-}
-
-function notify(title, message) {
-    var notifier = require('node-notifier');
-    notifier.notify({
-        'title': title || 'Gulp',
-        'message': message || 'Please check your log or open your browser.',
-        icon: process.cwd() + '/icon.png'
-    });
-}
-
-function getJs(filename) {
-    return filename.replace('.ts', '.js');
-}
-
-function buildConfig(target) {
-    var env = $.util.env.environment || $.util.env.env || 'dev';
-    var configBase = './config';
-    var options = getPkg();
-    options.env = env;
-    return gulp
-        .src(path.join(configBase, env + '.json'))
-        .pipe($.rename('config.json'))
-        .pipe($.template(options))
-        .pipe(gulp.dest(target));
-}

build/util.js

@@ -1,5 +1,9 @@
 require('dotenv').config();
 
+/**
+ * This is the database configuration for the migrations and
+ * the seeders.
+ */
 module.exports = {
     client: process.env.DB_CLIENT,
     connection: process.env.DB_CONNECTION,