Add code gen config for the module name

Modifications:

- Add config to the code generator allowing a different module name to
  be specified.
- Remove unused code

Result:

The grpc module name can be specified in generated code

Author: glbrntt

Sources/GRPCCodeGen/CodeGenerator.swift

@@ -40,6 +40,8 @@ public struct CodeGenerator: Sendable {
     public var client: Bool
     /// Whether or not server code should be generated.
     public var server: Bool
+    /// The name of the core gRPC module.
+    public var grpcCoreModuleName: String
 
     /// Creates a new configuration.
     ///
@@ -61,6 +63,7 @@ public struct CodeGenerator: Sendable {
       self.indentation = indentation
       self.client = client
       self.server = server
+      self.grpcCoreModuleName = "GRPCCore"
     }
 
     /// The possible access levels for the generated code.
@@ -96,7 +99,8 @@ public struct CodeGenerator: Sendable {
       accessLevel: self.config.accessLevel,
       accessLevelOnImports: self.config.accessLevelOnImports,
       client: self.config.client,
-      server: self.config.server
+      server: self.config.server,
+      grpcCoreModuleName: self.config.grpcCoreModuleName
     )
 
     let sourceFile = try textRenderer.render(structured: structuredSwiftRepresentation)

Sources/GRPCCodeGen/Internal/Translator/IDLToStructuredSwiftTranslator.swift

@@ -17,15 +17,16 @@
 /// Creates a representation for the server and client code, as well as for the enums containing useful type aliases and properties.
 /// The representation is generated based on the ``CodeGenerationRequest`` object and user specifications,
 /// using types from ``StructuredSwiftRepresentation``.
-package struct IDLToStructuredSwiftTranslator: Translator {
+package struct IDLToStructuredSwiftTranslator {
   package init() {}
 
   func translate(
     codeGenerationRequest: CodeGenerationRequest,
     accessLevel: CodeGenerator.Config.AccessLevel,
     accessLevelOnImports: Bool,
     client: Bool,
-    server: Bool
+    server: Bool,
+    grpcCoreModuleName: String
   ) throws -> StructuredSwiftRepresentation {
     try self.validateInput(codeGenerationRequest)
     let accessModifier = AccessModifier(accessLevel)
@@ -84,7 +85,8 @@ package struct IDLToStructuredSwiftTranslator: Translator {
       imports = try self.makeImports(
         dependencies: codeGenerationRequest.dependencies,
         accessLevel: accessLevel,
-        accessLevelOnImports: accessLevelOnImports
+        accessLevelOnImports: accessLevelOnImports,
+        grpcCoreModuleName: grpcCoreModuleName
       )
     }
 
@@ -102,13 +104,14 @@ package struct IDLToStructuredSwiftTranslator: Translator {
   package func makeImports(
     dependencies: [Dependency],
     accessLevel: CodeGenerator.Config.AccessLevel,
-    accessLevelOnImports: Bool
+    accessLevelOnImports: Bool,
+    grpcCoreModuleName: String
   ) throws -> [ImportDescription] {
     var imports: [ImportDescription] = []
     imports.append(
       ImportDescription(
         accessLevel: accessLevelOnImports ? AccessModifier(accessLevel) : nil,
-        moduleName: "GRPCCore"
+        moduleName: grpcCoreModuleName
       )
     )
 

Sources/GRPCCodeGen/Internal/Translator/SpecializedTranslator.swift

@@ -107,7 +107,8 @@ extension StructuredSwiftTests {
       let imports = try StructuredSwiftTests.Import.translator.makeImports(
         dependencies: dependencies,
         accessLevel: accessLevel,
-        accessLevelOnImports: true
+        accessLevelOnImports: true,
+        grpcCoreModuleName: "GRPCCore"
       )
 
       #expect(render(imports) == expected)
@@ -157,7 +158,8 @@ extension StructuredSwiftTests {
       let imports = try StructuredSwiftTests.Import.translator.makeImports(
         dependencies: dependencies,
         accessLevel: accessLevel,
-        accessLevelOnImports: true
+        accessLevelOnImports: true,
+        grpcCoreModuleName: "GRPCCore"
       )
 
       #expect(render(imports) == expected)
@@ -191,11 +193,29 @@ extension StructuredSwiftTests {
       let imports = try StructuredSwiftTests.Import.translator.makeImports(
         dependencies: dependencies,
         accessLevel: accessLevel,
-        accessLevelOnImports: true
+        accessLevelOnImports: true,
+        grpcCoreModuleName: "GRPCCore"
       )
 
       #expect(render(imports) == expected)
     }
 
+    @Test("gRPC module name")
+    func grpcModuleName() throws {
+      let translator = IDLToStructuredSwiftTranslator()
+      let imports = try translator.makeImports(
+        dependencies: [],
+        accessLevel: .public,
+        accessLevelOnImports: true,
+        grpcCoreModuleName: "GRPCCoreFoo"
+      )
+
+      let expected =
+        """
+        public import GRPCCoreFoo
+        """
+
+      #expect(render(imports) == expected)
+    }
   }
 }

Sources/GRPCCodeGen/Internal/Translator/Translator.swift

@@ -169,7 +169,8 @@ final class IDLToStructuredSwiftTranslatorSnippetBasedTests: XCTestCase {
       accessLevel: accessLevel,
       accessLevelOnImports: true,
       client: false,
-      server: server
+      server: server,
+      grpcCoreModuleName: "GRPCCore"
     )
     let renderer = TextBasedRenderer.default
     let sourceFile = try renderer.render(structured: structuredSwift)
@@ -197,7 +198,8 @@ final class IDLToStructuredSwiftTranslatorSnippetBasedTests: XCTestCase {
         accessLevel: .public,
         accessLevelOnImports: true,
         client: true,
-        server: true
+        server: true,
+        grpcCoreModuleName: "GRPCCore"
       )
     ) {
       error in
@@ -244,7 +246,8 @@ final class IDLToStructuredSwiftTranslatorSnippetBasedTests: XCTestCase {
         accessLevel: .public,
         accessLevelOnImports: true,
         client: true,
-        server: true
+        server: true,
+        grpcCoreModuleName: "GRPCCore"
       )
     ) {
       error in
@@ -279,7 +282,8 @@ final class IDLToStructuredSwiftTranslatorSnippetBasedTests: XCTestCase {
         accessLevel: .public,
         accessLevelOnImports: true,
         client: true,
-        server: true
+        server: true,
+        grpcCoreModuleName: "GRPCCore"
       )
     ) {
       error in
@@ -325,7 +329,8 @@ final class IDLToStructuredSwiftTranslatorSnippetBasedTests: XCTestCase {
         accessLevel: .internal,
         accessLevelOnImports: true,
         client: true,
-        server: true
+        server: true,
+        grpcCoreModuleName: "GRPCCore"
       )
     ) { error in
       XCTAssertEqual(
@@ -369,7 +374,8 @@ final class IDLToStructuredSwiftTranslatorSnippetBasedTests: XCTestCase {
         accessLevel: .public,
         accessLevelOnImports: true,
         client: true,
-        server: true
+        server: true,
+        grpcCoreModuleName: "GRPCCore"
       )
     ) { error in
       XCTAssertEqual(
@@ -429,7 +435,8 @@ final class IDLToStructuredSwiftTranslatorSnippetBasedTests: XCTestCase {
         accessLevel: .public,
         accessLevelOnImports: true,
         client: true,
-        server: true
+        server: true,
+        grpcCoreModuleName: "GRPCCore"
       )
     ) { error in
       XCTAssertEqual(
@@ -482,7 +489,8 @@ final class IDLToStructuredSwiftTranslatorSnippetBasedTests: XCTestCase {
         accessLevel: .public,
         accessLevelOnImports: true,
         client: true,
-        server: true
+        server: true,
+        grpcCoreModuleName: "GRPCCore"
       )
     ) {
       error in
@@ -528,7 +536,8 @@ final class IDLToStructuredSwiftTranslatorSnippetBasedTests: XCTestCase {
         accessLevel: .public,
         accessLevelOnImports: true,
         client: true,
-        server: true
+        server: true,
+        grpcCoreModuleName: "GRPCCore"
       )
     ) {
       error in