swift templates small refactoring
This commit is contained in:
parent
328a62984f
commit
c0b101d1ff
|
|
@ -1,4 +1,4 @@
|
|||
{%- import '../../utils.twig' as utils -%}
|
||||
{%- for field in fields %}
|
||||
{{ field.name }} = {{ utils.formatNullable('try', field.nullable, field.optional) }} {{ utils.mappingFromMapForField(field) }}
|
||||
{{ field.name }} = {{ utils.formatNullableOrOptional('try', field.nullable, field.optional) }} {{ utils.mappingFromMapForField(field) }}
|
||||
{%- endfor -%}
|
||||
|
|
@ -4,6 +4,6 @@
|
|||
// MARK: - Fields
|
||||
{% for field in fields %}
|
||||
/// {{ field.description }}
|
||||
let {{ field.name }}: {{ utils.formatNullable(utils.formatValueType(field.type.type), field.nullable, field.optional) }}
|
||||
let {{ field.name }}: {{ utils.formatNullableOrOptional(utils.formatValueType(field.type.type), field.nullable, field.optional) }}
|
||||
{% endfor -%}
|
||||
{% endif %}
|
||||
|
|
@ -2,6 +2,6 @@
|
|||
|
||||
{%- if fields is not empty -%}
|
||||
{%- for field in fields -%}
|
||||
{{ field.name }}: {{ utils.formatNullable(utils.formatValueType(field.type.type), field.nullable, field.optional) }}{% if field.optional %} = nil{% endif %}{%- if not (loop.last) %}, {% endif %}
|
||||
{{ field.name }}: {{ utils.formatNullableOrOptional(utils.formatValueType(field.type.type), field.nullable, field.optional) }}{% if field.optional %} = nil{% endif %}{%- if not (loop.last) %}, {% endif %}
|
||||
{%- endfor -%}
|
||||
{%- endif -%}
|
||||
|
|
@ -18,7 +18,7 @@ ImmutableMappable
|
|||
{%- endif -%}
|
||||
{% endmacro %}
|
||||
|
||||
{% macro formatNullable(expr, nullable, optional) %}
|
||||
{% macro formatNullableOrOptional(expr, nullable, optional) %}
|
||||
{{- expr -}}{%- if nullable or optional -%}?{%- endif -%}
|
||||
{% endmacro %}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue