Refactor how the database is opened

Author: simolus3

demos/supabase-todolist-drift/lib/attachments/queue.dart

@@ -13,7 +13,7 @@ part 'queue.g.dart';
 
 @Riverpod(keepAlive: true)
 Future<PhotoAttachmentQueue> attachmentQueue(Ref ref) async {
-  final db = await ref.read(initializePowerSyncProvider.future);
+  final db = await ref.read(powerSyncInstanceProvider.future);
   final queue = PhotoAttachmentQueue(db, remoteStorage);
   await queue.init();
   return queue;

demos/supabase-todolist-drift/lib/attachments/queue.g.dart

@@ -16,7 +16,7 @@ String _createSearchTermWithOptions(String searchTerm) {
 @riverpod
 Future<List> search(Ref ref, String searchTerm, String tableName) async {
   String searchTermWithOptions = _createSearchTermWithOptions(searchTerm);
-  final db = await ref.read(initializePowerSyncProvider.future);
+  final db = await ref.read(powerSyncInstanceProvider.future);
   return await db.getAll(
       'SELECT * FROM fts_$tableName WHERE fts_$tableName MATCH ? ORDER BY rank',
       [searchTermWithOptions]);

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

@@ -112,7 +112,7 @@ class MyHomePage extends ConsumerWidget {
                 var navigator = Navigator.of(context);
                 navigator.pop();
                 await Supabase.instance.client.auth.signOut();
-                await (await ref.read(initializePowerSyncProvider.future))
+                await (await ref.read(powerSyncInstanceProvider.future))
                     .disconnectAndClear();
 
                 navigator.pushReplacement(MaterialPageRoute(

demos/supabase-todolist-drift/lib/fts_helpers.g.dart

@@ -140,37 +140,40 @@ class SupabaseConnector extends PowerSyncBackendConnector {
 }
 
 @Riverpod(keepAlive: true)
-Future<PowerSyncDatabase> initializePowerSync(Ref ref) async {
-  final db = PowerSyncDatabase(
-      schema: schema, path: await _getDatabasePath(), logger: attachedLogger);
-  await db.initialize();
-
-  SupabaseConnector? currentConnector;
-
-  if (ref.read(session) != null) {
-    currentConnector = SupabaseConnector();
-    db.connect(connector: currentConnector);
-  }
+final class PowerSyncInstance extends _$PowerSyncInstance {
+  @override
+  Future<PowerSyncDatabase> build() async {
+    final db = PowerSyncDatabase(
+        schema: schema, path: await _getDatabasePath(), logger: attachedLogger);
+    await db.initialize();
 
-  final instance = Supabase.instance.client.auth;
-  final sub = instance.onAuthStateChange.listen((data) async {
-    final event = data.event;
-    if (event == AuthChangeEvent.signedIn) {
-      // Connect to PowerSync when the user is signed in
+    SupabaseConnector? currentConnector;
+    if (ref.read(session) != null) {
       currentConnector = SupabaseConnector();
-      db.connect(connector: currentConnector!);
-    } else if (event == AuthChangeEvent.signedOut) {
-      // Implicit sign out - disconnect, but don't delete data
-      currentConnector = null;
-      await db.disconnect();
-    } else if (event == AuthChangeEvent.tokenRefreshed) {
-      // Supabase token refreshed - trigger token refresh for PowerSync.
-      currentConnector?.prefetchCredentials();
+      db.connect(connector: currentConnector);
     }
-  });
-  ref.onDispose(sub.cancel);
 
-  return db;
+    // Connect and disconnect based on auth changes
+    final instance = Supabase.instance.client.auth;
+    final sub = instance.onAuthStateChange.listen((data) async {
+      final event = data.event;
+      if (event == AuthChangeEvent.signedIn) {
+        // Connect to PowerSync when the user is signed in
+        currentConnector = SupabaseConnector();
+        db.connect(connector: currentConnector!);
+      } else if (event == AuthChangeEvent.signedOut) {
+        // Implicit sign out - disconnect, but don't delete data
+        currentConnector = null;
+        await db.disconnect();
+      } else if (event == AuthChangeEvent.tokenRefreshed) {
+        // Supabase token refreshed - trigger token refresh for PowerSync.
+        currentConnector?.prefetchCredentials();
+      }
+    });
+    ref.onDispose(sub.cancel);
+
+    return db;
+  }
 }
 
 final session = statefulProvider<Session?>((ref, change) {
@@ -185,7 +188,7 @@ final session = statefulProvider<Session?>((ref, change) {
 });
 
 final syncStatus = statefulProvider<SyncStatus>((ref, change) {
-  final status = Stream.fromFuture(ref.read(initializePowerSyncProvider.future))
+  final status = Stream.fromFuture(ref.read(powerSyncInstanceProvider.future))
       .asyncExpand((db) => db.statusStream);
   final sub = status.listen(change);
   ref.onDispose(sub.cancel);
@@ -194,7 +197,7 @@ final syncStatus = statefulProvider<SyncStatus>((ref, change) {
 });
 
 final driftDatabase = Provider<AppDatabase>((ref) {
-  final powerSync = ref.read(initializePowerSyncProvider.future);
+  final powerSync = ref.read(powerSyncInstanceProvider.future);
   return AppDatabase(DatabaseConnection.delayed(Future(() async {
     return SqliteAsyncDriftConnection(await powerSync);
   })));

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

@@ -4,15 +4,15 @@ import 'package:powersync/powersync.dart';
 import 'package:supabase_todolist_drift/powersync.dart';
 
 import 'list_item.dart';
-import 'list_item_dialog.dart';
+import 'new_list_dialog.dart';
 import '../main.dart';
 
 void _showAddDialog(BuildContext context) async {
   return showDialog<void>(
     context: context,
     barrierDismissible: false, // user must tap button!
     builder: (BuildContext context) {
-      return const ListItemDialog();
+      return const NewListDialog();
     },
   );
 }

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

@@ -3,8 +3,8 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:supabase_todolist_drift/powersync.dart';
 
-final class ListItemDialog extends HookConsumerWidget {
-  const ListItemDialog({super.key});
+final class NewListDialog extends HookConsumerWidget {
+  const NewListDialog({super.key});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {