Ts improve (#1867)

* fix(gen:endpoint): return promise

* chore(app): tsd -> typings

(fix webdriver-update for diff npm versions)

closes #1803

[2a46b5d] b

* refactor(client): fix some type errors

* fix(build): don't include postinstall on CI

* test(gen): replace expected tsd files with expected typings file

* fix(gen:app): only include `typings.json` with TS

Author: Awk34

gulpfile.js

@@ -84,6 +84,10 @@ var processJson = function(src, dest, opt) {
 
             var json = JSON.parse(data.replace(/<%(.*)%>/g, ''));
 
+            if(/package.json/g.test(src) && opt.test) {
+                delete json.scripts.postinstall;
+            }
+
             // set properties
             json.name = opt.appName;
             json.description = opt.private
@@ -103,13 +107,14 @@ var processJson = function(src, dest, opt) {
 
 function updateFixtures(target) {
     const deps = target === 'deps';
+    const test = target === 'test';
     const genVer = require('./package.json').version;
     const dest = __dirname + (deps ? '/angular-fullstack-deps/' : '/test/fixtures/');
     const appName = deps ? 'angular-fullstack-deps' : 'tempApp';
 
     return Promise.all([
-        processJson('templates/app/_package.json', dest + 'package.json', {appName, genVer, private: !deps}),
-        processJson('templates/app/_bower.json', dest + 'bower.json', {appName, genVer, private: !deps})
+        processJson('templates/app/_package.json', dest + 'package.json', {appName, genVer, private: !deps, test: test}),
+        processJson('templates/app/_bower.json', dest + 'bower.json', {appName, genVer, private: !deps, test: test})
     ]);
 }
 

src/generators/endpoint/index.js

@@ -29,7 +29,7 @@ export class Generator extends Base {
 
   initializing() {
     // init shared generator properies and methods
-    genNamedBase(this);
+    return genNamedBase(this);
   }
 
   prompting() {

src/test/get-expected-files.js

@@ -111,8 +111,7 @@ export function app(options) {
     files = files.concat([
       'tsconfig.client.test.json',
       'tsconfig.client.json',
-      'tsd.json',
-      'tsd_test.json',
+      'typings.json',
       'client/tslint.json'
     ]);
   } else {

templates/app/Gruntfile(grunt).js

@@ -664,19 +664,8 @@ module.exports = function(grunt) {
       }
     },
 
-    tsd: {
-      install: {
-        options: {
-          command: 'reinstall',
-          config: './tsd.json'
-        }
-      },
-      install_test: {
-        options: {
-          command: 'reinstall',
-          config: './tsd_test.json'
-        }
-      }
+    typings: {
+      install: {}
     },<% } %><% if(filters.stylus) { %>
 
     // Compiles Stylus to CSS
@@ -856,7 +845,7 @@ module.exports = function(grunt) {
         'clean:server',
         'env:all',
         'concurrent:pre',<% if(filters.ts) { %>
-        'tsd',<% } %>
+        'typings',<% } %>
         'concurrent:server',
         'injector',
         'wiredep:client',
@@ -869,7 +858,7 @@ module.exports = function(grunt) {
       'clean:server',
       'env:all',
       'concurrent:pre',<% if(filters.ts) { %>
-      'tsd',<% } %>
+      'typings',<% } %>
       'concurrent:server',
       'injector',
       'wiredep:client',
@@ -901,7 +890,7 @@ module.exports = function(grunt) {
         'concurrent:pre',<% if(filters.ts) { %>
         'ts:client',
         'ts:client_test',
-        'tsd',<% } %>
+        'typings',<% } %>
         'concurrent:test',
         'injector',
         'postcss',
@@ -923,8 +912,7 @@ module.exports = function(grunt) {
           'env:all',
           'env:test',
           'concurrent:pre',<% if(filters.ts) { %>
-          'tsd:install',
-          'tsd:install_test',
+          'typings',
           'ts:client',
           'ts:client_test',<% } %>
           'concurrent:test',
@@ -971,7 +959,7 @@ module.exports = function(grunt) {
   grunt.registerTask('build', [
     'clean:dist',
     'concurrent:pre',<% if(filters.ts) { %>
-    'tsd',<% } %>
+    'typings',<% } %>
     'concurrent:dist',
     'injector',
     'wiredep:client',

templates/app/_package.json

@@ -50,7 +50,7 @@
     "gulp-autoprefixer": "^3.1.0",
     "gulp-babel": "^6.1.2",<% if(filters.ts) { %>
     "gulp-typescript": "~2.13.0",
-    "gulp-tsd": "~0.1.0",
+    "gulp-typings": "^1.3.6",
     "gulp-tslint": "^5.0.0",<% } %>
     "gulp-cache": "^0.4.2",
     "gulp-concat": "^2.6.0",
@@ -113,7 +113,7 @@
     "grunt-contrib-less": "^1.2.0",<% } %>
     "grunt-babel": "~6.0.0",<% if(filters.ts) { %>
     "grunt-ts": "^5.3.2",
-    "grunt-tsd": "~0.1.0",
+    "grunt-typings": "~0.1.4",
     "grunt-tslint": "~3.1.0",<% } %>
     "grunt-google-cdn": "~0.4.0",
     "grunt-jscs": "^2.1.0",
@@ -168,17 +168,23 @@
     "phantomjs-prebuilt": "^2.1.4",
     "proxyquire": "^1.0.1",
     "supertest": "^1.1.0"<% if(filters.ts) { %>,
-    "tslint": "^3.5.0"<% } %>
+    "tslint": "^3.5.0",
+    "typings": "^0.8.1"<% } %>
   },
   "engines": {
     "node": "^4.4.0",
     "npm": "^2.14.20"
   },
-  "scripts": {
-    "start": "node server",<% if(filters.gulp) { %>
+  "scripts": {<% if(filters.gulp) { %>
     "test": "gulp test",<% } else { %>
     "test": "grunt test",<% } %>
-    "update-webdriver": "node node_modules/grunt-protractor-runner/node_modules/protractor/bin/webdriver-manager update"
+    <%_ if(filters.ts) { _%>
+    "postinstall": "./node_modules/.bin/typings install",<% } %>
+    <%_ if(semver.satisfies(npmVersion, '>= 3')) { _%>
+    "update-webdriver": "node node_modules/protractor/bin/webdriver-manager update",
+    <%_ } else { _%>
+    "update-webdriver": "node node_modules/grunt-protractor-runner/node_modules/protractor/bin/webdriver-manager update",<% } %>
+    "start": "node server"
   },
   "private": true
 }

templates/app/client/app/account(auth)/settings/settings.controller.js

@@ -1,10 +1,10 @@
 'use strict';
 
 class SettingsController {
-  constructor(Auth) {
-    this.errors = {};
-    this.submitted = false;
+  errors = {};
+  submitted = false;
 
+  constructor(Auth) {
     this.Auth = Auth;
   }
 

templates/app/client/app/admin(auth)/admin.controller.js

@@ -3,6 +3,10 @@
 (function() {
 
 class AdminController {
+  <%_ if(filters.ts || filters.flow) { _%>
+  users: Object[];
+
+  <%_ } _%>
   constructor(User) {
     // Use the User $resource to fetch all users
     this.users = User.query();

templates/app/gulpfile.babel(gulp).js

@@ -245,9 +245,8 @@ function injectTsConfig(filesGlob, tsconfigPath){
 gulp.task('inject:tsconfig', () => {
     return injectTsConfig([
         `${clientPath}/**/!(*.spec|*.mock).ts`,
-       `!${clientPath}/bower_components/**/*`,
-        `${clientPath}/typings/**/*.d.ts`,
-        `!${clientPath}/test_typings/**/*.d.ts`
+        `!${clientPath}/bower_components/**/*`,
+        `typings/main.d.ts`
     ], 
     './tsconfig.client.json');
 });
@@ -256,8 +255,7 @@ gulp.task('inject:tsconfigTest', () => {
     return injectTsConfig([
         `${clientPath}/**/+(*.spec|*.mock).ts`,
         `!${clientPath}/bower_components/**/*`,
-        `!${clientPath}/typings/**/*.d.ts`,
-        `${clientPath}/test_typings/**/*.d.ts`
+        `typings/main.d.ts`
     ], 
     './tsconfig.client.test.json');
 });<% } %>
@@ -298,25 +296,17 @@ gulp.task('inject:<%= styleExt %>', () => {
 });<% } %><% if(filters.ts) { %>
 
 // Install DefinitelyTyped TypeScript definition files
-gulp.task('tsd', cb => {
-    plugins.tsd({
-        command: 'reinstall',
-        config: './tsd.json'
-    }, cb);
-});
-
-gulp.task('tsd:test', cb => {
-    plugins.tsd({
-        command: 'reinstall',
-        config: './tsd_test.json'
-    }, cb);
+gulp.task('typings', () => {
+    return gulp.src("./typings.json")
+        .pipe(plugins.typings());
 });<% } %>
 
 gulp.task('styles', () => {
     <%_ if(!filters.css) { _%>
     return gulp.src(paths.client.mainStyle)
     <%_ } else { _%>
-    return gulp.src(paths.client.styles)<% } %>
+    return gulp.src(paths.client.styles)
+    <%_ } _%>
         .pipe(styles())
         .pipe(gulp.dest('.tmp/app'));
 });<% if(filters.ts) { %>
@@ -326,20 +316,18 @@ gulp.task('copy:constant', ['constant'], () => {
         .pipe(gulp.dest('.tmp/app'));
 })
 
-gulp.task('transpile:client', ['tsd', 'copy:constant'], () => {
-    let tsProject = plugins.typescript.createProject('./tsconfig.client.json');
-    return tsProject.src()
+gulp.task('transpile:client', ['typings', 'copy:constant'], () => {
+    return gulp.src(['client/{app,components}/**/!(*.spec|*.mock).ts', 'typings/main.d.ts'])
         .pipe(plugins.sourcemaps.init())
-        .pipe(plugins.typescript(tsProject)).js
+        .pipe(plugins.typescript()).js
         .pipe(plugins.sourcemaps.write('.'))
         .pipe(gulp.dest('.tmp'));
 });
 
-gulp.task('transpile:client:test', ['tsd:test'], () => {
-    let tsTestProject = plugins.typescript.createProject('./tsconfig.client.test.json');
-    return tsTestProject.src()
+gulp.task('transpile:client:test', ['typings'], () => {
+    return gulp.src(['client/{app,components}/**/+(*.spec|*.mock).ts', 'typings/main.d.ts'])
         .pipe(plugins.sourcemaps.init())
-        .pipe(plugins.typescript(tsTestProject)).js
+        .pipe(plugins.typescript()).js
         .pipe(plugins.sourcemaps.write('.'))
         .pipe(gulp.dest('.tmp/test'));
 });<% } %><% if(filters.babel) { %>
@@ -448,7 +436,7 @@ gulp.task('watch', () => {
         .pipe(gulp.dest('.tmp'))
         .pipe(plugins.livereload());<% } %><% if(filters.ts) { %>
 
-    gulp.watch(paths.client.scripts, ['inject:tsconfig', 'lint:scripts:client', 'transpile:client']);<% } %>
+    gulp.watch(paths.client.scripts, ['lint:scripts:client', 'transpile:client']);<% } %>
 
     plugins.watch(_.union(paths.server.scripts, testFiles))
         .pipe(plugins.plumber())
@@ -459,7 +447,7 @@ gulp.task('watch', () => {
 });
 
 gulp.task('serve', cb => {
-    runSequence(['clean:tmp', 'constant', 'env:all'<% if(filters.ts) { %>, 'tsd'<% } %>],
+    runSequence(['clean:tmp', 'constant', 'env:all'<% if(filters.ts) { %>, 'typings'<% } %>],
         ['lint:scripts', 'inject'<% if(filters.jade) { %>, 'jade'<% } %>],
         ['wiredep:client'],
         ['transpile:client', 'styles'],
@@ -478,7 +466,7 @@ gulp.task('serve:dist', cb => {
 });
 
 gulp.task('serve:debug', cb => {
-    runSequence(['clean:tmp', 'constant'<% if(filters.ts) { %>, 'tsd'<% } %>],
+    runSequence(['clean:tmp', 'constant'<% if(filters.ts) { %>, 'typings'<% } %>],
         ['lint:scripts', 'inject'<% if(filters.jade) { %>, 'jade'<% } %>],
         ['wiredep:client'],
         ['transpile:client', 'styles'],
@@ -568,7 +556,7 @@ gulp.task('build', cb => {
         'jade',<% } %>
         'inject',
         'wiredep:client',<% if(filters.ts) { %>
-        'tsd',<% } %>
+        'typings',<% } %>
         [
             'build:images',
             'copy:extras',

templates/app/tsconfig.client(ts).json

@@ -2,11 +2,12 @@
     "compilerOptions": {
         "sourceMap": true,
         "rootDir": "./client",
-        "outDir": ".tmp"
+        "outDir": ".tmp",
+        "target": "ES5"
     },
     "filesGlob": [
         "client/{app,components}/**/!(*.spec).ts",
-        "client/typings/**/*.d.ts"
+        "typings/main.d.ts"
     ],
     "files": [
         "client/app/account/account.ts",
@@ -36,10 +37,6 @@
         "client/components/ui-router/ui-router.mock.ts",
         "client/components/util/util.module.ts",
         "client/components/util/util.service.ts",
-        "client/typings/angularjs/angular.d.ts",
-        "client/typings/jquery/jquery.d.ts",
-        "client/typings/lodash/lodash.d.ts",
-        "client/typings/socket.io-client/socket.io-client.d.ts",
-        "client/typings/tsd.d.ts"
+        "typings/main.d.ts"
     ]
 }