diff --git a/src/generators/generator-base.js b/src/generators/generator-base.js index d4a13c314..dd6ca54cf 100644 --- a/src/generators/generator-base.js +++ b/src/generators/generator-base.js @@ -49,12 +49,19 @@ export class Base extends YoBase { to() { return this.filters.expect ? ').to' : '.should'; } + + public() { + return this.filters.ts ? 'public ' : ''; + } + private() { + return this.filters.ts ? 'private ' : ''; + } } export class NamedBase extends Base { constructor(...args) { super(...args); - + this.argument('name', { type: String, required: true }); var name = this.name.replace(/\//g, '-'); diff --git a/templates/app/client/app/main/main.component.js b/templates/app/client/app/main/main.component.js index a8f75fa25..8c2567d86 100644 --- a/templates/app/client/app/main/main.component.js +++ b/templates/app/client/app/main/main.component.js @@ -8,18 +8,18 @@ import { SocketService } from '../../components/socket/socket.service'; styles: [require('./main.<%=styleExt%>')], }) export class MainComponent implements OnInit<% if(filters.socketio) { %>, OnDestroy<% } %> { - Http; <%_ if(filters.socketio) { -%> SocketService;<% } %> awesomeThings = []; <%_ if(filters.models) { -%> newThing = '';<% } %> - static parameters = [Http, SocketService]; - constructor(_Http_: Http<% if(filters.socketio) { %>, _SocketService_: SocketService<% } %>) { - this.Http = _Http_; + <%_ if(filters.babel) { -%> + static parameters = [Http, SocketService];<% } %> + constructor(<%= private() %>http: Http<% if(filters.socketio) { %>, <%= private() %>socketService: SocketService<% } %>) { + this.Http = http; <%_ if(filters.socketio) { -%> - this.SocketService = _SocketService_;<% } %> + this.SocketService = socketService;<% } %> } ngOnInit() {