more refactor

Author: lohanidamodar

templates/flutter/base/macros.twig

@@ -1,11 +1,9 @@
-{% import "flutter/base/macros.twig" as macros %}
-
         final Map<String, dynamic> params = {
 {% for parameter in method.parameters.query %}
-            {{ macros.map_parameter(parameter) }}
+            '{{ parameter.name }}': {{ parameter.name | caseCamel | escapeKeyword }},
 {% endfor %}
 {% for parameter in method.parameters.body %}
-            {{ macros.map_parameter(parameter) }}
+            '{{ parameter.name }}': {{ parameter.name | caseCamel | escapeKeyword }},
 {% endfor %}
         };
 

templates/flutter/base/api.twig templates/flutter/base/requests/api.twigtemplates/flutter/base/api.twig renamed to templates/flutter/base/requests/api.twig

@@ -1,11 +1,9 @@
-{% import "flutter/base/macros.twig"  as macros %}
-
-        final Map<String, dynamic> params = {
+      final Map<String, dynamic> params = {
 {% for parameter in method.parameters.query %}
-            {{ macros.map_parameter(parameter) }}
+            '{{ parameter.name }}': {{ parameter.name | caseCamel | escapeKeyword }},
 {% endfor %}
 {% for parameter in method.parameters.body %}
-            {{ macros.map_parameter(parameter) }}
+            '{{ parameter.name }}': {{ parameter.name | caseCamel | escapeKeyword }},
 {% endfor %}
         };
 

templates/flutter/base/file.twig templates/flutter/base/requests/file.twigtemplates/flutter/base/file.twig renamed to templates/flutter/base/requests/file.twig

@@ -1,11 +1,9 @@
-{% import "flutter/base/macros.twig" as macros %}
-
         final Map<String, dynamic> params = {
 {% for parameter in method.parameters.query %}
-            {{ macros.map_parameter(parameter) }}
+            '{{ parameter.name }}': {{ parameter.name | caseCamel | escapeKeyword }},
 {% endfor %}
 {% for parameter in method.parameters.body %}
-            {{ macros.map_parameter(parameter) }}
+            '{{ parameter.name }}': {{ parameter.name | caseCamel | escapeKeyword }},
 {% endfor %}
 {% if method.security|length > 0 %}
 {% for node in method.security %}

templates/flutter/base/location.twig …ates/flutter/base/requests/location.twigtemplates/flutter/base/location.twig renamed to templates/flutter/base/requests/location.twig templates/flutter/base/location.twig renamed to templates/flutter/base/requests/location.twig

@@ -1,11 +1,9 @@
-{% import "flutter/base/macros.twig" as macros %}
-
         final Map<String, dynamic> params = {
 {% for parameter in method.parameters.query %}
-            {{ macros.map_parameter(parameter) }}
+            '{{ parameter.name }}': {{ parameter.name | caseCamel | escapeKeyword }},
 {% endfor %}
 {% for parameter in method.parameters.body %}
-            {{ macros.map_parameter(parameter) }}
+            '{{ parameter.name }}': {{ parameter.name | caseCamel | escapeKeyword }},
 {% endfor %}
 {% if method.type == 'webAuth' %}
 {% if method.security|length > 0 %}

templates/flutter/base/oauth.twig …mplates/flutter/base/requests/oauth.twigtemplates/flutter/base/oauth.twig renamed to templates/flutter/base/requests/oauth.twig templates/flutter/base/oauth.twig renamed to templates/flutter/base/requests/oauth.twig

@@ -1,6 +1,8 @@
 part of {{ language.params.packageName }};
-
-{% import "flutter/base/macros.twig" as macros %}
+{% macro parameter(parameter) %}{% if parameter.required %}required {{ parameter.type | typeName }}{% else %}{{ parameter.type | typeName }}?{% endif %} {{ parameter.name | caseCamel | escapeKeyword }}{% endmacro %}
+{% macro method_parameters(parameters, consumes) %}
+{% if parameters.all|length > 0 %}{{ '{' }}{% for parameter in parameters.all %}{{ _self.parameter(parameter) }}{% if not loop.last %}, {% endif %}{% endfor %}{% if 'multipart/form-data' in consumes %}, Function(UploadProgress)? onProgress{% endif %}{{ '}' }}{% endif %}
+{% endmacro %}
 
 {%if service.description %}
 {{ service.description|dartComment}}
@@ -15,17 +17,17 @@ class {{ service.name | caseUcfirst }} extends Service {
 {{ method.description|dartComment }}
      ///
 {% endif %}
-    {% if method.type == 'webAuth' %}Future{% elseif method.type == 'location' %} Future<Uint8List> {% else %} {% if method.responseModel and method.responseModel != 'any' %}Future<models.{{method.responseModel | caseUcfirst}}>{% else %}Future{% endif %}{% endif %} {{ method.name | caseCamel }}({{ macros.method_parameters(method.parameters, method.consumes) }}) async {
+    {% if method.type == 'webAuth' %}Future{% elseif method.type == 'location' %} Future<Uint8List> {% else %} {% if method.responseModel and method.responseModel != 'any' %}Future<models.{{method.responseModel | caseUcfirst}}>{% else %}Future{% endif %}{% endif %} {{ method.name | caseCamel }}({{ _self.method_parameters(method.parameters, method.consumes) }}) async {
         {% if method.parameters.path | length > 0 %}final{% else %}const{% endif %} String path = '{{ method.path }}'{% for parameter in method.parameters.path %}.replaceAll('{{ '{' }}{{ parameter.name | caseCamel }}{{ '}' }}', {{ parameter.name | caseCamel | escapeKeyword }}){% endfor %};
 
 {% if 'multipart/form-data' in method.consumes %}
-{{ include('flutter/base/file.twig') }}
+{{ include('flutter/base/requests/file.twig') }}
 {% elseif method.type == 'webAuth' %}
-{{ include('flutter/base/oauth.twig') }}
+{{ include('flutter/base/requests/oauth.twig') }}
 {% elseif method.type == 'location' %}
-{{ include('flutter/base/location.twig') }}
+{{ include('flutter/base/requests/location.twig') }}
 {% else %}
-{{ include('flutter/base/api.twig') }}
+{{ include('flutter/base/requests/api.twig') }}
 {% endif %}
 
     }