[CodeGenLib] Fixes for the generated code (#1790)

Motivation:

- the protocol name for the streaming service used in the typealias does not match the actual
streaming service protocol name
- we have already replaced the Methods enum name with "Method" so this change has
to be reflected in all places where properties of the enum are used
- the first argument label of the registerHandler() method is "forMethod" and not "for"

Modifications:

Modified all the translators that handle these methods or names and their tests.

Result:

The generated code will be compiled.

Author: stefanadranca

Sources/GRPCCodeGen/Internal/Translator/ClientCodeTranslator.swift

@@ -24,21 +24,21 @@
 /// ```swift
 /// public protocol Foo_BarClientProtocol: Sendable {
 ///   func baz<R: Sendable>(
-///     request: ClientRequest.Single<foo.Bar.Methods.baz.Input>,
-///     serializer: some MessageSerializer<foo.Bar.Methods.baz.Input>,
-///     deserializer: some MessageDeserializer<foo.Bar.Methods.baz.Output>,
-///     _ body: @Sendable @escaping (ClientResponse.Single<foo.Bar.Methods.Baz.Output>) async throws -> R
-///   ) async throws -> ServerResponse.Stream<foo.Bar.Methods.Baz.Output>
+///     request: ClientRequest.Single<foo.Bar.Method.baz.Input>,
+///     serializer: some MessageSerializer<foo.Bar.Method.baz.Input>,
+///     deserializer: some MessageDeserializer<foo.Bar.Method.baz.Output>,
+///     _ body: @Sendable @escaping (ClientResponse.Single<foo.Bar.Method.Baz.Output>) async throws -> R
+///   ) async throws -> ServerResponse.Stream<foo.Bar.Method.Baz.Output>
 /// }
 /// extension Foo.Bar.ClientProtocol {
 ///   public func get<R: Sendable>(
-///     request: ClientRequest.Single<Foo.Bar.Methods.Baz.Input>,
-///     _ body: @Sendable @escaping (ClientResponse.Single<Foo.Bar.Methods.Baz.Output>) async throws -> R
+///     request: ClientRequest.Single<Foo.Bar.Method.Baz.Input>,
+///     _ body: @Sendable @escaping (ClientResponse.Single<Foo.Bar.Method.Baz.Output>) async throws -> R
 ///   ) async rethrows -> R {
 ///     try await self.baz(
 ///       request: request,
-///       serializer: ProtobufSerializer<Foo.Bar.Methods.Baz.Input>(),
-///       deserializer: ProtobufDeserializer<Foo.Bar.Methods.Baz.Output>(),
+///       serializer: ProtobufSerializer<Foo.Bar.Method.Baz.Input>(),
+///       deserializer: ProtobufDeserializer<Foo.Bar.Method.Baz.Output>(),
 ///       body
 ///     )
 /// }
@@ -48,14 +48,14 @@
 ///     self.client = client
 ///   }
 ///   public func methodA<R: Sendable>(
-///     request: ClientRequest.Stream<namespaceA.ServiceA.Methods.methodA.Input>,
-///     serializer: some MessageSerializer<namespaceA.ServiceA.Methods.methodA.Input>,
-///     deserializer: some MessageDeserializer<namespaceA.ServiceA.Methods.methodA.Output>,
-///     _ body: @Sendable @escaping (ClientResponse.Single<namespaceA.ServiceA.Methods.methodA.Output>) async throws -> R
+///     request: ClientRequest.Stream<namespaceA.ServiceA.Method.methodA.Input>,
+///     serializer: some MessageSerializer<namespaceA.ServiceA.Method.methodA.Input>,
+///     deserializer: some MessageDeserializer<namespaceA.ServiceA.Method.methodA.Output>,
+///     _ body: @Sendable @escaping (ClientResponse.Single<namespaceA.ServiceA.Method.methodA.Output>) async throws -> R
 ///   ) async rethrows -> R {
 ///    try await self.client.clientStreaming(
 ///      request: request,
-///      descriptor: NamespaceA.ServiceA.Methods.MethodA.descriptor,
+///      descriptor: NamespaceA.ServiceA.Method.MethodA.descriptor,
 ///      serializer: serializer,
 ///      deserializer: deserializer,
 ///      handler: body
@@ -399,7 +399,7 @@ extension ClientCodeTranslator {
         .init(
           label: "descriptor",
           expression: .identifierPattern(
-            "\(service.namespacedTypealiasGeneratedName).Methods.\(method.name.generatedUpperCase).descriptor"
+            "\(service.namespacedTypealiasGeneratedName).Method.\(method.name.generatedUpperCase).descriptor"
           )
         ),
         .init(label: "serializer", expression: .identifierPattern("serializer")),
@@ -439,7 +439,7 @@ extension ClientCodeTranslator {
     type: InputOutputType
   ) -> String {
     var components: String =
-      "\(service.namespacedTypealiasGeneratedName).Methods.\(method.name.generatedUpperCase)"
+      "\(service.namespacedTypealiasGeneratedName).Method.\(method.name.generatedUpperCase)"
 
     switch type {
     case .input:

Sources/GRPCCodeGen/Internal/Translator/ServerCodeTranslator.swift

@@ -31,23 +31,23 @@
 /// extension foo.Bar.StreamingServiceProtocol {
 ///   public func registerRPCs(with router: inout RPCRouter) {
 ///     router.registerHandler(
-///       for: foo.Method.baz.descriptor,
-///       deserializer: ProtobufDeserializer<foo.Methods.baz.Input>(),
-///       serializer: ProtobufSerializer<foo.Methods.baz.Output>(),
+///       forMethod: foo.Method.baz.descriptor,
+///       deserializer: ProtobufDeserializer<foo.Method.baz.Input>(),
+///       serializer: ProtobufSerializer<foo.Method.baz.Output>(),
 ///       handler: { request in try await self.baz(request: request) }
 ///     )
 ///   }
 /// }
 /// public protocol foo_BarServiceProtocol: foo.Bar.StreamingServiceProtocol {
 ///   func baz(
-///     request: ServerRequest.Single<foo.Bar.Methods.baz.Input>
-///   ) async throws -> ServerResponse.Single<foo.Bar.Methods.baz.Output>
+///     request: ServerRequest.Single<foo.Bar.Method.baz.Input>
+///   ) async throws -> ServerResponse.Single<foo.Bar.Method.baz.Output>
 /// }
 /// // Generated partial conformance to `foo_BarStreamingServiceProtocol`.
 /// extension foo.Bar.ServiceProtocol {
 ///   public func baz(
-///     request: ServerRequest.Stream<foo.Bar.Methods.baz.Input>
-///   ) async throws -> ServerResponse.Stream<foo.Bar.Methods.baz.Output> {
+///     request: ServerRequest.Stream<foo.Bar.Method.baz.Input>
+///   ) async throws -> ServerResponse.Stream<foo.Bar.Method.baz.Output> {
 ///     let response = try await self.baz(request: ServerRequest.Single(stream: request)
 ///     return ServerResponse.Stream(single: response)
 ///   }
@@ -221,7 +221,7 @@ extension ServerCodeTranslator {
     var arguments = [FunctionArgumentDescription]()
     arguments.append(
       .init(
-        label: "for",
+        label: "forMethod",
         expression: .identifierPattern(
           self.methodDescriptorPath(for: method, service: service)
         )
@@ -460,7 +460,7 @@ extension ServerCodeTranslator {
     type: InputOutputType
   ) -> String {
     var components: String =
-      "\(service.namespacedTypealiasGeneratedName).Methods.\(method.name.generatedUpperCase)"
+      "\(service.namespacedTypealiasGeneratedName).Method.\(method.name.generatedUpperCase)"
 
     switch type {
     case .input:
@@ -478,7 +478,7 @@ extension ServerCodeTranslator {
     service: CodeGenerationRequest.ServiceDescriptor
   ) -> String {
     return
-      "\(service.namespacedTypealiasGeneratedName).Methods.\(method.name.generatedUpperCase).descriptor"
+      "\(service.namespacedTypealiasGeneratedName).Method.\(method.name.generatedUpperCase).descriptor"
   }
 
   /// Generates the fully qualified name of the type alias for a service protocol.

Sources/GRPCCodeGen/Internal/Translator/TypealiasTranslator.swift

@@ -38,8 +38,8 @@
 ///       // ...
 ///
 ///       public static let descriptors: [MethodDescriptor] = [
-///         echo.Echo.Get.descriptor,
-///         echo.Echo.Collect.descriptor,
+///         Echo.Echo.Method.Get.descriptor,
+///         Echo.Echo.Method.Collect.descriptor,
 ///         // ...
 ///       ]
 ///     }
@@ -222,7 +222,9 @@ extension TypealiasTranslator {
     for methodName in methodNames {
       let methodDescriptorPath = Expression.memberAccess(
         MemberAccessDescription(
-          left: .identifierType(.member(["Methods", methodName])),
+          left: .identifierType(
+            .member([service.namespacedTypealiasGeneratedName, "Method", methodName])
+          ),
           right: "descriptor"
         )
       )
@@ -245,7 +247,7 @@ extension TypealiasTranslator {
     let streamingServiceProtocolTypealias = Declaration.typealias(
       accessModifier: self.accessModifier,
       name: "StreamingServiceProtocol",
-      existingType: .member("\(service.namespacedGeneratedName)ServiceStreamingProtocol")
+      existingType: .member("\(service.namespacedGeneratedName)StreamingServiceProtocol")
     )
     let serviceProtocolTypealias = Declaration.typealias(
       accessModifier: self.accessModifier,