rename

PapyrusCore/Sources/Macros.swift

@@ -12,7 +12,7 @@ public macro Routes() = #externalMacro(module: "PapyrusPlugin", type: "RoutesMac
 @attached(peer, names: suffixed(Mock))
 public macro Mock() = #externalMacro(module: "PapyrusPlugin", type: "MockMacro")
 
-// MARK: Function or Protocol attributes
+// MARK: Protocol or Function attributes
 
 @attached(peer)
 public macro Headers(_ headers: [String: String]) = #externalMacro(module: "PapyrusPlugin", type: "DecoratorMacro")

PapyrusPlugin/Sources/Macros/APIMacro.swift

@@ -37,12 +37,12 @@ extension API {
  // 2. builder used by all live endpoint functions
 
  Declaration("func builder(method: String, path: String) -> RequestBuilder") {
- if modifiers.isEmpty {
+ if attributes.isEmpty {
  "provider.newBuilder(method: method, path: path)"
  } else {
  "var req = provider.newBuilder(method: method, path: path)"
 
- for modifier in modifiers {
+ for modifier in attributes {
  modifier.builderStatement()
  }
 
@@ -63,10 +63,10 @@ extension API.Endpoint {
 
  "var req = builder(method: \(method.inQuotes), path: \(path.inQuotes))"
 
- // 1. add function scope modifiers
+ // 1. add function scope attributes
 
- for modifier in modifiers {
- modifier.builderStatement()
+ for attribute in attributes {
+ attribute.builderStatement()
  }
 
  // 2. add parameters
@@ -108,7 +108,7 @@ extension EndpointParameter {
  }
 }
 
-extension EndpointModifier {
+extension EndpointAttribute {
  fileprivate func builderStatement() -> String {
  switch self {
  case .json(let encoder, let decoder):

PapyrusPlugin/Sources/Models/API.swift

@@ -2,9 +2,9 @@ import SwiftSyntax
 
 struct API {
  struct Endpoint {
- /// Modifiers to be applied to this endpoint. These take precedence
- /// over modifiers at the API scope.
- let modifiers: [EndpointModifier]
+ /// Attributes to be applied to this endpoint. These take precedence
+ /// over attributes at the API scope.
+ let attributes: [EndpointAttribute]
  let method: String
  let path: String
  let pathParameters: [String]
@@ -18,8 +18,8 @@ struct API {
  let name: String
  /// The access level of the API (public, internal, etc).
  let access: String?
- /// Modifiers to be applied to every endpoint of this API.
- let modifiers: [EndpointModifier]
+ /// Attributes to be applied to every endpoint of this API.
+ let attributes: [EndpointAttribute]
  let endpoints: [Endpoint]
 }
 
@@ -32,7 +32,7 @@ extension API {
  return API(
  name: proto.protocolName,
  access: proto.access,
- modifiers: proto.protocolAttributes.compactMap { EndpointModifier($0) },
+ attributes: proto.protocolAttributes.compactMap { EndpointAttribute($0) },
  endpoints: try proto.functions.map( { try parse($0) })
  )
  }
@@ -44,7 +44,7 @@ extension API {
 
  let (method, path, pathParameters) = try parseMethodAndPath(function)
  return API.Endpoint(
- modifiers: function.functionAttributes.compactMap { EndpointModifier($0) },
+ attributes: function.functionAttributes.compactMap { EndpointAttribute($0) },
  method: method,
  path: path,
  pathParameters: pathParameters,

PapyrusPlugin/Sources/Models/EndpointModifier.swift → PapyrusPlugin/Sources/Models/EndpointAttribute.swift

@@ -2,7 +2,7 @@ import SwiftSyntax
 
 /// To be parsed from protocol and function attributes. Modifies requests /
 /// responses in some way.
-enum EndpointModifier {
+enum EndpointAttribute {
  case json(encoder: String, decoder: String)
  case urlForm(encoder: String)
  case multipart(encoder: String)

PapyrusPlugin/Sources/Models/EndpointParameter.swift

@@ -31,13 +31,13 @@ struct EndpointParameter {
  } else if type.hasPrefix("Query<") {
  .query
  } else if pathParameters.contains(name) {
- // if name matches a path param, assume this belongs in path
+ // if name matches a path param, infer this belongs in path
  .path
  } else if ["GET", "HEAD", "DELETE"].contains(httpMethod) {
- // if method is GET, HEAD, DELETE, assume query
+ // if method is GET, HEAD, DELETE, infer query
  .query
  } else {
- // otherwise assume it's a body field
+ // otherwise infer it's a body field
  .field
  }
  }