swift

Author: lohanidamodar

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

@@ -10,6 +10,21 @@ import NIO
 import {{spec.title | caseUcfirst}}Models
 
 open class {{ service.name | caseUcfirst }}: Service {
+{% if service.globalParams | length %}
+{% for parameter in service.globalParams %}
+    var {{ parameter.name | caseCamel | escapeKeyword }}: {{ parameter.type | typeName }}{% if not parameter.required %}?{% endif %}
+{% endfor %}
+
+
+    public init(_ client: Client, {% for parameter in service.globalParams %}_ {{ parameter.name | caseCamel | escapeKeyword }}: {{ parameter.type | typeName }}{% if not parameter.required %}? = nil{% endif %}{% if not loop.last %}, {% endif %}{% endfor %})
+    {
+{% for parameter in service.globalParams %}
+        self.{{ parameter.name | caseCamel | escapeKeyword }} = {{ parameter.name | caseCamel | escapeKeyword }}
+{% endfor %}
+        super.init(client)
+    }
+
+{% endif %}
 {% for method in service.methods %}
     ///
     /// {{ method.title }}
@@ -28,7 +43,7 @@ open class {{ service.name | caseUcfirst }}: Service {
     @available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, *)
 {% endif %}
     open func {{ method.name | caseCamel }}(
-{% for parameter in method.parameters.all %}
+{% for parameter in method.parameters.all | filter((param) => not param.isGlobal) %}
         {{ parameter.name | caseCamel | escapeKeyword }}: {{ parameter.type | typeName | raw }}{% if not parameter.required %}? = nil{% endif %}{% if not loop.last or 'multipart/form-data' in method.consumes %},{% endif %}
 
 {% endfor %}
@@ -40,7 +55,7 @@ open class {{ service.name | caseUcfirst }}: Service {
 {% for parameter in method.parameters.path %}
         path = path.replacingOccurrences(
           of: "{{ '{' }}{{ parameter.name | caseCamel }}{{ '}' }}",
-          with: {% if method.parameters.path %}{{ parameter.name | caseCamel | escapeKeyword }}{% else %}""{% endif %}
+          with: {% if method.parameters.path %}{% if parameter.isGlobal %}self.{% endif %}{{ parameter.name | caseCamel | escapeKeyword }}{% else %}""{% endif %}
 
         )
 {% endfor %}
@@ -50,7 +65,7 @@ open class {{ service.name | caseUcfirst }}: Service {
         let params: [String: Any?] = [:]
 {% endif %}
 {% for parameter in method.parameters.query | merge(method.parameters.body) %}
-            "{{ parameter.name }}": {{ parameter.name | caseCamel | escapeKeyword }}{% if not loop.last or _self.methodNeedsSecurityParameters(method) %},{% endif %}
+            "{{ parameter.name }}": {% if parameter.isGlobal %}self.{% endif %}{{ parameter.name | caseCamel | escapeKeyword }}{% if not loop.last or _self.methodNeedsSecurityParameters(method) %},{% endif %}
 
 {% endfor %}
 {% if _self.methodNeedsSecurityParameters(method) %}
@@ -138,7 +153,7 @@ open class {{ service.name | caseUcfirst }}: Service {
 {{ method.description | swiftComment }}
     ///
 {% endif %}
-{% for parameter in method.parameters.all %}
+{% for parameter in method.parameters.all | filter((param) => not param.isGlobal) %}
     /// @param {{ parameter.type | typeName | raw}} {{ parameter.name | caseCamel }}
 {% endfor %}
     /// @throws Exception
@@ -149,7 +164,7 @@ open class {{ service.name | caseUcfirst }}: Service {
     @available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, *)
 {% endif %}
     open func {{ method.name | caseCamel }}(
-{% for parameter in method.parameters.all %}
+{% for parameter in method.parameters.all | filter((param) => not param.isGlobal) %}
         {{ parameter.name | caseCamel | escapeKeyword }}: {{ parameter.type | typeName | raw }}{% if not parameter.required %}? = nil{% endif %},
 {% endfor %}
 {% if 'multipart/form-data' in method.consumes %}
@@ -160,7 +175,7 @@ open class {{ service.name | caseUcfirst }}: Service {
         Task {
             do {
                 let result = try await {{ method.name | caseCamel }}(
-{% for parameter in method.parameters.all %}
+{% for parameter in method.parameters.all | filter((param) => not param.isGlobal) %}
                     {{ parameter.name | caseCamel | escapeKeyword }}: {{ parameter.name | caseCamel | escapeKeyword }}{% if not loop.last or 'multipart/form-data' in method.consumes %},{% endif %}
 
 {% endfor %}

tests/languages/swift-client/Tests.swift

@@ -25,7 +25,7 @@ class Tests: XCTestCase {
             .addHeader(key: "Origin", value: "http://localhost")
             .setSelfSigned()
 
-        let foo = Foo(client)
+        let foo = Foo(client, "string")
         let bar = Bar(client)
         let general = General(client)
         let realtime = Realtime(client)
@@ -41,19 +41,19 @@ class Tests: XCTestCase {
         var mock: Mock
 
         // Foo Tests
-        mock = try await foo.get(x: "string", y: 123, z: ["string in array"])
+        mock = try await foo.get(y: 123, z: ["string in array"])
         print(mock.result)
 
-        mock = try await foo.post(x: "string", y: 123, z: ["string in array"])
+        mock = try await foo.post(y: 123, z: ["string in array"])
         print(mock.result)
 
-        mock = try await foo.put(x: "string", y: 123, z: ["string in array"])
+        mock = try await foo.put(y: 123, z: ["string in array"])
         print(mock.result)
 
-        mock = try await foo.patch(x: "string", y: 123, z: ["string in array"])
+        mock = try await foo.patch(y: 123, z: ["string in array"])
         print(mock.result)
 
-        mock = try await foo.delete(x: "string", y: 123, z: ["string in array"])
+        mock = try await foo.delete(y: 123, z: ["string in array"])
         print(mock.result)
 
 

tests/languages/swift-server/Tests.swift

@@ -24,26 +24,26 @@ class Tests: XCTestCase {
             .addHeader(key: "Origin", value: "http://localhost")
             .setSelfSigned()
 
-        let foo = Foo(client)
+        let foo = Foo(client, "string")
         let bar = Bar(client)
         let general = General(client)
 
         var mock: Mock
 
         // Foo Tests
-        mock = try await foo.get(x: "string", y: 123, z: ["string in array"])
+        mock = try await foo.get(y: 123, z: ["string in array"])
         print(mock.result)
 
-        mock = try await foo.post(x: "string", y: 123, z: ["string in array"])
+        mock = try await foo.post(y: 123, z: ["string in array"])
         print(mock.result)
 
-        mock = try await foo.put(x: "string", y: 123, z: ["string in array"])
+        mock = try await foo.put(y: 123, z: ["string in array"])
         print(mock.result)
 
-        mock = try await foo.patch(x: "string", y: 123, z: ["string in array"])
+        mock = try await foo.patch(y: 123, z: ["string in array"])
         print(mock.result)
 
-        mock = try await foo.delete(x: "string", y: 123, z: ["string in array"])
+        mock = try await foo.delete(y: 123, z: ["string in array"])
         print(mock.result)