From 6c3e36fffec8866cfa0a70d5ec5610cef4d7392b Mon Sep 17 00:00:00 2001 From: Ailton Vieira Pinto Filho Date: Sun, 11 Jun 2023 21:21:56 -0300 Subject: [PATCH] Update the route parameter to resource --- Sources/SwiftRequest/SwiftRequest.swift | 2 +- Sources/SwiftRequestMacros/ServiceMacro.swift | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Sources/SwiftRequest/SwiftRequest.swift b/Sources/SwiftRequest/SwiftRequest.swift index 9737455..9480f74 100644 --- a/Sources/SwiftRequest/SwiftRequest.swift +++ b/Sources/SwiftRequest/SwiftRequest.swift @@ -4,7 +4,7 @@ public macro Service() = #externalMacro(module: "SwiftRequestMacros", type: "Ser @attached(member, names: named(baseURL), named(session), named(init(baseURL:session:))) @attached(conformance) -public macro Service(route: String) = #externalMacro(module: "SwiftRequestMacros", type: "ServiceMacro") +public macro Service(resource: String) = #externalMacro(module: "SwiftRequestMacros", type: "ServiceMacro") @attached(peer, names: overloaded) public macro GET(_ path: String, headers: [String: any CustomStringConvertible] = [:]) = #externalMacro(module: "SwiftRequestMacros", type: "GetRequestMacro") diff --git a/Sources/SwiftRequestMacros/ServiceMacro.swift b/Sources/SwiftRequestMacros/ServiceMacro.swift index 76e1ef6..fe39f00 100644 --- a/Sources/SwiftRequestMacros/ServiceMacro.swift +++ b/Sources/SwiftRequestMacros/ServiceMacro.swift @@ -9,10 +9,10 @@ public struct ServiceMacro: MemberMacro { in context: some MacroExpansionContext ) throws -> [DeclSyntax] { let attribute = Attribute(from: node) - let route = attribute.arguments.first?.value + let resource = attribute.arguments.first?.value - let baseUrlExpr = if let route { - "baseURL.appendingPathComponent(\"\(route)\")" + let baseUrlExpr = if let resource { + "baseURL.appendingPathComponent(\"\(resource)\")" } else { "baseURL" }