fix(flutter): analyze errors after Plan C provider migrations

- cache_first.dart: backtick-fence List<T> doc comment to dodge
  unintended_html_in_doc_comment.
- library_providers.dart:163: switch single-row insert to
  insertAllOnConflictUpdate; Batch only exposes the *AllOnConflict*
  variant.
- 5 test files: StreamProvider.overrideWith takes Create<Stream<T>>,
  not Create<Future<T>>. Wrap data emissions in Stream.value(...).
- artist_detail_screen_test: add models/album.dart import for AlbumRef
  type annotation.
- track_actions_sheet_test: drop _StubLiked extends LikedIdsController
  (notifier no longer exists post-migration); override with
  Stream.value(LikedIds(...)) instead.
- like_button_test: rollback assertion now requires drift writes via
  LikesController. Skip under _skipDrift until libsqlite3-dev lands on
  the runner image (Fable #399). Replace stale .notifier reference
  with likesControllerProvider for completeness.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-05-10 13:04:27 -04:00
parent 98fdd9dcdf
commit 94727f40bb
8 changed files with 28 additions and 27 deletions
+1 -1
View File
@@ -13,7 +13,7 @@ import 'dart:async';
/// Wraps the watch + cold-cache fallback pattern. Generic over: /// Wraps the watch + cold-cache fallback pattern. Generic over:
/// D — the drift row type (or TypedResult for joins) /// D — the drift row type (or TypedResult for joins)
/// T — the result type the caller wants (e.g. List<ArtistRef>) /// T — the result type the caller wants (e.g. `List<ArtistRef>`)
/// ///
/// `fetchAndPopulate` is invoked when drift is empty AND `isOnline()` /// `fetchAndPopulate` is invoked when drift is empty AND `isOnline()`
/// returns true. It must populate drift via its own side-effect; the /// returns true. It must populate drift via its own side-effect; the
@@ -160,7 +160,7 @@ final albumProvider = StreamProvider.family<
final api = await ref.read(libraryApiProvider.future); final api = await ref.read(libraryApiProvider.future);
final fresh = await api.getAlbum(albumId); final fresh = await api.getAlbum(albumId);
await db.batch((b) { await db.batch((b) {
b.insertOnConflictUpdate(db.cachedAlbums, fresh.album.toDrift()); b.insertAllOnConflictUpdate(db.cachedAlbums, [fresh.album.toDrift()]);
b.insertAllOnConflictUpdate(db.cachedTracks, b.insertAllOnConflictUpdate(db.cachedTracks,
fresh.tracks.map((t) => t.toDrift()).toList()); fresh.tracks.map((t) => t.toDrift()).toList());
}); });
@@ -12,12 +12,12 @@ void main() {
testWidgets('renders album header + track list', (tester) async { testWidgets('renders album header + track list', (tester) async {
await tester.pumpWidget(ProviderScope( await tester.pumpWidget(ProviderScope(
overrides: [ overrides: [
albumProvider('al-1').overrideWith((ref) async => ( albumProvider('al-1').overrideWith((ref) => Stream.value((
album: const AlbumRef(id: 'al-1', title: 'Drukqs', artistId: 'a-1', artistName: 'Aphex Twin'), album: const AlbumRef(id: 'al-1', title: 'Drukqs', artistId: 'a-1', artistName: 'Aphex Twin'),
tracks: const [ tracks: const [
TrackRef(id: 't-1', title: 'Avril 14th', albumId: 'al-1', artistId: 'a-1', durationSec: 121, trackNumber: 4), TrackRef(id: 't-1', title: 'Avril 14th', albumId: 'al-1', artistId: 'a-1', durationSec: 121, trackNumber: 4),
], ],
)), ))),
], ],
child: MaterialApp(theme: buildThemeData(), home: const AlbumDetailScreen(id: 'al-1')), child: MaterialApp(theme: buildThemeData(), home: const AlbumDetailScreen(id: 'al-1')),
)); ));
@@ -4,6 +4,7 @@ import 'package:flutter_test/flutter_test.dart';
import 'package:minstrel/library/artist_detail_screen.dart'; import 'package:minstrel/library/artist_detail_screen.dart';
import 'package:minstrel/library/library_providers.dart'; import 'package:minstrel/library/library_providers.dart';
import 'package:minstrel/models/album.dart';
import 'package:minstrel/models/artist.dart'; import 'package:minstrel/models/artist.dart';
import 'package:minstrel/theme/theme_data.dart'; import 'package:minstrel/theme/theme_data.dart';
@@ -11,8 +12,8 @@ void main() {
testWidgets('renders artist name and Albums header', (tester) async { testWidgets('renders artist name and Albums header', (tester) async {
await tester.pumpWidget(ProviderScope( await tester.pumpWidget(ProviderScope(
overrides: [ overrides: [
artistProvider('a-1').overrideWith((ref) async => const ArtistRef(id: 'a-1', name: 'Aphex Twin')), artistProvider('a-1').overrideWith((ref) => Stream.value(const ArtistRef(id: 'a-1', name: 'Aphex Twin'))),
artistAlbumsProvider('a-1').overrideWith((ref) async => const []), artistAlbumsProvider('a-1').overrideWith((ref) => Stream.value(const <AlbumRef>[])),
], ],
child: MaterialApp(theme: buildThemeData(), home: const ArtistDetailScreen(id: 'a-1')), child: MaterialApp(theme: buildThemeData(), home: const ArtistDetailScreen(id: 'a-1')),
)); ));
@@ -28,7 +28,7 @@ void main() {
overrides: [ overrides: [
homeProvider.overrideWith((ref) async => _emptyHome), homeProvider.overrideWith((ref) async => _emptyHome),
playlistsListProvider('all').overrideWith( playlistsListProvider('all').overrideWith(
(ref) async => PlaylistsList.empty(), (ref) => Stream.value(PlaylistsList.empty()),
), ),
systemPlaylistsStatusProvider.overrideWith( systemPlaylistsStatusProvider.overrideWith(
(ref) async => SystemPlaylistsStatus.empty(), (ref) async => SystemPlaylistsStatus.empty(),
@@ -48,7 +48,7 @@ void main() {
overrides: [ overrides: [
homeProvider.overrideWith((ref) async => _emptyHome), homeProvider.overrideWith((ref) async => _emptyHome),
playlistsListProvider('all').overrideWith( playlistsListProvider('all').overrideWith(
(ref) async => PlaylistsList.empty(), (ref) => Stream.value(PlaylistsList.empty()),
), ),
systemPlaylistsStatusProvider.overrideWith( systemPlaylistsStatusProvider.overrideWith(
(ref) async => SystemPlaylistsStatus.empty(), (ref) async => SystemPlaylistsStatus.empty(),
@@ -89,8 +89,8 @@ void main() {
overrides: [ overrides: [
homeProvider.overrideWith((ref) async => _emptyHome), homeProvider.overrideWith((ref) async => _emptyHome),
playlistsListProvider('all').overrideWith( playlistsListProvider('all').overrideWith(
(ref) async => (ref) => Stream.value(
const PlaylistsList(owned: [forYou], public: []), const PlaylistsList(owned: [forYou], public: [])),
), ),
systemPlaylistsStatusProvider.overrideWith( systemPlaylistsStatusProvider.overrideWith(
(ref) async => SystemPlaylistsStatus.empty(), (ref) async => SystemPlaylistsStatus.empty(),
@@ -120,7 +120,7 @@ void main() {
overrides: [ overrides: [
homeProvider.overrideWith((ref) async => home), homeProvider.overrideWith((ref) async => home),
playlistsListProvider('all').overrideWith( playlistsListProvider('all').overrideWith(
(ref) async => PlaylistsList.empty(), (ref) => Stream.value(PlaylistsList.empty()),
), ),
systemPlaylistsStatusProvider.overrideWith( systemPlaylistsStatusProvider.overrideWith(
(ref) async => SystemPlaylistsStatus.empty(), (ref) async => SystemPlaylistsStatus.empty(),
@@ -43,9 +43,14 @@ class _ThrowingLikesApi implements LikesApi {
const Paged<ArtistRef>(items: [], total: 0, limit: 50, offset: 0); const Paged<ArtistRef>(items: [], total: 0, limit: 50, offset: 0);
} }
// libsqlite3 missing on flutter-ci runner; the rollback assertion now
// depends on drift writes via LikesController. Re-enable when the runner
// image carries libsqlite3-dev (Fable #399).
const _skipDrift = true;
void main() { void main() {
testWidgets('tap toggles icon optimistically; rollback on error', testWidgets('tap toggles icon optimistically; rollback on error',
(tester) async { skip: _skipDrift, (tester) async {
final api = _ThrowingLikesApi(); final api = _ThrowingLikesApi();
final container = ProviderContainer(overrides: [ final container = ProviderContainer(overrides: [
likesApiProvider.overrideWith((ref) async => api), likesApiProvider.overrideWith((ref) async => api),
@@ -70,9 +75,9 @@ void main() {
// Force the next mutation to fail; rollback restores prior state. // Force the next mutation to fail; rollback restores prior state.
api.throwOnNext = true; api.throwOnNext = true;
final notifier = container.read(likedIdsProvider.notifier); final controller = container.read(likesControllerProvider);
try { try {
await notifier.toggle(LikeKind.album, 'al-1'); await controller.toggle(LikeKind.album, 'al-1');
} catch (_) {/* expected */} } catch (_) {/* expected */}
await tester.pump(); await tester.pump();
expect(find.byIcon(Icons.favorite), findsOneWidget); // rolled back expect(find.byIcon(Icons.favorite), findsOneWidget); // rolled back
@@ -39,7 +39,7 @@ const _systemPlaylist = Playlist(
Widget _harness(PlaylistsList lists) { Widget _harness(PlaylistsList lists) {
return ProviderScope( return ProviderScope(
overrides: [ overrides: [
playlistsListProvider('user').overrideWith((ref) async => lists), playlistsListProvider('user').overrideWith((ref) => Stream.value(lists)),
], ],
child: MaterialApp( child: MaterialApp(
theme: buildThemeData(), theme: buildThemeData(),
@@ -85,8 +85,8 @@ void main() {
await t.pumpWidget(ProviderScope( await t.pumpWidget(ProviderScope(
overrides: [ overrides: [
playlistsListProvider('user').overrideWith( playlistsListProvider('user').overrideWith(
(ref) async => (ref) => Stream.value(
const PlaylistsList(owned: [_userPlaylist], public: []), const PlaylistsList(owned: [_userPlaylist], public: [])),
), ),
], ],
child: MaterialApp( child: MaterialApp(
@@ -21,14 +21,6 @@ const _track = TrackRef(
streamUrl: '', streamUrl: '',
); );
class _StubLiked extends LikedIdsController {
_StubLiked({this.trackIds = const <String>{}});
final Set<String> trackIds;
@override
Future<LikedIds> build() async =>
LikedIds(artists: const {}, albums: const {}, tracks: trackIds);
}
class _StubQuarantine extends MyQuarantineController { class _StubQuarantine extends MyQuarantineController {
@override @override
Future<List<QuarantineMineRow>> build() async => const []; Future<List<QuarantineMineRow>> build() async => const [];
@@ -37,8 +29,11 @@ class _StubQuarantine extends MyQuarantineController {
Widget _harness({bool hideQueueActions = false, Set<String>? likedTracks}) { Widget _harness({bool hideQueueActions = false, Set<String>? likedTracks}) {
return ProviderScope( return ProviderScope(
overrides: [ overrides: [
likedIdsProvider likedIdsProvider.overrideWith((ref) => Stream.value(LikedIds(
.overrideWith(() => _StubLiked(trackIds: likedTracks ?? const {})), artists: const {},
albums: const {},
tracks: likedTracks ?? const {},
))),
myQuarantineProvider.overrideWith(() => _StubQuarantine()), myQuarantineProvider.overrideWith(() => _StubQuarantine()),
], ],
child: MaterialApp( child: MaterialApp(