Split out post process builder state.

Author: davidmorgan

build_runner/test/generate/watch_test.dart

@@ -426,6 +426,10 @@ void main() {
           cachedGraph,
           equalsAssetGraph(expectedGraph, checkPreviousInputsDigest: false),
         );
+        expect(
+          cachedGraph.allPostProcessBuildStepOutputs,
+          expectedGraph.allPostProcessBuildStepOutputs,
+        );
       });
 
       test('ignores events from nested packages', () async {

build_runner/test/server/asset_handler_test.dart

@@ -10,6 +10,7 @@ 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/asset_graph/post_process_build_step_id.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';
@@ -48,9 +49,11 @@ void main() {
   void addAsset(String id, String content, {bool deleted = false}) {
     var node = makeAssetNode(id, [], computeDigest(AssetId.parse(id), 'a'));
     if (deleted) {
-      node = node.rebuild(
-        (b) => b..deletedBy.add(node.id.addExtension('.post_anchor.1')),
-      );
+      node = node.rebuild((b) {
+        b.deletedBy.add(
+          PostProcessBuildStepId(input: node.id, actionNumber: 1),
+        );
+      });
     }
     graph.add(node);
     delegate.testing.writeString(node.id, content);

build_runner/test/server/serve_handler_test.dart

@@ -15,6 +15,7 @@ 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/asset_graph/post_process_build_step_id.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';
@@ -139,9 +140,11 @@ void main() {
   void addSource(String id, String content, {bool deleted = false}) {
     var node = makeAssetNode(id, [], computeDigest(AssetId.parse(id), content));
     if (deleted) {
-      node = node.rebuild(
-        (b) => b..deletedBy.add(node.id.addExtension('.post_anchor.1')),
-      );
+      node = node.rebuild((b) {
+        b.deletedBy.add(
+          PostProcessBuildStepId(input: node.id, actionNumber: 1),
+        );
+      });
     }
     assetGraph.add(node);
     readerWriter.testing.writeString(node.id, content);

build_runner_core/CHANGELOG.md

@@ -27,6 +27,8 @@
 - Add `reportUnusedAssetsForInput` to `BuildOptions`, to listen for when
   a builder notifies that an asset is unused.
 - Use `LibraryCycleGraphLoader` to load transitive deps for analysis.
+- Track post process builder outputs separately from the main graph Instead of
+  in `postProcessAnchor` nodes.
 
 ## 8.0.0
 

build_runner_core/lib/src/asset_graph/graph.dart

@@ -14,6 +14,7 @@ import 'package:build/src/internal.dart';
 import 'package:built_collection/built_collection.dart';
 import 'package:crypto/crypto.dart';
 import 'package:glob/glob.dart';
+import 'package:meta/meta.dart';
 import 'package:package_config/package_config.dart';
 import 'package:watcher/watcher.dart';
 
@@ -23,6 +24,7 @@ import '../generate/phase.dart';
 import '../util/constants.dart';
 import 'exceptions.dart';
 import 'node.dart';
+import 'post_process_build_step_id.dart';
 
 part 'serialization.dart';
 
@@ -46,6 +48,14 @@ class AssetGraph implements GeneratedAssetHider {
 
   final BuiltMap<String, LanguageVersion?> packageLanguageVersions;
 
+  /// All post process build steps outputs, indexed by package then
+  /// [PostProcessBuildStepId].
+  ///
+  /// Created with empty outputs at the start of the build if it's a new build
+  /// step; or deserialized with previous build outputs if it has run before.
+  final Map<String, Map<PostProcessBuildStepId, Set<AssetId>>>
+  _postProcessBuildStepOutputs = {};
+
   AssetGraph._(
     this.buildPhasesDigest,
     this.dartVersion,
@@ -93,6 +103,10 @@ class AssetGraph implements GeneratedAssetHider {
 
   List<int> serialize() => _AssetGraphSerializer(this).serialize();
 
+  @visibleForTesting
+  Map<String, Map<PostProcessBuildStepId, Set<AssetId>>>
+  get allPostProcessBuildStepOutputs => _postProcessBuildStepOutputs;
+
   /// Checks if [id] exists in the graph.
   bool contains(AssetId id) =>
       _nodesByPackage[id.package]?.containsKey(id.path) ?? false;
@@ -158,6 +172,7 @@ class AssetGraph implements GeneratedAssetHider {
       }
     }
     _nodesByPackage.putIfAbsent(node.id.package, () => {})[node.id.path] = node;
+
     return node;
   }
 
@@ -238,16 +253,21 @@ class AssetGraph implements GeneratedAssetHider {
   /// Also removes all edges between all removed nodes and remaining nodes.
   ///
   /// Returns the IDs of removed asset nodes.
-  Set<AssetId> _removeRecursive(AssetId id, {Set<AssetId>? removedIds}) {
+  Set<AssetId> _removeRecursive(
+    AssetId id, {
+    Set<AssetId>? removedIds,
+    Map<AssetId, Set<AssetId>>? anchorOutputs,
+  }) {
     removedIds ??= <AssetId>{};
     var node = get(id);
     if (node == null) return removedIds;
     removedIds.add(id);
-    for (var anchor in node.anchorOutputs.toList()) {
-      _removeRecursive(anchor, removedIds: removedIds);
-    }
     for (var output in node.primaryOutputs.toList()) {
-      _removeRecursive(output, removedIds: removedIds);
+      _removeRecursive(
+        output,
+        removedIds: removedIds,
+        anchorOutputs: anchorOutputs,
+      );
     }
     for (var output in node.outputs) {
       updateNodeIfPresent(output, (nodeBuilder) {
@@ -290,6 +310,12 @@ class AssetGraph implements GeneratedAssetHider {
     if (node.type != NodeType.missingSource) {
       _nodesByPackage[id.package]!.remove(id.path);
     }
+
+    // Remove post build action applications with removed assets as inputs.
+    for (final packageOutputs in _postProcessBuildStepOutputs.values) {
+      packageOutputs.removeWhere((id, _) => removedIds!.contains(id.input));
+    }
+
     return removedIds;
   }
 
@@ -301,6 +327,25 @@ class AssetGraph implements GeneratedAssetHider {
   Iterable<AssetNode> packageNodes(String package) =>
       _nodesByPackage[package]?.values ?? [];
 
+  Iterable<PostProcessBuildStepId> postProcessBuildStepIds({
+    required String package,
+  }) => _postProcessBuildStepOutputs[package]?.keys ?? const [];
+
+  void updatePostProcessBuildStep(
+    PostProcessBuildStepId buildStepId, {
+    required Set<AssetId> outputs,
+  }) {
+    _postProcessBuildStepOutputs.putIfAbsent(
+          buildStepId.input.package,
+          () => {},
+        )[buildStepId] =
+        outputs;
+  }
+
+  Iterable<AssetId> postProcessBuildStepOutputs(PostProcessBuildStepId action) {
+    return _postProcessBuildStepOutputs[action.input.package]![action]!;
+  }
+
   /// All the generated outputs in the graph.
   Iterable<AssetId> get outputs =>
       allNodes.where((n) => n.type == NodeType.generated).map((n) => n.id);
@@ -547,7 +592,7 @@ class AssetGraph implements GeneratedAssetHider {
           ),
         );
       } else if (phase is PostBuildPhase) {
-        _addPostBuildPhaseAnchors(phase, allInputs);
+        _addPostBuildActionApplications(phase, allInputs);
       } else {
         throw StateError('Unrecognized phase type $phase');
       }
@@ -600,27 +645,21 @@ class AssetGraph implements GeneratedAssetHider {
     return phaseOutputs;
   }
 
-  /// Adds all [AssetNode.postProcessAnchor]s for [phase] given [allInputs];
-  ///
-  /// Does not return anything because [AssetNode.postProcessAnchor]s are
-  /// synthetic and should not be treated as inputs.
-  void _addPostBuildPhaseAnchors(PostBuildPhase phase, Set<AssetId> allInputs) {
-    var actionNum = 0;
+  /// Adds all [PostProcessBuildStepId]s for [phase] given [allInputs];
+  void _addPostBuildActionApplications(
+    PostBuildPhase phase,
+    Set<AssetId> allInputs,
+  ) {
+    var actionNumber = 0;
     for (var action in phase.builderActions) {
       var inputs = allInputs.where((input) => _actionMatches(action, input));
       for (var input in inputs) {
-        var buildOptionsNodeId = builderOptionsIdForAction(action, actionNum);
-        var anchor = AssetNode.postProcessAnchorForInputAndAction(
-          input,
-          actionNum,
-          buildOptionsNodeId,
+        updatePostProcessBuildStep(
+          PostProcessBuildStepId(input: input, actionNumber: actionNumber),
+          outputs: {},
         );
-        add(anchor);
-        updateNode(input, (nodeBuilder) {
-          nodeBuilder.anchorOutputs.add(anchor.id);
-        });
       }
-      actionNum++;
+      actionNumber++;
     }
   }
 
@@ -762,11 +801,14 @@ class AssetGraph implements GeneratedAssetHider {
 Digest computeBuilderOptionsDigest(BuilderOptions options) =>
     md5.convert(utf8.encode(json.encode(options.config)));
 
-AssetId builderOptionsIdForAction(BuildAction action, int actionNum) {
+AssetId builderOptionsIdForAction(BuildAction action, int actionNumber) {
   if (action is InBuildPhase) {
-    return AssetId(action.package, 'Phase$actionNum.builderOptions');
+    return AssetId(action.package, 'Phase$actionNumber.builderOptions');
   } else if (action is PostBuildAction) {
-    return AssetId(action.package, 'PostPhase$actionNum.builderOptions');
+    return PostProcessBuildStepId.builderOptionsIdFor(
+      package: action.package,
+      actionNumber: actionNumber,
+    );
   } else {
     throw StateError('Unsupported action type $action');
   }

build_runner_core/lib/src/asset_graph/node.dart

@@ -10,7 +10,7 @@ import 'package:built_value/built_value.dart';
 import 'package:built_value/serializer.dart';
 import 'package:crypto/crypto.dart';
 
-import '../generate/phase.dart';
+import 'post_process_build_step_id.dart';
 
 part 'node.g.dart';
 
@@ -23,7 +23,6 @@ class NodeType extends EnumClass {
   static const NodeType glob = _$glob;
   static const NodeType internal = _$internal;
   static const NodeType placeholder = _$placeholder;
-  static const NodeType postProcessAnchor = _$postProcessAnchor;
   static const NodeType source = _$source;
   static const NodeType missingSource = _$missingSource;
 
@@ -54,10 +53,6 @@ abstract class AssetNode implements Built<AssetNode, AssetNodeBuilder> {
   /// [AssetNode.glob].
   GlobNodeState? get globNodeState;
 
-  /// Additional node configuration for an
-  /// [AssetNode.postProcessAnchorNodeConfiguration].
-  PostProcessAnchorNodeConfiguration? get postProcessAnchorNodeConfiguration;
-
   /// The assets that any [Builder] in the build graph declares it may output
   /// when run on this asset.
   BuiltSet<AssetId> get primaryOutputs;
@@ -66,19 +61,14 @@ abstract class AssetNode implements Built<AssetNode, AssetNodeBuilder> {
   /// which reads this asset.
   BuiltSet<AssetId> get outputs;
 
-  /// The [AssetId]s of all [AssetNode.postProcessAnchor] assets for which this
-  /// node is the primary input.
-  BuiltSet<AssetId> get anchorOutputs;
-
   /// The [Digest] for this node in its last known state.
   ///
   /// May be `null` if this asset has no outputs, or if it doesn't actually
   /// exist.
   Digest? get lastKnownDigest;
 
-  /// The IDs of the [AssetNode.postProcessAnchor] for post process builder
-  /// which requested to delete this asset.
-  BuiltSet<AssetId> get deletedBy;
+  /// The `PostProcessBuildStep`s which requested to delete this asset.
+  BuiltSet<PostProcessBuildStepId> get deletedBy;
 
   /// Whether this asset is a normal, readable file.
   ///
@@ -223,35 +213,6 @@ abstract class AssetNode implements Built<AssetNode, AssetNodeBuilder> {
   static AssetId createGlobNodeId(String package, String glob, int phaseNum) =>
       AssetId(package, 'glob.$phaseNum.${base64.encode(utf8.encode(glob))}');
 
-  /// A [primaryInput] to a [PostBuildAction].
-  ///
-  /// The [outputs] of this node are the individual outputs created for the
-  /// [primaryInput] during the [PostBuildAction] at index [actionNumber].
-  factory AssetNode.postProcessAnchor(
-    AssetId id, {
-    required AssetId primaryInput,
-    required int actionNumber,
-    required AssetId builderOptionsId,
-    Digest? previousInputsDigest,
-  }) => AssetNode((b) {
-    b.id = id;
-    b.type = NodeType.postProcessAnchor;
-    b.postProcessAnchorNodeConfiguration.actionNumber = actionNumber;
-    b.postProcessAnchorNodeConfiguration.builderOptionsId = builderOptionsId;
-    b.postProcessAnchorNodeConfiguration.primaryInput = primaryInput;
-  });
-
-  factory AssetNode.postProcessAnchorForInputAndAction(
-    AssetId primaryInput,
-    int actionNumber,
-    AssetId builderOptionsId,
-  ) => AssetNode.postProcessAnchor(
-    primaryInput.addExtension('.post_anchor.$actionNumber'),
-    primaryInput: primaryInput,
-    actionNumber: actionNumber,
-    builderOptionsId: builderOptionsId,
-  );
-
   AssetNode._() {
     // Check that configuration and state fields are non-null exactly when the
     // node is of the corresponding type.
@@ -277,10 +238,6 @@ abstract class AssetNode implements Built<AssetNode, AssetNodeBuilder> {
       globNodeConfiguration != null,
       globNodeState != null,
     );
-    check(
-      type == NodeType.postProcessAnchor,
-      postProcessAnchorNodeConfiguration != null,
-    );
   }
 }
 
@@ -387,27 +344,6 @@ abstract class GlobNodeState
   GlobNodeState._();
 }
 
-// Additional configuration for an [AssetNode.postProcessAnchor].
-abstract class PostProcessAnchorNodeConfiguration
-    implements
-        Built<
-          PostProcessAnchorNodeConfiguration,
-          PostProcessAnchorNodeConfigurationBuilder
-        > {
-  static Serializer<PostProcessAnchorNodeConfiguration> get serializer =>
-      _$postProcessAnchorNodeConfigurationSerializer;
-
-  int get actionNumber;
-  AssetId get builderOptionsId;
-  AssetId get primaryInput;
-
-  PostProcessAnchorNodeConfiguration._();
-
-  factory PostProcessAnchorNodeConfiguration(
-    void Function(PostProcessAnchorNodeConfigurationBuilder) updates,
-  ) = _$PostProcessAnchorNodeConfiguration;
-}
-
 /// Work that needs doing for a node that tracks its inputs.
 class PendingBuildAction extends EnumClass {
   static Serializer<PendingBuildAction> get serializer =>
@@ -427,8 +363,8 @@ class PendingBuildAction extends EnumClass {
 @SerializersFor([AssetNode])
 final Serializers serializers =
     (_$serializers.toBuilder()
-          ..add(AssetIdSerializer())
-          ..add(DigestSerializer()))
+          ..add(const AssetIdSerializer())
+          ..add(const DigestSerializer()))
         .build();
 
 /// Serializer for [AssetId].
@@ -455,6 +391,8 @@ class AssetIdSerializer implements PrimitiveSerializer<AssetId> {
     AssetId object, {
     FullType specifiedType = FullType.unspecified,
   }) => object.toString();
+
+  const AssetIdSerializer();
 }
 
 /// Serializer for [Digest].
@@ -478,4 +416,6 @@ class DigestSerializer implements PrimitiveSerializer<Digest> {
     Digest object, {
     FullType specifiedType = FullType.unspecified,
   }) => base64.encode(object.bytes);
+
+  const DigestSerializer();
 }