Merge pull request #56 from FoalTS/support-shell

Add a shell and move templates into the modules.

Author: LoicPoullain

generators/app/index.js

@@ -55,7 +55,7 @@ Welcome to the FoalTS generator! The following questions will help you create yo
           type: 'input',
           name: 'uri',
           message: 'What is your database uri?',
-          default: database === 'sqlite' ? 'sqlite://database.db' : ''
+          default: database === 'sqlite' ? 'sqlite://db.sqlite3' : ''
         },
         {
           type: 'confirm',
@@ -116,7 +116,9 @@ Welcome to the FoalTS generator! The following questions will help you create yo
       testSecret2: crypto.randomBytes(32).toString('hex'),
     }
     const paths = [
+      'src/app/templates/index.html',
       'src/app/app.module.ts',
+      'src/app/app.ts',
       'src/app/index-view.service.spec.ts',
       'src/app/index-view.service.ts',
       'src/config/config.ts',
@@ -126,8 +128,7 @@ Welcome to the FoalTS generator! The following questions will help you create yo
       'src/config/test.ts',
       'src/main.ts',
 
-      'templates/index.html',
-
+      'gulpfile.js',
       'package.json',
       'server.js',
       'tsconfig.json',
@@ -141,6 +142,10 @@ Welcome to the FoalTS generator! The following questions will help you create yo
       )
     }
     if (this.authentication) {
+      this.fs.copy(
+        this.templatePath('src/app/auth/templates/login-view.html'),
+        this.destinationPath(`${this.names.kebabName}/src/app/auth/templates/login-view.html`)
+      )
       paths.push(
         'src/app/auth/auth.module.ts',
         'src/app/auth/authenticator.service.ts',
@@ -149,7 +154,6 @@ Welcome to the FoalTS generator! The following questions will help you create yo
         'src/app/auth/login-view.service.ts',
         'src/app/shared/user.interface.ts',
         'src/app/shared/user.service.ts',
-        'templates/login-view.html',
       );
     }
     for (let path of paths) {
@@ -192,12 +196,10 @@ Welcome to the FoalTS generator! The following questions will help you create yo
     this.npmInstall([], {}, () => {}, { cwd: this.names.kebabName });
     this.npmInstall([
       'concurrently',
-      'nodemon',
       'mocha',
       'chai',
       '@types/mocha',
       '@types/chai',
-      'typescript',
       'tslint'
     ], { 'save-dev': true }, () => {}, { cwd: this.names.kebabName });
   }

generators/app/templates/gulpfile.js

@@ -0,0 +1,41 @@
+const gulp = require('gulp');
+const ts = require('gulp-typescript');
+const nodemon = require('gulp-nodemon');
+const sourcemaps = require('gulp-sourcemaps');
+const del = require('del');
+
+const tsProject = ts.createProject('tsconfig.json');
+
+const templateBlob = './src/**/*.html';
+
+gulp.task('clean', () => del('dist'));
+
+gulp.task('compile', function () {
+  return tsProject.src()
+    .pipe(sourcemaps.init())
+    .pipe(tsProject())
+    .pipe(sourcemaps.write())
+    .pipe(gulp.dest('dist'));
+});
+
+gulp.task('copy-templates', () => {
+  return gulp.src(templateBlob)
+    .pipe(gulp.dest('dist'));
+});
+
+gulp.task('build', ['compile', 'copy-templates']);
+
+gulp.task('dev:start', ['compile'], () => {
+  return nodemon({
+    script: 'server.js',
+    ext: 'ts',
+    watch: tsProject.config.include,
+    tasks: ['compile']
+  });
+});
+
+gulp.task('dev:copy-templates', ['copy-templates'], () => {
+  return gulp.watch(templateBlob, ['copy-templates']);
+});
+
+gulp.task('dev:app', ['dev:start', 'dev:copy-templates'])

generators/app/templates/package.json

@@ -4,10 +4,11 @@
   "description": "",
   "scripts": {
     "lint": "tslint -c tslint.json -p tsconfig.json",
-    "build": "tsc",
+    "build": "gulp clean && gulp build",
+    "shell": "cd dist/app && node -e \"const { app } = require('./app')\" -i",
     "test": "mocha -r source-map-support/register \"./dist/**/*.spec.js\"",
     "start": "node server.js",
-    "dev:app": "tsc && concurrently -p \"[{name}]\" -n \"BUILD,SERVER\" -c \"bold\" \"tsc -w\" \"nodemon -e js server.js\"",
+    "dev:app": "gulp clean && gulp dev:app",
     "dev:test": "tsc && concurrently -p \"[{name}]\" -n \"BUILD,SERVER\" -c \"bold\" \"tsc -w\" \"mocha -r source-map-support/register -w \"./dist/**/*.spec.js\"\""
   },
   "engines": {
@@ -27,5 +28,13 @@
     "@foal/ejs": "^0.4.0-beta.1",
     "@foal/express": "^0.4.0-beta.1",
     "source-map-support": "^0.5.1"
+  },
+  "devDependencies": {
+    "del": "^3.0.0",
+    "gulp": "^3.9.1",
+    "typescript": "^2.7.2",
+    "gulp-typescript": "^4.0.1",
+    "gulp-nodemon": "^2.2.1",
+    "gulp-sourcemaps": "^2.6.4"
   }
 }

generators/app/templates/src/app/app.ts

@@ -0,0 +1,5 @@
+import { App } from '@foal/core';
+
+import { AppModule } from './app.module';
+
+export const app = new App(AppModule);

generators/app/templates/src/app/auth/login-view.service.ts

@@ -4,6 +4,6 @@ import { EjsTemplateService } from '@foal/ejs';
 @Service()
 export class LoginViewService extends EjsTemplateService {
   constructor() {
-    super('./templates/login-view.html');
+    super(__dirname + '/templates/login-view.html');
   }
 }

…/app/templates/templates/login-view.html …s/src/app/auth/templates/login-view.htmlgenerators/app/templates/templates/login-view.html renamed to generators/app/templates/src/app/auth/templates/login-view.html generators/app/templates/templates/login-view.html renamed to generators/app/templates/src/app/auth/templates/login-view.html

@@ -4,6 +4,6 @@ import { EjsTemplateService } from '@foal/ejs';
 @Service()
 export class IndexViewService extends EjsTemplateService {
   constructor() {
-    super('./templates/index.html');
+    super(__dirname + '/templates/index.html');
   }
 }

generators/app/templates/src/app/index-view.service.ts

@@ -1,4 +1,3 @@
-import { App } from '@foal/core';
 import { getMiddlewares } from '@foal/express';
 import * as bodyParser from 'body-parser';
 import * as csurf from 'csurf';
@@ -8,11 +7,9 @@ import * as helmet from 'helmet';
 import * as logger from 'morgan';
 import * as path from 'path';
 
-import { AppModule } from './app/app.module';
+import { app as foal } from './app/app';
 import { config } from './config';
 
-const foal = new App(AppModule);
-
 const app = express();
 
 app.use(logger('[:date] ":method :url HTTP/:http-version" :status - :response-time ms'));