more cleaning up

Author: lohanidamodar

templates/flutter/base/requests/api.twig

@@ -1,16 +1,11 @@
+{% import 'flutter/base/utils.twig' as utils %}
         final Map<String, dynamic> params = {
-{% for parameter in method.parameters.query %}
-            '{{ parameter.name }}': {{ parameter.name | caseCamel | escapeKeyword }},
-{% endfor %}
-{% for parameter in method.parameters.body %}
-            '{{ parameter.name }}': {{ parameter.name | caseCamel | escapeKeyword }},
-{% endfor %}
+            {{ utils.map_parameter(method.parameters.query) }}
+            {{ utils.map_parameter(method.parameters.body) }}
         };
 
         final Map<String, String> headers = {
-{% for key, header in method.headers %}
-            '{{ key }}': '{{ header }}',
-{% endfor %}
+            {{ utils.map_headers(method.headers) }}
         };
 
         final res = await client.call(HttpMethod.{{ method.method | caseLower }}, path: path, params: params, headers: headers);

templates/flutter/base/requests/file.twig

@@ -1,16 +1,11 @@
-      final Map<String, dynamic> params = {
-{% for parameter in method.parameters.query %}
-            '{{ parameter.name }}': {{ parameter.name | caseCamel | escapeKeyword }},
-{% endfor %}
-{% for parameter in method.parameters.body %}
-            '{{ parameter.name }}': {{ parameter.name | caseCamel | escapeKeyword }},
-{% endfor %}
+      {% import 'flutter/base/utils.twig' as utils %}
+        final Map<String, dynamic> params = {
+            {{ utils.map_parameter(method.parameters.query) }}
+            {{ utils.map_parameter(method.parameters.body) }}
         };
 
         final Map<String, String> headers = {
-{% for key, header in method.headers %}
-            '{{ key }}': '{{ header }}',
-{% endfor %}
+            {{ utils.map_headers(method.headers) }}
         };
 
 {% if 'multipart/form-data' in method.consumes %}

templates/flutter/base/requests/location.twig

@@ -1,12 +1,8 @@
+{% import 'flutter/base/utils.twig' as utils %}
         final Map<String, dynamic> params = {
-{% for parameter in method.parameters.query %}
-            '{{ parameter.name }}': {{ parameter.name | caseCamel | escapeKeyword }},
-{% endfor %}
-{% for parameter in method.parameters.body %}
-            '{{ parameter.name }}': {{ parameter.name | caseCamel | escapeKeyword }},
-{% endfor %}
-{% if method.security|length > 0 %}
-{% for node in method.security %}
+            {{ utils.map_parameter(method.parameters.query) }}
+            {{ utils.map_parameter(method.parameters.body) }}
+{% if method.security|length > 0 %}{% for node in method.security %}
 {% for key,header in node|keys %}
             '{{header|caseLower}}': client.config['{{header|caseLower}}'],
 {% endfor %}

templates/flutter/base/requests/oauth.twig

@@ -1,23 +1,16 @@
+{% import 'flutter/base/utils.twig' as utils %}
         final Map<String, dynamic> params = {
-{% for parameter in method.parameters.query %}
-            '{{ parameter.name }}': {{ parameter.name | caseCamel | escapeKeyword }},
-{% endfor %}
-{% for parameter in method.parameters.body %}
-            '{{ parameter.name }}': {{ parameter.name | caseCamel | escapeKeyword }},
-{% endfor %}
-{% if method.type == 'webAuth' %}
+            {{ utils.map_parameter(method.parameters.query) }}
+            {{ utils.map_parameter(method.parameters.body) }}
 {% if method.security|length > 0 %}
 {% for node in method.security %}
 {% for key,header in node|keys %}
             '{{header|caseLower}}': client.config['{{header|caseLower}}'],
 {% endfor %}
 {% endfor %}
-{% endif %}
 {% endif %}
         };
 
-{% if method.type == 'webAuth' %}
-
         final List query = [];
 
         params.forEach((key, value) {
@@ -38,5 +31,4 @@
           query: query.join('&')
         );
 
-      return client.webAuth(url);
-{% endif %}
+      return client.webAuth(url);

templates/flutter/base/utils.twig

@@ -0,0 +1,11 @@
+{% macro map_parameter(parameters) %}
+{% for parameter in parameters %}
+'{{ parameter.name }}': {{ parameter.name | caseCamel | escapeKeyword }},
+{% endfor %}
+{% endmacro %}
+
+{% macro map_headers(headers) %}
+{% for key, header in headers %}
+            '{{ key }}': '{{ header }}',
+{% endfor %}
+{% endmacro %}