Track pending build work in Build instead of in the asset graph.

Author: davidmorgan

_test_common/lib/assets.dart

@@ -10,12 +10,12 @@ import 'package:crypto/crypto.dart';
 AssetNode makeAssetNode([
   String? assetIdString,
   List<AssetId>? outputs,
-  Digest? lastKnownDigest,
+  Digest? digest,
 ]) {
   var id = makeAssetId(assetIdString);
   return AssetNode.source(
     id,
-    lastKnownDigest: lastKnownDigest,
+    digest: digest,
     outputs: outputs,
     primaryOutputs: outputs,
   );

build_runner/CHANGELOG.md

@@ -14,6 +14,8 @@
 - Use `built_value` for `AssetNode` and related types.
 - Add details of what changed and what is built to `--verbose` logging.
 - Compute outputs as needed instead of storing them in the asset graph.
+- Refactor invalidation to track current build progress in `Build` instead of
+  in the asset graph.
 
 ## 2.4.15
 

build_runner/bin/graph_inspector.dart

@@ -144,10 +144,9 @@ class InspectNodeCommand extends Command<bool> {
         final nodeState = node.generatedNodeState!;
         final nodeConfiguration = node.generatedNodeConfiguration!;
         description
-          ..writeln('  state: ${nodeState.pendingBuildAction}')
-          ..writeln('  wasOutput: ${nodeState.wasOutput}')
+          ..writeln('  wasOutput: ${node.wasOutput}')
           ..writeln('  phase: ${nodeConfiguration.phaseNumber}')
-          ..writeln('  isFailure: ${nodeState.isFailure}');
+          ..writeln('  result: ${nodeState.result}');
       }
 
       void printAsset(AssetId asset) =>

build_runner/lib/src/entrypoint/clean.dart

@@ -86,7 +86,7 @@ Future<void> _cleanUpSourceOutputs(
   for (var id in assetGraph.outputs) {
     if (id.package != packageGraph.root.name) continue;
     var node = assetGraph.get(id)!;
-    if (node.generatedNodeState!.wasOutput) {
+    if (node.wasOutput) {
       // Note that this does a file.exists check in the root package and
       // only tries to delete the file if it exists. This way we only
       // actually delete to_source outputs, without reading in the build

build_runner/lib/src/server/asset_graph_handler.dart

@@ -151,19 +151,10 @@ class AssetGraphHandler {
             node.type == NodeType.generated
                 ? node.generatedNodeConfiguration!.isHidden
                 : null,
-        'state':
+        'wasOutput': node.type == NodeType.generated ? node.wasOutput : null,
+        'result':
             node.type == NodeType.generated
-                ? '${node.generatedNodeState!.pendingBuildAction}'
-                : node.type == NodeType.glob
-                ? '${node.globNodeState!.pendingBuildAction}'
-                : null,
-        'wasOutput':
-            node.type == NodeType.generated
-                ? node.generatedNodeState!.wasOutput
-                : null,
-        'isFailure':
-            node.type == NodeType.generated
-                ? node.generatedNodeState!.isFailure
+                ? node.generatedNodeState!.result
                 : null,
         'phaseNumber':
             node.type == NodeType.generated
@@ -176,7 +167,7 @@ class AssetGraphHandler {
             node.type == NodeType.glob
                 ? node.globNodeConfiguration!.glob
                 : null,
-        'lastKnownDigest': node.lastKnownDigest.toString(),
+        'digest': node.digest.toString(),
       },
       'edges': edges,
       'nodes': nodes,

build_runner/lib/src/watcher/change_filter.dart

@@ -34,7 +34,7 @@ FutureOr<bool> shouldProcess(
       reader.cache.invalidate([change.id]);
       return reader
           .digest(change.id)
-          .then((newDigest) => node.lastKnownDigest != newDigest);
+          .then((newDigest) => node.digest != newDigest);
     }
   } else {
     if (change.type != ChangeType.ADD) return false;

build_runner/test/generate/watch_test.dart

@@ -371,10 +371,8 @@ void main() {
           bCopyId,
           phaseNumber: 0,
           primaryInput: makeAssetId('a|web/b.txt'),
-          pendingBuildAction: PendingBuildAction.none,
-          wasOutput: true,
-          isFailure: false,
-          lastKnownDigest: computeDigest(bCopyId, 'b2'),
+          result: true,
+          digest: computeDigest(bCopyId, 'b2'),
           inputs: [makeAssetId('a|web/b.txt')],
           isHidden: false,
         );
@@ -395,10 +393,8 @@ void main() {
           cCopyId,
           phaseNumber: 0,
           primaryInput: cTxtId,
-          pendingBuildAction: PendingBuildAction.none,
-          wasOutput: true,
-          isFailure: false,
-          lastKnownDigest: computeDigest(cCopyId, 'c'),
+          result: true,
+          digest: computeDigest(cCopyId, 'c'),
           inputs: [makeAssetId('a|web/c.txt')],
           isHidden: false,
         );

build_runner/test/server/asset_handler_test.dart

@@ -14,6 +14,7 @@ import 'package:build_runner_core/src/asset_graph/post_process_build_step_id.dar
 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:crypto/crypto.dart';
 import 'package:shelf/shelf.dart';
 import 'package:test/test.dart';
 
@@ -137,10 +138,9 @@ void main() {
       AssetNode.generated(
         AssetId('a', 'web/main.ddc.js'),
         phaseNumber: 0,
-        pendingBuildAction: PendingBuildAction.none,
         isHidden: false,
-        wasOutput: true,
-        isFailure: true,
+        digest: Digest([]),
+        result: false,
         primaryInput: AssetId('a', 'web/main.dart'),
       ),
     );

build_runner/test/server/serve_handler_test.dart

@@ -20,6 +20,7 @@ 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';
+import 'package:crypto/crypto.dart';
 import 'package:logging/logging.dart';
 import 'package:shelf/shelf.dart';
 import 'package:stream_channel/stream_channel.dart';
@@ -210,10 +211,9 @@ void main() {
         AssetNode.generated(
           AssetId('a', 'web/main.ddc.js'),
           phaseNumber: 0,
-          pendingBuildAction: PendingBuildAction.none,
           isHidden: false,
-          wasOutput: true,
-          isFailure: true,
+          digest: Digest([]),
+          result: false,
           primaryInput: AssetId('a', 'web/main.dart'),
         ),
       );

build_runner_core/CHANGELOG.md

@@ -32,6 +32,8 @@
 - Compute outputs as needed instead of storing them in the asset graph.
 - Check build options for changes in the phase setup instead of storing them
   in the asset graph.
+- Refactor invalidation to track current build progress in `Build` instead of
+  in the asset graph.
 
 ## 8.0.0