Attachments Helper (#35)

Author: stevensJourney

CHANGELOG.md

@@ -1,12 +1,18 @@
 # Changelog
 
+# 1.0.0-Beta.12
+
+- Added attachment sync helpers
+- Added support for cancellations in watched queries
+
 # 1.0.0-beta.11
 
-* Fix deadlock when `connect()` is called immediately after opening a database.
+- Fix deadlock when `connect()` is called immediately after opening a database.
 
 # 1.0.0-Beta.10
 
-* Added the ability to specify a custom logging implementation
+- Added the ability to specify a custom logging implementation
+
 ```swift
   let db = PowerSyncDatabase(
     schema: Schema(
@@ -23,69 +29,70 @@
     logger: DefaultLogger(minSeverity: .debug)
 )
 ```
-* added `.close()` method on `PowerSyncDatabaseProtocol`
-* Update `powersync-kotlin` dependency to version `1.0.0-BETA29`, which fixes these issues:
-  * Fix potential race condition between jobs in `connect()` and `disconnect()`.
-  * Fix race condition causing data received during uploads not to be applied.
-  * Fixed issue where automatic driver migrations would fail with the error:
+
+- added `.close()` method on `PowerSyncDatabaseProtocol`
+- Update `powersync-kotlin` dependency to version `1.0.0-BETA29`, which fixes these issues:
+  - Fix potential race condition between jobs in `connect()` and `disconnect()`.
+  - Fix race condition causing data received during uploads not to be applied.
+  - Fixed issue where automatic driver migrations would fail with the error:
+
 ```
 Sqlite operation failure database is locked attempted to run migration and failed. closing connection
 ```
 
 ## 1.0.0-Beta.9
 
-* Update PowerSync SQLite core extension to 0.3.12.
-* Added queuing protection and warnings when connecting multiple PowerSync clients to the same database file.
-* Improved concurrent SQLite connection support. A single write connection and multiple read connections are used for concurrent read queries.
-* Internally improved the linking of SQLite.
-* Enabled Full Text Search support.
-* Added the ability to update the schema for existing PowerSync clients.
-* Fixed bug where local only, insert only and view name overrides were not applied for schema tables.
+- Update PowerSync SQLite core extension to 0.3.12.
+- Added queuing protection and warnings when connecting multiple PowerSync clients to the same database file.
+- Improved concurrent SQLite connection support. A single write connection and multiple read connections are used for concurrent read queries.
+- Internally improved the linking of SQLite.
+- Enabled Full Text Search support.
+- Added the ability to update the schema for existing PowerSync clients.
+- Fixed bug where local only, insert only and view name overrides were not applied for schema tables.
 
 ## 1.0.0-Beta.8
 
-* Improved watch query internals. Added the ability to throttle watched queries.
-* Added support for sync bucket priorities.
+- Improved watch query internals. Added the ability to throttle watched queries.
+- Added support for sync bucket priorities.
 
 ## 1.0.0-Beta.7
 
-* Fixed an issue where throwing exceptions in the query `mapper` could cause a runtime crash.
-* Internally improved type casting.
+- Fixed an issue where throwing exceptions in the query `mapper` could cause a runtime crash.
+- Internally improved type casting.
 
 ## 1.0.0-Beta.6
 
-* BREAKING CHANGE: `watch` queries are now throwable and therefore will need to be accompanied by a `try` e.g.
+- BREAKING CHANGE: `watch` queries are now throwable and therefore will need to be accompanied by a `try` e.g.
 
 ```swift
 try database.watch()
 ```
 
-* BREAKING CHANGE: `transaction` functions are now throwable and therefore will need to be accompanied by a `try` e.g.
+- BREAKING CHANGE: `transaction` functions are now throwable and therefore will need to be accompanied by a `try` e.g.
 
 ```swift
 try await database.writeTransaction { transaction in
   try transaction.execute(...)
 }
 ```
-* Allow `execute` errors to be handled
-* `userId` is now set to `nil` by default and therefore it is no longer required to be set to `nil` when instantiating `PowerSyncCredentials` and can therefore be left out.
 
-## 1.0.0-Beta.5
+- Allow `execute` errors to be handled
+- `userId` is now set to `nil` by default and therefore it is no longer required to be set to `nil` when instantiating `PowerSyncCredentials` and can therefore be left out.
 
-* Implement improvements to errors originating in Kotlin so that they can be handled in Swift
-* Improve `__fetchCredentials`to log the error but not cause an app crash on error
+## 1.0.0-Beta.5
 
+- Implement improvements to errors originating in Kotlin so that they can be handled in Swift
+- Improve `__fetchCredentials`to log the error but not cause an app crash on error
 
 ## 1.0.0-Beta.4
 
-* Allow cursor to use column name to get value by including the following functions that accept a column name parameter:
-`getBoolean`,`getBooleanOptional`,`getString`,`getStringOptional`, `getLong`,`getLongOptional`, `getDouble`,`getDoubleOptional`
-* BREAKING CHANGE: This should not affect anyone but made `KotlinPowerSyncCredentials`, `KotlinPowerSyncDatabase` and `KotlinPowerSyncBackendConnector` private as these should never have been public.
-
+- Allow cursor to use column name to get value by including the following functions that accept a column name parameter:
+  `getBoolean`,`getBooleanOptional`,`getString`,`getStringOptional`, `getLong`,`getLongOptional`, `getDouble`,`getDoubleOptional`
+- BREAKING CHANGE: This should not affect anyone but made `KotlinPowerSyncCredentials`, `KotlinPowerSyncDatabase` and `KotlinPowerSyncBackendConnector` private as these should never have been public.
 
 ## 1.0.0-Beta.3
 
-* BREAKING CHANGE: Update underlying powersync-kotlin package to BETA18.0 which requires transactions to become synchronous as opposed to asynchronous.
+- BREAKING CHANGE: Update underlying powersync-kotlin package to BETA18.0 which requires transactions to become synchronous as opposed to asynchronous.
   ```swift
   try await database.writeTransaction { transaction in
     try await transaction.execute(
@@ -106,8 +113,8 @@ try await database.writeTransaction { transaction in
 
 ## 1.0.0-Beta.2
 
-* Upgrade PowerSyncSqliteCore to 0.3.8
+- Upgrade PowerSyncSqliteCore to 0.3.8
 
 ## 1.0.0-Beta.1
 
-* Initial Beta release
+- Initial Beta release

Demo/PowerSyncExample.xcodeproj/project.pbxproj

@@ -40,6 +40,7 @@
 		B69F7D862C8EE27400565448 /* AnyCodable in Frameworks */ = {isa = PBXBuildFile; productRef = B69F7D852C8EE27400565448 /* AnyCodable */; };
 		B6B3698A2C64F4B30033C307 /* Navigation.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6B369892C64F4B30033C307 /* Navigation.swift */; };
 		B6FFD5322D06DA8000EEE60F /* PowerSync in Frameworks */ = {isa = PBXBuildFile; productRef = B6FFD5312D06DA8000EEE60F /* PowerSync */; };
+		BE2F26EC2DA54B2F0080F1AE /* SupabaseRemoteStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE2F26EB2DA54B2A0080F1AE /* SupabaseRemoteStorage.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -106,6 +107,7 @@
 		B6F421372BC42F450005D0D0 /* core.klib */ = {isa = PBXFileReference; lastKnownFileType = file; path = core.klib; sourceTree = "<group>"; };
 		B6F4213D2BC42F5B0005D0D0 /* sqlite3.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = sqlite3.c; path = "../powersync-kotlin/core/build/interop/sqlite/sqlite3.c"; sourceTree = "<group>"; };
 		B6F421402BC430B60005D0D0 /* sqlite3.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = sqlite3.h; path = "../powersync-kotlin/core/build/interop/sqlite/sqlite3.h"; sourceTree = "<group>"; };
+		BE2F26EB2DA54B2A0080F1AE /* SupabaseRemoteStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SupabaseRemoteStorage.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -218,6 +220,7 @@
 		B65C4D6F2C60D58500176007 /* PowerSync */ = {
 			isa = PBXGroup;
 			children = (
+				BE2F26EB2DA54B2A0080F1AE /* SupabaseRemoteStorage.swift */,
 				6A7315BA2B98BDD30004CB17 /* SystemManager.swift */,
 				6A4AD3842B9EE763005CBFD4 /* SupabaseConnector.swift */,
 				6ABD78772B9F2D2800558A41 /* Schema.swift */,
@@ -564,6 +567,7 @@
 				B65C4D6D2C60D38B00176007 /* HomeScreen.swift in Sources */,
 				6A7315882B9854220004CB17 /* PowerSyncExampleApp.swift in Sources */,
 				B666585F2C62115300159A81 /* ListRow.swift in Sources */,
+				BE2F26EC2DA54B2F0080F1AE /* SupabaseRemoteStorage.swift in Sources */,
 				B66658632C621CA700159A81 /* AddTodoListView.swift in Sources */,
 				B666585D2C620E9E00159A81 /* WifiIcon.swift in Sources */,
 				6A9669042B9EE6FA00B05DCF /* SignInScreen.swift in Sources */,
@@ -705,10 +709,11 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"PowerSyncExample/Preview Content\"";
-				DEVELOPMENT_TEAM = 6WA62GTJNA;
+				DEVELOPMENT_TEAM = ZGT7463CVJ;
 				ENABLE_PREVIEWS = YES;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_KEY_NSCameraUsageDescription = "Take Photos for Todo Completion";
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
@@ -721,7 +726,7 @@
 				MARKETING_VERSION = 1.0;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "$(inherited)";
-				PRODUCT_BUNDLE_IDENTIFIER = com.powersync.PowerSyncExample;
+				PRODUCT_BUNDLE_IDENTIFIER = com.powersync.PowerSyncSwiftExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "PowerSyncExample/PowerSyncExample-Bridging-Header.h";
@@ -742,10 +747,11 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"PowerSyncExample/Preview Content\"";
-				DEVELOPMENT_TEAM = 6WA62GTJNA;
+				DEVELOPMENT_TEAM = ZGT7463CVJ;
 				ENABLE_PREVIEWS = YES;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_KEY_NSCameraUsageDescription = "Take Photos for Todo Completion";
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
@@ -757,7 +763,7 @@
 				);
 				MARKETING_VERSION = 1.0;
 				OTHER_LDFLAGS = "$(inherited)";
-				PRODUCT_BUNDLE_IDENTIFIER = com.powersync.PowerSyncExample;
+				PRODUCT_BUNDLE_IDENTIFIER = com.powersync.PowerSyncSwiftExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "PowerSyncExample/PowerSyncExample-Bridging-Header.h";

Demo/PowerSyncExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -15,8 +15,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/powersync-ja/powersync-kotlin.git",
       "state" : {
-        "revision" : "443df078f4b9352de137000b993d564d4ab019b7",
-        "version" : "1.0.0-BETA28.0"
+        "revision" : "633a2924f7893f7ebeb064cbcd9c202937673633",
+        "version" : "1.0.0-BETA30.0"
       }
     },
     {

Demo/PowerSyncExample.xcodeproj/xcshareddata/xcschemes/PowerSyncExample.xcscheme

@@ -39,6 +39,7 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
+      enableGPUValidationMode = "1"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">

Demo/PowerSyncExample/Components/TodoListRow.swift

@@ -1,36 +1,116 @@
 import SwiftUI
 
 struct TodoListRow: View {
-  let todo: Todo
-  let completeTapped: () -> Void
-
-  var body: some View {
-    HStack {
-      Text(todo.description)
-      Spacer()
-      Button {
-        completeTapped()
-      } label: {
-        Image(systemName: todo.isComplete ? "checkmark.circle.fill" : "circle")
-      }
-      .buttonStyle(.plain)
+    let todo: Todo
+    let isCameraAvailable: Bool
+    let completeTapped: () -> Void
+    let deletePhotoTapped: () -> Void
+    let capturePhotoTapped: () -> Void
+    let selectPhotoTapped: () -> Void
+
+    @State private var image: UIImage? = nil
+
+    var body: some View {
+        HStack {
+            Text(todo.description)
+            Group {
+                if let image = image {
+                    Image(uiImage: image)
+                        .resizable()
+                        .scaledToFit()
+
+                } else if todo.photoUri != nil {
+                    // Show progress while loading the image
+                    ProgressView()
+                        .onAppear {
+                            Task {
+                                await loadImage()
+                            }
+                        }
+                } else if todo.photoId != nil {
+                    // Show progres, wait for a URI to be present
+                    ProgressView()
+                } else {
+                    EmptyView()
+                }
+            }
+            Spacer()
+            VStack {
+                if todo.photoId == nil {
+                    HStack {
+                        if isCameraAvailable {
+                            Button {
+                                capturePhotoTapped()
+                            } label: {
+                                Image(systemName: "camera.fill")
+                            }
+                            .buttonStyle(.plain)
+                        }
+                        Button {
+                            selectPhotoTapped()
+                        } label: {
+                            Image(systemName: "photo.on.rectangle")
+                        }
+                        .buttonStyle(.plain)
+                    }
+                } else {
+                    Button {
+                        deletePhotoTapped()
+                    } label: {
+                        Image(systemName: "trash.fill")
+                    }
+                    .buttonStyle(.plain)
+                }
+                Spacer()
+                Button {
+                    completeTapped()
+                } label: {
+                    Image(systemName: todo.isComplete ? "checkmark.circle.fill" : "circle")
+                }
+                .buttonStyle(.plain)
+            }.onChange(of: todo.photoId) { _, newPhotoId in
+                if newPhotoId == nil {
+                    // Clear the image when photoId becomes nil
+                    image = nil
+                }
+            }
+        }
     }
-  }
-}
 
+    private func loadImage() async {
+        guard let urlString = todo.photoUri else { return }
+        let url = URL(fileURLWithPath: urlString)
+
+        do {
+            let data = try Data(contentsOf: url)
+            if let loadedImage = UIImage(data: data) {
+                image = loadedImage
+            } else {
+                print("Failed to decode image from data.")
+            }
+        } catch {
+            print("Error loading image from disk:", error)
+        }
+    }
+}
 
 #Preview {
     TodoListRow(
-      todo: .init(
-        id: UUID().uuidString.lowercased(),
-        listId: UUID().uuidString.lowercased(),
-        photoId: nil,
-        description: "description",
-        isComplete: false,
-        createdAt: "",
-        completedAt: nil,
-        createdBy: UUID().uuidString.lowercased(),
-        completedBy: nil
-      )
+        todo: .init(
+            id: UUID().uuidString.lowercased(),
+            listId: UUID().uuidString.lowercased(),
+            photoId: nil,
+            description: "description",
+            isComplete: false,
+            createdAt: "",
+            completedAt: nil,
+            createdBy: UUID().uuidString.lowercased(),
+            completedBy: nil,
+
+        ),
+        isCameraAvailable: true,
+        completeTapped: {},
+        deletePhotoTapped: {},
+        capturePhotoTapped: {}
     ) {}
 }