Fixed problem with camel case method names (typescript fatal error)

lib/views/swagger2.js

@@ -192,6 +192,12 @@ var getViewForSwagger2 = function(opts, type) {
         if (parameter.required && parameter.in !== 'path') {
           hasAnyRequired = true;
         }
+
+        parameter.isDefaultQuoted = false;
+        if (parameter.default && typeof parameter.default === 'string') {
+          parameter.isDefaultQuoted = true;
+        }
+
         method.parameters.push(parameter);
       });
 

templates/typescript-class.mustache

@@ -5,7 +5,7 @@ import 'isomorphic-fetch';
 /// <reference path="{{&.}}" />
 {{/imports}}
 
-type QueryParameters = { [key: string]: string | number | string[] | number[] };
+type QueryParameters = { [key: string]: string | number | string[] | number[] | undefined };
 
 {{#definitions}}
 export type {{&name}} = {{#tsType}}{{> type}}{{/tsType}};
@@ -20,6 +20,35 @@ class ApiError {
   }
 }
 
+const queryParametersToSnakeCase = (parameters: QueryParameters) => {
+    const snakeCaseParams: any = {};
+
+    Object.keys(parameters).map(key => {
+        const value = parameters[key];
+
+        snakeCaseParams[toSnakeCase(key)] = value;
+    });
+
+    return snakeCaseParams;
+}
+
+const toSnakeCase = (msg: string) => {
+    const upperChars = msg.match(/([A-Z])/g);
+    if (! upperChars) {
+        return msg;
+    }
+
+    let str = msg.toString();
+    for (var i = 0, n = upperChars.length; i < n; i++) {
+        str = str.replace(new RegExp(upperChars[i]), '_' + upperChars[i].toLowerCase());
+    }
+
+    if (str.slice(0, 1) === '_') {
+        str = str.slice(1);
+    }
+    return str;
+}
+
 /**
  * {{&description}}
  * @class {{&className}}
@@ -37,9 +66,12 @@ class {{&className}} {
     serializeQueryParams(parameters: QueryParameters) {
         const str: string[] = [];
         for (let p in parameters) {
-        if (parameters.hasOwnProperty(p)) {
-            str.push(`${encodeURIComponent(p)}=${encodeURIComponent(parameters[p].toString())}`);
-        }
+            if (parameters.hasOwnProperty(p)) {
+                if(parameters[p] !== undefined) {    
+                    const parameter = parameters[p] || "";
+                    str.push(`${encodeURIComponent(p)}=${encodeURIComponent(parameter.toString())}`);
+                }
+            }
         }
         return str.join('&');
     }
@@ -67,31 +99,16 @@ class {{&className}} {
     }
     {{/isSecure}}
 
-    private async request(method: string, url: string, body: any, headers: any, queryParameters: QueryParameters, form: any) {
+    private async request(method: string, url: string, body: any, headers: any, queryParameters: QueryParameters) {
         const queryParams = queryParameters && Object.keys(queryParameters).length ? this.serializeQueryParams(queryParameters) : null ;
         const urlWithParams = url + (queryParams ? '?' + queryParams : '');
 
-        // ugly hack, we need to delete Content-Type header with multipart/form-data
-        // that way, browser will calculate form specific headers on it's own
-        // contentTypeHeader[0] because nearly every header's value is set using array
-        const contentTypeHeader = headers['Content-Type'];
-        if(contentTypeHeader && contentTypeHeader[0] === 'multipart/form-data') {
-            delete headers['Content-Type'];
-        }
-
         if (body && !Object.keys(body).length) {
             body = undefined;
         } else {
             body = JSON.stringify(body);
         }
 
-        if (form && Object.keys(form).length) {
-            body = new FormData();
-            for (let k in form) {
-                body.append(k, form[k]);
-            }
-        }
-
         const response = await fetch(urlWithParams, { method, headers, body });
         if(response.ok) {
             return response.json();

templates/typescript-method.mustache

@@ -33,7 +33,6 @@
 {
     let path = '{{&path}}';
     let headers: Headers = new Headers();
-    let form: any = {};
 
 {{#isSecure}}
     headers = this.appendAuthHeaders(headers);
@@ -73,26 +72,15 @@
 
     {{#isHeaderParameter}}
         {{#isSingleton}}
-            headers['{{&name}}'] = '{{&singleton}}';
+            headers.append('{{&name}}', '{{&singleton}}');
         {{/isSingleton}}
         {{^isSingleton}}
-            if(parameters['{{&camelCaseName}}'] !== undefined) {
-                headers['{{&name}}'] = parameters['{{&camelCaseName}}']!;
+            if(queryParameters['{{&camelCaseName}}'] !== undefined) {
+                headers.append('{{&name}}', queryParameters['{{&camelCaseName}}']!);
             }
         {{/isSingleton}}
     {{/isHeaderParameter}}
 
-    {{#isFormParameter}}
-        {{#isSingleton}}
-            form['{{&name}}'] = '{{&singleton}}';
-        {{/isSingleton}}
-        {{^isSingleton}}
-            if(parameters['{{&camelCaseName}}'] !== undefined) {
-                form['{{&name}}'] = parameters['{{&camelCaseName}}'];
-            }
-        {{/isSingleton}}
-    {{/isFormParameter}}
-
     {{#required}}
         {{#isQueryParameter}}
             if(queryParameters['{{&camelCaseName}}'] === undefined) {
@@ -103,19 +91,21 @@
 
 {{/parameters}}
 
+    queryParameters = queryParametersToSnakeCase(queryParameters);
+
+
     {{^isBodyParameter}}
         {{#isPOST}}
-            form = queryParameters;
-            queryParameters = {};
+            // queryParameters = {};
         {{/isPOST}}
     {{/isBodyParameter}}
 
+
     return this.request(
         '{{method}}',
         `${this.baseUrl}${path}`,
         {{#hasBody}}body{{/hasBody}}{{^hasBody}}{}{{/hasBody}},
         headers,
-        queryParameters,
-        form
+        queryParameters
     );
 }