From 4587c27d7c73b635688e1fb6d9acef548f9d25d0 Mon Sep 17 00:00:00 2001
From: George Barnett <gbarnett@apple.com>
Date: Tue, 3 Dec 2024 16:48:30 +0000
Subject: [PATCH] Always include the 'SwiftProtobuf' import in generated code
 (#16)

Motivation:

The 'SwiftProtobuf' import was missing from generated code.

Modifications:

- Always generate an import for 'SwiftProtobuf'

Result:

Import are more correct
---
 Sources/GRPCProtobufCodeGen/ProtobufCodeGenParser.swift     | 3 ++-
 .../ProtobufCodeGenParserTests.swift                        | 6 ++++--
 .../ProtobufCodeGeneratorTests.swift                        | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Sources/GRPCProtobufCodeGen/ProtobufCodeGenParser.swift b/Sources/GRPCProtobufCodeGen/ProtobufCodeGenParser.swift
index d51c02d..69a48da 100644
--- a/Sources/GRPCProtobufCodeGen/ProtobufCodeGenParser.swift
+++ b/Sources/GRPCProtobufCodeGen/ProtobufCodeGenParser.swift
@@ -96,7 +96,8 @@ extension ProtobufCodeGenParser {
     file: FileDescriptor
   ) -> [Dependency] {
     var codeDependencies: [Dependency] = [
-      .init(module: "GRPCProtobuf", accessLevel: .internal)
+      Dependency(module: "GRPCProtobuf", accessLevel: .internal),
+      Dependency(module: "SwiftProtobuf", accessLevel: self.accessLevel),
     ]
     // Adding as dependencies the modules containing generated code or types for
     // '.proto' files imported in the '.proto' file we are parsing.
diff --git a/Tests/GRPCProtobufCodeGenTests/ProtobufCodeGenParserTests.swift b/Tests/GRPCProtobufCodeGenTests/ProtobufCodeGenParserTests.swift
index 9fd592a..60610f3 100644
--- a/Tests/GRPCProtobufCodeGenTests/ProtobufCodeGenParserTests.swift
+++ b/Tests/GRPCProtobufCodeGenTests/ProtobufCodeGenParserTests.swift
@@ -61,7 +61,8 @@ struct ProtobufCodeGenParserTests {
     @Test("Dependencies")
     func dependencies() {
       let expected: [GRPCCodeGen.Dependency] = [
-        .init(module: "GRPCProtobuf", accessLevel: .internal)  // Always an internal import
+        .init(module: "GRPCProtobuf", accessLevel: .internal),  // Always an internal import
+        .init(module: "SwiftProtobuf", accessLevel: .internal),
       ]
       #expect(self.codeGen.dependencies == expected)
     }
@@ -173,7 +174,8 @@ struct ProtobufCodeGenParserTests {
     @Test("Dependencies")
     func dependencies() {
       let expected: [GRPCCodeGen.Dependency] = [
-        .init(module: "GRPCProtobuf", accessLevel: .internal)  // Always an internal import
+        .init(module: "GRPCProtobuf", accessLevel: .internal),  // Always an internal import
+        .init(module: "SwiftProtobuf", accessLevel: .internal),
       ]
       #expect(self.codeGen.dependencies == expected)
     }
diff --git a/Tests/GRPCProtobufCodeGenTests/ProtobufCodeGeneratorTests.swift b/Tests/GRPCProtobufCodeGenTests/ProtobufCodeGeneratorTests.swift
index 6422b96..ddbd9ef 100644
--- a/Tests/GRPCProtobufCodeGenTests/ProtobufCodeGeneratorTests.swift
+++ b/Tests/GRPCProtobufCodeGenTests/ProtobufCodeGeneratorTests.swift
@@ -67,6 +67,7 @@ struct ProtobufCodeGeneratorTests: UsesDescriptorSet {
 
       import GRPCCore
       import GRPCProtobuf
+      import SwiftProtobuf
 
       // MARK: - test.TestService