fix(swift): have a codable body for improved ux (#2902)

algolia · Mar 25, 2024 · cdac5ff · cdac5ff · github-actions · Mar 25, 2024
1 parent 846e9d3
commit cdac5ff
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/generators/src/main/java/com/algolia/codegen/AlgoliaSwiftGenerator.java b/generators/src/main/java/com/algolia/codegen/AlgoliaSwiftGenerator.java
@@ -197,7 +197,7 @@ public void processOpts() {
       "lambda.to-codable",
       (Mustache.Lambda) (fragment, writer) -> {
         String initialType = fragment.execute();
-        writer.write(initialType.equalsIgnoreCase("AnyCodable") ? "[String: AnyCodable]" : initialType);
+        writer.write(initialType.equalsIgnoreCase("AnyCodable") ? "Codable" : initialType);
       }
     );
 

diff --git a/playground/swift/playground/playground/main.swift b/playground/swift/playground/playground/main.swift
@@ -35,24 +35,23 @@ Task {
           .init(firstname: "Warren", lastname: "Speach", followers: 42, company: "Norwalk Crmc")
         ]
 
-        let client = SearchClient(appId: applicationID, apiKey: apiKey)
+        let client = try SearchClient(appID: applicationID, apiKey: apiKey)
 
         for contact in contacts {
-            let saveObjRes = try await client.saveObject(indexName: "contacts", body: contact)
-//            let saveObjRes = try await client.saveObject(indexName: "contacts", body: contact, requestOptions: RequestOptions(headers: ["X-Algolia-Test": "True"], body: ["age": contact.followers]))
+            let saveObjRes = try await client.saveObject(indexName: "contacts", body: contacts)
             while true {
                 let taskResponse = try await client.getTask(indexName: "contacts", taskID: saveObjRes.taskID)
-                if taskResponse.status == TaskStatus.published {
+                if taskResponse.status == SearchTaskStatus.published {
                     break
                 }
             }
         }
 
-        let searchParams = SearchParamsObject(query: "Jimmy")
+        let searchParams = SearchSearchParamsObject(query: "Jimmy")
 
-        let res = try await client.searchSingleIndex(
+        let res: SearchResponse<Contact> = try await client.searchSingleIndex(
             indexName: "contacts",
-            searchParams: .searchParamsObject(searchParams)
+            searchParams: .searchSearchParamsObject(searchParams)
         )
 
         dump(res.hits[0])

diff --git a/templates/swift/api.mustache b/templates/swift/api.mustache
@@ -106,7 +106,7 @@ import Foundation
           throw AlgoliaError.invalidArgument("{{{paramName}}}", "{{{operationId}}}")
         }
 
-        {{/required}}{{/isString}}{{/queryParams}}{{#bodyParam}}{{#isFreeFormObject}}{{#required}}guard !{{{paramName}}}.isEmpty else {
+        {{/required}}{{/isString}}{{/queryParams}}{{#bodyParam}}{{#isFreeFormObject}}{{#required}}guard {{{paramName}}} != nil, let {{{paramName}}}Dictionary = {{{paramName}}} as? [String: Codable], !{{{paramName}}}Dictionary.isEmpty else {
           throw AlgoliaError.invalidArgument("{{{paramName}}}", "{{{operationId}}}")
         }
 

diff --git a/templates/swift/tests/paramValue.mustache b/templates/swift/tests/paramValue.mustache
@@ -1 +1 @@
-{{#isObject}}{{objectName}}({{^hasAdditionalProperties}}{{#value}}{{> tests/generateParams}}{{^-last}}, {{/-last}}{{/value}}{{/hasAdditionalProperties}}{{#hasAdditionalProperties}}from: [{{#value}}"{{key}}": AnyCodable({{> tests/paramValue }}){{^-last}}, {{/-last}}{{/value}}]{{/hasAdditionalProperties}}){{/isObject}}{{#isString}}{{#isAnyType}}AnyCodable({{/isAnyType}}"{{{value}}}"{{#isAnyType}}){{/isAnyType}}{{/isString}}{{#isNumber}}{{#isLong}}Int64({{/isLong}}{{{value}}}{{#isLong}}){{/isLong}}{{/isNumber}}{{#isBoolean}}{{{value}}}{{/isBoolean}}{{#isEnum}}{{objectName}}.{{#lambda.swiftIdentifier}}{{#lambda.camelcase}}{{valueEscaped}}{{/lambda.camelcase}}{{/lambda.swiftIdentifier}}{{/isEnum}}{{#isArray}}[{{#value}}{{> tests/generateParams}}{{^-last}}, {{/-last}}{{/value}}]{{/isArray}}{{#isMap}}Map[{{{.}}}]{{/isMap}}{{#isFreeFormObject}}{{#isAnyType}}[{{#value}}{{#entrySet}}"{{key}}": "{{{value}}}"{{/entrySet}}{{/value}}]{{/isAnyType}}{{^isAnyType}}[{{^value}}:{{/value}}{{#value}}{{> tests/generateParams}}{{^-last}}, {{/-last}}{{/value}}]{{/isAnyType}}{{/isFreeFormObject}}{{#isNull}}{{#inClientTest}}TestNull{{{objectName}}}(){{/inClientTest}}{{/isNull}}
+{{#isObject}}{{objectName}}({{^hasAdditionalProperties}}{{#value}}{{> tests/generateParams}}{{^-last}}, {{/-last}}{{/value}}{{/hasAdditionalProperties}}{{#hasAdditionalProperties}}from: [{{#value}}"{{key}}": AnyCodable({{> tests/paramValue }}){{^-last}}, {{/-last}}{{/value}}]{{/hasAdditionalProperties}}){{/isObject}}{{#isString}}{{#isAnyType}}AnyCodable({{/isAnyType}}"{{{value}}}"{{#isAnyType}}){{/isAnyType}}{{/isString}}{{#isNumber}}{{#isLong}}Int64({{/isLong}}{{{value}}}{{#isLong}}){{/isLong}}{{/isNumber}}{{#isBoolean}}{{{value}}}{{/isBoolean}}{{#isEnum}}{{objectName}}.{{#lambda.swiftIdentifier}}{{#lambda.camelcase}}{{valueEscaped}}{{/lambda.camelcase}}{{/lambda.swiftIdentifier}}{{/isEnum}}{{#isArray}}[{{#value}}{{> tests/generateParams}}{{^-last}}, {{/-last}}{{/value}}]{{/isArray}}{{#isMap}}Map[{{{.}}}]{{/isMap}}{{#isFreeFormObject}}{{#isAnyType}}[{{#value}}{{#entrySet}}"{{key}}": "{{{value}}}"{{/entrySet}}{{/value}}]{{/isAnyType}}{{^isAnyType}}{{^value}}[String: AnyCodable](){{/value}}{{#value}}{{#-first}}[{{/-first}}{{> tests/generateParams}}{{^-last}}, {{/-last}}{{#-last}}]{{/-last}}{{/value}}{{/isAnyType}}{{/isFreeFormObject}}{{#isNull}}{{#inClientTest}}TestNull{{{objectName}}}(){{/inClientTest}}{{/isNull}}