Hacking.

Author: davidmorgan

_test_common/lib/in_memory_reader_writer.dart

@@ -28,7 +28,7 @@ class InMemoryRunnerAssetReaderWriter extends InMemoryAssetReaderWriterImpl
 
   @override
   Future writeAsBytes(AssetId id, List<int> bytes) async {
-    var type = assets.containsKey(id) ? ChangeType.MODIFY : ChangeType.ADD;
+    var type = testing.exists(id) ? ChangeType.MODIFY : ChangeType.ADD;
     await super.writeAsBytes(id, bytes);
     FakeWatcher.notifyWatchers(
       WatchEvent(type, p.absolute(id.package, p.fromUri(id.path))),
@@ -41,7 +41,7 @@ class InMemoryRunnerAssetReaderWriter extends InMemoryAssetReaderWriterImpl
     String contents, {
     Encoding encoding = utf8,
   }) async {
-    var type = assets.containsKey(id) ? ChangeType.MODIFY : ChangeType.ADD;
+    var type = testing.exists(id) ? ChangeType.MODIFY : ChangeType.ADD;
     await super.writeAsString(id, contents, encoding: encoding);
     FakeWatcher.notifyWatchers(
       WatchEvent(type, p.absolute(id.package, p.fromUri(id.path))),

build/lib/src/builder/build_step_impl.dart

@@ -100,6 +100,9 @@ class BuildStepImpl implements BuildStep, AssetReaderState {
   @override
   Filesystem get filesystem => _reader.filesystem;
 
+  @override
+  FilesystemCache get cache => _reader.cache;
+
   @override
   AssetFinder get assetFinder => _reader.assetFinder;
 

build/lib/src/state/reader_state.dart

@@ -22,6 +22,11 @@ extension AssetReaderStateExtension on AssetReader {
     return (this as AssetReaderState).filesystem;
   }
 
+  FilesystemCache get cache {
+    _requireIsAssetReaderState();
+    return (this as AssetReaderState).cache;
+  }
+
   AssetFinder get assetFinder {
     _requireIsAssetReaderState();
     return (this as AssetReaderState).assetFinder;
@@ -68,6 +73,9 @@ abstract interface class AssetReaderState {
   /// such as read tracking, caching and visibility restriction.
   Filesystem get filesystem;
 
+  /// The [FilesystemCache] that this reader uses for caching.
+  FilesystemCache get cache;
+
   /// The [AssetFinder] associated with this reader.
   ///
   /// All readers have an [AssetFinder], but the functionality it provides,

build/test/builder/build_step_impl_test.dart

@@ -113,7 +113,7 @@ void main() {
       await buildStep.complete();
 
       // One output.
-      expect(readerWriter.readStringForTest(outputId), 'foo');
+      expect(readerWriter.testing.readString(outputId), 'foo');
     });
 
     group('resolve', () {

build/test/generate/run_post_process_builder_test.dart

@@ -63,8 +63,8 @@ void main() {
         addAsset: addAsset,
         deleteAsset: deleteAsset,
       );
-      expect(readerWriter.existsForTest(aTxt), isTrue);
-      expect(readerWriter.readStringForTest(aTxtCopy), 'a');
+      expect(readerWriter.testing.exists(aTxt), isTrue);
+      expect(readerWriter.testing.readString(aTxtCopy), 'a');
       expect(adds, contains(aTxtCopy));
     });
 

build_runner/lib/src/watcher/change_filter.dart

@@ -31,7 +31,7 @@ FutureOr<bool> shouldProcess(
     if (_isAddOrEditOnGeneratedFile(node, change.type)) return false;
     if (change.type == ChangeType.MODIFY) {
       // Was it really modified or just touched?
-      reader.filesystem.cache.invalidate([change.id]);
+      reader.cache.invalidate([change.id]);
       return reader
           .digest(change.id)
           .then((newDigest) => node.lastKnownDigest != newDigest);

build_runner/test/server/asset_handler_test.dart

@@ -50,7 +50,7 @@ void main() {
       node.deletedBy.add(node.id.addExtension('.post_anchor.1'));
     }
     graph.add(node);
-    delegate.filesystem.writeAsStringSync(node.id, content);
+    delegate.testing.writeString(node.id, content);
   }
 
   test('can not read deleted nodes', () async {

build_runner_core/lib/src/asset/batch.dart

@@ -87,6 +87,9 @@ final class BatchReader extends AssetReader implements AssetReaderState {
   @override
   Filesystem get filesystem => _inner.filesystem;
 
+  @override
+  FilesystemCache get cache => _inner.cache;
+
   @override
   AssetPathProvider? get assetPathProvider => _inner.assetPathProvider;
 

build_runner_core/lib/src/asset/build_cache.dart

@@ -47,6 +47,9 @@ class BuildCacheReader implements AssetReader, AssetReaderState {
   @override
   Filesystem get filesystem => _delegate.filesystem;
 
+  @override
+  FilesystemCache get cache => _delegate.cache;
+
   @override
   AssetFinder get assetFinder => _delegate.assetFinder;
 

build_runner_core/lib/src/asset/file_based.dart

@@ -24,8 +24,9 @@ class FileBasedAssetReader extends AssetReader implements AssetReaderState {
   final Filesystem filesystem;
   @override
   late final AssetFinder assetFinder = FunctionAssetFinder(_findAssets);
-
+  @override
   final FilesystemCache cache;
+
   final PackageGraph packageGraph;
 
   FileBasedAssetReader(

build_runner_core/lib/src/asset/reader.dart

@@ -106,6 +106,9 @@ class SingleStepReader extends AssetReader implements AssetReaderState {
   @override
   Filesystem get filesystem => _delegate.filesystem;
 
+  @override
+  FilesystemCache get cache => _delegate.cache;
+
   @override
   AssetPathProvider? get assetPathProvider => _delegate.assetPathProvider;
 

build_runner_core/lib/src/asset_graph/graph.dart

@@ -190,7 +190,7 @@ class AssetGraph {
     Iterable<AssetNode> nodes,
     AssetReader digestReader,
   ) async {
-    await digestReader.filesystem.cache.invalidate(nodes.map((n) => n.id));
+    await digestReader.cache.invalidate(nodes.map((n) => n.id));
     await Future.wait(
       nodes.map((node) async {
         node.lastKnownDigest = await digestReader.digest(node.id);

build_runner_core/lib/src/generate/build_definition.dart

@@ -168,7 +168,7 @@ class AssetTracker {
       var node = assetGraph.get(id)!;
       var originalDigest = node.lastKnownDigest;
       if (originalDigest == null) return;
-      await _reader.filesystem.cache.invalidate([id]);
+      await _reader.cache.invalidate([id]);
       var currentDigest = await _reader.digest(id);
       if (currentDigest != originalDigest) {
         updates[id] = ChangeType.MODIFY;

build_runner_core/lib/src/generate/build_impl.dart

@@ -296,7 +296,7 @@ class _SingleBuild {
         _delete,
         _reader,
       );
-      await _reader.filesystem.cache.invalidate(invalidated);
+      await _reader.cache.invalidate(invalidated);
     });
   }
 
@@ -978,7 +978,7 @@ class _SingleBuild {
           return;
         } else {
           if (node.lastKnownDigest == null) {
-            await reader.filesystem.cache.invalidate([id]);
+            await reader.cache.invalidate([id]);
             node.lastKnownDigest = await reader.digest(id);
           }
         }

build_runner_core/test/environment/create_merged_dir_test.dart

@@ -70,7 +70,7 @@ void main() {
     setUp(() async {
       readerWriter = InMemoryRunnerAssetReaderWriter();
       for (final source in sources.entries) {
-        readerWriter.filesystem.writeAsStringSync(source.key, source.value);
+        readerWriter.testing.writeString(source.key, source.value);
       }
       environment = TestBuildEnvironment(readerWriter: readerWriter);
       graph = await AssetGraph.build(
@@ -102,10 +102,7 @@ void main() {
               ..state = NodeState.upToDate
               ..wasOutput = true
               ..isFailure = false;
-        readerWriter.filesystem.writeAsStringSync(
-          id,
-          sources[node.primaryInput]!,
-        );
+        readerWriter.testing.writeString(id, sources[node.primaryInput]!);
       }
       tmpDir = await Directory.systemTemp.createTemp('build_tests');
       anotherTmpDir = await Directory.systemTemp.createTemp('build_tests');

build_test/lib/src/in_memory_reader_writer.dart

@@ -61,6 +61,7 @@ class InMemoryAssetReaderWriterImpl extends AssetReader
 
   final InMemoryFilesystem _filesystem;
 
+  @override
   final FilesystemCache cache;
 
   final String? rootPackage;

build_test/lib/src/written_asset_reader.dart

@@ -33,6 +33,9 @@ class WrittenAssetReader extends AssetReader implements AssetReaderState {
   @override
   Filesystem get filesystem => source.filesystem;
 
+  @override
+  FilesystemCache get cache => source.cache;
+
   @override
   late final AssetFinder assetFinder = FunctionAssetFinder(_findAssets);
 
@@ -52,7 +55,7 @@ class WrittenAssetReader extends AssetReader implements AssetReaderState {
 
   @override
   Future<bool> canRead(AssetId id) {
-    var canRead = source.existsForTest(id);
+    var canRead = source.testing.exists(id);
     if (filterSpy != null) {
       canRead =
           canRead &&

build_web_compilers/test/util.dart

@@ -17,7 +17,6 @@ Future<void> testBuilderAndCollectAssets(
     builder,
     assets,
     onLog: (log) => printOnFailure('${log.level}: ${log.message}'),
-    resumeFrom: 
   );
   result.readerWriter.assets.forEach((id, value) {
     assets['${id.package}|${id.path}'] = value;

scratch_space/test/scratch_space_test.dart

@@ -93,7 +93,7 @@ void main() {
       var writer = InMemoryAssetReaderWriter();
       await scratchSpace.copyOutput(outputId, writer);
 
-      expect(writer.readStringForTest(outputId), outputContent);
+      expect(writer.testing.readString(outputId), outputContent);
     });
 
     test('Can delete a ScratchSpace', () async {