Fix the build command

Author: hirsch88

.gitignore

@@ -28,6 +28,8 @@ dist/
 
 # Generated source-code #
 src/**/*.js
+src/**/*.js.map
 test/**/*.js
+test/**/*.js.map
 coverage/
 !test/preprocessor.js

.vscode/launch.json

@@ -8,10 +8,10 @@
             "type": "node",
             "request": "launch",
             "name": "Debug",
-            "program": "${workspaceRoot}/dist/app.js",
+            "program": "${workspaceRoot}/src/app.js",
             "smartStep": true,
             "outFiles": [
-                "../dist/**/*.js"
+                "../src/**/*.js"
             ],
             "protocol": "inspector",
             "preLaunchTask": "build",

.vscode/settings.json

@@ -1,4 +1,9 @@
 {
     "typescript.tsdk": "./node_modules/typescript/lib",
-    "cSpell.enabled": true
+    "cSpell.enabled": true,
+    "files.exclude": {
+        "src/**/*.js": true,
+        "src/**/*.js.map": true,
+        "test/**/*.js": true
+    }
 }

package.json

@@ -13,10 +13,12 @@
     "test:black-box:pretty": "npm run test:black-box -- --verbose",
     "lint": "./node_modules/.bin/tslint -c ./tslint.json -p tsconfig.json 'src/**/*.ts' --format stylish",
     "transpile": "./node_modules/.bin/tsc",
-    "clean:dist": "./node_modules/.bin/rimraf ./dist",
+    "clean": "npm run clean:src && npm run clean:knex",
+    "clean:src": "./node_modules/.bin/trash './src/**/*.js' './src/**/*.js.map'",
+    "clean:knex": "./node_modules/.bin/trash knexfile.js knexfile.js.map",
     "copy:assets": "npm run copy:swagger && npm run copy:public",
-    "copy:swagger": "./node_modules/.bin/copyup ./src/api/swagger.json ./dist",
-    "copy:public": "./node_modules/.bin/copyup ./src/public/* ./dist",
+    "copy:swagger": "./node_modules/.bin/copyup ./src/api/swagger.json ./dist/src",
+    "copy:public": "./node_modules/.bin/copyup ./src/public/* ./dist/src",
     "db:migrate": "npm run banner migrate && ./node_modules/.bin/knex migrate:latest",
     "db:migrate:rollback": "npm run banner rollback && ./node_modules/.bin/knex migrate:rollback",
     "db:seed": "npm run banner seed && ./node_modules/.bin/knex seed:run",
@@ -27,7 +29,7 @@
     "setup": "yarn install && npm run db:migrate && npm run db:seed",
     "serve": "npm run banner serve && ./node_modules/.bin/nodemon --watch 'src/**/*.ts' --watch 'src/**/*.json' --watch '.env'",
     "test": "npm run banner test && NODE_ENV=test ./node_modules/.bin/jest ./test/unit",
-    "build": "npm run banner build && npm run lint && npm run clean:dist && npm run transpile && npm run copy:assets",
+    "build": "npm run banner build && npm run lint && npm run clean:src && npm run transpile && npm run clean:knex",
     "start": "node dist/app.js"
   },
   "repository": "git+ssh://git@github.com/w3tec/express-typescript-boilerplate.git",
@@ -60,7 +62,7 @@
   "dependencies": {
     "@types/bluebird": "^3.5.8",
     "@types/body-parser": "^1.16.4",
-    "@types/bookshelf": "^0.9.1",
+    "@types/bookshelf": "^0.9.3",
     "@types/chalk": "^0.4.31",
     "@types/commander": "^2.9.1",
     "@types/cors": "^2.8.1",
@@ -74,20 +76,20 @@
     "@types/jest": "^20.0.2",
     "@types/jsonwebtoken": "^7.2.1",
     "@types/knex": "0.0.52",
-    "@types/lodash": "^4.14.66",
+    "@types/lodash": "^4.14.67",
     "@types/mkdirp": "^0.3.29",
     "@types/morgan": "^1.7.32",
     "@types/pluralize": "^0.0.27",
     "@types/reflect-metadata": "0.0.5",
-    "@types/request": "^0.0.44",
+    "@types/request": "^0.0.45",
     "@types/request-promise": "^4.1.35",
     "@types/serve-favicon": "^2.2.28",
     "@types/winston": "^2.3.3",
     "body-parser": "^1.17.2",
     "bookshelf": "^0.10.3",
     "bookshelf-camelcase": "^1.1.4",
     "chalk": "^1.1.3",
-    "class-validator": "^0.7.1",
+    "class-validator": "^0.7.2",
     "commander": "^2.10.0",
     "compression": "^1.6.2",
     "copyfiles": "^1.2.0",
@@ -122,6 +124,7 @@
     "serve-favicon": "^2.4.3",
     "swagger-jsdoc": "^1.9.5",
     "swagger-ui-express": "^2.0.0",
+    "trash-cli": "^1.4.0",
     "ts-jest": "^20.0.6",
     "ts-node": "^3.1.0",
     "tslint": "^5.4.3",

src/core/database/Factory.ts

@@ -26,11 +26,11 @@ export class Factory {
         this.blueprints = {};
     }
 
-    public define(ModelStatic: typeof bookshelf.Model, callback: (faker: Faker.FakerStatic, args: any[]) => any): void {
+    public define(ModelStatic: any, callback: (faker: Faker.FakerStatic, args: any[]) => any): void {
         this.blueprints[this.getNameOfModel(ModelStatic)] = new BluePrint(ModelStatic, callback);
     }
 
-    public get(ModelStatic: typeof bookshelf.Model, ...args: any[]): ModelFactory {
+    public get(ModelStatic: any, ...args: any[]): ModelFactory {
         return new ModelFactory(
             this.faker,
             this.blueprints[this.getNameOfModel(ModelStatic)],

tsconfig.json

@@ -2,8 +2,8 @@
     "compilerOptions": {
         "target": "es6",
         "module": "commonjs",
+        "pretty": true,
         "sourceMap": true,
-        "outDir": "dist",
         "importHelpers": true,
         "strict": true,
         "noImplicitAny": false,
@@ -15,23 +15,26 @@
         "noImplicitReturns": true,
         "noFallthroughCasesInSwitch": true,
         "moduleResolution": "node",
-        "baseUrl": "./",
+        "baseUrl": ".",
         "paths": {
             "*": [
-                "./node_modules/*",
-                "./src/types/*"
+                "node_modules/*",
+                "src/types/*"
             ]
         },
         "rootDirs": [],
         "typeRoots": [
-            "./src/types"
+            "src/types"
         ],
         "types": [],
         "allowSyntheticDefaultImports": true,
         "experimentalDecorators": true,
         "emitDecoratorMetadata": true
     },
     "include": [
-        "./src/**/*"
+        "src/**/*"
+    ],
+    "exclude": [
+        "node_modules/*"
     ]
 }