Remoed dynamic variables, implemented context.deleteAttachment() and fixed various formatting

dean-journeyapps · simolus3 · commit 9ec641e143c8 · 2025-08-19T15:38:25.000+02:00
diff --git a/demos/supabase-todolist/lib/widgets/todo_item_widget.dart b/demos/supabase-todolist/lib/widgets/todo_item_widget.dart
@@ -27,7 +27,7 @@ class TodoItemWidget extends StatelessWidget {
       await attachmentQueue.deleteFile(
         attachmentId: todo.photoId!,
         updateHook: (context, attachment) async {
-          // await context.execute("UPDATE todos SET photo_id = NULL WHERE id = ?", [todo.id]);
+          await context.execute("UPDATE todos SET photo_id = NULL WHERE id = ?", [todo.id]);
         },
       );
     }
diff --git a/demos/supabase-todolist/pubspec.lock b/demos/supabase-todolist/pubspec.lock
@@ -567,13 +567,6 @@ packages:
       relative: true
     source: path
     version: "1.15.0"
-  powersync_attachments_helper:
-    dependency: "direct overridden"
-    description:
-      path: "../../packages/powersync_attachments_helper"
-      relative: true
-    source: path
-    version: "0.6.18+11"
   powersync_attachments_stream:
     dependency: "direct main"
     description:
@@ -764,10 +757,10 @@ packages:
     dependency: transitive
     description:
       name: sqlite3
-      sha256: "310af39c40dd0bb2058538333c9d9840a2725ae0b9f77e4fd09ad6696aa8f66e"
+      sha256: f393d92c71bdcc118d6203d07c991b9be0f84b1a6f89dd4f7eed348131329924
       url: "https://pub.dev"
     source: hosted
-    version: "2.7.5"
+    version: "2.9.0"
   sqlite3_flutter_libs:
     dependency: transitive
     description:
@@ -1057,5 +1050,5 @@ packages:
     source: hosted
     version: "2.1.0"
 sdks:
-  dart: ">=3.8.1 <4.0.0"
+  dart: ">=3.7.0 <4.0.0"
   flutter: ">=3.27.0"
diff --git a/packages/powersync_attachments_stream/.metadata b/packages/powersync_attachments_stream/.metadata
diff --git a/packages/powersync_attachments_stream/lib/common.dart b/packages/powersync_attachments_stream/lib/common.dart
@@ -4,5 +4,5 @@ export 'src/abstractions/sync_error_handler.dart';
 export 'src/abstractions/attachment_service.dart';
 export 'src/abstractions/attachment_context.dart';
 export 'src/abstractions/local_storage.dart';
-export 'src/abstractions/remote_storage.dart'; 
+export 'src/abstractions/remote_storage.dart';
 export 'src/attachment_queue_service.dart';
diff --git a/packages/powersync_attachments_stream/lib/powersync_attachments_stream.dart b/packages/powersync_attachments_stream/lib/powersync_attachments_stream.dart
@@ -1,4 +1,3 @@
 /// Default exports for native platforms (dart:io). For web, use 'common.dart'.
 export 'common.dart';
 export 'src/storage/io_local_storage.dart';
-export 'src/attachment_queue_service.dart';
diff --git a/packages/powersync_attachments_stream/lib/src/abstractions/attachment_context.dart b/packages/powersync_attachments_stream/lib/src/abstractions/attachment_context.dart
@@ -1,3 +1,5 @@
+import 'package:sqlite_async/sqlite_async.dart';
+
 import '../attachment.dart';
 
 /// Context for performing Attachment operations.
@@ -8,8 +10,7 @@ abstract class AbstractAttachmentContext {
   /// Delete the attachment from the attachment queue.
   ///
   /// [id]: The ID of the attachment to delete.
-  /// [tx]: The database context to use for the operation.
-  Future<void> deleteAttachment(String id, dynamic context);
+  Future<void> deleteAttachment(String id);
 
   /// Set the state of the attachment to ignore.
   Future<void> ignoreAttachment(String id);
@@ -38,12 +39,14 @@ abstract class AbstractAttachmentContext {
   /// Delete attachments which have been archived.
   ///
   /// Returns true if all items have been deleted. Returns false if there might be more archived items remaining.
-  Future<bool> deleteArchivedAttachments(Future<void> Function(List<Attachment>) callback);
+  Future<bool> deleteArchivedAttachments(
+      Future<void> Function(List<Attachment>) callback);
 
   /// Upserts an attachment record given a database connection context.
   ///
   /// [attachment]: The attachment to upsert.
   /// [context]: The database transaction/context to use for the operation.
   /// Returns the upserted [Attachment].
-  Future<Attachment> upsertAttachment(Attachment attachment, dynamic context);
-}
+  Future<Attachment> upsertAttachment(
+      Attachment attachment, SqliteWriteContext context);
+}
diff --git a/packages/powersync_attachments_stream/lib/src/abstractions/attachment_service.dart b/packages/powersync_attachments_stream/lib/src/abstractions/attachment_service.dart
@@ -8,5 +8,6 @@ abstract class AbstractAttachmentService {
 
   /// Executes a callback with an exclusive lock on all attachment operations.
   /// This helps prevent race conditions between different updates.
-  Future<R> withContext<R>(Future<R> Function(AbstractAttachmentContext context) action);
-}
+  Future<R> withContext<R>(
+      Future<R> Function(AbstractAttachmentContext context) action);
+}
diff --git a/packages/powersync_attachments_stream/lib/src/abstractions/local_storage.dart b/packages/powersync_attachments_stream/lib/src/abstractions/local_storage.dart
@@ -1,6 +1,6 @@
 import 'dart:typed_data';
 
-abstract class AbstractLocalStorageAdapter {
+abstract interface class LocalStorageAdapter {
   /// Saves binary data stream to storage at the specified file path
   ///
   /// [filePath] - Path where the file will be stored
diff --git a/packages/powersync_attachments_stream/lib/src/abstractions/remote_storage.dart b/packages/powersync_attachments_stream/lib/src/abstractions/remote_storage.dart
@@ -1,5 +1,5 @@
 import 'dart:async';
- 
+
 import '../attachment.dart';
 
 /// Adapter for interfacing with remote attachment storage.
diff --git a/packages/powersync_attachments_stream/lib/src/abstractions/sync_error_handler.dart b/packages/powersync_attachments_stream/lib/src/abstractions/sync_error_handler.dart
@@ -3,7 +3,7 @@ import '../attachment.dart';
 /// Interface for handling errors during attachment operations.
 /// Implementations determine whether failed operations should be retried.
 /// Attachment records are archived if an operation fails and should not be retried.
-abstract class AbstractSyncErrorHandler {
+abstract class SyncErrorHandler {
   /// Determines whether the provided attachment download operation should be retried.
   ///
   /// [attachment] The attachment involved in the failed download operation.
@@ -33,4 +33,4 @@ abstract class AbstractSyncErrorHandler {
     Attachment attachment,
     Object exception,
   );
-}
+}
diff --git a/packages/powersync_attachments_stream/lib/src/attachment.dart b/packages/powersync_attachments_stream/lib/src/attachment.dart
@@ -57,20 +57,28 @@ const defaultAttachmentsQueueTableName = AttachmentQueue.defaultTableName;
 class Attachment {
   /// Unique identifier for the attachment.
   final String id;
+
   /// Timestamp of the last record update.
   final int timestamp;
+
   /// Name of the attachment file, e.g., `[id].jpg`.
   final String filename;
+
   /// Current state of the attachment, represented as an ordinal of [AttachmentState].
   final AttachmentState state;
+
   /// Local URI pointing to the attachment file, if available.
   final String? localUri;
+
   /// Media type of the attachment, typically represented as a MIME type.
   final String? mediaType;
+
   /// Size of the attachment in bytes, if available.
   final int? size;
+
   /// Indicates whether the attachment has been synced locally before.
   final bool hasSynced;
+
   /// Additional metadata associated with the attachment.
   final String? metaData;
 
@@ -139,19 +147,19 @@ class AttachmentsQueueTable extends Table {
     List<Index> indexes = const [],
     String? viewName,
   }) : super.localOnly(
-         attachmentsQueueTableName,
-         [
-           const Column.text('filename'),
-           const Column.text('local_uri'),
-           const Column.integer('timestamp'),
-           const Column.integer('size'),
-           const Column.text('media_type'),
-           const Column.integer('state'),
-           const Column.integer('has_synced'),
-           const Column.text('meta_data'),
-           ...additionalColumns,
-         ],
-         viewName: viewName,
-         indexes: indexes,
-       );
+          attachmentsQueueTableName,
+          [
+            const Column.text('filename'),
+            const Column.text('local_uri'),
+            const Column.integer('timestamp'),
+            const Column.integer('size'),
+            const Column.text('media_type'),
+            const Column.integer('state'),
+            const Column.integer('has_synced'),
+            const Column.text('meta_data'),
+            ...additionalColumns,
+          ],
+          viewName: viewName,
+          indexes: indexes,
+        );
 }
diff --git a/packages/powersync_attachments_stream/lib/src/attachment_queue_service.dart b/packages/powersync_attachments_stream/lib/src/attachment_queue_service.dart
@@ -9,8 +9,8 @@ import 'dart:async';
 import 'package:logging/logging.dart';
 import 'package:powersync_core/powersync_core.dart';
 import 'package:sqlite_async/mutex.dart';
+import 'package:sqlite_async/sqlite_async.dart';
 
- 
 import 'attachment.dart';
 import 'abstractions/attachment_service.dart';
 import 'abstractions/attachment_context.dart';
@@ -50,9 +50,9 @@ class WatchedAttachmentItem {
     this.filename,
     this.metaData,
   }) : assert(
-         fileExtension != null || filename != null,
-         'Either fileExtension or filename must be provided.',
-       );
+          fileExtension != null || filename != null,
+          'Either fileExtension or filename must be provided.',
+        );
 }
 
 /// Class used to implement the attachment queue.
@@ -76,9 +76,9 @@ class AttachmentQueue {
   final PowerSyncDatabase db;
   final AbstractRemoteStorageAdapter remoteStorage;
   final Stream<List<WatchedAttachmentItem>> Function() watchAttachments;
-  final AbstractLocalStorageAdapter localStorage;
+  final LocalStorageAdapter localStorage;
   final String attachmentsQueueTableName;
-  final AbstractSyncErrorHandler? errorHandler;
+  final SyncErrorHandler? errorHandler;
   final Duration syncInterval;
   final int archivedCacheLimit;
   final Duration syncThrottleDuration;
@@ -188,9 +188,7 @@ class AttachmentQueue {
     String attachmentId,
     String? fileExtension,
   ) async {
-    return fileExtension != null
-        ? '$attachmentId.$fileExtension'
-        : '$attachmentId.dat';
+    return '$attachmentId.${fileExtension ?? 'dat'}';
   }
 
   /// Processes attachment items returned from [watchAttachments].
@@ -204,20 +202,15 @@ class AttachmentQueue {
       final List<Attachment> attachmentUpdates = [];
 
       for (final item in items) {
-        final existingQueueItem = currentAttachments
-            .cast<Attachment?>()
-            .firstWhere(
-              (a) => a != null && a.id == item.id,
-              orElse: () => null,
-            );
+        final existingQueueItem =
+            currentAttachments.where((a) => a.id == item.id).firstOrNull;
 
         if (existingQueueItem == null) {
           if (!downloadAttachments) continue;
 
           // This item should be added to the queue.
           // This item is assumed to be coming from an upstream sync.
-          final String filename =
-              item.filename ??
+          final String filename = item.filename ??
               await resolveNewAttachmentFilename(item.id, item.fileExtension);
 
           attachmentUpdates.add(
@@ -286,8 +279,9 @@ class AttachmentQueue {
     required String mediaType,
     String? fileExtension,
     String? metaData,
-    required Future<void> Function(dynamic context, Attachment attachment)
-    updateHook,
+    required Future<void> Function(
+            SqliteWriteContext context, Attachment attachment)
+        updateHook,
   }) async {
     final row = await db.get('SELECT uuid() as id');
     final id = row['id'] as String;
@@ -323,8 +317,9 @@ class AttachmentQueue {
   /// The default implementation assumes the attachment record already exists locally.
   Future<Attachment> deleteFile({
     required String attachmentId,
-    required Future<void> Function(dynamic context, Attachment attachment)
-    updateHook,
+    required Future<void> Function(
+            SqliteWriteContext context, Attachment attachment)
+        updateHook,
   }) async {
     return await attachmentsService.withContext((attachmentContext) async {
       final attachment = await attachmentContext.getAttachment(attachmentId);
diff --git a/packages/powersync_attachments_stream/lib/src/implementations/attachment_context.dart b/packages/powersync_attachments_stream/lib/src/implementations/attachment_context.dart
@@ -1,6 +1,7 @@
 import 'package:powersync_core/powersync_core.dart';
 import 'package:powersync_core/sqlite3_common.dart';
 import 'package:logging/logging.dart';
+import 'package:sqlite_async/sqlite_async.dart';
 
 import '../abstractions/attachment_context.dart';
 import '../attachment.dart';
@@ -24,9 +25,11 @@ class AttachmentContextImpl implements AbstractAttachmentContext {
   }
 
   @override
-  Future<void> deleteAttachment(String id, dynamic context) async {
+  Future<void> deleteAttachment(String id) async {
     log.info('deleteAttachment: $id');
-    await context.execute('DELETE FROM $table WHERE id = ?', [id]);
+    await db.writeTransaction((tx) async {
+      await tx.execute('DELETE FROM $table WHERE id = ?', [id]);
+    });
   }
 
   @override
@@ -112,13 +115,15 @@ class AttachmentContextImpl implements AbstractAttachmentContext {
         maxArchivedCount,
       ],
     );
-    final archivedAttachments = results.map((row) => Attachment.fromRow(row)).toList();
+    final archivedAttachments =
+        results.map((row) => Attachment.fromRow(row)).toList();
 
     if (archivedAttachments.isEmpty) {
       return false;
     }
 
-    log.info('Deleting ${archivedAttachments.length} archived attachments (exceeding maxArchivedCount=$maxArchivedCount)...');
+    log.info(
+        'Deleting ${archivedAttachments.length} archived attachments (exceeding maxArchivedCount=$maxArchivedCount)...');
     // Call the callback with the list of archived attachments before deletion
     await callback(archivedAttachments);
 
@@ -137,9 +142,8 @@ class AttachmentContextImpl implements AbstractAttachmentContext {
   @override
   Future<Attachment> upsertAttachment(
     Attachment attachment,
-    dynamic context,
+    SqliteWriteContext context,
   ) async {
-
     await context.execute(
       '''INSERT OR REPLACE INTO 
                     $table (id, timestamp, filename, local_uri, media_type, size, state, has_synced, meta_data) 
diff --git a/packages/powersync_attachments_stream/lib/src/storage/io_local_storage.dart b/packages/powersync_attachments_stream/lib/src/storage/io_local_storage.dart
@@ -6,10 +6,10 @@ import 'package:path/path.dart' as p;
 
 import '../abstractions/local_storage.dart';
 
-/// Implements [AbstractLocalStorageAdapter] for device filesystem using Dart IO.
+/// Implements [LocalStorageAdapter] for device filesystem using Dart IO.
 ///
 /// Handles file and directory operations for attachments.
-class IOLocalStorage implements AbstractLocalStorageAdapter {
+class IOLocalStorage implements LocalStorageAdapter {
   final String attachmentsDirectory;
   late final Directory baseDir;
 
diff --git a/packages/powersync_attachments_stream/lib/src/sync/syncing_service.dart b/packages/powersync_attachments_stream/lib/src/sync/syncing_service.dart
diff --git a/packages/powersync_attachments_stream/pubspec.lock b/packages/powersync_attachments_stream/pubspec.lock
diff --git a/packages/powersync_attachments_stream/pubspec.yaml b/packages/powersync_attachments_stream/pubspec.yaml
diff --git a/packages/powersync_attachments_stream/test/local_storage_test.dart b/packages/powersync_attachments_stream/test/local_storage_test.dart

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class TodoItemWidget extends StatelessWidget {`
`27`	`27`	`await attachmentQueue.deleteFile(`
`28`	`28`	`attachmentId: todo.photoId!,`
`29`	`29`	`updateHook: (context, attachment) async {`
`30`		`- // await context.execute("UPDATE todos SET photo_id = NULL WHERE id = ?", [todo.id]);`
	`30`	`+ await context.execute("UPDATE todos SET photo_id = NULL WHERE id = ?", [todo.id]);`
`31`	`31`	`},`
`32`	`32`	`);`
`33`	`33`	`}`