process: sync commits from Aspect-internal silo

.bazelversion

@@ -1 +1 @@
-7.2.1
+7.3.1

WORKSPACE

@@ -164,10 +164,15 @@ http_archive(
     patches = [
         "//:patches/bazelbuild_bazel-gazelle_aspect-cli.patch",
         "//:patches/bazelbuild_bazel-gazelle_aspect-walk-subdir.patch",
+        "//:patches/bazelbuild_bazel-gazelle_aspect-gitignore.patch",
     ],
-    sha256 = "c6c87f08f3534612da5e1250c5f4dc7b8c0135b22f102fc6d1bfa76f3bdbd1fa",
-    strip_prefix = "bazel-gazelle-2d6805c8b74e44add398c5c70279648b36c11d58",
-    urls = ["https://github.com/bazelbuild/bazel-gazelle/archive/2d6805c8b74e44add398c5c70279648b36c11d58.tar.gz"],
+    sha256 = "872f1532567cdc53dc8e9f4681cd45021cd6787e2bde8a022bcec24a5867ce4c",
+    # Ensure this version always matches the go.mod version.
+    #
+    # :notice: Care should be taken when upgrading gazelle since we have vendored & modified parts of gazelle
+    # in the CLI configure command (pkg/aspect/configure).
+    strip_prefix = "bazel-gazelle-571d953b2bb9534c145242ead08eb35b3b096a5e",
+    urls = ["https://github.com/bazelbuild/bazel-gazelle/archive/571d953b2bb9534c145242ead08eb35b3b096a5e.tar.gz"],
 )
 
 http_archive(

bazel/ts/defs.bzl

@@ -1,8 +1,67 @@
 """
-Defaults for Typescript projects in aspect-cli
+Defaults for Typescript projects in Silo
 """
 
+load("@aspect_rules_swc//swc:defs.bzl", _swc = "swc")
+load("@aspect_rules_ts//ts:defs.bzl", _ts_config = "ts_config", _ts_project = "ts_project")
 load("@aspect_rules_ts//ts:proto.bzl", _ts_proto_library = "ts_proto_library")
+load("@bazel_skylib//lib:partial.bzl", "partial")
+load("@bazel_skylib//rules:write_file.bzl", _write_file = "write_file")
+
+ts_config = _ts_config
+
+def ts_project(name, module_type = "commonjs", **kwargs):
+    """Macro around ts_project for silo.
+
+    Args:
+        name: Name of the ts_project target
+        module_type: Type of module swc should transpile to
+        **kwargs: Additional attributes to pass to the ts_project rule
+    """
+    swcrc = ".swcrc_%s" % name
+    _write_file(
+        name = "swcrc_%s" % name,
+        out = swcrc,
+        content = json.encode({
+            "inlineSourcesContent": True,
+            "jsc": {
+                "keepClassNames": True,
+                "parser": {
+                    "decorators": True,
+                    "decoratorsBeforeExport": False,
+                    "dynamicImport": True,
+                    "syntax": "typescript",
+                },
+                "transform": {
+                    "decoratorMetadata": True,
+                    "legacyDecorator": True,
+                    "react": {
+                        "runtime": "automatic",
+                    },
+                },
+            },
+            "module": {
+                "type": module_type,
+            },
+            "sourceMaps": True,
+        }).splitlines(),
+    )
+
+    tsconfig = kwargs.pop("tsconfig", "//bazel/ts:tsconfig.node")
+
+    _ts_project(
+        name = name,
+        declaration = True,
+        source_map = True,
+        tsconfig = {"include": ["**/*.{ts,tsx}"]},
+        extends = tsconfig,
+        transpiler = partial.make(
+            _swc,
+            source_maps = "true",
+            swcrc = swcrc,
+        ),
+        **kwargs
+    )
 
 def ts_proto_library(name, protoc_gen_options = {
     "js_import_style": "legacy_commonjs",

docs/help/topics/directives.md

@@ -33,7 +33,7 @@ Test source files are source files ending with `.spec.ts` (and other ts extensio
 The test file pattern can be configured with the 'js*test*\*' directives.
 
 By default `aspect configure` creates new BUILD files for each directory containing source files.
-This can be configured to only edit existing BUILD files using the `js_generation_mode` directive.
+This can be configured to only edit existing BUILD files using the `generation_mode` directive.
 
 Each BUILD file may have a `ts_project` rule for sources, another for tests,
 a `npm_package` rule for pnpm workspace projects, and `npm_link_all_packages` for linking node_modules.
@@ -83,7 +83,7 @@ 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_generation_mode none\|directory`          | `directory`                 | 
+| `# gazelle:generation_mode update\|create`              | `create`                    |
 | DEPRECATED: see `generation_mode` directive. |
 | `# gazelle:js_custom_files _name_ _glob_`               |                             |
 | DEPRECATED:Generate additional custom `ts_project` targets |

gazelle/common/BUILD.bazel

@@ -5,7 +5,6 @@ go_library(
     srcs = [
         "bazel.go",
         "directives.go",
-        "excludes.go",
         "regex.go",
         "rules.go",
         "set.go",
@@ -19,7 +18,7 @@ go_library(
         "@bazel_gazelle//label:go_default_library",
         "@bazel_gazelle//language:go_default_library",
         "@bazel_gazelle//rule:go_default_library",
-        "@bazel_gazelle//walk:go_default_library",
         "@com_github_emirpasic_gods//sets/treeset",
+        "@com_github_emirpasic_gods//utils",
     ],
 )

gazelle/common/directives.go

@@ -18,9 +18,6 @@ type GenerationModeType string
 
 // Generation modes
 const (
-	// None: do not update or create any BUILD files
-	GenerationModeNone GenerationModeType = "none"
-
 	// Update: update and maintain existing BUILD files
 	GenerationModeUpdate GenerationModeType = "update"
 

gazelle/common/git/BUILD.bazel

@@ -16,4 +16,5 @@ go_test(
     name = "git_test",
     srcs = ["gitignore_test.go"],
     embed = [":git"],
+    deps = ["@bazel_gazelle//config:go_default_library"],
 )

gazelle/common/git/gitignore.go

@@ -12,79 +12,99 @@ import (
 	gitignore "github.com/go-git/go-git/v5/plumbing/format/gitignore"
 )
 
-// Wrap the ignore files along with the relative path they were loaded from
-// to enable quick-exit checks.
-type ignoreEntry struct {
-	i    gitignore.Matcher
-	base string
-}
+// Must align with patched bazel-gazelle
+const ASPECT_GITIGNORE = "__aspect:gitignore"
 
-type GitIgnore struct {
-	ignores []ignoreEntry
-}
+// Directive to enable/disable gitignore support
+const Directive_GitIgnore = "gitignore"
+
+// Internal
+const enabledExt = Directive_GitIgnore
+const lastConfiguredExt = "gitignore:dir"
+const ignorePatternsExt = "gitignore:patterns"
 
-func NewGitIgnore() *GitIgnore {
-	return &GitIgnore{
-		ignores: make([]ignoreEntry, 0),
+func CollectIgnoreFiles(c *config.Config, rel string) {
+	// Only parse once per directory.
+	if lastCollected, hasCollected := c.Exts[lastConfiguredExt]; hasCollected && lastCollected == rel {
+		return
 	}
-}
+	c.Exts[lastConfiguredExt] = rel
 
-func (i *GitIgnore) CollectIgnoreFiles(c *config.Config, rel string) {
-	// Collect gitignore style ignore files in this directory.
+	// Find and add .gitignore files from this directory
 	ignoreFilePath := path.Join(c.RepoRoot, rel, ".gitignore")
-
-	if ignoreReader, ignoreErr := os.Open(ignoreFilePath); ignoreErr == nil {
+	ignoreReader, ignoreErr := os.Open(ignoreFilePath)
+	if ignoreErr == nil {
 		BazelLog.Tracef("Add ignore file %s/.gitignore", rel)
+		defer ignoreReader.Close()
+		addIgnore(c, rel, ignoreReader)
+	} else if !os.IsNotExist(ignoreErr) {
+		BazelLog.Errorf("Failed to open %s/.gitignore: %v", rel, ignoreErr)
+	}
+}
 
-		i.addIgnore(rel, ignoreReader)
+func EnableGitignore(c *config.Config, enabled bool) {
+	c.Exts[enabledExt] = enabled
+	if enabled {
+		c.Exts[ASPECT_GITIGNORE] = createMatcherFunc(c)
+	} else {
+		c.Exts[ASPECT_GITIGNORE] = nil
 	}
 }
 
-func (i *GitIgnore) addIgnore(rel string, ignoreReader io.Reader) {
-	// Persist a relative path to the ignore file to enable quick-exit checks.
-	base := path.Clean(rel)
-	if base == "." {
-		base = ""
+func isEnabled(c *config.Config) bool {
+	enabled, hasEnabled := c.Exts[enabledExt]
+	return hasEnabled && enabled.(bool)
+}
+
+func addIgnore(c *config.Config, rel string, ignoreReader io.Reader) {
+	var ignorePatterns []gitignore.Pattern
+
+	// Load parent ignore patterns
+	if c.Exts[ignorePatternsExt] != nil {
+		ignorePatterns = c.Exts[ignorePatternsExt].([]gitignore.Pattern)
 	}
 
-	domain := []string{}
-	if base != "" {
-		domain = strings.Split(base, "/")
+	// Append new ignore patterns
+	ignorePatterns = append(ignorePatterns, parseIgnore(rel, ignoreReader)...)
+
+	// Persist appended ignore patterns
+	c.Exts[ignorePatternsExt] = ignorePatterns
+
+	// Persist a matcher function with the updated ignore patterns if enabled
+	if isEnabled(c) {
+		c.Exts[ASPECT_GITIGNORE] = createMatcherFunc(c)
+	}
+}
+
+func parseIgnore(rel string, ignoreReader io.Reader) []gitignore.Pattern {
+	var domain []string
+	if rel != "" {
+		domain = strings.Split(path.Clean(rel), "/")
 	}
 
 	matcherPatterns := make([]gitignore.Pattern, 0)
 
 	reader := bufio.NewScanner(ignoreReader)
 	for reader.Scan() {
-		p := gitignore.ParsePattern(reader.Text(), domain)
-		matcherPatterns = append(matcherPatterns, p)
-	}
-
-	ignore := gitignore.NewMatcher(matcherPatterns)
+		p := strings.TrimSpace(reader.Text())
+		if p == "" || strings.HasPrefix(p, "#") {
+			continue
+		}
 
-	// Add a trailing slash to the base path to ensure the ignore file only
-	// processes paths within that directory.
-	if base != "" && !strings.HasSuffix(base, "/") {
-		base += "/"
+		matcherPatterns = append(matcherPatterns, gitignore.ParsePattern(p, domain))
 	}
 
-	i.ignores = append(i.ignores, ignoreEntry{
-		i:    ignore,
-		base: base,
-	})
+	return matcherPatterns
 }
 
-func (i *GitIgnore) Matches(p string) bool {
-	for _, ignore := range i.ignores {
-		// Ensure the path is within the base path of the ignore file
-		// to avoid strings.Split unless necessary.
-		if !strings.HasPrefix(p, ignore.base) {
-			continue
-		}
-		if ignore.i.Match(strings.Split(p, "/"), false) {
-			return true
-		}
+func createMatcherFunc(c *config.Config) func(string) bool {
+	patterns, patternsFound := c.Exts[ignorePatternsExt]
+	if !patternsFound {
+		return nil
 	}
 
-	return false
+	matcher := gitignore.NewMatcher(patterns.([]gitignore.Pattern))
+	return func(s string) bool {
+		return matcher.Match(strings.Split(s, "/"), false)
+	}
 }