Fix path escaping on Darwin in SwiftPM plugin (regression of #2085) (#2273)

Resolves #2085

---------

Co-authored-by: Emanuel Erben <emanuel.erben@gmail.com>

Author: Lutzifer

Examples/v1/RouteGuide/Model/route_guide.pb.swift

@@ -61,21 +61,21 @@ public struct Routeguide_Rectangle: Sendable {
 
   /// One corner of the rectangle.
   public var lo: Routeguide_Point {
-    get {return _lo ?? Routeguide_Point()}
+    get {_lo ?? Routeguide_Point()}
     set {_lo = newValue}
   }
   /// Returns true if `lo` has been explicitly set.
-  public var hasLo: Bool {return self._lo != nil}
+  public var hasLo: Bool {self._lo != nil}
   /// Clears the value of `lo`. Subsequent reads from it will return its default value.
   public mutating func clearLo() {self._lo = nil}
 
   /// The other corner of the rectangle.
   public var hi: Routeguide_Point {
-    get {return _hi ?? Routeguide_Point()}
+    get {_hi ?? Routeguide_Point()}
     set {_hi = newValue}
   }
   /// Returns true if `hi` has been explicitly set.
-  public var hasHi: Bool {return self._hi != nil}
+  public var hasHi: Bool {self._hi != nil}
   /// Clears the value of `hi`. Subsequent reads from it will return its default value.
   public mutating func clearHi() {self._hi = nil}
 
@@ -100,11 +100,11 @@ public struct Routeguide_Feature: Sendable {
 
   /// The point where the feature is detected.
   public var location: Routeguide_Point {
-    get {return _location ?? Routeguide_Point()}
+    get {_location ?? Routeguide_Point()}
     set {_location = newValue}
   }
   /// Returns true if `location` has been explicitly set.
-  public var hasLocation: Bool {return self._location != nil}
+  public var hasLocation: Bool {self._location != nil}
   /// Clears the value of `location`. Subsequent reads from it will return its default value.
   public mutating func clearLocation() {self._location = nil}
 
@@ -123,11 +123,11 @@ public struct Routeguide_RouteNote: Sendable {
 
   /// The location from which the message is sent.
   public var location: Routeguide_Point {
-    get {return _location ?? Routeguide_Point()}
+    get {_location ?? Routeguide_Point()}
     set {_location = newValue}
   }
   /// Returns true if `location` has been explicitly set.
-  public var hasLocation: Bool {return self._location != nil}
+  public var hasLocation: Bool {self._location != nil}
   /// Clears the value of `location`. Subsequent reads from it will return its default value.
   public mutating func clearLocation() {self._location = nil}
 

Plugins/GRPCSwiftPlugin/plugin.swift

@@ -168,13 +168,13 @@ struct GRPCSwiftPlugin {
   ) -> Command {
     // Construct the `protoc` arguments.
     var protocArgs = [
-      "--plugin=protoc-gen-grpc-swift=\(protocGenGRPCSwiftPath.path())",
-      "--grpc-swift_out=\(outputDirectory.path())",
+      "--plugin=protoc-gen-grpc-swift=\(protocGenGRPCSwiftPath.fileSystemPath)",
+      "--grpc-swift_out=\(outputDirectory.fileSystemPath)",
     ]
 
     importPaths.forEach { path in
       protocArgs.append("-I")
-      protocArgs.append(path.path())
+      protocArgs.append(path.fileSystemPath)
     }
 
     if let visibility = invocation.visibility {
@@ -255,6 +255,16 @@ struct GRPCSwiftPlugin {
   }
 }
 
+extension URL {
+  fileprivate var fileSystemPath: String {
+    #if canImport(Darwin)
+    return self.path(percentEncoded: false)
+    #else
+    return self.path()
+    #endif
+  }
+}
+
 extension GRPCSwiftPlugin: BuildToolPlugin {
   func createBuildCommands(
     context: PluginContext,

Sources/GRPC/AsyncAwaitSupport/GRPCAsyncServerHandler.swift

@@ -62,7 +62,8 @@ extension GRPCAsyncServerHandler {
     requestDeserializer: Deserializer,
     responseSerializer: Serializer,
     interceptors: [ServerInterceptor<Request, Response>],
-    wrapping unary: @escaping @Sendable (Request, GRPCAsyncServerCallContext) async throws
+    wrapping unary:
+      @escaping @Sendable (Request, GRPCAsyncServerCallContext) async throws
       -> Response
   ) {
     self._handler = .init(
@@ -88,10 +89,11 @@ extension GRPCAsyncServerHandler {
     requestDeserializer: Deserializer,
     responseSerializer: Serializer,
     interceptors: [ServerInterceptor<Request, Response>],
-    wrapping clientStreaming: @escaping @Sendable (
-      GRPCAsyncRequestStream<Request>,
-      GRPCAsyncServerCallContext
-    ) async throws -> Response
+    wrapping clientStreaming:
+      @escaping @Sendable (
+        GRPCAsyncRequestStream<Request>,
+        GRPCAsyncServerCallContext
+      ) async throws -> Response
   ) {
     self._handler = .init(
       context: context,
@@ -112,11 +114,12 @@ extension GRPCAsyncServerHandler {
     requestDeserializer: Deserializer,
     responseSerializer: Serializer,
     interceptors: [ServerInterceptor<Request, Response>],
-    wrapping serverStreaming: @escaping @Sendable (
-      Request,
-      GRPCAsyncResponseStreamWriter<Response>,
-      GRPCAsyncServerCallContext
-    ) async throws -> Void
+    wrapping serverStreaming:
+      @escaping @Sendable (
+        Request,
+        GRPCAsyncResponseStreamWriter<Response>,
+        GRPCAsyncServerCallContext
+      ) async throws -> Void
   ) {
     self._handler = .init(
       context: context,
@@ -140,11 +143,12 @@ extension GRPCAsyncServerHandler {
     requestDeserializer: Deserializer,
     responseSerializer: Serializer,
     interceptors: [ServerInterceptor<Request, Response>],
-    wrapping bidirectional: @escaping @Sendable (
-      GRPCAsyncRequestStream<Request>,
-      GRPCAsyncResponseStreamWriter<Response>,
-      GRPCAsyncServerCallContext
-    ) async throws -> Void
+    wrapping bidirectional:
+      @escaping @Sendable (
+        GRPCAsyncRequestStream<Request>,
+        GRPCAsyncResponseStreamWriter<Response>,
+        GRPCAsyncServerCallContext
+      ) async throws -> Void
   ) {
     self._handler = .init(
       context: context,
@@ -265,11 +269,12 @@ internal final class AsyncServerHandler<
     responseSerializer: Serializer,
     callType: GRPCCallType,
     interceptors: [ServerInterceptor<Request, Response>],
-    userHandler: @escaping @Sendable (
-      GRPCAsyncRequestStream<Request>,
-      GRPCAsyncResponseStreamWriter<Response>,
-      GRPCAsyncServerCallContext
-    ) async throws -> Void
+    userHandler:
+      @escaping @Sendable (
+        GRPCAsyncRequestStream<Request>,
+        GRPCAsyncResponseStreamWriter<Response>,
+        GRPCAsyncServerCallContext
+      ) async throws -> Void
   ) {
     self.serializer = responseSerializer
     self.deserializer = requestDeserializer

Sources/GRPC/AsyncAwaitSupport/GRPCSendable.swift

@@ -21,5 +21,6 @@ public typealias GRPCSendable = Swift.Sendable
 @preconcurrency
 public protocol GRPCPreconcurrencySendable: Sendable {}
 
-@preconcurrency public typealias GRPCChannelInitializer = @Sendable (Channel)
+@preconcurrency public typealias GRPCChannelInitializer =
+  @Sendable (Channel)
   -> EventLoopFuture<Void>

Sources/GRPC/CallHandlers/BidirectionalStreamingServerHandler.swift

@@ -76,7 +76,8 @@ public final class BidirectionalStreamingServerHandler<
     requestDeserializer: Deserializer,
     responseSerializer: Serializer,
     interceptors: [ServerInterceptor<Request, Response>],
-    observerFactory: @escaping (StreamingResponseCallContext<Response>)
+    observerFactory:
+      @escaping (StreamingResponseCallContext<Response>)
       -> EventLoopFuture<(StreamEvent<Request>) -> Void>
   ) {
     self.serializer = responseSerializer

Sources/GRPC/CallHandlers/ClientStreamingServerHandler.swift

@@ -77,7 +77,8 @@ public final class ClientStreamingServerHandler<
     requestDeserializer: Deserializer,
     responseSerializer: Serializer,
     interceptors: [ServerInterceptor<Request, Response>],
-    observerFactory: @escaping (UnaryResponseCallContext<Response>)
+    observerFactory:
+      @escaping (UnaryResponseCallContext<Response>)
       -> EventLoopFuture<(StreamEvent<Request>) -> Void>
   ) {
     self.serializer = responseSerializer

Sources/GRPC/CallHandlers/ServerStreamingServerHandler.swift

@@ -73,7 +73,8 @@ public final class ServerStreamingServerHandler<
     requestDeserializer: Deserializer,
     responseSerializer: Serializer,
     interceptors: [ServerInterceptor<Request, Response>],
-    userFunction: @escaping (Request, StreamingResponseCallContext<Response>)
+    userFunction:
+      @escaping (Request, StreamingResponseCallContext<Response>)
       -> EventLoopFuture<GRPCStatus>
   ) {
     self.serializer = responseSerializer

Sources/GRPCReflectionService/v1/reflection-v1.pb.swift

@@ -170,11 +170,11 @@ public struct Grpc_Reflection_V1_ServerReflectionResponse: Sendable {
   public var validHost: String = String()
 
   public var originalRequest: Grpc_Reflection_V1_ServerReflectionRequest {
-    get {return _originalRequest ?? Grpc_Reflection_V1_ServerReflectionRequest()}
+    get {_originalRequest ?? Grpc_Reflection_V1_ServerReflectionRequest()}
     set {_originalRequest = newValue}
   }
   /// Returns true if `originalRequest` has been explicitly set.
-  public var hasOriginalRequest: Bool {return self._originalRequest != nil}
+  public var hasOriginalRequest: Bool {self._originalRequest != nil}
   /// Clears the value of `originalRequest`. Subsequent reads from it will return its default value.
   public mutating func clearOriginalRequest() {self._originalRequest = nil}
 

Sources/GRPCReflectionService/v1Alpha/reflection-v1alpha.pb.swift

@@ -173,11 +173,11 @@ public struct Grpc_Reflection_V1alpha_ServerReflectionResponse: Sendable {
   public var validHost: String = String()
 
   public var originalRequest: Grpc_Reflection_V1alpha_ServerReflectionRequest {
-    get {return _originalRequest ?? Grpc_Reflection_V1alpha_ServerReflectionRequest()}
+    get {_originalRequest ?? Grpc_Reflection_V1alpha_ServerReflectionRequest()}
     set {_originalRequest = newValue}
   }
   /// Returns true if `originalRequest` has been explicitly set.
-  public var hasOriginalRequest: Bool {return self._originalRequest != nil}
+  public var hasOriginalRequest: Bool {self._originalRequest != nil}
   /// Clears the value of `originalRequest`. Subsequent reads from it will return its default value.
   public mutating func clearOriginalRequest() {self._originalRequest = nil}
 

Tests/GRPCTests/ClientInterceptorPipelineTests.swift

@@ -301,7 +301,8 @@ class ClientInterceptorPipelineTests: GRPCTestCase {
 // MARK: - Test Interceptors
 
 /// A simple interceptor which records and then forwards and request and response parts it sees.
-class RecordingInterceptor<Request, Response>: ClientInterceptor<Request, Response>, @unchecked
+class RecordingInterceptor<Request, Response>: ClientInterceptor<Request, Response>,
+  @unchecked
   Sendable
 {
   var requestParts: [GRPCClientRequestPart<Request>] = []