Added support for string enum parameters and inline model enums. Note…

… that TypeScript 2.4 is required to support string initializers in generated enums.

.gitignore

@@ -5,8 +5,9 @@ node_modules
 .vscode
 .idea
 bin
+lib
 obj
+out
 output
 temp
-lib
 npm-debug.log

package.json

@@ -1,7 +1,7 @@
 {
   "name": "angular4-swagger-client-generator",
-  "version": "0.1.12",
-  "description": "Angular4 REST API client generator from Swagger JSON with camel case settigs",
+  "version": "0.1.13",
+  "description": "Angular 4/5 REST API client generator from Swagger JSON with camel case settings",
   "homepage": "https://github.com/lotjomik/angular4-swagger-client-generator",
   "main": "index.js",
   "bin": {
@@ -44,6 +44,6 @@
     "optimist": "^0.6.1",
     "request": "^2.81.0",
     "tslint": "^5.7.0",
-    "typescript": "^2.1.5"
+    "typescript": "^2.4.0"
   }
 }

src/generator.js

@@ -285,15 +285,15 @@ var Generator = (function () {
                     typescriptType: null
                 };
 
-                if (property.isArray)
+                if (property.isArray) {
                     if (_.has(propin.items, '$ref')) {
                         property.type = that.camelCase(propin.items['$ref'].replace('#/definitions/', ''));
                     } else if (_.has(propin.items, 'type')) {
                         property.type = that.camelCase(propin.items['type']);
                     } else {
                         property.type = propin.type;
                     }
-
+                }
                 else {
                     property.type = _.has(propin, '$ref') ? that.camelCase(propin['$ref'].replace('#/definitions/', '')) : propin.type;
                 }
@@ -306,7 +306,6 @@ var Generator = (function () {
                     property.typescriptType = property.type;
                 }
 
-
                 if (property.isRef) {
                     definition.refs.push(property);
 

templates/angular2-model.mustache

@@ -2,6 +2,14 @@
 import { {{.}} } from './{{#lower}}{{.}}{{/lower}}.model';
 {{/imports}}
 
+{{#enums}}
+export enum {{name}} {
+  {{#values}}
+  {{#upper}}{{value}}{{/upper}} = '{{value}}'{{^isLast}},{{/isLast}}
+  {{/values}}
+}
+
+{{/enums}}
 export interface {{&name}} {
 {{#properties}}
   {{#isArray}}

templates/angular2-service.mustache

@@ -1,13 +1,21 @@
 import { Inject, Injectable, Optional } from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams, HttpResponse } from '@angular/common/http';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 
 import {
-{{#definitions}}  {{name}}{{^last}},
-{{/last}}{{/definitions}}
+{{#definitions}} {{name}}{{^isLast}},
+{{/isLast}}{{/definitions}}
 
 } from './models';
 
+{{#enums}}
+export enum {{name}} {
+  {{#values}}
+  {{#upper}}{{value}}{{/upper}} = '{{value}}'{{^isLast}},{{/isLast}}
+  {{/values}}
+}
+
+{{/enums}}
 /**
 * Created with angular4-swagger-client-generator.
 */
@@ -33,7 +41,7 @@ export class ApiClientService {
   {{/parameters}}
   * @return Full HTTP response as Observable
   */
-  public {{&methodName}}({{#parameters}}{{&camelCaseName}}: {{typescriptType}}{{^last}}, {{/last}}{{/parameters}}): Observable<HttpResponse<{{&response}}>> {
+  public {{&methodName}}({{#parameters}}{{&camelCaseName}}: {{typescriptType}}{{^isLast}}, {{/isLast}}{{/parameters}}): Observable<HttpResponse<{{&response}}>> {
     let uri = `{{&backTickPath}}`;
     let headers = new HttpHeaders();
     let params = new HttpParams();