Extra tracking for build_test. (#4047)

davidmorgan · web-flow · commit 1290279d1e1b · 2025-06-18T08:48:18.000+02:00
diff --git a/build/CHANGELOG.md b/build/CHANGELOG.md
@@ -1,3 +1,5 @@
+## 2.5.2-wip
+
 ## 2.5.1
 
 - Use `build_runner_core` 9.0.1.
diff --git a/build/pubspec.yaml b/build/pubspec.yaml
@@ -1,5 +1,5 @@
 name: build
-version: 2.5.1
+version: 2.5.2-wip
 description: A package for authoring build_runner compatible code generators.
 repository: https://github.com/dart-lang/build/tree/master/build
 resolution: workspace
@@ -10,7 +10,7 @@ environment:
 dependencies:
   analyzer: '>=6.9.0 <8.0.0'
   async: ^2.5.0
-  build_runner_core: '9.0.1'
+  build_runner_core: '9.1.0-wip'
   built_collection: ^5.1.1
   built_value: ^8.9.5
   convert: ^3.0.0
@@ -24,8 +24,8 @@ dependencies:
   pool: ^1.5.0
 
 dev_dependencies:
-  build_resolvers: '2.5.1'
-  build_test: '3.0.0'
+  build_resolvers: '2.5.2-wip'
+  build_test: '3.1.0-wip'
   built_value_generator: ^8.9.5
   dart_flutter_team_lints: ^3.1.0
   test: ^1.16.0
diff --git a/build_resolvers/CHANGELOG.md b/build_resolvers/CHANGELOG.md
@@ -1,3 +1,5 @@
+## 2.5.2-wip
+
 ## 2.5.1
 
 - Use `build_runner_core` 2.5.1.
diff --git a/build_resolvers/pubspec.yaml b/build_resolvers/pubspec.yaml
@@ -1,5 +1,5 @@
 name: build_resolvers
-version: 2.5.1
+version: 2.5.2-wip
 description: Resolve Dart code in a Builder
 repository: https://github.com/dart-lang/build/tree/master/build_resolvers
 resolution: workspace
@@ -10,8 +10,8 @@ environment:
 dependencies:
   analyzer: '>=6.9.0 <8.0.0'
   async: ^2.5.0
-  build: '2.5.1'
-  build_runner_core: '9.0.1'
+  build: '2.5.2-wip'
+  build_runner_core: '9.1.0-wip'
   collection: ^1.17.0
   convert: ^3.1.1
   crypto: ^3.0.0
diff --git a/build_runner/CHANGELOG.md b/build_runner/CHANGELOG.md
@@ -1,3 +1,5 @@
+## 2.5.2-wip
+
 ## 2.5.1
 
 - Don't log stack traces for subclasses of `Exception`.
diff --git a/build_runner/pubspec.yaml b/build_runner/pubspec.yaml
@@ -1,5 +1,5 @@
 name: build_runner
-version: 2.5.1
+version: 2.5.2-wip
 description: A build system for Dart code generation and modular compilation.
 repository: https://github.com/dart-lang/build/tree/master/build_runner
 resolution: workspace
@@ -16,11 +16,11 @@ dependencies:
   analyzer: '>=4.4.0 <8.0.0'
   args: ^2.0.0
   async: ^2.5.0
-  build: '2.5.1'
+  build: '2.5.2-wip'
   build_config: ">=1.1.0 <1.2.0"
   build_daemon: ^4.0.0
-  build_resolvers: '2.5.1'
-  build_runner_core: '9.0.1'
+  build_resolvers: '2.5.2-wip'
+  build_runner_core: '9.1.0-wip'
   code_builder: ^4.2.0
   collection: ^1.15.0
   crypto: ^3.0.0
diff --git a/build_runner_core/CHANGELOG.md b/build_runner_core/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 9.1.0-wip
+
+- More detailed tracking of reads for the benefit of `build_test`.
+
 ## 9.0.1
 
 - Don't log stack traces for subclasses of `Exception`.
diff --git a/build_runner_core/lib/src/generate/build.dart b/build_runner_core/lib/src/generate/build.dart
@@ -468,7 +468,11 @@ class Build {
           primaryPackage: primaryInput.package,
         ),
         readerWriter: this.readerWriter,
-        inputTracker: InputTracker(this.readerWriter.filesystem),
+        inputTracker: InputTracker(
+          this.readerWriter.filesystem,
+          primaryInput: primaryInput,
+          builderLabel: phase.builderLabel,
+        ),
         assetsWritten: {},
       );
 
@@ -608,7 +612,10 @@ class Build {
         primaryPackage: input.package,
       ),
       readerWriter: this.readerWriter,
-      inputTracker: InputTracker(this.readerWriter.filesystem),
+      inputTracker: InputTracker(
+        this.readerWriter.filesystem,
+        primaryInput: input,
+      ),
       assetsWritten: {},
     );
 
diff --git a/build_runner_core/lib/src/generate/input_tracker.dart b/build_runner_core/lib/src/generate/input_tracker.dart
@@ -21,6 +21,8 @@ class InputTracker {
   static Map<Filesystem, List<InputTracker>> inputTrackersForTesting =
       Map.identity();
 
+  final AssetId? primaryInput;
+  final String? builderLabel;
   final HashSet<AssetId> _inputs = HashSet<AssetId>();
   final HashSet<AssetId> _resolverEntrypoints = HashSet<AssetId>();
 
@@ -29,7 +31,7 @@ class InputTracker {
   /// [filesystem] is used to distinguish input trackers for testing, because
   /// each test case creates a new in-memory filesystem. It's not used
   /// otherwise.
-  InputTracker(Filesystem filesystem) {
+  InputTracker(Filesystem filesystem, {this.primaryInput, this.builderLabel}) {
     if (captureInputTrackersForTesting) {
       inputTrackersForTesting.putIfAbsent(filesystem, () => []).add(this);
     }
diff --git a/build_runner_core/pubspec.yaml b/build_runner_core/pubspec.yaml
@@ -1,5 +1,5 @@
 name: build_runner_core
-version: 9.0.1
+version: 9.1.0-wip
 description: Core tools to organize the structure of a build and run Builders.
 repository: https://github.com/dart-lang/build/tree/master/build_runner_core
 resolution: workspace
@@ -15,10 +15,10 @@ platforms:
 dependencies:
   analyzer: '>=6.9.0 <8.0.0'
   async: ^2.5.0
-  build: '2.5.1'
+  build: '2.5.2-wip'
   build_config: ^1.0.0
-  build_resolvers: '2.5.1'
-  build_runner: '2.5.1'
+  build_resolvers: '2.5.2-wip'
+  build_runner: '2.5.2-wip'
   built_collection: ^5.1.1
   built_value: ^8.10.1
   collection: ^1.15.0
diff --git a/build_test/CHANGELOG.md b/build_test/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 3.1.0-wip
+
+- Add `inputsTrackedFor` and `resolverEntrypointsTrackedFor` to
+  `ReaderWriterTesting`, so tests can determine what each build step
+  read and resolved.
+
 ## 3.0.0
 
 Breaking changes:
diff --git a/build_test/lib/src/in_memory_reader_writer.dart b/build_test/lib/src/in_memory_reader_writer.dart
@@ -194,12 +194,42 @@ class _ReaderWriterTestingImpl implements ReaderWriterTesting {
           .expand((tracker) => tracker.inputs)
           .toSet();
 
+  @override
+  Iterable<AssetId> inputsTrackedFor({
+    AssetId? primaryInput,
+    String? builderLabel,
+  }) =>
+      InputTracker.inputTrackersForTesting[_readerWriter.filesystem]!
+          .where((inputTracker) {
+            return (primaryInput == null ||
+                    primaryInput == inputTracker.primaryInput) &&
+                (builderLabel == null ||
+                    builderLabel == inputTracker.builderLabel);
+          })
+          .expand((tracker) => tracker.inputs)
+          .toSet();
+
   @override
   Iterable<AssetId> get resolverEntrypointsTracked =>
       InputTracker.inputTrackersForTesting[_readerWriter.filesystem]!
           .expand((tracker) => tracker.resolverEntrypoints)
           .toSet();
 
+  @override
+  Iterable<AssetId> resolverEntrypointsTrackedFor({
+    AssetId? primaryInput,
+    String? builderLabel,
+  }) =>
+      InputTracker.inputTrackersForTesting[_readerWriter.filesystem]!
+          .where((inputTracker) {
+            return (primaryInput == null ||
+                    primaryInput == inputTracker.primaryInput) &&
+                (builderLabel == null ||
+                    builderLabel == inputTracker.builderLabel);
+          })
+          .expand((tracker) => tracker.resolverEntrypoints)
+          .toSet();
+
   @override
   Iterable<AssetId> get assetsRead => _readerWriter.assetsRead;
 
diff --git a/build_test/lib/src/test_reader_writer.dart b/build_test/lib/src/test_reader_writer.dart
@@ -32,13 +32,30 @@ abstract interface class ReaderWriterTesting {
   /// The assets that have been recorded as inputs of the build.
   Iterable<AssetId> get inputsTracked;
 
+  /// The assets that have been recorded as inputs of the build, filtered to
+  /// build steps for [primaryInput] and/or with [builderLabel].
+  ///
+  /// Builder labels are the builder names that appear in log output, for
+  /// example `source_gen:combining_builder`.
+  Iterable<AssetId> inputsTrackedFor({
+    AssetId? primaryInput,
+    String? builderLabel,
+  });
+
   /// The assets that the build resolved using the analyzer.
   ///
   /// Only the entrypoints are recorded, but all sources reachable transitively
   /// via its directives will be treated as dependencies of the build for
   /// invalidation purposes.
   Iterable<AssetId> get resolverEntrypointsTracked;
 
+  /// The assets that have been resolved using the analyzer, filtered to
+  /// build steps for [primaryInput] and/or with [builderLabel].
+  Iterable<AssetId> resolverEntrypointsTrackedFor({
+    AssetId? primaryInput,
+    String? builderLabel,
+  });
+
   /// The assets that have been read via the [TestReaderWriter]'s non-test
   /// APIs.
   ///
diff --git a/build_test/pubspec.yaml b/build_test/pubspec.yaml
@@ -1,6 +1,6 @@
 name: build_test
 description: Utilities for writing unit tests of Builders.
-version: 3.0.0
+version: 3.1.0-wip
 repository: https://github.com/dart-lang/build/tree/master/build_test
 resolution: workspace
 
@@ -12,7 +12,7 @@ dependencies:
   build: ^2.5.0
   build_config: ^1.0.0
   build_resolvers: ^2.5.0
-  build_runner_core: ^9.0.0
+  build_runner_core: ^9.1.0-wip
   convert: ^3.0.0
   crypto: ^3.0.0
   glob: ^2.0.0
diff --git a/build_test/test/test_builder_test.dart b/build_test/test/test_builder_test.dart

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+## 2.5.2-wip`
	`2`	`+`
`1`	`3`	`## 2.5.1`
`2`	`4`
`3`	`5`	- Use `build_runner_core` 9.0.1.