kylefang/swift-request
1
0
Fork 0
mirror of https://github.com/zhigang1992/swift-request.git synced 2026-01-12 17:52:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix ServiceExecutor protocol to require implementation

Browse Source
This commit is contained in:
Ailton Vieira
2023-06-28 20:08:42 -03:00
parent a3989c4245
commit 9d5544153c
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Sources/SwiftRequest/ServiceExecutor.swift
View File

@@ -5,19 +5,23 @@ public protocol ServiceExecutor {
}
extension ServiceExecutor {
public func execute<Output: Decodable>(_ request: Request) async throws -> Output {
let (output, _): (Output, _) = try await self.execute(request)
public func callAsFunction<Output: Decodable>(_ request: Request) async throws -> Output {
let (output, _): (Output, _) = try await self(request)
return output
}
public func execute<Output: Decodable>(_ request: Request) async throws -> (Output, HTTPURLResponse) {
let (data, response) = try await self.execute(request)
public func callAsFunction<Output: Decodable>(_ request: Request) async throws -> (Output, HTTPURLResponse) {
let (data, response): (Data, HTTPURLResponse) = try await self.execute(request)
let output = try JSONDecoder().decode(Output.self, from: data)
return (output, response)
}
public func execute(_ request: Request) async throws -> Data {
let (data, _) = try await self.execute(request)
public func callAsFunction(_ request: Request) async throws -> Data {
let (data, _) = try await self(request)
return data
}
public func callAsFunction(_ request: Request) async throws -> (Data, HTTPURLResponse) {
return try await execute(request)
}
}

2
Sources/SwiftRequestMacros/ServiceMethodExpander.swift
View File

@@ -52,7 +52,7 @@ class ServiceMethodExpander {
let codeBlock = CodeBlockSyntax {
VariableDeclSyntax(Keyword.let, name: "request", initializer: .init(value: request))
ReturnStmtSyntax(expression: "try await executor.execute(request)" as ExprSyntax)
ReturnStmtSyntax(expression: "try await executor(request)" as ExprSyntax)
}
let newDeclaration = declaration