Generate code file for protos with no definitions #27
Conversation
Motivation To prepare for use in a SwiftPM build plugin which requires deterministic output files and to match the behavior of `proto-gen-swift` we should generate a source file even if no definitions are found. Modifications: We no longer return early in the case of no definitions being found. Result: We will generate a Swift source file even if no definitions are found.
There was a problem hiding this comment.
Can you add a test for this?
Obviously it'd make more sense to get grpc/grpc-swift#2151 merged first so we don't need to update the test afterwards.
You can modify dev/protos/generate.sh so that a descriptor set is generated for foo-messages.proto, once you have that it should be straightforward to add one by following other examples in GRPCProtobufCodeGenTests.
* Add empty proto file test * Add a preamble to `foo-messages.proto` * Don't unconditionally add a dependency on `GRPCProtobuf` if there are no services * Add the new test case code generation to `dev/protos/generate.sh` * depend on `grpc-swift` `main` to pick up empty file generation changes.
rnro
force-pushed
the
generate_empty_files
branch
from
f3164b2 to
5731604
Compare
| @@ -31,7 +31,7 @@ let products: [Product] = [ | |||
| let dependencies: [Package.Dependency] = [ | |||
| .package( | |||
| url: "https://github.com/grpc/grpc-swift.git", | |||
| exact: "2.0.0-beta.2" | |||
| branch: "main" | |||
There was a problem hiding this comment.
@glbrntt note this change. I'm happy to take a different approach than this if you'd rather.
There was a problem hiding this comment.
Nope, this is good. We only switched to exact for the tagged releases, main is fine between releases.
| @@ -31,7 +31,7 @@ let products: [Product] = [ | |||
| let dependencies: [Package.Dependency] = [ | |||
| .package( | |||
| url: "https://github.com/grpc/grpc-swift.git", | |||
| exact: "2.0.0-beta.2" | |||
| branch: "main" | |||
There was a problem hiding this comment.
Nope, this is good. We only switched to exact for the tagged releases, main is fine between releases.
| if file.services.count > 0 { | ||
| codeDependencies.append(Dependency(module: "GRPCProtobuf", accessLevel: .internal)) | ||
| } |
There was a problem hiding this comment.
This isn't quite right: we'll still generate some imports in some cases unnecessarily (i.e. if the file defines a message which depends on a type which is bundled with SwiftProtobuf). We should return the empty array if there are no services.
This change is broken out of #26
Motivation
To prepare for use in a SwiftPM build plugin which requires deterministic output files and to match the behavior of
proto-gen-swiftwe should generate a source file even if no definitions are found.Modifications:
foo-messages.protoGRPCProtobufif there are no servicesdev/protos/generate.shgrpc-swiftmainto pick up empty file generation changes.Result:
We will generate a Swift source file even if no definitions are found.