Merge pull request #262 from deniszholob/template-formatting-tweaks

Template formatting tweaks

Author: luisfpg

templates/operationBody.handlebars

@@ -1,6 +1,5 @@
 {{{bodyMethodTsComments}}}{{methodName}}({{>operationParameters}}): Observable<{{{resultType}}}> {
-
-    return this.{{responseMethodName}}(params,context).pipe(
-      map((r: {{@root.responseClass}}<{{{resultType}}}>) => r.body as {{{resultType}}})
+    return this.{{responseMethodName}}(params, context).pipe(
+      map((r: {{@root.responseClass}}<{{{resultType}}}>): {{{resultType}}} => r.body)
     );
   }

templates/operationParameters.handlebars

@@ -1,11 +1,11 @@
-params{{^operation.parametersRequired}}?{{/operation.parametersRequired}}: {
+
+    params{{^operation.parametersRequired}}?{{/operation.parametersRequired}}: {
 {{#operation.parameters}}
-{{{tsComments}}}{{{var}}}{{^required}}?{{/required}}: {{{type}}};{{#tsComments}}{{/tsComments}}
+{{{tsComments}}}  {{{var}}}{{^required}}?{{/required}}: {{{type}}};{{#tsComments}}{{/tsComments}}
 {{/operation.parameters}}
 {{#requestBody}}
-{{{../operation.requestBody.tsComments}}}body{{^../operation.requestBody.required}}?{{/../operation.requestBody.required
-}}: {{{type}}}
+  {{{../operation.requestBody.tsComments}}}body{{^../operation.requestBody.required}}?{{/../operation.requestBody.required}}: {{{type}}}
 {{/requestBody}}
-  },
-  context?: HttpContext
-
+    },
+    context?: HttpContext
+  

templates/operationPath.handlebars

@@ -1,4 +1,2 @@
-  /**
-   * Path part for operation {{id}}
-   */
-  static readonly {{pathVar}} = '{{{path}}}';
+  /** Path part for operation `{{id}}()` */
+  static readonly {{pathVar}}: '{{{path}}}';

templates/operationResponse.handlebars

@@ -1,5 +1,4 @@
 {{{responseMethodTsComments}}}{{responseMethodName}}({{>operationParameters}}): Observable<{{@root.responseClass}}<{{{resultType}}}>> {
-
     const rb = new {{@root.requestBuilderClass}}(this.rootUrl, {{@root.typeName}}.{{operation.pathVar}}, '{{operation.method}}');
     if (params) {
 {{#operation.parameters}}
@@ -10,12 +9,10 @@
 {{/requestBody}}
     }
 
-    return this.http.request(rb.build({
-      responseType: '{{responseType}}',
-      accept: '{{accept}}',
-      context: context
-    })).pipe(
-      filter((r: any) => r instanceof HttpResponse),
+    return this.http.request(
+      rb.build({ responseType: '{{responseType}}', accept: '{{accept}}', context })
+    ).pipe(
+      filter((r: any): r is HttpResponse<any> => r instanceof HttpResponse),
       map((r: HttpResponse<any>) => {
         {{> handleResponse}}
       })

templates/service.handlebars

@@ -1,25 +1,21 @@
 /* tslint:disable */
 /* eslint-disable */
+import { HttpClient, HttpContext, HttpResponse } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { HttpClient, HttpResponse, HttpContext } from '@angular/common/http';
+import { Observable } from 'rxjs';
+import { filter, map } from 'rxjs/operators';
+
 import { {{baseServiceClass}} } from '../{{baseServiceFile}}';
 import { {{configurationClass}} } from '../{{configurationFile}}';
 import { {{responseClass}} } from '../{{responseFile}}';
 import { {{requestBuilderClass}} } from '../{{requestBuilderFile}}';
-import { Observable } from 'rxjs';
-import { map, filter } from 'rxjs/operators';
 
 {{#imports}}import { {{{typeName}}}{{#useAlias}} as {{{qualifiedName}}}{{/useAlias}} } from '{{{file}}}';
 {{/imports}}
 
-{{{tsComments}}}@Injectable({
-  providedIn: 'root',
-})
+{{{tsComments}}}@Injectable({ providedIn: 'root' })
 export class {{typeName}} extends {{baseServiceClass}} {
-  constructor(
-    config: {{configurationClass}},
-    http: HttpClient
-  ) {
+  constructor(config: {{configurationClass}}, http: HttpClient) {
     super(config, http);
   }