More.

Author: davidmorgan

build/lib/src/state/filesystem_cache.dart

@@ -151,13 +151,17 @@ class InMemoryFilesystemCache implements FilesystemCache {
     final maybeResult = _bytesContentCache[id];
     if (maybeResult != null) return maybeResult;
 
-    // check canRead first?
+    // Not in cache. Check pending writes and deletes.
     if (_pendingDeletes.containsKey(id)) throw AssetNotFoundException(id);
     if (_pendingWrites.containsKey(id)) {
-      throw StateError('Whoops, should have been cached: $id');
+      throw StateError('Should be in cache: $id');
     }
 
-    return _bytesContentCache[id] = ifAbsent();
+    // Read and cache.
+    final bytes = _bytesContentCache[id] = ifAbsent();
+    // Might not be a valid String, only convert to String when read as String.
+    _stringContentCache.remove(id);
+    return bytes;
   }
 
   @override
@@ -174,18 +178,21 @@ class InMemoryFilesystemCache implements FilesystemCache {
     final maybeResult = _stringContentCache[id];
     if (maybeResult != null) return maybeResult;
 
-    // check canRead first?
+    // Not in cache. Check pending writes and deletes.
     if (_pendingDeletes.containsKey(id)) throw AssetNotFoundException(id);
     if (_pendingWrites.containsKey(id)) {
+      // Might have been written as bytes; only cached as String when it's
+      // read as String, because it might not be a valid String.
       final bytes = _bytesContentCache[id];
       if (bytes == null) {
-        throw StateError('Whoops, should have been cached: $id');
+        throw StateError('Should be in cache: $id');
       } else {
         return _stringContentCache[id] = utf8.decode(_bytesContentCache[id]!);
       }
     }
 
     final bytes = ifAbsent();
+    _bytesContentCache[id] = bytes;
     return _stringContentCache[id] = utf8.decode(bytes);
   }
 
@@ -195,13 +202,12 @@ class InMemoryFilesystemCache implements FilesystemCache {
     List<int> contents, {
     required void Function() writer,
   }) {
-    _bytesContentCache[id] =
-        (contents is Uint8List ? contents : Uint8List.fromList(contents));
     // [contents] might not be a valid string so defer trying to
     // decode it until if/when it's read as a string.
     _stringContentCache.remove(id);
+    _bytesContentCache[id] =
+        (contents is Uint8List ? contents : Uint8List.fromList(contents));
     _canReadCache[id] = true;
-
     _pendingDeletes.remove(id);
     _pendingWrites[id] = writer;
   }
@@ -213,19 +219,28 @@ class InMemoryFilesystemCache implements FilesystemCache {
     Encoding encoding = utf8,
     required void Function() writer,
   }) {
-    // TODO: encoding?
-    _stringContentCache[id] = contents;
-    _bytesContentCache[id] = utf8.encode(contents);
-    _canReadCache[id] = true;
+    // Strings are only cached if utf8.
+    if (encoding == utf8) {
+      _stringContentCache[id] = contents;
+    } else {
+      _stringContentCache.remove(id);
+    }
+
+    final encoded = encoding.encode(contents);
+    _bytesContentCache[id] =
+        encoded is Uint8List ? encoded : Uint8List.fromList(encoded);
 
+    _canReadCache[id] = true;
     _pendingDeletes.remove(id);
     _pendingWrites[id] = writer;
   }
 
   @override
   void delete(AssetId id, {required void Function() deleter}) {
+    _stringContentCache.remove(id);
+    _bytesContentCache.remove(id);
+    _canReadCache[id] = false;
     _pendingWrites.remove(id);
     _pendingDeletes[id] = deleter;
-    _canReadCache[id] = false;
   }
 }

build_runner/CHANGELOG.md

@@ -16,6 +16,7 @@
 - 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.
+- Remove `completeBuild` from `RunnerAssetWriter` as it's no longer needed.
 
 ## 2.4.15
 

build_runner_core/lib/src/generate/build.dart

@@ -311,7 +311,6 @@ class Build {
       },
       (e, st) {
         if (!done.isCompleted) {
-          print('Unhandled build failure! $e $st');
           _logger.severe('Unhandled build failure!', e, st);
           done.complete(BuildResult(BuildStatus.failure, []));
         }

build_test/CHANGELOG.md

@@ -9,6 +9,8 @@
 - Add `testingBuilderConfig` to `testBuilders` to control builder config
   override.
 - Add `resolvers` parameter to `testBuild` and `testBuilders`.
+- Add `readerWriter` and `enableLowResourceMode` parameters to `testBuild`
+  and `testBuilders`.
 - Breaking change: removed `tearDown` parameter to `resolveSources` for
   keeping resolvers across multiple tests.
 - Breaking change: tests must use new `TestReaderWriter` instead of

build_test/lib/src/test_builder.dart

@@ -200,8 +200,16 @@ Future<TestBuilderResult> testBuilder(
 /// builder to run for all inputs. To use the default builder config instead,
 /// set [testingBuilderConfig] to `false`.
 ///
-/// Returns a [TestBuilderResult] with the [TestReaderWriter] used for
-/// the build, which can be used for further checks.
+/// Optionally pass [readerWriter] to pass in the filesystem that will be
+/// used during the build. Before the build, [sourceAssets] will be written
+/// to it.
+///
+/// Optionally pass [enableLowResourceMode], which acts like the command
+/// line flag; in particular it disables file caching.
+///
+/// Returns a [TestBuilderResult] with the [BuildResult] and the
+/// [TestReaderWriter] used for the build, which can be used for further
+/// checks.
 Future<TestBuilderResult> testBuilders(
   Iterable<Builder> builders,
   Map<String, /*String|List<int>*/ Object> sourceAssets, {