Add generate_internal_visibility_from_proto_files feature

swift/internal/feature_names.bzl

@@ -295,6 +295,11 @@ SWIFT_FEATURE_GENERATE_FROM_RAW_PROTO_FILES = "swift.generate_from_raw_proto_fil
 # generating a Swift file from a proto file.
 SWIFT_FEATURE_GENERATE_PATH_TO_UNDERSCORES_FROM_PROTO_FILES = "swift.generate_path_to_underscores_from_proto_files"
 
+# If enabled, the toolchain will use `--swift_opt=Visibility=Internal`
+# (instead of `--swift_opt=Visibility=Public`) for the protoc Swift plugin arguments when
+# generating a Swift file from a proto file.
+SWIFT_FEATURE_GENERATE_INTERNAL_VISIBILITY_FROM_PROTO_FILES = "swift.generate_internal_visibility_from_proto_files"
+
 # If enabled and whole module optimisation is being used, the `*.swiftdoc`,
 # `*.swiftmodule` and `*-Swift.h` are generated with a separate action
 # rather than as part of the compilation.

swift/internal/swift_protoc_gen_aspect.bzl

@@ -25,6 +25,7 @@ load(
     "SWIFT_FEATURE_ENABLE_LIBRARY_EVOLUTION",
     "SWIFT_FEATURE_ENABLE_TESTING",
     "SWIFT_FEATURE_GENERATE_FROM_RAW_PROTO_FILES",
+    "SWIFT_FEATURE_GENERATE_INTERNAL_VISIBILITY_FROM_PROTO_FILES",
     "SWIFT_FEATURE_GENERATE_PATH_TO_UNDERSCORES_FROM_PROTO_FILES",
 )
 load(":linking.bzl", "new_objc_provider")
@@ -107,6 +108,7 @@ def _register_pbswift_generate_action(
         module_mapping_file,
         generate_from_proto_sources,
         generate_path_to_underscores_from_proto_files,
+        generate_internal_visibility_from_proto_files,
         mkdir_and_run,
         protoc_executable,
         protoc_plugin_executable,
@@ -132,6 +134,8 @@ def _register_pbswift_generate_action(
             comments (https://github.com/bazelbuild/bazel/issues/9337).
         generate_path_to_underscores_from_proto_files: True/False for if
             generation should use `FileNaming=PathToUnderscores` argument.
+        generate_internal_visibility_from_proto_files: True/False for if
+            generation should use `Visibility=Internal` argument
         mkdir_and_run: The `File` representing the `mkdir_and_run` executable.
         protoc_executable: The `File` representing the `protoc` executable.
         protoc_plugin_executable: The `File` representing the `protoc` plugin
@@ -182,7 +186,11 @@ def _register_pbswift_generate_action(
     else:
         protoc_args.add("--swift_opt=FileNaming=FullPath")
 
-    protoc_args.add("--swift_opt=Visibility=Public")
+    if generate_internal_visibility_from_proto_files:
+        protoc_args.add("--swift_opt=Visibility=Internal")
+    else:
+        protoc_args.add("--swift_opt=Visibility=Public")
+
     if module_mapping_file:
         protoc_args.add(
             module_mapping_file,
@@ -392,6 +400,10 @@ def _swift_protoc_gen_aspect_impl(target, aspect_ctx):
             feature_configuration = feature_configuration,
             feature_name = SWIFT_FEATURE_GENERATE_PATH_TO_UNDERSCORES_FROM_PROTO_FILES,
         )
+        generate_internal_visibility_from_proto_files = swift_common.is_enabled(
+            feature_configuration = feature_configuration,
+            feature_name = SWIFT_FEATURE_GENERATE_INTERNAL_VISIBILITY_FROM_PROTO_FILES,
+        )
 
         # Only the files for direct sources should be generated, but the
         # transitive descriptor sets are still need to be able to parse/load
@@ -418,6 +430,7 @@ def _swift_protoc_gen_aspect_impl(target, aspect_ctx):
             transitive_module_mapping_file,
             generate_from_proto_sources,
             generate_path_to_underscores_from_proto_files,
+            generate_internal_visibility_from_proto_files,
             aspect_ctx.executable._mkdir_and_run,
             aspect_ctx.executable._protoc,
             aspect_ctx.executable._protoc_gen_swift,

third_party/com_github_apple_swift_log/BUILD.overlay

@@ -1,10 +1,5 @@
-load(
-    "@build_bazel_apple_support//rules:universal_binary.bzl",
-    "universal_binary",
-)
 load(
     "@build_bazel_rules_swift//swift:swift.bzl",
-    "swift_binary",
     "swift_library",
 )
 

third_party/com_github_apple_swift_nio/BUILD.overlay

@@ -1,10 +1,5 @@
-load(
-    "@build_bazel_apple_support//rules:universal_binary.bzl",
-    "universal_binary",
-)
 load(
     "@build_bazel_rules_swift//swift:swift.bzl",
-    "swift_binary",
     "swift_library",
 )
 
@@ -13,12 +8,12 @@ swift_library(
     srcs = glob([
         "Sources/NIOCore/*.swift",
     ]),
+    module_name = "NIOCore",
+    visibility = ["//visibility:public"],
     deps = [
-        ":NIOConcurrencyHelpers",
         ":CNIOLinux",
+        ":NIOConcurrencyHelpers",
     ],
-    module_name = "NIOCore",
-    visibility = ["//visibility:public"],
 )
 
 swift_library(
@@ -29,8 +24,8 @@ swift_library(
     module_name = "NIOEmbedded",
     visibility = ["//visibility:public"],
     deps = [
-        "NIOCore",
         "NIOConcurrencyHelpers",
+        "NIOCore",
         "_NIODataStructures",
     ],
 )
@@ -43,8 +38,8 @@ swift_library(
     module_name = "NIOPosix",
     visibility = ["//visibility:public"],
     deps = [
-        "CNIOLinux",
         "CNIODarwin",
+        "CNIOLinux",
         "CNIOWindows",
         "NIOConcurrencyHelpers",
         "NIOCore",
@@ -73,7 +68,10 @@ swift_library(
     ]),
     module_name = "_NIOConcurrency",
     visibility = ["//visibility:public"],
-    deps = ["NIO", "NIOCore"],
+    deps = [
+        "NIO",
+        "NIOCore",
+    ],
 )
 
 swift_library(
@@ -179,8 +177,8 @@ swift_library(
     module_name = "NIOHTTP1",
     visibility = ["//visibility:public"],
     deps = [
-        ":NIOCore",
         ":CNIOHTTPParser",
+        ":NIOCore",
     ],
 )
 
@@ -202,9 +200,9 @@ swift_library(
     module_name = "_NIODataStructures",
     visibility = ["//visibility:public"],
     deps = [
-        "NIOCore",
-        "NIOConcurrencyHelpers",
         "CNIOHTTPParser",
+        "NIOConcurrencyHelpers",
+        "NIOCore",
     ],
 )
 

third_party/com_github_apple_swift_nio_extras/BUILD.overlay

@@ -1,10 +1,5 @@
-load(
-    "@build_bazel_apple_support//rules:universal_binary.bzl",
-    "universal_binary",
-)
 load(
     "@build_bazel_rules_swift//swift:swift.bzl",
-    "swift_binary",
     "swift_library",
 )
 
@@ -13,9 +8,9 @@ swift_library(
     srcs = glob([
         "Sources/NIOExtras/**/*.swift",
     ]),
+    module_name = "NIOExtras",
+    visibility = ["//visibility:public"],
     deps = [
         "@com_github_apple_swift_nio//:NIOCore",
     ],
-    module_name = "NIOExtras",
-    visibility = ["//visibility:public"],
 )

third_party/com_github_apple_swift_nio_http2/BUILD.overlay

@@ -1,10 +1,5 @@
-load(
-    "@build_bazel_apple_support//rules:universal_binary.bzl",
-    "universal_binary",
-)
 load(
     "@build_bazel_rules_swift//swift:swift.bzl",
-    "swift_binary",
     "swift_library",
 )
 
@@ -13,23 +8,23 @@ swift_library(
     srcs = glob([
         "Sources/NIOHPACK/**/*.swift",
     ]),
+    module_name = "NIOHPACK",
+    visibility = ["//visibility:public"],
     deps = [
         "@com_github_apple_swift_nio//:NIOCore",
         "@com_github_apple_swift_nio//:NIOHTTP1",
         "@com_github_apple_swift_nio//:NIOTLS",
     ],
-    module_name = "NIOHPACK",
-    visibility = ["//visibility:public"],
 )
 
 swift_library(
     name = "NIOHTTP2",
     srcs = glob([
         "Sources/NIOHTTP2/**/*.swift",
     ]),
+    module_name = "NIOHTTP2",
+    visibility = ["//visibility:public"],
     deps = [
         ":NIOHPACK",
     ],
-    module_name = "NIOHTTP2",
-    visibility = ["//visibility:public"],
 )

third_party/com_github_apple_swift_nio_transport_services/BUILD.overlay

@@ -1,10 +1,5 @@
-load(
-    "@build_bazel_apple_support//rules:universal_binary.bzl",
-    "universal_binary",
-)
 load(
     "@build_bazel_rules_swift//swift:swift.bzl",
-    "swift_binary",
     "swift_library",
 )
 
@@ -13,11 +8,11 @@ swift_library(
     srcs = glob([
         "Sources/NIOTransportServices/**/*.swift",
     ]),
+    module_name = "NIOTransportServices",
+    visibility = ["//visibility:public"],
     deps = [
         "@com_github_apple_swift_nio//:NIOCore",
         "@com_github_apple_swift_nio//:NIOFoundationCompat",
         "@com_github_apple_swift_nio//:NIOTLS",
     ],
-    module_name = "NIOTransportServices",
-    visibility = ["//visibility:public"],
 )