Skip to content

Commit cac7e34

Browse files
Merge pull request #202 from lohanidamodar/fix-dart-default-params
default param fix for dart
2 parents c05d1ad + 25c8131 commit cac7e34

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

templates/dart/lib/client.dart.twig

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,12 @@ class Client {
6868
};
6969
}
7070

71+
params.keys.forEach((key) {
72+
if (params[key] == null) {
73+
params.remove(key);
74+
}
75+
});
76+
7177
// Origin is hardcoded for testing
7278
Options options = Options(
7379
headers: {...this.headers!, ...headers},

templates/dart/lib/services/service.dart.twig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
part of {{ language.params.packageName }};
22

33
{% macro parameter(parameter) %}
4-
{% if parameter.name == 'orderType' %}{% if parameter.required %}required {% endif %}{{ 'OrderType orderType = OrderType.asc' }}{% else %}
5-
{% if parameter.required %}required {% endif %}{{ parameter.type | typeName }} {{ parameter.name | caseCamel }}{{ parameter | paramDefault | escapeDollarSign }}{% endif %}
4+
{% if parameter.name == 'orderType' %}{% if parameter.required %}required {{ 'OrderType orderType' }}{% else %}OrderType? orderType{% endif %}{% else %}
5+
{% if parameter.required %}required {{ parameter.type | typeName }}{% else %}{{ parameter.type | typeName }}?{% endif %} {{ parameter.name | caseCamel }}{% endif %}
66
{% endmacro %}
77
{% macro method_parameters(parameters) %}
88
{% if parameters.all|length > 0 %}{{ '{' }}{% for parameter in parameters.all %}{{ _self.parameter(parameter) }}{% if not loop.last %}, {% endif %}{% endfor %}{{ '}' }}{% endif %}
99
{% endmacro %}
1010
{% macro map_parameter(parameter) %}
11-
{% if parameter.name == 'orderType' %}'{{ parameter.name }}': {{ parameter.name | caseCamel }}.name(),{% else %}
11+
{% if parameter.name == 'orderType' %}'{{ parameter.name }}': {{ parameter.name | caseCamel }}{% if parameter.required %}{% else %}?{% endif %}.name(),{% else %}
1212
'{{ parameter.name }}': {{ parameter.name | caseCamel }},{% endif %}
1313
{% endmacro %}
1414

templates/flutter/lib/services/service.dart.twig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
part of {{ language.params.packageName }};
22

33
{% macro parameter(parameter) %}
4-
{% if parameter.name == 'orderType' %}{% if parameter.required %}required {% endif %}{{ 'OrderType orderType = OrderType.asc' }}{% else %}
5-
{% if parameter.required %}required {{ parameter.type | typeName }}{% else %}{{ parameter.type | typeName }}?{% endif %} {{ parameter.name | caseCamel }}{% if parameter.required %}{{ parameter | paramDefault | escapeDollarSign }}{% endif %}{% endif %}
4+
{% if parameter.name == 'orderType' %}{% if parameter.required %}required {{ 'OrderType orderType' }}{% else %}OrderType? orderType{% endif %}{% else %}
5+
{% if parameter.required %}required {{ parameter.type | typeName }}{% else %}{{ parameter.type | typeName }}?{% endif %} {{ parameter.name | caseCamel }}{% endif %}
66
{% endmacro %}
77
{% macro method_parameters(parameters) %}
88
{% if parameters.all|length > 0 %}{{ '{' }}{% for parameter in parameters.all %}{{ _self.parameter(parameter) }}{% if not loop.last %}, {% endif %}{% endfor %}{{ '}' }}{% endif %}
99
{% endmacro %}
1010
{% macro map_parameter(parameter) %}
11-
{% if parameter.name == 'orderType' %}'{{ parameter.name }}': {{ parameter.name | caseCamel }}.name(),{% else %}
11+
{% if parameter.name == 'orderType' %}'{{ parameter.name }}': {{ parameter.name | caseCamel }}{% if parameter.required %}{% else %}?{% endif %}.name(),{% else %}
1212
'{{ parameter.name }}': {{ parameter.name | caseCamel }},{% endif %}
1313
{% endmacro %}
1414

0 commit comments

Comments
 (0)