Revert "Split out _SingleBuild as Build and BuildImpl as BuildSeries.…" (#3926)

This reverts commit 224dd81.

Author: davidmorgan

build/pubspec.yaml

@@ -11,7 +11,6 @@ dependencies:
   analyzer: '>=6.9.0 <8.0.0'
   async: ^2.5.0
   build_runner_core: ^9.0.0-wip
-  built_collection: ^5.1.1
   convert: ^3.0.0
   crypto: ^3.0.0
   glob: ^2.0.0

build_runner/lib/src/daemon/change_providers.dart

@@ -8,7 +8,7 @@ import 'package:build_daemon/change_provider.dart';
 // ignore: implementation_imports
 import 'package:build_runner_core/src/asset_graph/graph.dart';
 // ignore: implementation_imports
-import 'package:build_runner_core/src/generate/asset_tracker.dart';
+import 'package:build_runner_core/src/generate/build_definition.dart';
 import 'package:watcher/watcher.dart' show WatchEvent;
 
 /// Continually updates the [changes] stream as watch events are seen on the

build_runner/lib/src/daemon/daemon_builder.dart

@@ -17,9 +17,9 @@ import 'package:build_runner_core/build_runner_core.dart'
 import 'package:build_runner_core/build_runner_core.dart'
     hide BuildResult, BuildStatus;
 // ignore: implementation_imports
-import 'package:build_runner_core/src/generate/asset_tracker.dart';
+import 'package:build_runner_core/src/generate/build_definition.dart';
 // ignore: implementation_imports
-import 'package:build_runner_core/src/generate/build_series.dart';
+import 'package:build_runner_core/src/generate/build_impl.dart';
 import 'package:stream_transform/stream_transform.dart';
 import 'package:watcher/watcher.dart';
 
@@ -36,7 +36,7 @@ import 'change_providers.dart';
 class BuildRunnerDaemonBuilder implements DaemonBuilder {
   final _buildResults = StreamController<BuildResults>();
 
-  final BuildSeries _buildSeries;
+  final BuildImpl _builder;
   final BuildOptions _buildOptions;
   final StreamController<ServerLog> _outputStreamController;
   final ChangeProvider changeProvider;
@@ -47,7 +47,7 @@ class BuildRunnerDaemonBuilder implements DaemonBuilder {
   final Stream<ServerLog> logs;
 
   BuildRunnerDaemonBuilder._(
-    this._buildSeries,
+    this._builder,
     this._buildOptions,
     this._outputStreamController,
     this.changeProvider,
@@ -60,7 +60,7 @@ class BuildRunnerDaemonBuilder implements DaemonBuilder {
   @override
   Stream<BuildResults> get builds => _buildResults.stream;
 
-  FinalizedReader get reader => _buildSeries.finalizedReader;
+  FinalizedReader get reader => _builder.finalizedReader;
 
   final _buildScriptUpdateCompleter = Completer<void>();
   Future<void> get buildScriptUpdated => _buildScriptUpdateCompleter.future;
@@ -79,7 +79,7 @@ class BuildRunnerDaemonBuilder implements DaemonBuilder {
             .toList();
 
     if (!_buildOptions.skipBuildScriptCheck &&
-        _buildSeries.buildScriptUpdates!.hasBeenUpdated(
+        _builder.buildScriptUpdates!.hasBeenUpdated(
           changes.map<AssetId>((change) => change.id).toSet(),
         )) {
       if (!_buildScriptUpdateCompleter.isCompleted) {
@@ -131,7 +131,7 @@ class BuildRunnerDaemonBuilder implements DaemonBuilder {
 
     try {
       var mergedChanges = collectChanges([changes]);
-      var result = await _buildSeries.run(
+      var result = await _builder.run(
         mergedChanges,
         buildDirs: buildDirs,
         buildFilters: buildFilters,
@@ -190,7 +190,7 @@ class BuildRunnerDaemonBuilder implements DaemonBuilder {
 
   @override
   Future<void> stop() async {
-    await _buildSeries.beforeExit();
+    await _builder.beforeExit();
     await _buildOptions.logListener.cancel();
   }
 
@@ -279,7 +279,7 @@ class BuildRunnerDaemonBuilder implements DaemonBuilder {
       logPerformanceDir: daemonOptions.logPerformanceDir,
     );
 
-    var buildSeries = await BuildSeries.create(
+    var builder = await BuildImpl.create(
       buildOptions,
       daemonEnvironment,
       builders,
@@ -300,7 +300,7 @@ class BuildRunnerDaemonBuilder implements DaemonBuilder {
         .asyncWhere(
           (change) => shouldProcess(
             change,
-            buildSeries.assetGraph,
+            builder.assetGraph,
             buildOptions,
             // Assume we will create an outputDir.
             true,
@@ -316,11 +316,11 @@ class BuildRunnerDaemonBuilder implements DaemonBuilder {
             ? AutoChangeProviderImpl(graphEvents())
             : ManualChangeProviderImpl(
               AssetTracker(daemonEnvironment.reader, buildOptions.targetGraph),
-              buildSeries.assetGraph,
+              builder.assetGraph,
             );
 
     return BuildRunnerDaemonBuilder._(
-      buildSeries,
+      builder,
       buildOptions,
       outputStreamController,
       changeProvider,

build_runner/lib/src/generate/watch_impl.dart

@@ -11,7 +11,7 @@ import 'package:build_runner_core/build_runner_core.dart';
 // ignore: implementation_imports
 import 'package:build_runner_core/src/asset_graph/graph.dart';
 // ignore: implementation_imports
-import 'package:build_runner_core/src/generate/build_series.dart';
+import 'package:build_runner_core/src/generate/build_impl.dart';
 import 'package:crypto/crypto.dart';
 import 'package:logging/logging.dart';
 import 'package:stream_transform/stream_transform.dart';
@@ -159,9 +159,9 @@ WatchImpl _runWatch(
 );
 
 class WatchImpl implements BuildState {
-  BuildSeries? _buildSeries;
+  BuildImpl? _build;
 
-  AssetGraph? get assetGraph => _buildSeries?.assetGraph;
+  AssetGraph? get assetGraph => _build?.assetGraph;
 
   final String? _configKey;
 
@@ -250,7 +250,7 @@ class WatchImpl implements BuildState {
     var controller = StreamController<BuildResult>();
 
     Future<BuildResult> doBuild(List<List<AssetChange>> changes) async {
-      var build = _buildSeries!;
+      var build = _build!;
       _logger
         ..info('${'-' * 72}\n')
         ..info('Starting Build\n');
@@ -362,7 +362,7 @@ class WatchImpl implements BuildState {
         })
         .onDone(() async {
           await currentBuild;
-          await _buildSeries?.beforeExit();
+          await _build?.beforeExit();
           if (!controller.isClosed) await controller.close();
           _logger.info('Builds finished. Safe to exit\n');
         });
@@ -387,10 +387,10 @@ class WatchImpl implements BuildState {
       }
 
       BuildResult firstBuild;
-      BuildSeries? build;
+      BuildImpl? build;
       try {
         build =
-            _buildSeries = await BuildSeries.create(
+            _build = await BuildImpl.create(
               options,
               watcherEnvironment,
               builders,

build_runner/test/generate/watch_test.dart

@@ -14,7 +14,6 @@ import 'package:build_runner/src/generate/watch_impl.dart' as watch_impl;
 import 'package:build_runner_core/build_runner_core.dart';
 import 'package:build_runner_core/src/asset_graph/graph.dart';
 import 'package:build_runner_core/src/asset_graph/node.dart';
-import 'package:build_runner_core/src/generate/build_phases.dart';
 import 'package:build_test/src/in_memory_reader_writer.dart';
 import 'package:logging/logging.dart';
 import 'package:path/path.dart' as path;
@@ -355,7 +354,7 @@ void main() {
         );
 
         var expectedGraph = await AssetGraph.build(
-          BuildPhases([]),
+          [],
           <AssetId>{},
           {packageConfigId},
           buildPackageGraph({rootPackage('a'): []}),

build_runner/test/server/asset_handler_test.dart

@@ -10,7 +10,6 @@ import 'package:build_runner/src/server/server.dart';
 import 'package:build_runner_core/build_runner_core.dart';
 import 'package:build_runner_core/src/asset_graph/graph.dart';
 import 'package:build_runner_core/src/asset_graph/node.dart';
-import 'package:build_runner_core/src/generate/build_phases.dart';
 import 'package:build_runner_core/src/generate/options.dart';
 import 'package:build_runner_core/src/package_graph/target_graph.dart';
 import 'package:shelf/shelf.dart';
@@ -24,7 +23,7 @@ void main() {
 
   setUp(() async {
     graph = await AssetGraph.build(
-      BuildPhases([]),
+      [],
       <AssetId>{},
       <AssetId>{},
       buildPackageGraph({rootPackage('a'): []}),
@@ -39,7 +38,7 @@ void main() {
         packageGraph,
         defaultRootPackageSources: defaultRootPackageSources,
       ),
-      BuildPhases([]),
+      [],
       'a',
     );
     handler = AssetHandler(reader, 'a');

build_runner/test/server/serve_handler_test.dart

@@ -15,7 +15,6 @@ import 'package:build_runner/src/server/server.dart';
 import 'package:build_runner_core/build_runner_core.dart';
 import 'package:build_runner_core/src/asset_graph/graph.dart';
 import 'package:build_runner_core/src/asset_graph/node.dart';
-import 'package:build_runner_core/src/generate/build_phases.dart';
 import 'package:build_runner_core/src/generate/options.dart';
 import 'package:build_runner_core/src/generate/performance_tracker.dart';
 import 'package:build_runner_core/src/package_graph/target_graph.dart';
@@ -108,7 +107,7 @@ void main() {
     final packageGraph = buildPackageGraph({rootPackage('a'): []});
     readerWriter = TestReaderWriter(rootPackage: packageGraph.root.name);
     assetGraph = await AssetGraph.build(
-      BuildPhases([]),
+      [],
       <AssetId>{},
       <AssetId>{},
       packageGraph,
@@ -123,7 +122,7 @@ void main() {
             packageGraph,
             defaultRootPackageSources: defaultRootPackageSources,
           ),
-          BuildPhases([]),
+          [],
           'a',
         ),
       ),

build_runner_core/lib/src/asset/finalized_reader.dart

@@ -15,7 +15,7 @@ import '../../build_runner_core.dart';
 import '../asset_graph/graph.dart';
 import '../asset_graph/node.dart';
 import '../asset_graph/optional_output_tracker.dart';
-import '../generate/build_phases.dart';
+import '../generate/phase.dart';
 import '../package_graph/target_graph.dart';
 
 /// A view of the build output.
@@ -30,7 +30,7 @@ class FinalizedReader {
   final TargetGraph _targetGraph;
   OptionalOutputTracker? _optionalOutputTracker;
   final String _rootPackage;
-  final BuildPhases _buildPhases;
+  final List<BuildPhase> _buildPhases;
 
   void reset(Set<String> buildDirs, Set<BuildFilter> buildFilters) {
     _optionalOutputTracker = OptionalOutputTracker(