Skip to content

Commit 55b4fa3

Browse files
abnegateabnegate
committed
Fix swift escapes
1 parent b0d9a63 commit 55b4fa3

File tree

6 files changed

+19
-20
lines changed

6 files changed

+19
-20
lines changed

‎templates/swift/Sources/Client.swift.twig

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ open class Client {
2525
"x-sdk-language": "{{ language.name | caseLower }}",
2626
"x-sdk-version": "{{ sdk.version }}"{% if spec.global.defaultHeaders | length > 0 %},{% endif %}
2727

28-
{% for key,header in spec.global.defaultHeaders %}
28+
{%~ for key,header in spec.global.defaultHeaders %}
2929
"{{key}}": "{{header}}"{% if not loop.last %},{% endif %}
3030

31-
{% endfor %}
31+
{%~ endfor %}
3232
]
3333

3434
open var config: [String: String] = [:]
@@ -95,14 +95,14 @@ open class Client {
9595
}
9696
}
9797

98-
{% for header in spec.global.headers %}
98+
{%~ for header in spec.global.headers %}
9999
///
100100
/// Set {{header.key | caseUcfirst}}
101101
///
102-
{% if header.description %}
102+
{%~ if header.description %}
103103
/// {{header.description}}
104104
///
105-
{% endif %}
105+
{%~ endif %}
106106
/// @param String value
107107
///
108108
/// @return Client
@@ -113,7 +113,7 @@ open class Client {
113113
return self
114114
}
115115

116-
{% endfor %}
116+
{%~ endfor %}
117117

118118
///
119119
/// Set self signed
@@ -590,7 +590,6 @@ extension Client {
590590
}
591591

592592
extension Client {
593-
594593
public enum HTTPStatus: Int {
595594
case unknown = -1
596595
case ok = 200

‎templates/swift/Sources/Enums/Enum.swift.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import Foundation
33
public enum {{ enum.name | caseUcfirst | overrideIdentifier }}: String, Codable {
44
{%~ for value in enum.enum %}
55
{%~ set key = enum.keys is empty ? value : enum.keys[loop.index0] %}
6-
case {{ key | caseCamel | replace({'-': ''})}}
6+
case {{ key | caseCamel | replace({'-': ''}) | escapeSwiftKeyword }}
77
{%~ endfor %}
88

99
public func encode(to encoder: Encoder) throws {

‎templates/swift/Sources/Models/Model.swift.twig

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class {{ definition | modelType(spec) | raw }} {
99

1010
{%~ for property in definition.properties %}
1111
/// {{ property.description }}
12-
public let {{ property.name | escapeKeyword | removeDollarSign }}: {{ property | propertyType(spec) | raw }}{% if not property.required %}?{% endif %}
12+
public let {{ property.name | escapeSwiftKeyword | removeDollarSign }}: {{ property | propertyType(spec) | raw }}{% if not property.required %}?{% endif %}
1313

1414

1515
{%~ endfor %}
@@ -20,15 +20,15 @@ public class {{ definition | modelType(spec) | raw }} {
2020

2121
init(
2222
{%~ for property in definition.properties %}
23-
{{ property.name | escapeKeyword | removeDollarSign }}: {{ property | propertyType(spec) | raw }}{% if not property.required %}?{% endif %}{% if not loop.last or (loop.last and definition.additionalProperties) %},{% endif %}
23+
{{ property.name | escapeSwiftKeyword | removeDollarSign }}: {{ property | propertyType(spec) | raw }}{% if not property.required %}?{% endif %}{% if not loop.last or (loop.last and definition.additionalProperties) %},{% endif %}
2424

2525
{%~ endfor %}
2626
{%~ if definition.additionalProperties %}
2727
data: T
2828
{%~ endif %}
2929
) {
3030
{%~ for property in definition.properties %}
31-
self.{{ property.name | escapeKeyword | removeDollarSign }} = {{ property.name | escapeKeyword | removeDollarSign }}
31+
self.{{ property.name | escapeSwiftKeyword | removeDollarSign }} = {{ property.name | escapeSwiftKeyword | removeDollarSign }}
3232
{%~ endfor %}
3333
{%~ if definition.additionalProperties %}
3434
self.data = data
@@ -38,7 +38,7 @@ public class {{ definition | modelType(spec) | raw }} {
3838
public func toMap() -> [String: Any] {
3939
return [
4040
{%~ for property in definition.properties %}
41-
"{{ property.name | escapeKeyword }}": {% if property.sub_schema %}{% if property.type == 'array' %}{{property.name | escapeKeyword | removeDollarSign}}.map { $0.toMap() }{% else %}{{property.name | escapeKeyword | removeDollarSign}}.toMap(){% endif %}{% else %}{{property.name | escapeKeyword | removeDollarSign}}{% endif %} as Any{% if not loop.last or (loop.last and definition.additionalProperties) %},{% endif %}
41+
"{{ property.name | escapeSwiftKeyword }}": {% if property.sub_schema %}{% if property.type == 'array' %}{{property.name | escapeSwiftKeyword | removeDollarSign}}.map { $0.toMap() }{% else %}{{property.name | escapeSwiftKeyword | removeDollarSign}}.toMap(){% endif %}{% else %}{{property.name | escapeSwiftKeyword | removeDollarSign}}{% endif %} as Any{% if not loop.last or (loop.last and definition.additionalProperties) %},{% endif %}
4242

4343
{%~ endfor %}
4444
{%~ if definition.additionalProperties %}
@@ -50,7 +50,7 @@ public class {{ definition | modelType(spec) | raw }} {
5050
public static func from(map: [String: Any] ) -> {{ definition.name | caseUcfirst }} {
5151
return {{ definition.name | caseUcfirst }}(
5252
{%~ for property in definition.properties %}
53-
{{ property.name | escapeKeyword | removeDollarSign }}: {% if property.sub_schema %}{% if property.type == 'array' %}(map["{{property.name }}"] as! [[String: Any]]).map { {{property.sub_schema | caseUcfirst}}.from(map: $0) }{% else %}{{property.sub_schema | caseUcfirst}}.from(map: map["{{property.name }}"] as! [String: Any]){% endif %}{% else %}map["{{property.name }}"] as{% if property.required %}!{% else %}?{% endif %} {{ property | propertyType(spec) | raw }}{% endif %}{% if not loop.last or (loop.last and definition.additionalProperties) %},{% endif %}
53+
{{ property.name | escapeSwiftKeyword | removeDollarSign }}: {% if property.sub_schema %}{% if property.type == 'array' %}(map["{{property.name }}"] as! [[String: Any]]).map { {{property.sub_schema | caseUcfirst}}.from(map: $0) }{% else %}{{property.sub_schema | caseUcfirst}}.from(map: map["{{property.name }}"] as! [String: Any]){% endif %}{% else %}map["{{property.name }}"] as{% if property.required %}!{% else %}?{% endif %} {{ property | propertyType(spec) | raw }}{% endif %}{% if not loop.last or (loop.last and definition.additionalProperties) %},{% endif %}
5454

5555
{%~ endfor %}
5656
{%~ if definition.additionalProperties %}

‎templates/swift/Sources/Services/Service.swift.twig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ open class {{ service.name | caseUcfirst | overrideIdentifier }}: Service {
2727
{%~ endif %}
2828
open func {{ method.name | caseCamel | overrideIdentifier }}{% if method.responseModel | hasGenericType(spec) %}<T>{% endif %}(
2929
{%~ for parameter in method.parameters.all %}
30-
{{ parameter.name | caseCamel | escapeKeyword }}: {{ parameter | typeName | raw }}{% if not parameter.required or parameter.nullable %}? = nil{% endif %}{% if not loop.last or 'multipart/form-data' in method.consumes or method.responseModel | hasGenericType(spec) %},{% endif %}
30+
{{ parameter.name | caseCamel | escapeSwiftKeyword }}: {{ parameter | typeName | raw }}{% if not parameter.required or parameter.nullable %}? = nil{% endif %}{% if not loop.last or 'multipart/form-data' in method.consumes or method.responseModel | hasGenericType(spec) %},{% endif %}
3131

3232
{%~ endfor %}
3333
{%~ if method.responseModel | hasGenericType(spec) %}
@@ -93,7 +93,7 @@ open class {{ service.name | caseUcfirst | overrideIdentifier }}: Service {
9393
{%~ endif %}
9494
open func {{ method.name | caseCamel }}(
9595
{%~ for parameter in method.parameters.all %}
96-
{{ parameter.name | caseCamel | escapeKeyword }}: {{ parameter | typeName | raw }}{% if not parameter.required or parameter.nullable %}? = nil{% endif %}{% if not loop.last or 'multipart/form-data' in method.consumes %},{% endif %}
96+
{{ parameter.name | caseCamel | escapeSwiftKeyword }}: {{ parameter | typeName | raw }}{% if not parameter.required or parameter.nullable %}? = nil{% endif %}{% if not loop.last or 'multipart/form-data' in method.consumes %},{% endif %}
9797

9898
{%~ endfor %}
9999
{%~ if 'multipart/form-data' in method.consumes %}
@@ -102,7 +102,7 @@ open class {{ service.name | caseUcfirst | overrideIdentifier }}: Service {
102102
) async throws -> {{ method | returnType(spec, '[String: AnyCodable]') | raw }} {
103103
return try await {{ method.name | caseCamel }}(
104104
{%~ for parameter in method.parameters.all %}
105-
{{ parameter.name | caseCamel | escapeKeyword }}: {{ parameter.name | caseCamel | escapeKeyword }},
105+
{{ parameter.name | caseCamel | escapeSwiftKeyword }}: {{ parameter.name | caseCamel | escapeSwiftKeyword }},
106106
{%~ endfor %}
107107
nestedType: [String: AnyCodable].self
108108
{%~ if 'multipart/form-data' in method.consumes %}

‎templates/swift/base/params.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
let apiPath: String = "{{ method.path }}"
22
{%~ for parameter in method.parameters.path %}
3-
.replacingOccurrences(of: "{{ '{' }}{{ parameter.name | caseCamel }}{{ '}' }}", with: {{ parameter.name | caseCamel | escapeKeyword }}{% if parameter.enumName is not null %}.rawValue{% endif %})
3+
.replacingOccurrences(of: "{{ '{' }}{{ parameter.name | caseCamel }}{{ '}' }}", with: {{ parameter.name | caseCamel | escapeSwiftKeyword }}{% if parameter.enumName is not null %}.rawValue{% endif %})
44
{%~ endfor %}
55

66
{%~ if method.parameters.query | merge(method.parameters.body) | length <= 0 %}
@@ -10,7 +10,7 @@
1010
{%- else -%} let
1111
{%- endif %} apiParams: [String: Any?] = [
1212
{%~ for parameter in method.parameters.query | merge(method.parameters.body) %}
13-
"{{ parameter.name }}": {{ parameter.name | caseCamel | escapeKeyword }}{% if not loop.last or (method.type == 'location' or method.type == 'webAuth' and method.auth | length > 0) %},{% endif %}
13+
"{{ parameter.name }}": {{ parameter.name | caseCamel | escapeSwiftKeyword }}{% if not loop.last or (method.type == 'location' or method.type == 'webAuth' and method.auth | length > 0) %},{% endif %}
1414

1515
{%~ endfor %}
1616
{%~ if method.type == 'location' or method.type == 'webAuth' %}

‎templates/swift/docs/example.md.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ let client = Client()
1717

1818
let {{ service.name | caseCamel }} = {{ service.name | caseUcfirst }}(client{% if service.globalParams | length %}{% for parameter in service.globalParams %}, {{ parameter | paramExample }}{% endfor %}{% endif %})
1919

20-
let {% if method.type == 'webAuth' %}success{% elseif method.type == 'location' %}byteBuffer{% elseif method.responseModel | length == 0 %}result{% else %}{{ method.responseModel | caseCamel | escapeKeyword }}{% endif %} = try await {{ service.name | caseCamel }}.{{ method.name | caseCamel }}({% if method.parameters.all | filter((param) => param.required) | length == 0 %}){{ '\n' }}{% endif %}
20+
let {% if method.type == 'webAuth' %}success{% elseif method.type == 'location' %}byteBuffer{% elseif method.responseModel | length == 0 %}result{% else %}{{ method.responseModel | caseCamel | escapeSwiftKeyword }}{% endif %} = try await {{ service.name | caseCamel }}.{{ method.name | caseCamel }}({% if method.parameters.all | filter((param) => param.required) | length == 0 %}){{ '\n' }}{% endif %}
2121

2222
{% for parameter in method.parameters.all | filter((parameter) => parameter.required) %}
23-
{{parameter.name}}: {% if parameter.enumValues | length > 0%}{{parameter.enumName}}.{{(parameter.enumKeys[0] ?? parameter.enumValues[0]) | caseUcfirst | replace({'-': ''}) }}{% else%}{{ parameter | paramExample | escapeKeyword }}{% endif %}{% if not loop.last %},{% endif %}
23+
{{parameter.name}}: {% if parameter.enumValues | length > 0%}{{parameter.enumName}}.{{(parameter.enumKeys[0] ?? parameter.enumValues[0]) | caseUcfirst | replace({'-': ''}) }}{% else%}{{ parameter | paramExample | escapeSwiftKeyword }}{% endif %}{% if not loop.last %},{% endif %}
2424
{% if loop.last %}
2525

2626
)

0 commit comments

Comments
 (0)