process: sync commits from Aspect-internal silo

WORKSPACE

@@ -163,6 +163,22 @@ protoc_toolchains(
     version = "v21.7",
 )
 
+http_archive(
+    name = "rules_python",
+    integrity = "sha256-bERKXOYmJB6fdw/0TFPBLWen8f+81eG2p0EAneLkBAo=",
+    strip_prefix = "rules_python-49cdf7d3fe000076d6432a34238e5d25f5b598d0",
+    # NB: version matches go.mod where we fetch the rules_python/gazelle Go package.
+    url = "https://github.com/bazelbuild/rules_python/archive/49cdf7d3fe000076d6432a34238e5d25f5b598d0.tar.gz",
+)
+
+load("@rules_python//python:repositories.bzl", "py_repositories")
+
+py_repositories()
+
+load("@rules_python//gazelle:deps.bzl", "python_stdlib_list_deps")
+
+python_stdlib_list_deps()
+
 load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
 load("//:go.bzl", _go_repositories = "deps")
 

cmd/aspect/configure/configure.go

@@ -30,8 +30,9 @@ func NewDefaultCmd() *cobra.Command {
 }
 
 func NewCmd(streams ioutils.Streams) *cobra.Command {
-	v := configure.New(streams)
-
+	return NewCmdWithConfigure(streams, configure.New(streams))
+}
+func NewCmdWithConfigure(streams ioutils.Streams, v *configure.Configure) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "configure",
 		Short: "Auto-configure Bazel by updating BUILD files",
@@ -46,13 +47,17 @@ Run 'aspect help directives' for more documentation on directives.
 
 So far these languages are supported:
 - Go and Protocol Buffers, thanks to code from [gazelle]
+- Python, thanks to code from [rules_python]
 - JavaScript (including TypeScript)
 - Kotlin (experimental, see https://github.com/aspect-build/aspect-cli/issues/474)
+- Starlark, thanks to code from [bazel-skylib]
 
 configure is based on [gazelle]. We are very grateful to the authors of that software.
 The advantage of configure in Aspect CLI is that you don't need to compile the tooling before running it.
 
 [gazelle]: https://github.com/bazelbuild/bazel-gazelle
+[rules_python]: https://github.com/bazelbuild/rules_python/tree/main/gazelle
+[bazel-skylib]: https://github.com/bazelbuild/bazel-skylib/tree/main/gazelle
 
 To change the behavior of configure, you add "directives" to your BUILD files, which are comments
 in a special syntax.

cmd/aspect/lint/lint.go

@@ -28,10 +28,10 @@ import (
 )
 
 func NewDefaultCmd(pluginSystem system.PluginSystem) *cobra.Command {
-	return NewCmd(ioutils.DefaultStreams, pluginSystem, bazel.WorkspaceFromWd, []lint.LintHandler{})
+	return NewCmd(ioutils.DefaultStreams, pluginSystem, bazel.WorkspaceFromWd, []lint.LintResultsHandler{})
 }
 
-func NewCmd(streams ioutils.Streams, pluginSystem system.PluginSystem, bzl bazel.Bazel, lintHandlers []lint.LintHandler) *cobra.Command {
+func NewCmd(streams ioutils.Streams, pluginSystem system.PluginSystem, bzl bazel.Bazel, lintHandlers []lint.LintResultsHandler) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "lint <target patterns>",
 		Args:  cobra.MinimumNArgs(1),

cmd/aspect/root/root.go

@@ -73,11 +73,14 @@ func NewDefaultCmd(pluginSystem system.PluginSystem) *cobra.Command {
 
 func CheckAspectLockVersionFlag(args []string) bool {
 	for _, arg := range args {
-		if arg == "--"+flags.AspectLockVersion {
+		if arg == "--"+flags.AspectLockVersion+"=false" {
+			return false
+		}
+		if arg == "--"+flags.AspectLockVersion+"=true" || arg == "--"+flags.AspectLockVersion {
 			return true
 		}
 	}
-	return false
+	return flags.AspectLockVersionDefault()
 }
 
 func CheckAspectDisablePluginsFlag(args []string) bool {
@@ -156,13 +159,13 @@ func NewCmd(
 	cmd.AddCommand(test.NewDefaultCmd(pluginSystem))
 	cmd.AddCommand(version.NewDefaultCmd())
 	cmd.AddCommand(outputs.NewDefaultCmd())
-	cmd.AddCommand(configure.NewDefaultCmd())
 	cmd.SetHelpCommand(help.NewCmd())
 
 	if !buildinfo.Current().IsAspectPro {
 		// Aspect CLI only commands
 		cmd.AddCommand(lint.NewDefaultCmd(pluginSystem))
 		cmd.AddCommand(license.NewDefaultCmd())
+		cmd.AddCommand(configure.NewDefaultCmd())
 	}
 
 	// ### "Additional help topic commands" which are not runnable

docs/aspect_configure.md

@@ -18,13 +18,17 @@ Run 'aspect help directives' for more documentation on directives.
 
 So far these languages are supported:
 - Go and Protocol Buffers, thanks to code from [gazelle]
+- Python, thanks to code from [rules_python]
 - JavaScript (including TypeScript)
 - Kotlin (experimental, see https://github.com/aspect-build/aspect-cli/issues/474)
+- Starlark, thanks to code from [bazel-skylib]
 
 configure is based on [gazelle]. We are very grateful to the authors of that software.
 The advantage of configure in Aspect CLI is that you don't need to compile the tooling before running it.
 
 [gazelle]: https://github.com/bazelbuild/bazel-gazelle
+[rules_python]: https://github.com/bazelbuild/rules_python/tree/main/gazelle
+[bazel-skylib]: https://github.com/bazelbuild/bazel-skylib/tree/main/gazelle
 
 To change the behavior of configure, you add "directives" to your BUILD files, which are comments
 in a special syntax.

docs/help/topics/directives.md

@@ -65,8 +65,8 @@ enable other projects to declare dependencies on the package.
 | Equivalent to `js_files` but for the test `ts_project` rule. |
 | `# gazelle:js_npm_package_target_name _name_`           | `{dirname}`                 |
 | The format used to generate the name of the `npm_package` rule. |
-| `# gazelle:js_tsconfig _filename_`                      | `tsconfig.json`             |
-| Path to a `tsconfig.json` file used to help generate TypeScript rules.<br />This value is inherited by sub-directories and applied relative to each BUILD.<br />The `ts_project(tsconfig)` attribute is *NOT* set and must be done manually if necessary |
+| `# gazelle:js_tsconfig enabled\|disabled`               | `enabled`                   |
+| Enable generation of `ts_config` rules.<br />This value is inherited by sub-directories and applied relative to each BUILD.<br />The `ts_project(tsconfig)` attribute is *NOT* set and must be done manually if necessary |
 | `# gazelle:js_custom_files _name_ _glob_`               |                             | Generate additional custom `ts_project` targets |
 | `# gazelle:js_custom_test_files _name_ _glob_`          |                             | Generate additional custom `ts_project` testonly targets |
 <!-- prettier-ignore-end -->

gazelle/common/BUILD.bazel

@@ -14,6 +14,7 @@ go_library(
     deps = [
         "//gazelle/common/git",
         "//pkg/logger",
+        "@bazel_gazelle//config:go_default_library",
         "@bazel_gazelle//label:go_default_library",
         "@bazel_gazelle//language:go_default_library",
         "@bazel_gazelle//rule:go_default_library",

gazelle/common/bazel.go

@@ -3,20 +3,23 @@ package gazelle
 import (
 	"os"
 	"path"
+
+	"github.com/bazelbuild/bazel-gazelle/config"
 )
 
 var (
-	// BUILD file names.
-	buildFileNames = []string{"BUILD", "BUILD.bazel"}
-
 	// A set of already-seen Bazel packages so we avoid doing
 	// disk IO over and over to determine if a directory is a Bazel package.
 	isPackageCache = make(map[string]bool)
 )
 
 // IsBazelPackage determines if the directory is a Bazel package by probing for
 // the existence of a known BUILD file name.
-func IsBazelPackage(dir string) bool {
+func IsBazelPackage(config *config.Config, dir string) bool {
+	return HasBUILDFile(config.ValidBuildFileNames, dir)
+}
+
+func HasBUILDFile(buildFileNames []string, dir string) bool {
 	if isPkg, cached := isPackageCache[dir]; cached {
 		return isPkg
 	}
@@ -31,12 +34,3 @@ func IsBazelPackage(dir string) bool {
 	isPackageCache[dir] = false
 	return false
 }
-
-func isBuildFile(filename string) bool {
-	for _, buildFilename := range buildFileNames {
-		if filename == buildFilename {
-			return true
-		}
-	}
-	return false
-}

gazelle/common/excludes.go

@@ -9,7 +9,7 @@ import (
 )
 
 // Required for using go:linkname below for using the private isExcluded.
-// https://github.com/bazelbuild/bazel-gazelle/blob/v0.28.0/walk/config.go#L54-L73
+// walkConfig: https://github.com/bazelbuild/bazel-gazelle/blob/v0.37.0/walk/config.go#L41-L46
 type walkConfig struct {
 	excludes []string
 	// Below are fields that are not used by the isExcluded function but match the walkConfig
@@ -19,6 +19,8 @@ type walkConfig struct {
 	_ sync.Once // loadOnce sync.Once
 }
 
+// isExcluded: https://github.com/bazelbuild/bazel-gazelle/blob/v0.37.0/walk/config.go#L54-L59
+//
 //go:linkname isExcluded github.com/bazelbuild/bazel-gazelle/walk.(*walkConfig).isExcluded
 func isExcluded(wc *walkConfig, rel, base string) bool
 

gazelle/common/git/BUILD.bazel

@@ -8,7 +8,7 @@ go_library(
     deps = [
         "//pkg/logger",
         "@bazel_gazelle//config:go_default_library",
-        "@com_github_go_git_go_git//plumbing/format/gitignore",
+        "@com_github_go_git_go_git_v5//plumbing/format/gitignore",
     ],
 )
 

gazelle/common/git/gitignore.go

@@ -9,12 +9,9 @@ import (
 
 	BazelLog "aspect.build/cli/pkg/logger"
 	"github.com/bazelbuild/bazel-gazelle/config"
-	gitignore "github.com/go-git/go-git/plumbing/format/gitignore"
+	gitignore "github.com/go-git/go-git/v5/plumbing/format/gitignore"
 )
 
-// Ignore files following .gitignore syntax for files gazelle will ignore.
-var bazelIgnoreFiles = []string{".bazelignore", ".gitignore"}
-
 // Wrap the ignore files along with the relative path they were loaded from
 // to enable quick-exit checks.
 type ignoreEntry struct {
@@ -34,15 +31,12 @@ func NewGitIgnore() *GitIgnore {
 
 func (i *GitIgnore) CollectIgnoreFiles(c *config.Config, rel string) {
 	// Collect gitignore style ignore files in this directory.
-	for _, ignoreFileName := range bazelIgnoreFiles {
-		ignoreRelPath := path.Join(rel, ignoreFileName)
-		ignoreFilePath := path.Join(c.RepoRoot, ignoreRelPath)
+	ignoreFilePath := path.Join(c.RepoRoot, rel, ".gitignore")
 
-		if ignoreReader, ignoreErr := os.Open(ignoreFilePath); ignoreErr == nil {
-			BazelLog.Tracef("Add ignore file %s", ignoreRelPath)
+	if ignoreReader, ignoreErr := os.Open(ignoreFilePath); ignoreErr == nil {
+		BazelLog.Tracef("Add ignore file %s/.gitignore", rel)
 
-			i.addIgnore(rel, ignoreReader)
-		}
+		i.addIgnore(rel, ignoreReader)
 	}
 }
 

gazelle/common/starlark/BUILD.bazel

@@ -12,6 +12,7 @@ go_library(
         "//gazelle/common",
         "//gazelle/common/starlark/stdlib",
         "//pkg/logger",
+        "@bazel_gazelle//config:go_default_library",
         "@com_github_bazelbuild_buildtools//build:go_default_library",
         "@com_github_yargevad_filepathx//:filepathx",
         "@net_starlark_go//lib/json",

gazelle/common/starlark/eval.go

@@ -27,7 +27,7 @@ var thread = &starlark.Thread{
 	},
 }
 
-func Eval(starpath string, libs map[string]starlark.Value, locals map[string]interface{}) (starlark.StringDict, error) {
+func Eval(starpath string, libs starlark.StringDict, locals map[string]interface{}) (starlark.StringDict, error) {
 	// Predeclared libs in addition to the go.starlark.net/starlark standard library:
 	// * https://github.com/google/starlark-go/blob/f86470692795f8abcf9f837a3c53cf031c5a3d7e/starlark/library.go#L36-L73
 	// * https://github.com/google/starlark-go/blob/f86470692795f8abcf9f837a3c53cf031c5a3d7e/cmd/starlark/starlark.go#L96-L100

gazelle/common/starlark/glob.go

@@ -24,6 +24,7 @@ import (
 
 	common "aspect.build/cli/gazelle/common"
 	BazelLog "aspect.build/cli/pkg/logger"
+	"github.com/bazelbuild/bazel-gazelle/config"
 	bzl "github.com/bazelbuild/buildtools/build"
 )
 
@@ -231,7 +232,7 @@ func (pt *BazelPackageTree) AddPath(parts []string) {
 			if !isFile {
 				dir := path.Join(parts[:i+1]...)
 				dir = path.Join(*pt.pkg, dir)
-				isBazelPkg = common.IsBazelPackage(dir)
+				isBazelPkg = common.HasBUILDFile(config.DefaultValidBuildFileNames, dir)
 			}
 			branch = &BazelPackageTree{
 				pkg:            pt.pkg,

gazelle/common/starlark/utils/util.go

@@ -121,8 +121,15 @@ func ReadStringTuple(l starlark.Tuple) []string {
 }
 
 func ForEachMapEntry(v starlark.Value, f func(k string, v starlark.Value)) {
-	for _, item := range v.(*starlark.Dict).Items() {
-		f(ReadString(item[0]), item[1])
+	d := v.(*starlark.Dict)
+
+	iter := d.Iterate()
+	defer iter.Done()
+
+	var k starlark.Value
+	for iter.Next(&k) {
+		v, _, _ := d.Get(k)
+		f(ReadString(k), v)
 	}
 }
 
@@ -155,9 +162,14 @@ func ReadMap[K any](v starlark.Value, f func(k string, v starlark.Value) K) map[
 	d := v.(*starlark.Dict)
 	m := make(map[string]K)
 
-	for _, item := range d.Items() {
-		k := ReadString(item[0])
-		m[k] = f(k, item[1])
+	iter := d.Iterate()
+	defer iter.Done()
+
+	var kv starlark.Value
+	for iter.Next(&kv) {
+		k := ReadString(kv)
+		v, _, _ := d.Get(kv)
+		m[k] = f(k, v)
 	}
 
 	return m
@@ -167,8 +179,14 @@ func ReadMap2[K any](v starlark.Value, f func(v starlark.Value) K) map[string]K
 	d := v.(*starlark.Dict)
 	m := make(map[string]K)
 
-	for _, item := range d.Items() {
-		m[ReadString(item[0])] = f(item[1])
+	iter := d.Iterate()
+	defer iter.Done()
+
+	var kv starlark.Value
+	for iter.Next(&kv) {
+		k := ReadString(kv)
+		v, _, _ := d.Get(kv)
+		m[k] = f(v)
 	}
 
 	return m

gazelle/common/walk.go

@@ -20,7 +20,7 @@ func GazelleWalkDir(args language.GenerateArgs, ignore *git.GitIgnore, excludes
 	// Source files in the primary directory
 	for _, f := range args.RegularFiles {
 		// Skip BUILD files
-		if isBuildFile(f) {
+		if args.Config.IsValidBuildFileName(f) {
 			continue
 		}
 
@@ -52,7 +52,7 @@ func GazelleWalkDir(args language.GenerateArgs, ignore *git.GitIgnore, excludes
 				}
 
 				// Skip BUILD files
-				if isBuildFile(filePath) {
+				if args.Config.IsValidBuildFileName(path.Base(filePath)) {
 					return nil
 				}
 
@@ -76,7 +76,7 @@ func GazelleWalkDir(args language.GenerateArgs, ignore *git.GitIgnore, excludes
 
 				// If visiting a directory recurse if it is not a bazel package.
 				if info.IsDir() {
-					if IsBazelPackage(filePath) {
+					if IsBazelPackage(args.Config, filePath) {
 						return filepath.SkipDir
 					}
 					return nil

gazelle/js/generate.go

@@ -58,7 +58,7 @@ func (ts *typeScriptLang) GenerateRules(args language.GenerateArgs) language.Gen
 
 	// If this directory has not been declared as a bazel package only continue
 	// if generating new BUILD files is enabled.
-	if cfg.GenerationMode() == GenerationModeNone && !gazelle.IsBazelPackage(args.Dir) {
+	if cfg.GenerationMode() == GenerationModeNone && !gazelle.IsBazelPackage(args.Config, args.Dir) {
 		BazelLog.Tracef("GenerateRules '%s' BUILD creation disabled", args.Rel)
 		return language.GenerateResult{}
 	}

gazelle/js/tests/ignore_config_files/.test-bazelignore

@@ -0,0 +1 @@
+subtarget/s1.ts

gazelle/js/tests/parse_errors/BUILD.in

@@ -1,2 +1,2 @@
 # gazelle:js_ignore_imports mystery-module
-# gazelle:js_ignore_imports unknown-library
+# aspect:js_ignore_imports unknown-library

gazelle/js/tests/parse_errors/BUILD.out

@@ -1,7 +1,7 @@
 load("@aspect_rules_ts//ts:defs.bzl", "ts_project")
 
 # gazelle:js_ignore_imports mystery-module
-# gazelle:js_ignore_imports unknown-library
+# aspect:js_ignore_imports unknown-library
 
 ts_project(
     name = "parse_errors",

gazelle/js/tests/pnpm_workspace/lib/no-direct/package.json

@@ -3,6 +3,6 @@
   "private": true,
   "dependencies": {
     "@lib/b": "workspace:*",
-    "typescript": "4.9.5"
+    "typescript": "5.4.5"
   }
 }

gazelle/js/tests/pnpm_workspace/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "dependencies": {
-    "typescript": "4.9.5",
+    "typescript": "5.4.5",
     "@aspect-test/a": "5.0.2"
   },
   "devDependencies": {