1.5.7

Example/Package.swift

@@ -25,6 +25,12 @@ var package = Package(
  .product(name: "SwiftAPIClient", package: "swift-api-client"),
  ]
  ),
+ .testTarget(
+ name: "PetStoreTests",
+ dependencies: [
+ .target(name: "PetStore")
+ ]
+ ),
  .target(
  name: "PetStoreWithMacros",
  dependencies: [

Example/TEsts/PetStoreTests/PetStoreTests.swift

@@ -0,0 +1,11 @@
+import Foundation
+@testable import PetStore
+import SwiftAPIClient
+import XCTest
+
+final class PetStoreTests: XCTestCase {
+
+ func testRequests() async throws {
+ try await print(api().pet.findBy(status: .available))
+ }
+}

README.md

@@ -326,7 +326,7 @@ import PackageDescription
 let package = Package(
  name: "SomeProject",
  dependencies: [
- .package(url: "https://github.com/dankinsoid/swift-api-client.git", from: "1.5.6")
+ .package(url: "https://github.com/dankinsoid/swift-api-client.git", from: "1.5.7")
  ],
  targets: [
  .target(

Sources/SwiftAPIClientMacros/SwiftAPIClientMacros.swift

@@ -55,19 +55,30 @@ public struct SwiftAPIClientCallMacro: PeerMacro {
  }
  var queryParams: ([String], [(String, String)]) = ([], [])
  var bodyParams: ([String], [(String, String)]) = ([], [])
- for param in funcDecl.signature.parameterClause.parameters {
-
+ var fileIDName = "fileID"
+ var lineName = "line"
+ for var param in funcDecl.signature.parameterClause.parameters {
  let name = (param.secondName ?? param.firstName).trimmed.text
  if param.attributes.contains("Body") || name == "body", attribute.method == ".get" {
  throw MacroError("Body parameter is not allowed with GET method")
  }
- params += try scanParameters(name: name, type: "Query", param: param, into: &queryParams)
- params += try scanParameters(name: name, type: "Body", param: param, into: &bodyParams)
+ if param.defaultValue?.value.description == "#fileID" {
+ fileIDName = name
+ } else if param.defaultValue?.value.description == "#line" {
+ lineName = name
+ } else {
+ let count = params.count
+ params += try scanParameters(name: name, type: "Query", param: &param, into: &queryParams)
+ params += try scanParameters(name: name, type: "Body", param: &param, into: &bodyParams)
+ if count == params.count {
+ params.append(param)
+ }
+ }
  }
 
  params += [
- "\nfileID: String = #fileID,",
- "\nline: UInt = #line",
+ "\n\(raw: fileIDName): String = #fileID,",
+ "\n\(raw: lineName): UInt = #line",
  ]
  funcDecl.signature.parameterClause.rightParen.leadingTrivia = .newline
  funcDecl.signature.parameterClause.parameters = params
@@ -391,10 +402,9 @@ private func pathArguments(
 private func scanParameters(
  name: String,
  type: String,
- param: FunctionParameterListSyntax.Element,
+ param: inout FunctionParameterListSyntax.Element,
  into list: inout ([String], [(String, String)])
 ) throws -> [FunctionParameterListSyntax.Element] {
- var param = param
  param.trailingComma = .commaToken()
  param.leadingTrivia = .newline
  if param.attributes.remove(type.firstUppercased) {

Tests/SwiftAPIClientMacrosTests/CallMacroTests.swift

@@ -361,4 +361,35 @@ final class CallMacroTests: XCTestCase {
  indentationWidth: .spaces(2)
  )
  }
+
+ func testCallMacroFuncWithArguments() {
+ assertMacroExpansion(
+ """
+ @GET
+ func login(username: String, password: String) {
+ client.auth(.basic(username: username, password: password))
+ }
+ """,
+ expandedSource: """
+ func login(username: String, password: String) {
+ client.auth(.basic(username: username, password: password))
+ }
+ 
+ func login(
+ username: String,
+ password: String,
+ fileID: String = #fileID,
+ line: UInt = #line
+ ) async throws {
+ try await
+ client.auth(.basic(username: username, password: password))
+ .path("login")
+ .method(.get)
+ .call(.http, as: .void, fileID: fileID, line: line)
+ }
+ """,
+ macros: macros,
+ indentationWidth: .spaces(2)
+ )
+ }
 }