Skip to content

ts-proto improvements #259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pcj merged 8 commits into from
Jul 18, 2022
Merged

ts-proto improvements #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9109567
Enable js_outputs of proto_ts_library
pcj Jun 14, 2022
daa69af
Add proto_plugin flags
pcj Jun 14, 2022
35f08a2
Use basename for exclude comparison
pcj Jun 14, 2022
ef1dc95
ts-proto improve
pcj Jun 15, 2022
f92689e
Implement --include_proto_library_data=true
pcj Jun 15, 2022
7934a61
Suppres proto_compile if no outputs
pcj Jul 1, 2022
67dbc91
Add M filtering
pcj Jul 6, 2022
6986a0e
Fix plugin tests
pcj Jul 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pkg/plugin/akka/akka_grpc/protoc_gen_akka_grpc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ func TestProtoGenAkkaGrpcPlugin(t *testing.T) {
),
PluginName: "akka",
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/akka/akka-grpc:protoc-gen-akka-grpc"),
plugintest.WithOutputs("test_akka_grpc.srcjar"),
),
SkipIntegration: true,
Expand Down
7 changes: 7 additions & 0 deletions pkg/plugin/builtin/cpp_plugin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ func TestCppPlugin(t *testing.T) {
),
PluginName: "cpp",
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:cpp"),
plugintest.WithOutputs("test.pb.cc", "test.pb.h"),
),
},
Expand All @@ -26,6 +27,7 @@ func TestCppPlugin(t *testing.T) {
"proto_plugin", "cpp implementation builtin:cpp",
),
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:cpp"),
plugintest.WithOutputs("test.pb.cc", "test.pb.h"),
),
},
Expand All @@ -36,6 +38,7 @@ func TestCppPlugin(t *testing.T) {
"proto_plugin", "cpp implementation builtin:cpp",
),
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:cpp"),
plugintest.WithOutputs("test.pb.cc", "test.pb.h"),
),
},
Expand All @@ -47,6 +50,7 @@ func TestCppPlugin(t *testing.T) {
"proto_plugin", "cpp implementation builtin:cpp",
),
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:cpp"),
plugintest.WithOutputs("rel/test.pb.cc", "rel/test.pb.h"),
),
},
Expand All @@ -58,6 +62,7 @@ func TestCppPlugin(t *testing.T) {
"proto_plugin", "cpp implementation builtin:cpp",
),
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:cpp"),
plugintest.WithOutputs("snake_case.pb.cc", "snake_case.pb.h"),
),
},
Expand All @@ -69,6 +74,7 @@ func TestCppPlugin(t *testing.T) {
"proto_plugin", "cpp implementation builtin:cpp",
),
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:cpp"),
plugintest.WithOutputs("PascalCase.pb.cc", "PascalCase.pb.h"),
),
},
Expand All @@ -80,6 +86,7 @@ func TestCppPlugin(t *testing.T) {
"proto_plugin", "cpp implementation builtin:cpp",
),
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:cpp"),
plugintest.WithOutputs("camelCase.pb.cc", "camelCase.pb.h"),
),
},
Expand Down
7 changes: 7 additions & 0 deletions pkg/plugin/builtin/csharp_plugin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ func TestCsharpPlugin(t *testing.T) {
),
PluginName: "csharp",
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:csharp"),
plugintest.WithOutputs("Test.cs"),
),
},
Expand All @@ -28,6 +29,7 @@ func TestCsharpPlugin(t *testing.T) {
),
PluginName: "csharp",
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:csharp"),
plugintest.WithOutputs("Test.cs"),
),
},
Expand All @@ -39,6 +41,7 @@ func TestCsharpPlugin(t *testing.T) {
),
PluginName: "csharp",
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:csharp"),
plugintest.WithOutputs("Test.cs"),
),
},
Expand All @@ -49,6 +52,7 @@ func TestCsharpPlugin(t *testing.T) {
),
PluginName: "csharp",
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:csharp"),
plugintest.WithOutputs("Test.cs"),
),
},
Expand All @@ -60,7 +64,9 @@ func TestCsharpPlugin(t *testing.T) {
),
PluginName: "csharp",
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:csharp"),
plugintest.WithOutputs("rel/Test.cs"),
plugintest.WithOut("rel"),
),
},
"basename converted to pascal": {
Expand All @@ -71,6 +77,7 @@ func TestCsharpPlugin(t *testing.T) {
),
PluginName: "csharp",
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:csharp"),
plugintest.WithOutputs("FooBarBaz.cs"),
),
},
Expand Down
6 changes: 6 additions & 0 deletions pkg/plugin/builtin/java_plugin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ func TestJavaPlugin(t *testing.T) {
),
PluginName: "java",
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:java"),
plugintest.WithOutputs("test.srcjar"),
plugintest.WithOut("test.srcjar"),
),
},
"message with a package": {
Expand All @@ -26,7 +28,9 @@ func TestJavaPlugin(t *testing.T) {
),
PluginName: "java",
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:java"),
plugintest.WithOutputs("test.srcjar"),
plugintest.WithOut("test.srcjar"),
),
},
"relative package location": {
Expand All @@ -37,7 +41,9 @@ func TestJavaPlugin(t *testing.T) {
),
PluginName: "java",
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:java"),
plugintest.WithOutputs("src/main/java/foo/test.srcjar"),
plugintest.WithOut("src/main/java/foo/test.srcjar"),
),
},
})
Expand Down
5 changes: 5 additions & 0 deletions pkg/plugin/builtin/js_closure_plugin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ func TestJsClosurePlugin(t *testing.T) {
),
PluginName: "js",
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:closurejs"),
plugintest.WithOutputs("test.js"),
plugintest.WithOptions("import_style=closure", "library=test"),
),
Expand All @@ -27,6 +28,7 @@ func TestJsClosurePlugin(t *testing.T) {
),
PluginName: "js",
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:closurejs"),
plugintest.WithOutputs("test.js"),
plugintest.WithOptions("import_style=closure", "library=test"),
),
Expand All @@ -38,6 +40,7 @@ func TestJsClosurePlugin(t *testing.T) {
),
PluginName: "js",
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:closurejs"),
plugintest.WithOutputs("test.js"),
plugintest.WithOptions("import_style=closure", "library=test"),
),
Expand All @@ -49,6 +52,7 @@ func TestJsClosurePlugin(t *testing.T) {
),
PluginName: "js",
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:closurejs"),
plugintest.WithOutputs("test.js"),
plugintest.WithOptions("import_style=closure", "library=test"),
),
Expand All @@ -61,6 +65,7 @@ func TestJsClosurePlugin(t *testing.T) {
),
PluginName: "js",
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:closurejs"),
plugintest.WithOutputs("rel/test.js"),
plugintest.WithOptions("import_style=closure", "library=rel/test"),
),
Expand Down
5 changes: 5 additions & 0 deletions pkg/plugin/builtin/js_common_plugin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ func TestJsCommonPlugin(t *testing.T) {
),
PluginName: "js",
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:commonjs"),
plugintest.WithOutputs("test_pb.js"),
plugintest.WithOptions("import_style=commonjs"),
),
Expand All @@ -27,6 +28,7 @@ func TestJsCommonPlugin(t *testing.T) {
),
PluginName: "js",
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:commonjs"),
plugintest.WithOutputs("test_pb.js"),
plugintest.WithOptions("import_style=commonjs"),
),
Expand All @@ -38,6 +40,7 @@ func TestJsCommonPlugin(t *testing.T) {
),
PluginName: "js",
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:commonjs"),
plugintest.WithOutputs("test_pb.js"),
plugintest.WithOptions("import_style=commonjs"),
),
Expand All @@ -49,6 +52,7 @@ func TestJsCommonPlugin(t *testing.T) {
),
PluginName: "js",
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:commonjs"),
plugintest.WithOutputs("test_pb.js"),
plugintest.WithOptions("import_style=commonjs"),
),
Expand All @@ -61,6 +65,7 @@ func TestJsCommonPlugin(t *testing.T) {
),
PluginName: "js",
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:commonjs"),
plugintest.WithOutputs("rel/test_pb.js"),
plugintest.WithOptions("import_style=commonjs"),
),
Expand Down
6 changes: 6 additions & 0 deletions pkg/plugin/builtin/objc_plugin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ func TestObjcPlugin(t *testing.T) {
),
PluginName: "objc",
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:objc"),
plugintest.WithOutputs("Test.pbobjc.h", "Test.pbobjc.m"),
),
},
Expand All @@ -26,6 +27,7 @@ func TestObjcPlugin(t *testing.T) {
),
PluginName: "objc",
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:objc"),
plugintest.WithOutputs("Test.pbobjc.h", "Test.pbobjc.m"),
),
},
Expand All @@ -36,6 +38,7 @@ func TestObjcPlugin(t *testing.T) {
),
PluginName: "objc",
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:objc"),
plugintest.WithOutputs("Test.pbobjc.h", "Test.pbobjc.m"),
),
},
Expand All @@ -46,6 +49,7 @@ func TestObjcPlugin(t *testing.T) {
),
PluginName: "objc",
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:objc"),
plugintest.WithOutputs("Test.pbobjc.h", "Test.pbobjc.m"),
),
},
Expand All @@ -57,6 +61,7 @@ func TestObjcPlugin(t *testing.T) {
),
PluginName: "objc",
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:objc"),
plugintest.WithOutputs("rel/Test.pbobjc.h", "rel/Test.pbobjc.m"),
),
},
Expand All @@ -68,6 +73,7 @@ func TestObjcPlugin(t *testing.T) {
),
PluginName: "objc",
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:objc"),
plugintest.WithOutputs("FooBarBaz.pbobjc.h", "FooBarBaz.pbobjc.m"),
),
},
Expand Down
7 changes: 7 additions & 0 deletions pkg/plugin/builtin/php_plugin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ func TestPhpPlugin(t *testing.T) {
),
PluginName: "php",
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:php"),
plugintest.WithOutputs("GPBMetadata/Test.php"),
),
},
Expand All @@ -26,6 +27,7 @@ func TestPhpPlugin(t *testing.T) {
),
PluginName: "php",
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:php"),
plugintest.WithOutputs("GPBMetadata/Test.php", "E.php", "M.php"),
),
},
Expand All @@ -36,6 +38,7 @@ func TestPhpPlugin(t *testing.T) {
),
PluginName: "php",
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:php"),
plugintest.WithOutputs("GPBMetadata/Test.php", "P/E.php", "P/M.php"),
),
},
Expand All @@ -46,6 +49,7 @@ func TestPhpPlugin(t *testing.T) {
),
PluginName: "php",
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:php"),
plugintest.WithOutputs("GPBMetadata/Test.php", "foo/E.php", "foo/M.php"),
),
},
Expand All @@ -56,6 +60,7 @@ func TestPhpPlugin(t *testing.T) {
),
PluginName: "php",
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:php"),
plugintest.WithOutputs("bar/Test.php", "P/E.php", "P/M.php"),
),
},
Expand All @@ -67,7 +72,9 @@ func TestPhpPlugin(t *testing.T) {
),
PluginName: "php",
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:php"),
plugintest.WithOutputs("a/b/c/GPBMetadata/A/B/C/Test.php", "a/b/c/M.php"),
plugintest.WithOut("a/b/c"),
),
},
})
Expand Down
5 changes: 5 additions & 0 deletions pkg/plugin/builtin/pyi_plugin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ func TestPyiPlugin(t *testing.T) {
),
PluginName: "pyi",
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:pyi"),
plugintest.WithOutputs("test_pb2.pyi"),
),
},
Expand All @@ -26,6 +27,7 @@ func TestPyiPlugin(t *testing.T) {
),
PluginName: "pyi",
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:pyi"),
plugintest.WithOutputs("test_pb2.pyi"),
),
},
Expand All @@ -36,6 +38,7 @@ func TestPyiPlugin(t *testing.T) {
),
PluginName: "pyi",
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:pyi"),
plugintest.WithOutputs("test_pb2.pyi"),
),
},
Expand All @@ -47,6 +50,7 @@ func TestPyiPlugin(t *testing.T) {
),
PluginName: "pyi",
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:pyi"),
plugintest.WithOutputs("rel/test_pb2.pyi"),
),
},
Expand All @@ -58,6 +62,7 @@ func TestPyiPlugin(t *testing.T) {
),
PluginName: "pyi",
Configuration: plugintest.WithConfiguration(
plugintest.WithLabel(t, "@build_stack_rules_proto//plugin/builtin:pyi"),
plugintest.WithOutputs("a_b*c+d=e|g!h#i_pb2.pyi"),
),
},
Expand Down
Loading