Support optional path parameters #56
Conversation
jordanekay
force-pushed
the
optional-path-parameters
branch
from
ab8985c
to
60238c1
Compare
There was a problem hiding this comment.
This is great @jordanekay -
A quick piece of feedback and then this is ready to merge.
Thanks for the contribution - a solid improvement to path parameters 👍
| \(declaration) pathComponents: [String] = [\( | ||
| pathComponents | ||
| .filter { !$0.isEmpty } | ||
| .map { "\"\($0)\"" } | ||
| .joined(separator: ", "))] | ||
| """ | ||
|
|
||
| for (index, component) in pathComponents.filter({ !$0.isEmpty }).enumerated() { | ||
| if let parameter = pathParameter(from: component) { | ||
| buildRequest += """ | ||
| if \(parameter) as Any? == nil { | ||
| pathComponents.remove(at: \(index)) | ||
| } | ||
| """ | ||
| } | ||
| } | ||
|
|
||
| buildRequest += """ | ||
| let path = pathComponents.joined(separator: "/") | ||
| var req = builder(method: \"\(method)\", path: path) |
There was a problem hiding this comment.
Can we move this logic out of the @API macro and into the RequestBuilder?
I've been trying to keep all the "request construction" logic inside the RequestBuilder so that the generated code is dead simple to read.
Can make RequestBuilder.parameters a [String: String?] and then in the parameterizedPath() function exclude parameters that have nil values.
jordanekay
force-pushed
the
optional-path-parameters
branch
from
b4d025c
to
76315c4
Compare
jordanekay
force-pushed
the
optional-path-parameters
branch
from
0f7a939
to
e741e95
Compare
|
@jordanekay did you want to merge this PR after the feedback? Otherwise I've got some time this weekend an can get this functionality merged in 😄 |
|
Let’s close this—I’ll let you take it from here. Thank you! |
|
Cool - also FWIW the Alamofire dependency is dropped on main as well; will cut a release with that and the optional path parameters soon. Please do let me know if there's any more features needed / blockers for using this library for parts of your project! |
See example here.