Reduce public interface

Author: simolus3

demos/supabase-todolist/lib/attachments/photo_widget.dart

@@ -3,12 +3,12 @@ import 'dart:io';
 import 'package:path_provider/path_provider.dart';
 import 'package:path/path.dart' as p;
 import 'package:flutter/material.dart';
-import 'package:powersync_core/attachments_stream/attachment.dart';
+import 'package:powersync_core/attachments.dart';
 import 'package:powersync_flutter_demo/attachments/camera_helpers.dart';
 import 'package:powersync_flutter_demo/attachments/photo_capture_widget.dart';
-import 'package:powersync_flutter_demo/attachments/queue.dart';
 
 import '../models/todo_item.dart';
+import '../powersync.dart';
 
 class PhotoWidget extends StatefulWidget {
   final TodoItem todo;
@@ -44,7 +44,7 @@ class _PhotoWidgetState extends State<PhotoWidget> {
 
     bool fileExists = await File(photoPath).exists();
 
-    final row = await attachmentQueue.db
+    final row = await db
         .getOptional('SELECT * FROM attachments_queue WHERE id = ?', [photoId]);
 
     if (row != null) {

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

@@ -4,9 +4,9 @@ import 'dart:io';
 import 'package:logging/logging.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:powersync/powersync.dart';
-import 'package:powersync_core/attachments_stream/attachment_queue_service.dart';
-import 'package:powersync_core/attachments_stream/storage/io_local_storage.dart';
-import 'package:powersync_core/attachments_stream/attachment.dart';
+import 'package:powersync_core/attachments.dart';
+import 'package:powersync_core/attachments/io.dart';
+
 import 'package:powersync_flutter_demo/attachments/remote_storage_adapter.dart';
 
 late AttachmentQueue attachmentQueue;
@@ -21,15 +21,18 @@ Future<void> initializeAttachmentQueue(PowerSyncDatabase db) async {
     db: db,
     remoteStorage: remoteStorage,
     logger: logger,
-    localStorage: IOLocalStorage(appDocDir.path),
+    localStorage: IOLocalStorage(appDocDir),
     watchAttachments: () => db.watch('''
       SELECT photo_id as id FROM todos WHERE photo_id IS NOT NULL
-    ''').map((results) => results
-        .map((row) => WatchedAttachmentItem(
-              id: row['id'] as String,
-              fileExtension: 'jpg',
-            ))
-        .toList()),
+    ''').map(
+      (results) => [
+        for (final row in results)
+          WatchedAttachmentItem(
+            id: row['id'] as String,
+            fileExtension: 'jpg',
+          )
+      ],
+    ),
   );
 
   await attachmentQueue.startSync();

demos/supabase-todolist/lib/attachments/remote_storage_adapter.dart

@@ -1,12 +1,12 @@
 import 'dart:io';
 import 'dart:typed_data';
-import 'package:powersync_core/attachments_stream/attachment.dart';
-import 'package:powersync_core/attachments_stream/abstractions/remote_storage.dart';
+
+import 'package:powersync_core/attachments.dart';
 import 'package:powersync_flutter_demo/app_config.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
 import 'package:logging/logging.dart';
 
-class SupabaseStorageAdapter implements AbstractRemoteStorageAdapter {
+class SupabaseStorageAdapter implements RemoteAttachmentStorage {
   static final _log = Logger('SupabaseStorageAdapter');
 
   @override

demos/supabase-todolist/lib/models/schema.dart

@@ -1,5 +1,5 @@
 import 'package:powersync/powersync.dart';
-import 'package:powersync_core/attachments_stream/attachment.dart';
+import 'package:powersync_core/attachments.dart';
 
 const todosTable = 'todos';
 
@@ -22,6 +22,5 @@ Schema schema = Schema(([
     Column.text('name'),
     Column.text('owner_id')
   ]),
-  AttachmentsQueueTable(
-      attachmentsQueueTableName: defaultAttachmentsQueueTableName)
+  AttachmentsQueueTable()
 ]));

demos/supabase-todolist/pubspec.lock

@@ -300,10 +300,10 @@ packages:
     dependency: transitive
     description:
       name: http
-      sha256: "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b"
+      sha256: bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.5.0"
   http_multi_server:
     dependency: transitive
     description:
@@ -364,26 +364,26 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0"
+      sha256: "8dcda04c3fc16c14f48a7bb586d4be1f0d1572731b6d81d51772ef47c02081e0"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.9"
+    version: "11.0.1"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
+      sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.9"
+    version: "3.0.10"
   leak_tracker_testing:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+      sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
   lints:
     dependency: transitive
     description:
@@ -566,21 +566,28 @@ packages:
       path: "../../packages/powersync"
       relative: true
     source: path
-    version: "1.15.0"
+    version: "1.15.2"
+  powersync_attachments_helper:
+    dependency: "direct overridden"
+    description:
+      path: "../../packages/powersync_attachments_helper"
+      relative: true
+    source: path
+    version: "0.6.19"
   powersync_core:
     dependency: "direct main"
     description:
       path: "../../packages/powersync_core"
       relative: true
     source: path
-    version: "1.5.0"
+    version: "1.5.2"
   powersync_flutter_libs:
     dependency: "direct overridden"
     description:
       path: "../../packages/powersync_flutter_libs"
       relative: true
     source: path
-    version: "0.4.10"
+    version: "0.4.11"
   pub_semver:
     dependency: transitive
     description:
@@ -766,18 +773,17 @@ packages:
     dependency: transitive
     description:
       name: sqlite3_web
-      sha256: "967e076442f7e1233bd7241ca61f3efe4c7fc168dac0f38411bdb3bdf471eb3c"
+      sha256: "0f6ebcb4992d1892ac5c8b5ecd22a458ab9c5eb6428b11ae5ecb5d63545844da"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.1"
+    version: "0.3.2"
   sqlite_async:
     dependency: "direct main"
     description:
-      name: sqlite_async
-      sha256: "9332aedd311a19dd215dcb55729bc68dc587dc7655b569ab8819b68ee0be0082"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.11.7"
+      path: "/Users/simon/src/sqlite_async.dart/packages/sqlite_async"
+      relative: false
+    source: path
+    version: "0.12.1"
   stack_trace:
     dependency: transitive
     description:
@@ -846,26 +852,26 @@ packages:
     dependency: "direct dev"
     description:
       name: test
-      sha256: "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e"
+      sha256: "65e29d831719be0591f7b3b1a32a3cda258ec98c58c7b25f7b84241bc31215bb"
       url: "https://pub.dev"
     source: hosted
-    version: "1.25.15"
+    version: "1.26.2"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
+      sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.4"
+    version: "0.7.6"
   test_core:
     dependency: transitive
     description:
       name: test_core
-      sha256: "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa"
+      sha256: "80bf5a02b60af04b09e14f6fe68b921aad119493e26e490deaca5993fef1b05a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.8"
+    version: "0.6.11"
   typed_data:
     dependency: transitive
     description:
@@ -958,10 +964,10 @@ packages:
     dependency: transitive
     description:
       name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.2.0"
   vm_service:
     dependency: transitive
     description:
@@ -1043,5 +1049,5 @@ packages:
     source: hosted
     version: "2.1.0"
 sdks:
-  dart: ">=3.7.0 <4.0.0"
+  dart: ">=3.8.0-0 <4.0.0"
   flutter: ">=3.27.0"

demos/supabase-todolist/pubspec.yaml

@@ -10,8 +10,8 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  powersync_attachments_helper: ^0.6.19
   powersync: ^1.15.2
+  powersync_core: ^1.5.2
   path_provider: ^2.1.1
   supabase_flutter: ^2.0.1
   path: ^1.8.3

packages/powersync_core/dartdoc_options.yaml

@@ -0,0 +1,5 @@
+dartdoc:
+  categories:
+    attachments:
+      displayName: Attachments
+      markdown: doc/attachments.md

packages/powersync_core/doc/attachments.md

@@ -0,0 +1,4 @@
+export 'src/attachments/attachment.dart';
+export 'src/attachments/attachment_queue_service.dart';
+export 'src/attachments/local_storage.dart';
+export 'src/attachments/remote_storage.dart';

packages/powersync_core/lib/attachments.dart

@@ -0,0 +1,12 @@
+/// A platform-specific import supporting attachments on native platforms.
+///
+/// This library exports the [IOLocalStorage] class, implementing the
+/// [LocalStorageAdapter] interface by storing files under a root directory.
+///
+/// {@category attachments}
+library;
+
+import '../src/attachments/io_local_storage.dart';
+import '../src/attachments/local_storage.dart';
+
+export '../src/attachments/io_local_storage.dart';