Fixup codegen

Author: glbrntt

Sources/GRPCCodeGen/Internal/Translator/ClientCodeTranslator.swift

@@ -263,13 +263,13 @@ extension ClientCodeTranslator {
 
     // All methods have a response handler.
     var responseHandler = ParameterDescription(label: "onResponse", name: "handleResponse")
-    let responseKind = method.isOutputStreaming ? "Stream" : "Single"
+    let responseKind = method.isOutputStreaming ? "Streaming" : ""
     responseHandler.type = .closure(
       ClosureSignatureDescription(
         parameters: [
           ParameterDescription(
             type: .generic(
-              wrapper: .member(["GRPCCore", "ClientResponse", responseKind]),
+              wrapper: .member(["GRPCCore", "\(responseKind)ClientResponse"]),
               wrapped: .member(method.outputType)
             )
           )
@@ -308,12 +308,12 @@ extension ClientCodeTranslator {
     // return try await method(request: request, options: options, responseHandler: responseHandler)
 
     // First, make the init for the ClientRequest
-    let requestType = method.isInputStreaming ? "Stream" : "Single"
+    let requestType = method.isInputStreaming ? "Streaming" : ""
     var requestInit = FunctionCallDescription(
       calledExpression: .identifier(
         .type(
           .generic(
-            wrapper: .member(["GRPCCore", "ClientRequest", requestType]),
+            wrapper: .member(["GRPCCore", "\(requestType)ClientRequest"]),
             wrapped: .member(method.inputType)
           )
         )
@@ -490,9 +490,10 @@ extension ClientCodeTranslator {
     for method: CodeGenerationRequest.ServiceDescriptor.MethodDescriptor,
     in service: CodeGenerationRequest.ServiceDescriptor
   ) -> ParameterDescription {
-    let requestType = method.isInputStreaming ? "Stream" : "Single"
+    let requestType = method.isInputStreaming ? "Streaming" : ""
     let clientRequestType = ExistingTypeDescription.member([
-      "GRPCCore", "ClientRequest", requestType,
+      "GRPCCore",
+      "\(requestType)ClientRequest"
     ])
     return ParameterDescription(
       label: "request",
@@ -538,9 +539,9 @@ extension ClientCodeTranslator {
     in service: CodeGenerationRequest.ServiceDescriptor,
     includeDefaultResponseHandler: Bool
   ) -> ParameterDescription {
-    let clientStreaming = method.isOutputStreaming ? "Stream" : "Single"
+    let clientStreaming = method.isOutputStreaming ? "Streaming" : ""
     let closureParameterType = ExistingTypeDescription.generic(
-      wrapper: .member(["GRPCCore", "ClientResponse", clientStreaming]),
+      wrapper: .member(["GRPCCore", "\(clientStreaming)ClientResponse"]),
       wrapped: .member(method.outputType)
     )
 

Sources/GRPCCodeGen/Internal/Translator/ServerCodeTranslator.swift

@@ -147,7 +147,7 @@ extension ServerCodeTranslator {
         .init(
           label: "request",
           type: .generic(
-            wrapper: .member(["GRPCCore", "ServerRequest", "Stream"]),
+            wrapper: .member(["GRPCCore", "StreamingServerRequest"]),
             wrapped: .member(method.inputType)
           )
         ),
@@ -156,7 +156,7 @@ extension ServerCodeTranslator {
       keywords: [.async, .throws],
       returnType: .identifierType(
         .generic(
-          wrapper: .member(["GRPCCore", "ServerResponse", "Stream"]),
+          wrapper: .member(["GRPCCore", "StreamingServerResponse"]),
           wrapped: .member(method.outputType)
         )
       )
@@ -313,8 +313,8 @@ extension ServerCodeTranslator {
     in service: CodeGenerationRequest.ServiceDescriptor,
     accessModifier: AccessModifier? = nil
   ) -> Declaration {
-    let inputStreaming = method.isInputStreaming ? "Stream" : "Single"
-    let outputStreaming = method.isOutputStreaming ? "Stream" : "Single"
+    let inputStreaming = method.isInputStreaming ? "Streaming" : ""
+    let outputStreaming = method.isOutputStreaming ? "Streaming" : ""
 
     let functionSignature = FunctionSignatureDescription(
       accessModifier: accessModifier,
@@ -324,7 +324,7 @@ extension ServerCodeTranslator {
           label: "request",
           type:
             .generic(
-              wrapper: .member(["GRPCCore", "ServerRequest", inputStreaming]),
+              wrapper: .member(["GRPCCore", "\(inputStreaming)ServerRequest"]),
               wrapped: .member(method.inputType)
             )
         ),
@@ -333,7 +333,7 @@ extension ServerCodeTranslator {
       keywords: [.async, .throws],
       returnType: .identifierType(
         .generic(
-          wrapper: .member(["GRPCCore", "ServerResponse", outputStreaming]),
+          wrapper: .member(["GRPCCore", "\(outputStreaming)ServerResponse"]),
           wrapped: .member(method.outputType)
         )
       )
@@ -391,12 +391,7 @@ extension ServerCodeTranslator {
     if !method.isInputStreaming {
       // Transform the streaming request into a unary request.
       serverRequest = Expression.functionCall(
-        calledExpression: .memberAccess(
-          MemberAccessDescription(
-            left: .identifierPattern("GRPCCore.ServerRequest"),
-            right: "Single"
-          )
-        ),
+        calledExpression: .identifierType(.member(["GRPCCore", "ServerRequest"])),
         arguments: [
           FunctionArgumentDescription(label: "stream", expression: .identifierPattern("request"))
         ]
@@ -433,12 +428,7 @@ extension ServerCodeTranslator {
     // Transforming the unary response into a streaming one.
     if !method.isOutputStreaming {
       returnValue = .functionCall(
-        calledExpression: .memberAccess(
-          MemberAccessDescription(
-            left: .identifierType(.member(["GRPCCore", "ServerResponse"])),
-            right: "Stream"
-          )
-        ),
+        calledExpression: .identifier(.type(.member(["GRPCCore", "StreamingServerResponse"]))),
         arguments: [
           (FunctionArgumentDescription(label: "single", expression: .identifierPattern("response")))
         ]