swift

Author: millotp

templates/swift/snippets/method.mustache

@@ -16,16 +16,8 @@ final class {{client}}Snippet {
     // Initialize the client
     let client = try {{client}}(appID: "YOUR_APP_ID", apiKey: "YOUR_API_KEY"{{#hasRegionalHost}}, region: .{{defaultRegion}}{{/hasRegionalHost}})
 
-  {{#hasRequestOptions}}
-    let requestOptions = RequestOptions({{#requestOptions.headers}}
-      headers: [{{#parametersWithDataType}}"{{key}}": {{> tests/paramValue }}{{^-last}}, {{/-last}}{{/parametersWithDataType}}]{{/requestOptions.headers}}
-      {{#requestOptions.headers}}{{#requestOptions.queryParameters}},{{/requestOptions.queryParameters}}{{/requestOptions.headers}}{{#requestOptions.queryParameters}}
-      queryItems: APIHelper.mapValuesToQueryItems([{{#parametersWithDataType}}"{{key}}": {{> tests/paramValue }}{{^-last}}, {{/-last}}{{/parametersWithDataType}}]){{/requestOptions.queryParameters}}
-    )
-  {{/hasRequestOptions}}
-
     // Call the API
-    let response{{#isGeneric}}: {{{returnType}}}<Hit>{{/isGeneric}} = try await client.{{method}}({{#parametersWithDataType}}{{> tests/generateParams}}{{^-last}},{{/-last}}{{/parametersWithDataType}}{{#hasRequestOptions}}, requestOptions: requestOptions{{/hasRequestOptions}})
+    let response{{#isGeneric}}: {{{returnType}}}<Hit>{{/isGeneric}} = {{> tests/method}}
     // SEPARATOR<
   }
   {{/snippets}}

templates/swift/tests/client/method.mustache

@@ -1,8 +1,4 @@
-let response = try {{#isAsync}}await {{/isAsync}}client{{#method}}.{{.}}{{^isHelper}}WithHTTPInfo{{/isHelper}}{{/method}}(
-{{#parametersWithDataType}}{{> tests/generateParams }}{{^-last}},{{/-last}}
-{{/parametersWithDataType}}{{#requestOptions.parametersWithDataType}}{{#-first}}, requestOptions: RequestOptions({{/-first}}
-{{> tests/generateParams }}{{^-last}},{{/-last}}
-){{/requestOptions.parametersWithDataType}})
+let response = {{> tests/method}}
 {{^isHelper}}
 let responseBodyData = try XCTUnwrap(response.bodyData)
 {{#useEchoRequester}}

templates/swift/tests/e2e/e2e.mustache

@@ -46,7 +46,7 @@ final class {{client}}RequestsTestsE2E: XCTestCase {
           XCTFail("Please provide an `{{e2eApiKey}}` env var for e2e tests")
       }
 
-      e2eClient = try? {{client}}(appID: APPLICATION_ID, apiKey: API_KEY{{#hasRegionalHost}}, region: .{{defaultRegion}}{{/hasRegionalHost}})
+      client = try? {{client}}(appID: APPLICATION_ID, apiKey: API_KEY{{#hasRegionalHost}}, region: .{{defaultRegion}}{{/hasRegionalHost}})
     }
 
   {{#blocksE2E}}
@@ -61,7 +61,7 @@ final class {{client}}RequestsTestsE2E: XCTestCase {
         }
 
         {{#response}}
-          let e2eResponse{{#isGeneric}}: Response<{{{returnType}}}<Hit>>{{/isGeneric}} = try await e2eClient.{{method}}WithHTTPInfo({{#hasParams}}{{#parametersWithDataType}}{{> tests/generateParams }}{{^-last}}, {{/-last}}{{/parametersWithDataType}}{{/hasParams}}{{#hasRequestOptions}}, requestOptions: requestOptions{{/hasRequestOptions}})
+          let e2eResponse{{#isGeneric}}: Response<{{{returnType}}}<Hit>>{{/isGeneric}} = {{> tests/method}}
           {{#body}}
             let e2eResponseBody = try XCTUnwrap(e2eResponse.body)
             let e2eResponseBodyData = try CodableHelper.jsonEncoder.encode(e2eResponseBody)

templates/swift/tests/method.mustache

@@ -0,0 +1,5 @@
+try {{#isAsync}}await {{/isAsync}}client.{{method}}{{^isHelper}}WithHTTPInfo{{/isHelper}}({{#hasParams}}{{#parametersWithDataType}}{{> tests/generateParams }}{{^-last}}, {{/-last}}{{/parametersWithDataType}}{{/hasParams}}{{#hasRequestOptions}}, requestOptions: RequestOptions({{#requestOptions.headers}}
+  headers: [{{#parametersWithDataType}}"{{key}}": {{> tests/paramValue }}{{^-last}}, {{/-last}}{{/parametersWithDataType}}]{{/requestOptions.headers}}
+  {{#requestOptions.headers}}{{#requestOptions.queryParameters}},{{/requestOptions.queryParameters}}{{/requestOptions.headers}}{{#requestOptions.queryParameters}}
+  queryParameters: [{{#parametersWithDataType}}"{{key}}": {{> tests/paramValue }}{{^-last}}, {{/-last}}{{/parametersWithDataType}}]{{/requestOptions.queryParameters}}
+){{/hasRequestOptions}})

templates/swift/tests/requests/requests.mustache

@@ -21,15 +21,7 @@ final class {{client}}RequestsTests: XCTestCase {
         let transporter: Transporter = Transporter(configuration: configuration, requestBuilder: EchoRequestBuilder())
         let client: {{client}} = {{client}}(configuration: configuration, transporter: transporter)
 
-        {{#hasRequestOptions}}
-          let requestOptions = RequestOptions({{#requestOptions.headers}}
-            headers: [{{#parametersWithDataType}}"{{key}}": {{> tests/paramValue }}{{^-last}}, {{/-last}}{{/parametersWithDataType}}]{{/requestOptions.headers}}
-            {{#requestOptions.headers}}{{#requestOptions.queryParameters}},{{/requestOptions.queryParameters}}{{/requestOptions.headers}}{{#requestOptions.queryParameters}}
-            queryParameters: [{{#parametersWithDataType}}"{{key}}": {{> tests/paramValue }}{{^-last}}, {{/-last}}{{/parametersWithDataType}}]{{/requestOptions.queryParameters}}
-          )
-        {{/hasRequestOptions}}
-
-        let response{{#isGeneric}}: Response<{{{returnType}}}<Hit>>{{/isGeneric}} = try await client.{{method}}WithHTTPInfo({{#hasParams}}{{#parametersWithDataType}}{{> tests/generateParams }}{{^-last}}, {{/-last}}{{/parametersWithDataType}}{{/hasParams}}{{#hasRequestOptions}}, requestOptions: requestOptions{{/hasRequestOptions}})
+        let response{{#isGeneric}}: Response<{{{returnType}}}<Hit>>{{/isGeneric}} = {{> tests/method}}
         let responseBodyData = try XCTUnwrap(response.bodyData)
         let echoResponse = try CodableHelper.jsonDecoder.decode(EchoResponse.self, from: responseBodyData)