Fix tests

Author: simolus3

demos/django-todolist/lib/widgets/guard_by_sync.dart

@@ -7,9 +7,9 @@ import 'package:powersync_django_todolist_demo/powersync.dart';
 class GuardBySync extends StatelessWidget {
   final Widget child;
 
-  /// When set, wait only for a complete sync within the [BucketPriority]
+  /// When set, wait only for a complete sync within the [StreamPriority]
   /// instead of a full sync.
-  final BucketPriority? priority;
+  final StreamPriority? priority;
 
   const GuardBySync({
     super.key,

demos/supabase-todolist-drift/lib/powersync/powersync.dart

@@ -47,18 +47,19 @@ Future<PowerSyncDatabase> powerSyncInstance(Ref ref) async {
   return db;
 }
 
-final _syncStatusInternal = StreamProvider((ref) {
+final _syncStatusInternal = StreamProvider<SyncStatus?>((ref) {
   return Stream.fromFuture(
     ref.watch(powerSyncInstanceProvider.future),
-  ).asyncExpand((db) => db.statusStream).startWith(const SyncStatus());
+  ).asyncExpand<SyncStatus?>((db) => db.statusStream).startWith(null);
 });
 
 final syncStatus = Provider((ref) {
+  // ignore: invalid_use_of_internal_member
   return ref.watch(_syncStatusInternal).value ?? const SyncStatus();
 });
 
 @riverpod
-bool didCompleteSync(Ref ref, [BucketPriority? priority]) {
+bool didCompleteSync(Ref ref, [StreamPriority? priority]) {
   final status = ref.watch(syncStatus);
   if (priority != null) {
     return status.statusForPriority(priority).hasSynced ?? false;

demos/supabase-todolist-drift/lib/screens/lists.dart

@@ -35,7 +35,7 @@ final class _ListsWidget extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final lists = ref.watch(listsNotifierProvider);
-    final didSync = ref.watch(didCompleteSyncProvider(BucketPriority(1)));
+    final didSync = ref.watch(didCompleteSyncProvider(StreamPriority(1)));
 
     if (!didSync) {
       return const Text('Busy with sync...');

demos/supabase-todolist/lib/widgets/guard_by_sync.dart

@@ -7,9 +7,9 @@ import 'package:powersync_flutter_demo/powersync.dart';
 class GuardBySync extends StatelessWidget {
   final Widget child;
 
-  /// When set, wait only for a complete sync within the [BucketPriority]
+  /// When set, wait only for a complete sync within the [StreamPriority]
   /// instead of a full sync.
-  final BucketPriority? priority;
+  final StreamPriority? priority;
 
   const GuardBySync({
     super.key,

demos/supabase-todolist/lib/widgets/lists_page.dart

@@ -66,5 +66,5 @@ class ListsWidget extends StatelessWidget {
     );
   }
 
-  static final _listsPriority = BucketPriority(1);
+  static final _listsPriority = StreamPriority(1);
 }

packages/powersync_core/lib/src/sync/instruction.dart

@@ -94,7 +94,7 @@ final class CoreSyncStatus {
 
   static SyncPriorityStatus _priorityStatusFromJson(Map<String, Object?> json) {
     return (
-      priority: BucketPriority(json['priority'] as int),
+      priority: StreamPriority(json['priority'] as int),
       hasSynced: json['has_synced'] as bool?,
       lastSyncedAt: switch (json['last_synced_at']) {
         null => null,
@@ -123,7 +123,7 @@ final class DownloadProgress {
 
   static BucketProgress _bucketProgressFromJson(Map<String, Object?> json) {
     return (
-      priority: BucketPriority(json['priority'] as int),
+      priority: StreamPriority(json['priority'] as int),
       atLast: json['at_last'] as int,
       sinceLast: json['since_last'] as int,
       targetCount: json['target_count'] as int,

packages/powersync_core/lib/src/sync/streaming_sync.dart

@@ -385,7 +385,7 @@ class StreamingSyncImplementation implements StreamingSync {
             // checkpoint later.
           } else {
             _updateStatusForPriority((
-              priority: BucketPriority(bucketPriority),
+              priority: StreamPriority(bucketPriority),
               lastSyncedAt: DateTime.now(),
               hasSynced: true,
             ));

packages/powersync_core/lib/src/web/sync_worker_protocol.dart

@@ -226,7 +226,7 @@ extension type SerializedBucketProgress._(JSObject _) implements JSObject {
     return {
       for (final entry in array.toDart)
         entry.name: (
-          priority: BucketPriority(entry.priority),
+          priority: StreamPriority(entry.priority),
           atLast: entry.atLast,
           sinceLast: entry.sinceLast,
           targetCount: entry.targetCount,

packages/powersync_core/test/sync/in_memory_sync_test.dart

@@ -618,7 +618,7 @@ void _declareTests(String name, SyncOptions options, bool bson) {
       Future<void> expectProgress(
         StreamQueue<SyncStatus> status, {
         required Object total,
-        Map<BucketPriority, Object> priorities = const {},
+        Map<StreamPriority, Object> priorities = const {},
       }) async {
         await expectLater(
           status,
@@ -939,11 +939,11 @@ void _declareTests(String name, SyncOptions options, bool bson) {
             await Completer<void>().future;
           }));
 
-        syncClient.streamingSync();
+        await connect();
         await requestStarted.future;
         expect(database.currentStatus, isSyncStatus(connecting: true));
 
-        await syncClient.abort();
+        await database.disconnect();
         expect(database.currentStatus.anyError, isNull);
       });
 
@@ -962,7 +962,7 @@ void _declareTests(String name, SyncOptions options, bool bson) {
         });
         await expectLater(status, emits(isSyncStatus(downloading: true)));
 
-        await syncClient.abort();
+        await database.disconnect();
         expect(database.currentStatus.anyError, isNull);
       });
     });

packages/powersync_core/test/sync/sync_types_test.dart

@@ -216,11 +216,11 @@ void main() {
       }
     });
 
-    test('bucket priority comparisons', () {
-      expect(BucketPriority(0) < BucketPriority(3), isFalse);
-      expect(BucketPriority(0) > BucketPriority(3), isTrue);
-      expect(BucketPriority(0) >= BucketPriority(3), isTrue);
-      expect(BucketPriority(0) >= BucketPriority(0), isTrue);
+    test('stream priority comparisons', () {
+      expect(StreamPriority(0) < StreamPriority(3), isFalse);
+      expect(StreamPriority(0) > StreamPriority(3), isTrue);
+      expect(StreamPriority(0) >= StreamPriority(3), isTrue);
+      expect(StreamPriority(0) >= StreamPriority(0), isTrue);
     });
   });
 }