Handle "internal" directory visibility

gazelle/bzl/gazelle.go

@@ -233,11 +233,10 @@ func (*bzlLibraryLang) GenerateRules(args language.GenerateArgs) language.Genera
 
 		r.SetAttr("srcs", []string{f})
 
-		if args.File == nil || !args.File.HasDefaultVisibility() {
-			inPrivateDir := pathtools.Index(args.Rel, "private") >= 0
-			if !inPrivateDir {
-				r.SetAttr("visibility", []string{"//visibility:public"})
-			}
+		shouldSetVisibility := args.File == nil || !args.File.HasDefaultVisibility()
+		if shouldSetVisibility {
+			vis := checkInternalVisibility(args.Rel, "//visibility:public")
+			r.SetAttr("visibility", []string{vis})
 		}
 
 		fullPath := filepath.Join(args.Dir, f)
@@ -335,3 +334,16 @@ func (s srcsList) Contains(m string) bool {
 	}
 	return false
 }
+
+// checkInternalVisibility overrides the given visibility if the package is
+// internal.
+func checkInternalVisibility(rel, visibility string) string {
+	if i := pathtools.Index(rel, "internal"); i > 0 {
+		visibility = fmt.Sprintf("//%s:__subpackages__", rel[:i-1])
+	} else if i := pathtools.Index(rel, "private"); i > 0 {
+		visibility = fmt.Sprintf("//%s:__subpackages__", rel[:i-1])
+	} else if pathtools.HasPrefix(rel, "internal") || pathtools.HasPrefix(rel, "private") {
+		visibility = "//:__subpackages__"
+	}
+	return visibility
+}

gazelle/bzl/testdata/private/nested/private/BUILD.out

@@ -0,0 +1,7 @@
+load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
+
+bzl_library(
+    name = "bar",
+    srcs = ["bar.bzl"],
+    visibility = ["//nested:__subpackages__"],
+)

gazelle/bzl/testdata/private/nested/private/bar.bzl

@@ -0,0 +1,6 @@
+"""
+Test sample code.
+"""
+
+def func():
+    pass

gazelle/bzl/testdata/private/nested/private/inside/internal/BUILD.out

@@ -0,0 +1,7 @@
+load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
+
+bzl_library(
+    name = "bar",
+    srcs = ["bar.bzl"],
+    visibility = ["//nested/private/inside:__subpackages__"],
+)

gazelle/bzl/testdata/private/nested/private/inside/internal/bar.bzl

@@ -0,0 +1,6 @@
+"""
+Test sample code.
+"""
+
+def func():
+    pass

gazelle/bzl/testdata/private/private/BUILD.out

@@ -3,4 +3,5 @@ load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 bzl_library(
     name = "bar",
     srcs = ["bar.bzl"],
+    visibility = ["//:__subpackages__"],
 )