Extract into record

Author: simolus3

Diff for: demos/supabase-todolist/lib/widgets/guard_by_sync.dart

@@ -27,11 +27,11 @@ class GuardBySync extends StatelessWidget {
         final (didSync, progress) = switch (priority) {
           null => (
               status.hasSynced ?? false,
-              status.downloadProgress?.progress
+              status.downloadProgress?.untilCompletion
             ),
           var priority? => (
               status.statusForPriority(priority).hasSynced ?? false,
-              status.downloadProgress?.progressFor(priority)
+              status.downloadProgress?.untilPriority(priority)
             ),
         };
 
@@ -42,7 +42,9 @@ class GuardBySync extends StatelessWidget {
             child: Column(
               children: [
                 const Text('Busy with sync...'),
-                LinearProgressIndicator(value: progress),
+                LinearProgressIndicator(value: progress?.fraction),
+                if (progress case final progress?)
+                  Text('${progress.completed} out of ${progress.total}')
               ],
             ),
           );

Diff for: packages/powersync_core/lib/src/sync_status.dart

@@ -288,6 +288,12 @@ final class InternalSyncDownloadProgress {
   static const _mapEquality = MapEquality<Object?, Object?>();
 }
 
+typedef ProgressWithOperations = ({
+  int total,
+  int completed,
+  double fraction,
+});
+
 /// Provides realtime progress about how PowerSync is downloading rows.
 ///
 /// The reported progress always reflects the status towards the end of a
@@ -322,6 +328,24 @@ extension type SyncDownloadProgress._(InternalSyncDownloadProgress _internal) {
   /// a number between 0 and 1.
   double get progress => _internal._totalDownloaded / _internal._totalTarget;
 
+  ProgressWithOperations get untilCompletion => (
+        total: total,
+        completed: downloaded,
+        fraction: progress,
+      );
+
+  ProgressWithOperations untilPriority(BucketPriority priority) {
+    final downloaded = downloadedFor(priority);
+    final total = totalFor(priority);
+    final progress = total == 0 ? 0.0 : downloaded / total;
+
+    return (
+      total: totalFor(priority),
+      completed: downloaded,
+      fraction: progress,
+    );
+  }
+
   /// Returns how many operations have been downloaded for buckets in
   /// [priority].
   ///