Adding typescript support to generator-angular

app/index.js

@@ -47,6 +47,21 @@ var Generator = module.exports = function Generator(args, options) {
     this.env.options.coffee = this.options.coffee;
   }
 
+  if (typeof this.env.options.typescript === 'undefined') {
+    this.option('typescript', {
+      desc: 'Generate TypeScript instead of JavaScript'
+    });
+
+    // attempt to detect if user is using TS or not
+    // if cml arg provided, use that; else look for the existence of ts
+    if (!this.options.typescript &&
+      this.expandFiles(path.join(this.appPath, '/scripts/**/*.ts'), {}).length > 0) {
+      this.options.typescript = true;
+    }
+
+    this.env.options.typescript = this.options.typescript;
+  }
+
   if (typeof this.env.options.minsafe === 'undefined') {
     this.option('minsafe', {
       desc: 'Generate AngularJS minification safe code'
@@ -263,6 +278,7 @@ Generator.prototype.createIndexHtml = function createIndexHtml() {
 
 Generator.prototype.packageFiles = function () {
   this.coffee = this.env.options.coffee;
+  this.typescript = this.env.options.typescript;
   this.template('../../templates/common/_bower.json', 'bower.json');
   this.template('../../templates/common/_package.json', 'package.json');
   this.template('../../templates/common/Gruntfile.js', 'Gruntfile.js');

readme.md

@@ -173,8 +173,8 @@ angular.module('myMod').config(function ($provide) {
 ## Options
 In general, these options can be applied to any generator, though they only affect generators that produce scripts.
 
-### CoffeeScript
-For generators that output scripts, the `--coffee` option will output CoffeeScript instead of JavaScript.
+### CoffeeScript and TypeScript
+For generators that output scripts, the `--coffee` option will output CoffeeScript instead of JavaScript, and `--typescript` will out put TypeScript instead of JavaScript.
 
 For example:
 ```bash
@@ -187,9 +187,42 @@ angular.module('myMod')
   .controller 'UserCtrl', ($scope) ->
 ```
 
-A project can mix CoffeScript and JavaScript files.
+For example:
+```bash
+yo angular:controller user --typescript
+```
+
+Produces `app/scripts/controller/user.ts`:
+```typescript
+/// <reference path="../app.ts" />
+
+'use strict';
+
+module demoApp {
+    export interface IUserScope extends ng.IScope {
+        awesomeThings: any[];
+    }
+
+    export class UserCtrl {
+
+        constructor (private $scope:IUserScope) {
+	        $scope.awesomeThings = [
+              'HTML5 Boilerplate',
+              'AngularJS',
+              'Karma'
+            ];
+        }
+    }
+}
+
+angular.module('demoApp')
+  .controller('UserCtrl', demoApp.UserCtrl);
+```
+
+
+A project can mix TypeScript, CoffeScript, and JavaScript files.
 
-To output JavaScript files, even if CoffeeScript files exist (the default is to output CoffeeScript files if the generator finds any in the project), use `--coffee=false`.
+To output JavaScript files, even if CoffeeScript (or TypeScript) files exist (the default is to output CoffeeScript files if the generator finds any in the project), use `--coffee=false` and/or `--typescript=false`.
 
 ### Minification Safe
 

route/index.js

@@ -15,10 +15,12 @@ util.inherits(Generator, ScriptBase);
 
 Generator.prototype.rewriteAppJs = function () {
   var coffee = this.env.options.coffee;
+  var typescript = this.env.options.typescript;
+
   var config = {
     file: path.join(
       this.env.options.appPath,
-      'scripts/app.' + (coffee ? 'coffee' : 'js')
+      'scripts/app.' + (coffee ? 'coffee' : typescript ? 'ts': 'js')
     ),
     needle: '.otherwise',
     splicable: [

script-base.js

@@ -32,6 +32,20 @@ var Generator = module.exports = function Generator() {
     this.env.options.testPath = this.env.options.testPath || 'test/spec';
   }
 
+  this.env.options.typescript = this.options.typescript;
+  if (typeof this.env.options.typescript === 'undefined') {
+    this.option('typescript');
+
+    // attempt to detect if user is using CS or not
+    // if cml arg provided, use that; else look for the existence of cs
+    if (!this.options.typescript &&
+      this.expandFiles(path.join(this.env.options.appPath, '/scripts/**/*.ts'), {}).length > 0) {
+      this.options.typescript = true;
+    }
+
+    this.env.options.typescript = this.options.typescript;
+  }
+
   this.env.options.coffee = this.options.coffee;
   if (typeof this.env.options.coffee === 'undefined') {
     this.option('coffee');
@@ -59,6 +73,11 @@ var Generator = module.exports = function Generator() {
     this.scriptSuffix = '.coffee';
   }
 
+  if (this.env.options.typescript) {
+    sourceRoot = '/templates/typescript';
+    this.scriptSuffix = '.ts';
+  }
+
   if (this.env.options.minsafe) {
     sourceRoot += '-min';
   }

templates/common/Gruntfile.js

@@ -34,6 +34,14 @@ module.exports = function (grunt) {
       coffeeTest: {
         files: ['test/spec/{,*/}*.{coffee,litcoffee,coffee.md}'],
         tasks: ['newer:coffee:test', 'karma']
+      },<% } else if (typescript) { %>
+      typescript: {
+        files: ['<%%= yeoman.app %>/scripts/{,*/}*.ts'],
+        tasks: ['typescript:base']
+      },
+      typescriptTest: {
+        files: ['test/spec/{,*/}*.ts'],
+        tasks: ['typescript:test', 'karma']
       },<% } else { %>
       js: {
         files: ['<%%= yeoman.app %>/scripts/{,*/}*.js'],
@@ -63,7 +71,7 @@ module.exports = function (grunt) {
         },
         files: [
           '<%%= yeoman.app %>/{,*/}*.html',
-          '.tmp/styles/{,*/}*.css',<% if (coffee) { %>
+          '.tmp/styles/{,*/}*.css',<% if (coffee || typescript) { %>
           '.tmp/scripts/{,*/}*.js',<% } %>
           '<%%= yeoman.app %>/images/{,*/}*.{png,jpg,jpeg,gif,webp,svg}'
         ]
@@ -111,9 +119,9 @@ module.exports = function (grunt) {
         reporter: require('jshint-stylish')
       },
       all: [
-        'Gruntfile.js'<% if (!coffee) { %>,
+        'Gruntfile.js'<% if (!coffee && !typescript) { %>,
         '<%%= yeoman.app %>/scripts/{,*/}*.js'<% } %>
-      ]<% if (!coffee) { %>,
+      ]<% if (!coffee && !typescript) { %>,
       test: {
         options: {
           jshintrc: 'test/.jshintrc'
@@ -160,6 +168,33 @@ module.exports = function (grunt) {
       }
     },
 
+<% if (typescript) { %>
+    // Compiles TypeScript to JavaScript
+    typescript: {
+      base: {
+        src: ['<%%= yeoman.app %>/scripts/{,*/}*.ts'],
+        dest: '.tmp/scripts',
+        options: {
+          module: 'amd', //or commonjs
+          target: 'es5', //or es3
+          'base_path': '<%%= yeoman.app %>/scripts', //quoting base_path to get around jshint warning.
+          sourcemap: true,
+          declaration: true
+        }
+      },
+      test: {
+        src: ['test/spec/{,*/}*.ts', 'test/e2e/{,*/}*.ts'],
+        dest: '.tmp/spec',
+        options: {
+          module: 'amd', //or commonjs
+          target: 'es5', //or es3
+          sourcemap: true,
+          declaration: true
+        }
+      }
+    },<% } %>
+
+
 <% if (coffee) { %>
     // Compiles CoffeeScript to JavaScript
     coffee: {
@@ -343,17 +378,20 @@ module.exports = function (grunt) {
     // Run some tasks in parallel to speed up the build process
     concurrent: {
       server: [<% if (coffee) { %>
-        'coffee:dist',<% } %><% if (compass) { %>
+        'coffee:dist',<% } %><% if (typescript) { %>
+        'typescript:base',<% } %><% if (compass) { %>
         'compass:server'<% } else { %>
         'copy:styles'<% } %>
       ],
       test: [<% if (coffee) { %>
-        'coffee',<% } %><% if (compass) { %>
+        'coffee',<% } %><% if (typescript) { %>
+        'typescript',<% } %><% if (compass) { %>
         'compass'<% } else { %>
         'copy:styles'<% } %>
       ],
       dist: [<% if (coffee) { %>
-        'coffee',<% } %><% if (compass) { %>
+        'coffee',<% } %><% if (typescript) { %>
+        'typescript',<% } %><% if (compass) { %>
         'compass:dist',<% } else { %>
         'copy:styles',<% } %>
         'imagemin',

templates/common/_bower.json

@@ -4,7 +4,8 @@
   "dependencies": {
     "angular": "1.2.6",
     "json3": "~3.2.6",
-    "es5-shim": "~2.1.0"<% if (bootstrap) { %>,
+    "es5-shim": "~2.1.0"<% if (typescript) { %>,
+    "definitivelyTyped": "https://github.com/borisyankov/DefinitelyTyped.git"<% } %><% if (bootstrap) { %>,
     "jquery": "~1.10.2"<% if (compassBootstrap) { %>,
     "sass-bootstrap": "~3.0.2"<% } else { %>,
     "bootstrap": "~3.0.3"<% } } %><% if (resourceModule) { %>,

templates/common/_package.json

@@ -27,7 +27,8 @@
     "grunt-usemin": "~2.0.0",
     "jshint-stylish": "~0.1.3",
     "load-grunt-tasks": "~0.2.0",
-    "time-grunt": "~0.2.1"
+    "time-grunt": "~0.2.1",
+    "grunt-typescript": "~0.2.7"
   },
   "engines": {
     "node": ">=0.8.0"

templates/common/root/app/.buildignore

@@ -1 +1,2 @@
-*.coffee
+*.coffee
+*.ts

templates/typescript/app.ts

@@ -0,0 +1,19 @@
+/// <reference path="../bower_components/definitivelyTyped/angularjs/angular.d.ts" />
+<% if (ngRoute) { %>/// <reference path="../bower_components/definitivelyTyped/angularjs/angular-route.d.ts" /><% } %>
+/// <reference path="../bower_components/definitivelyTyped/angularjs/angular-resource.d.ts" />
+/// <reference path="../bower_components/definitivelyTyped/angularjs/angular-sanitize.d.ts" />
+/// <reference path="../bower_components/definitivelyTyped/angularjs/angular-resource.d.ts" />
+
+'use strict';
+
+angular.module('<%= scriptAppName %>', [<%= angularModules %>])<% if (ngRoute) { %>
+  .config(function ($routeProvider:ng.route.IRouteProvider) {
+    $routeProvider
+      .when('/', {
+        templateUrl: 'views/main.html',
+        controller: 'MainCtrl'
+      })
+      .otherwise({
+        redirectTo: '/'
+      });
+  })<% } %>;

templates/typescript/controller.ts

@@ -0,0 +1,23 @@
+/// <reference path="../app.ts" />
+
+'use strict';
+
+module <%= scriptAppName %> {
+    export interface I<%= classedName %>Scope extends ng.IScope {
+        awesomeThings: any[];
+    }
+
+    export class <%= classedName %>Ctrl {
+
+        constructor (private $scope:I<%= classedName %>Scope) {
+	        $scope.awesomeThings = [
+              'HTML5 Boilerplate',
+              'AngularJS',
+              'Karma'
+            ];
+        }
+    }
+}
+
+angular.module('<%= scriptAppName %>')
+  .controller('<%= classedName %>Ctrl', <%= scriptAppName %>.<%= classedName %>Ctrl);

templates/typescript/decorator.ts

@@ -0,0 +1,18 @@
+/// <reference path="../app.ts" />
+
+'use strict';
+
+module <%= scriptAppName %>{
+	export function <%= cameledName %>DecoratorProvider($provide:ng.auto.IProvideService):void {
+		//decorate <%= cameledName %>
+		$provide.decorator('<%= cameledName %>', <%= cameledName %>Decorator);
+	}
+
+	export function <%= cameledName %>Decorator($delegate) {
+		// decorate the $delegate
+		return $delegate;
+	}
+}
+
+angular.module('<%= scriptAppName %>')
+    .config(<%= scriptAppName %>.<%= cameledName %>DecoratorProvider);

templates/typescript/directive.ts

@@ -0,0 +1,22 @@
+/// <reference path="../app.ts" />
+
+'use strict';
+
+module <%= scriptAppName %> {
+
+	export class <%= classedName %> implements ng.IDirective {
+		template = '<div></div>';
+		restrict = 'E';
+		link = function (scope, element: JQuery, attrs: ng.IAttributes):void {
+			element.text('this is the <%= cameledName %> directive');
+		}
+	}
+
+	export function <%= cameledName %>Factory() {
+		return new <%= scriptAppName %>.<%= classedName %>();
+	}
+
+}
+
+angular.module('<%= scriptAppName %>')
+  .directive('<%= cameledName %>', <%= scriptAppName %>.<%= cameledName %>Factory);

templates/typescript/filter.ts

@@ -0,0 +1,18 @@
+/// <reference path="../app.ts" />
+
+'use strict';
+
+module <%= scriptAppName %> {
+	export function <%= cameledName %>FilterFactory():Function {
+		return <%= cameledName %>Filter;
+	}
+
+    function <%= cameledName %>Filter(input, param) {
+	  //usage {{"text" | <%= cameledName %>: "suffix"}}
+	  //returns '<%= cameledName %> filter: text suffix'
+      return '<%= cameledName %> filter: ' + input + (param ? ' ' + param: '');
+    }
+}
+
+angular.module('<%= scriptAppName %>')
+  .filter('<%= cameledName %>', <%= scriptAppName %>.<%= cameledName %>FilterFactory);

templates/typescript/service/constant.ts

@@ -0,0 +1,6 @@
+/// <reference path="../app.ts" />
+
+'use strict';
+
+angular.module('<%= scriptAppName %>')
+  .constant('<%= cameledName %>', 42);

templates/typescript/service/factory.ts

@@ -0,0 +1,21 @@
+/// <reference path="../app.ts" />
+
+'use strict';
+
+module <%= scriptAppName %> {
+    export function <%= cameledName %>Factory() {
+		return new <%= classedName %>(42);
+	}
+	export class <%= classedName %> {
+
+		constructor (private meaningOfLife) {
+		}
+
+		someMethod(){
+		    return this.meaningOfLife
+		}
+	}
+}
+
+angular.module('<%= scriptAppName %>')
+  .factory('<%= cameledName %>', <%= scriptAppName %>.<%= cameledName %>Factory);