Merge branch 'develop'

Author: ospatil

.gitignore

@@ -1 +1,2 @@
 node_modules/
+.DS_Store

README.md

@@ -5,20 +5,20 @@
 I'm a [Yeoman](http://yeoman.io) generator that allows you to create NodeJS modules using TypeScript. I let you quickly setup a project with latest available tools and best practices.
 Tools and libraries I use -
   - _tsc_ - for compiling TypeScript.
-  - _tsd_ - for TypeScript definition files management.
+  - _typings_ - for management of TypeScript definitions.
   - _tsconfig.json_ - for providing compiler options.
   - _tslint_ - for linting TypeScript source files.
   - [_gulp_](http://gulpjs.com/) - as a build system. You can carry out above tasks through gulp.
   - [_Jasmine 2_](http://jasmine.github.io/2.3/introduction.html) - for writing tests.
 
->You want to know if you can change any of these? Of course, why not? It is your module after all. I simply get down to business of generating, no questions asked. Once done, I get out of the way as if I were not there at all and you can do as you please!
+>You want to know if you can change any of these? Of course, why not? It is your module after all. I simply get down to business of generating, no questions asked. Once done, I get out of the way and you can do as you please!
 
 ## Usage
 
-Install `typescript tsd tslint generator-node-typescript` globally.
+Install `generator-node-typescript`, `gulp-cli` and `typings` globally.
 
 ```
-npm install -g typescript tsd tslint generator-node-typescript
+npm install -g generator-node-typescript gulp-cli typings
 ```
 
 Create a new directory and `cd` into it.
@@ -39,50 +39,23 @@ Here is the list of tasks available out of the box -
   _build          INTERNAL TASK - Compiles all TypeScript source files
   build           Compiles all TypeScript source files and updates module references
   clean           Cleans the generated js files from lib directory
-  gen_tsrefs      Generates the app.d.ts references file dynamically for all application *.ts files
+  gen-def         Generate a single .d.ts bundle containing external module declarations exported from TypeScript module files
   help            Display this help text.
   test            Runs the Jasmine test specs [build]
-  tsconfig_files  Update files section in tsconfig.json
   tslint          Lints all TypeScript source files
+  update-tsconfig Update files section in tsconfig.json using filesGlob entries
+  watch           Watches ts source files and runs build on change
 ```
 
-## Additional notes
-- I provide nice integration with [VSCode editor](https://code.visualstudio.com/). I configure the `gulp build` task as the default VSCode build task.
-- The `gulp build` task also updates _tsconfig/files_ section using _tsconfig/filesGlob_ and generates _typings/app.d.ts_ references file dynamically
-for all the application *.ts files before build so you don't have to do it manually.
-
-## Development tips
-- The _tsd_ tool dynamically updates _typings/tsd.d.ts_ file for all type definitions you install through it. Also, the gulp *gen_tsrefs* task dynamically
-updates _typings/app.d.ts_ references file for all application *.ts. Therefore you just need to add references to these two files in any _.ts_ file and you
-are good to go with *tsc* compiler.
-- To keep on using the typical CommonJS exports and imports use the `export` and `inport` systax mentioned in the example below.
-
-  ```ts
-  class Greeter {
-    greeting: string;
-    constructor(message: string) {
-      this.greeting = message;
-    }
-    greet() {
-      return 'Bonjour, ' + this.greeting + '!';
-    }
-  }
-  //The following line is important, export like this allows you to use the old-style CommonJS export/import.
-  export = Greeter;
-
-  ```
-  This is how the above class can be used in some other file.
+## What's new in the latest release?
+- Use of latest version of TypeScript(`^1.8`).
+- Switch to _typings_ as manager for TypeScript definitions. The TSD team has deprecated _tsd_ in favour of _typings_. You can find more information about _typings_ on [Github](https://github.com/typings/typings).
+- Integration of _dts-generator_ tool to generate a single _.d.ts_ bundle containing external module declarations exported from TypeScript source files in the module. The package.json now declares _typings_ field that points to the single _.d.ts_ bundle. You can find more information about _typings_ field on [TypeScript Wiki](https://github.com/Microsoft/TypeScript/wiki/Typings-for-npm-packages).
+- Less global dependencies. `typescript` and `tslint` are now installed as local dev dependencies allowing you to freely use different versions of these for different modules.
+- Addition of _gulp watch_ task that watches ts source files and runs build on change.
 
-  ```ts
-  /// <reference path="../typings/tsd.d.ts" />
-  /// <reference path="../typings/app.d.ts" />
-
-  import Greeter = require('./greeter');
-
-  const greeter = new Greeter('friend');
-  greeter.greet();
-
-  ```
+## Additional notes
+- I provide nice integration with [VS Code editor](https://code.visualstudio.com/). I configure the `gulp build` task as the default VS Code build task.
 
 ## License
 

generators/app/index.js

@@ -30,7 +30,6 @@ module.exports = yeoman.generators.Base.extend({
       this.directory('src', 'src');
       this.directory('test', 'test');
       this.directory('_vscode', '.vscode');
-      this.directory('typings', 'typings');
     },
 
     app: function () {
@@ -44,7 +43,8 @@ module.exports = yeoman.generators.Base.extend({
     projectfiles: function () {
       this.fs.copy(
         this.templatePath('_gulpfile.js'),
-        this.destinationPath('gulpfile.js')
+        this.destinationPath('gulpfile.js'),
+        { appname: _.kebabCase(path.basename(process.cwd())) }
         );
       this.fs.copy(
         this.templatePath('_tsconfig.json'),
@@ -73,8 +73,8 @@ module.exports = yeoman.generators.Base.extend({
     npmInstall: function () {
       var generator = this;
       generator.npmInstall(null, { skipInstall: this.options['skip-install'] }, function () {
-        generator.spawnCommandSync('tsd', ['init']); //tsd init
-        generator.spawnCommandSync('tsd', ['install', 'node', '--save']) //tsd install --save node
+        generator.spawnCommandSync('typings', ['init']); //typings init
+        generator.spawnCommandSync('typings', ['install', 'node', '--save', '--ambient']) //typings install --save node --ambient
       });
   }
   }

generators/app/templates/_gulpfile.js

@@ -8,29 +8,19 @@ var path = require('path');
 var inject = require('gulp-inject');
 var gulpSequence = require('gulp-sequence');
 var del = require('del');
-
-var typeDefsPath = (function (tsd) {
-  return tsd.path || 'typings';
-})(require('./tsd.json'));
+var dtsGenerator = require('dts-generator');
+require('dotbin');
 
 var tsFilesGlob = (function (c) {
   return c.filesGlob || c.files || '**/*.ts';
 })(require('./tsconfig.json'));
 
-gulp.task('tsconfig_files', 'Update files section in tsconfig.json', function () {
-  gulp.src(tsFilesGlob).pipe(tsconfig());
-});
+var appName = (function (p) {
+  return p.name;
+})(require('./package.json'));
 
-gulp.task('gen_tsrefs', 'Generates the app.d.ts references file dynamically for all application *.ts files', function () {
-  var target = gulp.src(path.join('.', typeDefsPath, 'app.d.ts'));
-  var sources = gulp.src([path.join('.', 'src', '**', '*.ts')], { read: false });
-  return target.pipe(inject(sources, {
-    starttag: '//{',
-    endtag: '//}',
-    transform: function (filepath) {
-      return '/// <reference path="..' + filepath + '" />';
-    }
-  })).pipe(gulp.dest(path.join('.', typeDefsPath)));
+gulp.task('update-tsconfig', 'Update files section in tsconfig.json', function () {
+  gulp.src(tsFilesGlob).pipe(tsconfig());
 });
 
 gulp.task('clean', 'Cleans the generated js files from lib directory', function () {
@@ -45,18 +35,40 @@ gulp.task('tslint', 'Lints all TypeScript source files', function () {
     .pipe(tslint.report('verbose'));
 });
 
+gulp.task('gen-def', 'Generate a single .d.ts bundle containing external module declarations exported from TypeScript module files', function (cb) {
+  return dtsGenerator.default({
+    name: appName,
+    project: '.',
+    out: './lib/' + appName + '.d.ts',
+    exclude: ['node_modules/**/*.d.ts', 'typings/**/*.d.ts']
+  });
+});
+
 gulp.task('_build', 'INTERNAL TASK - Compiles all TypeScript source files', function (cb) {
-  exec('tsc', function (err, stdout, stderr) {
+  exec('tsc --version', function (err, stdout, stderr) {
+    console.log('TypeScript ', stdout);
+    if (stderr) {
+      console.log(stderr);
+    }
+  });
+
+  return exec('tsc', function (err, stdout, stderr) {
     console.log(stdout);
-    console.log(stderr);
+    if (stderr) {
+      console.log(stderr);
+    }
     cb(err);
   });
 });
 
-//run tslint task, then run _tsconfig_files and _gen_tsrefs in parallel, then run _build
-gulp.task('build', 'Compiles all TypeScript source files and updates module references', gulpSequence('tslint', ['tsconfig_files', 'gen_tsrefs'], '_build'));
+//run tslint task, then run update-tsconfig and gen-def in parallel, then run _build
+gulp.task('build', 'Compiles all TypeScript source files and updates module references', gulpSequence('tslint', ['update-tsconfig', 'gen-def'], '_build'));
 
 gulp.task('test', 'Runs the Jasmine test specs', ['build'], function () {
   return gulp.src('test/*.js')
     .pipe(jasmine());
 });
+
+gulp.task('watch', 'Watches ts source files and runs build on change', function () {
+  gulp.watch('src/**/*.ts', ['build']);
+});

generators/app/templates/_package.json

@@ -1,8 +1,8 @@
 {
   "name": "<%= appname %>",
   "version": "0.0.0",
-  "description": "",
-  "license": "",
+  "description": "<%= appname %>",
+  "license": "MIT",
   "repository": "",
   "author": "",
   "keywords": [
@@ -17,16 +17,21 @@
   "dependencies": {},
   "devDependencies": {
     "del": "2.0.2",
+    "dotbin": "^1.0",
+    "dts-generator": "^1.7",
     "gulp": "^3.9.0",
     "gulp-help": "^1.6.0",
     "gulp-inject": "3.0.0",
     "gulp-jasmine": "^2.0.1",
     "gulp-sequence": "0.4.1",
     "gulp-tsconfig-files": "0.0.2",
     "gulp-tslint": "^3.1",
-    "jasmine": "^2.3.1"
+    "jasmine": "^2.3.1",
+    "tslint": "^3.5",
+    "typescript": "^1.8"
   },
   "engines": {
-    "node": ">=0.12.0"
-  }
+    "node": ">=2.0.0"
+  },
+  "typings": "./lib/<%= appname %>.d.ts"
 }

generators/app/templates/_tsconfig.json

@@ -9,6 +9,7 @@
     "removeComments": true
   },
   "filesGlob": [
+    "typings/main.d.ts",
     "src/**/*.ts"
   ],
   "files": [

generators/app/templates/typings/app.d.ts

@@ -1,6 +1,6 @@
 {
   "name": "generator-node-typescript",
-  "version": "0.10.0",
+  "version": "0.11.0-rc",
   "description": "Yeoman generator for Node modules using typescript and gulp",
   "license": "MIT",
   "main": "app/index.js",

package.json

@@ -6,6 +6,8 @@ var helpers = require('yeoman-generator').test;
 var os = require('os');
 
 describe('node-ts:app', function () {
+  this.timeout(5000); //5 second timeout
+
   before(function (done) {
     helpers.run(path.join(__dirname, '../generators/app'))
       .withOptions({ skipInstall: true })
@@ -33,7 +35,6 @@ describe('node-ts:app', function () {
   it('creates project files', function () {
     assert.file([
       '.vscode/tasks.json',
-      'typings/app.d.ts',
       'gulpfile.js',
       'tsconfig.json',
       'tslint.json',