Strict concurrency

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ on:
         branches: [main]
 
 jobs:
-    test-macos:
+    test-macos-xcode-15:
         runs-on: macos-13
         env:
             DEVELOPER_DIR: /Applications/Xcode_15.0.app/Contents/Developer
@@ -17,6 +17,16 @@ jobs:
               run: swift build -v
             - name: Test
               run: swift test -v
+    test-macos-xcode-16:
+        runs-on: macos-14
+        env:
+            DEVELOPER_DIR: /Applications/Xcode_16.0.app/Contents/Developer
+        steps:
+            - uses: actions/checkout@v3
+            - name: Build
+              run: swift build -v
+            - name: Test
+              run: swift test -v
     test-linux:
         runs-on: ubuntu-22.04
         strategy:
@@ -29,3 +39,26 @@ jobs:
               run: swift build
             - name: Run tests
               run: swift test
+    test-linux-swift6:
+        runs-on: ubuntu-24.04
+        strategy:
+            matrix:
+                swift: [6.0.1]
+        container: swift:${{ matrix.swift }}
+        steps:
+            - uses: actions/checkout@v3
+            - name: Build
+              run: swift build
+            - name: Run tests
+              run: swift test
+    check-macro-compatibility:
+        name: Check Macro Compatibility
+        runs-on: macos-latest
+        steps:
+          - name: Checkout repository
+            uses: actions/checkout@v4
+          - name: Run Swift Macro Compatibility Check
+            uses: Matejkob/swift-macro-compatibility-check@v1
+            with:
+                run-tests: false
+                major-versions-only: true

Example/Example.swift

@@ -0,0 +1,67 @@
+import Foundation
+import Papyrus
+
+// MARK: 0. Define your API.
+
+@API
+@Mock
+public protocol Sample: Sendable {
+    @GET("/todos")
+    func getTodos() async throws -> [Todo]
+
+    @POST("/todos")
+    func createTodo(name: String) async throws -> Todo
+
+    @URLForm
+    @POST("/todos/:id/tags")
+    func createTag(id: Int) async throws
+
+    @Multipart
+    @POST("/todo/:id/attachment")
+    func upload(id: Int, part1: Part, part2: Part) async throws
+}
+
+public struct Todo: Codable, Sendable {
+    let id: Int
+    let name: String
+}
+
+@main
+struct Example {
+  static func main() async throws {
+      // MARK: 1. Create a Provider with any custom configuration.
+
+      let provider = Provider(baseURL: "http://127.0.0.1:3000")
+          .modifyRequests {
+              $0.addAuthorization(.bearer("<my-auth-token>"))
+              $0.keyMapping = .snakeCase
+          }
+          .intercept { req, next in
+              let start = Date()
+              let res = try await next(req)
+              let elapsedTime = String(format: "%.2fs", Date().timeIntervalSince(start))
+              let statusCode = res.statusCode.map { "\($0)" } ?? "N/A"
+              print("Got a \(statusCode) for \(req.method) \(req.url!) after \(elapsedTime)")
+              return res
+          }
+
+      // MARK: 2. Initialize an API instance & call an endpoint.
+
+      let api: any Sample = SampleAPI(provider: provider)
+      let todos = try await api.getTodos()
+      print(todos)
+
+      // MARK: 3. Easily mock endpoints for tests.
+
+      let mock = SampleMock()
+      mock.mockGetTodos {
+          return [
+              Todo(id: 1, name: "Foo"),
+              Todo(id: 2, name: "Bar"),
+          ]
+      }
+
+      let mockedTodos = try await mock.getTodos()
+      print(mockedTodos)
+  }
+}

Package.swift

@@ -14,7 +14,7 @@ let package = Package(
         .library(name: "Papyrus", targets: ["Papyrus"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/apple/swift-syntax", "509.0.0"..<"601.0.0-prerelease"),
+        .package(url: "https://github.com/apple/swift-syntax", "509.0.0"..<"601.0.0"),
         .package(url: "https://github.com/pointfreeco/swift-macro-testing", from: "0.1.0"),
     ],
     targets: [
@@ -36,7 +36,10 @@ let package = Package(
             dependencies: [
                 "PapyrusPlugin"
             ],
-            path: "Papyrus/Sources"
+            path: "Papyrus/Sources",
+            swiftSettings: [
+                .enableExperimentalFeature("StrictConcurrency")
+            ]
         ),
         .testTarget(
             name: "PapyrusTests",
@@ -70,3 +73,14 @@ let package = Package(
         ),
     ]
 )
+
+#if compiler(>=6)
+  for target in package.targets where target.type != .system && target.type != .test {
+    target.swiftSettings = target.swiftSettings ?? []
+    target.swiftSettings?.append(contentsOf: [
+      .enableExperimentalFeature("StrictConcurrency"),
+      .enableUpcomingFeature("ExistentialAny"),
+      .enableUpcomingFeature("InferSendableFromCaptures"),
+    ])
+  }
+#endif

Package@swift-6.0.swift

@@ -0,0 +1,90 @@
+// swift-tools-version:6.0
+import CompilerPluginSupport
+import PackageDescription
+
+let package = Package(
+    name: "papyrus",
+    platforms: [
+        .iOS("13.0"),
+        .macOS("10.15"),
+        .tvOS("13.0")
+    ],
+    products: [
+        .executable(name: "Example", targets: ["Example"]),
+        .library(name: "Papyrus", targets: ["Papyrus"]),
+    ],
+    dependencies: [
+        .package(url: "https://github.com/apple/swift-syntax", "509.0.0"..<"601.0.0"),
+        .package(url: "https://github.com/pointfreeco/swift-macro-testing", from: "0.1.0"),
+    ],
+    targets: [
+
+        // MARK: Demo
+
+        .executableTarget(
+            name: "Example",
+            dependencies: [
+                "Papyrus"
+            ],
+            path: "Example"
+        ),
+
+        // MARK: Library
+
+        .target(
+            name: "Papyrus",
+            dependencies: [
+                "PapyrusPlugin"
+            ],
+            path: "Papyrus/Sources",
+            swiftSettings: [
+                .enableExperimentalFeature("StrictConcurrency")
+            ]
+        ),
+        .testTarget(
+            name: "PapyrusTests",
+            dependencies: [
+                "Papyrus"
+            ],
+            path: "Papyrus/Tests"
+        ),
+
+        // MARK: Plugin
+
+        .macro(
+            name: "PapyrusPlugin",
+            dependencies: [
+                .product(name: "SwiftSyntax", package: "swift-syntax"),
+                .product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
+                .product(name: "SwiftOperators", package: "swift-syntax"),
+                .product(name: "SwiftParser", package: "swift-syntax"),
+                .product(name: "SwiftParserDiagnostics", package: "swift-syntax"),
+                .product(name: "SwiftCompilerPlugin", package: "swift-syntax"),
+            ],
+            path: "PapyrusPlugin/Sources"
+        ),
+        .testTarget(
+            name: "PapyrusPluginTests",
+            dependencies: [
+                "PapyrusPlugin",
+                .product(name: "MacroTesting", package: "swift-macro-testing"),
+            ],
+            path: "PapyrusPlugin/Tests"
+        ),
+    ]
+)
+
+for target in package.targets {
+  target.swiftSettings = target.swiftSettings ?? []
+  target.swiftSettings?.append(contentsOf: [
+    .enableUpcomingFeature("ExistentialAny")
+  ])
+}
+
+for target in package.targets where target.type == .system || target.type == .test {
+  target.swiftSettings?.append(contentsOf: [
+    .swiftLanguageMode(.v5),
+    .enableExperimentalFeature("StrictConcurrency"),
+    .enableUpcomingFeature("InferSendableFromCaptures"),
+  ])
+}

Papyrus/Sources/CoderProvider.swift

@@ -0,0 +1,26 @@
+public protocol CoderProvider: Sendable {
+    func provideHttpBodyEncoder() -> any HTTPBodyEncoder
+    func provideHttpBodyDecoder() -> any HTTPBodyDecoder
+    func provideQueryEncoder() -> URLEncodedFormEncoder
+    func provideQueryDecoder() -> URLEncodedFormDecoder
+}
+
+public struct DefaultProvider: CoderProvider {
+    public init() {}
+
+    public func provideHttpBodyEncoder() -> any HTTPBodyEncoder {
+        return .json()
+    }
+
+    public func provideHttpBodyDecoder() -> any HTTPBodyDecoder {
+        return .json()
+    }
+
+    public func provideQueryEncoder() -> URLEncodedFormEncoder {
+        return URLEncodedFormEncoder()
+    }
+
+    public func provideQueryDecoder() -> URLEncodedFormDecoder {
+        return URLEncodedFormDecoder()
+    }
+}

Papyrus/Sources/Extensions/URLSession+Papyrus.swift

@@ -6,24 +6,24 @@ import FoundationNetworking
 extension Provider {
     public convenience init(baseURL: String,
                             urlSession: URLSession = .shared,
-                            modifiers: [RequestModifier] = [],
-                            interceptors: [Interceptor] = []) {
+                            modifiers: [any RequestModifier] = [],
+                            interceptors: [any Interceptor] = []) {
         self.init(baseURL: baseURL, http: urlSession, modifiers: modifiers, interceptors: interceptors)
     }
 }
 
 // MARK: `HTTPService` Conformance
 
 extension URLSession: HTTPService {
-    public func build(method: String, url: URL, headers: [String: String], body: Data?) -> PapyrusRequest {
+    public func build(method: String, url: URL, headers: [String: String], body: Data?) -> any PapyrusRequest {
         var request = URLRequest(url: url)
         request.httpMethod = method
         request.httpBody = body
         request.allHTTPHeaderFields = headers
         return request
     }
 
-    public func request(_ req: PapyrusRequest) async -> PapyrusResponse {
+    public func request(_ req: any PapyrusRequest) async -> any PapyrusResponse {
 #if os(Linux) // Linux doesn't have access to async URLSession APIs
         await withCheckedContinuation { continuation in
             let urlRequest = req.urlRequest
@@ -55,13 +55,13 @@ private struct _Response: PapyrusResponse {
     let urlRequest: URLRequest
     let urlResponse: URLResponse?
 
-    var request: PapyrusRequest? { urlRequest }
-    let error: Error?
+    var request: (any PapyrusRequest)? { urlRequest }
+    let error: (any Error)?
     let body: Data?
     let headers: [String: String]?
     var statusCode: Int? { (urlResponse as? HTTPURLResponse)?.statusCode }
 
-    init(request: URLRequest, response: URLResponse?, error: Error?, body: Data?) {
+    init(request: URLRequest, response: URLResponse?, error: (any Error)?, body: Data?) {
         self.urlRequest = request
         self.urlResponse = response
         self.error = error