Skip to content

Commit 3c23e62

Browse files
committed
Merge pull request #888 from andrewmcgivery/v2
Support for Typescript Generators
2 parents dc8738f + a675e3b commit 3c23e62

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

lib/ionic/generate.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ var fs = require('fs'),
66
Utils = ionicAppLib.utils,
77
log = ionicAppLib.logging.logger,
88
Info = ionicAppLib.info;
9+
Project = ionicAppLib.project;
910

1011
var IonicTask = function() {};
1112

@@ -21,9 +22,17 @@ IonicTask.prototype.run = function(ionic, argv) {
2122
if (!argv.v2) {
2223
return Utils.fail('Generators are only available for Ionic 2 projects');
2324
}
25+
26+
var project;
27+
try {
28+
project = Project.load(process.cwd());
29+
} catch (err){
30+
return Utils.fail(err);
31+
}
2432

2533
var generator = argv._[1];
2634
var name = argv._[2] //TODO support multiple names
35+
var isTS = project.typescript || argv.ts;
2736

2837
var ionicModule = loadToolingModule();
2938

@@ -34,7 +43,7 @@ IonicTask.prototype.run = function(ionic, argv) {
3443

3544
var promise;
3645
try {
37-
promise = ionicModule.generate({appDirectory: process.cwd(), generator: generator, name: name});
46+
promise = ionicModule.generate({appDirectory: process.cwd(), generator: generator, name: name, isTS: isTS});
3847
} catch (err) {
3948
if (err.message.indexOf('no generator available') != -1) {
4049
log.error(err.message);

lib/tasks/cliTasks.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -501,6 +501,10 @@ var TASKS = [
501501
'--list': {
502502
title: 'List available generators',
503503
boolean: true
504+
},
505+
'--typescript|--ts': {
506+
boolean: true,
507+
title: '(with --v2 only) Use TypeScript in generation'
504508
}
505509
},
506510
}

0 commit comments

Comments
 (0)