Merge branch 'main' into feat/nuget-release

Author: Chriztiaan

PowerSync/PowerSync.Common/Client/PowerSyncDatabase.cs

@@ -28,14 +28,14 @@ public class BasePowerSyncDatabaseOptions()
 
 }
 
-public abstract class DatabaseSource { }
+public interface IDatabaseSource { }
 
-public class DBAdapterSource(IDBAdapter Adapter) : DatabaseSource
+public class DBAdapterSource(IDBAdapter Adapter) : IDatabaseSource
 {
     public IDBAdapter Adapter { get; init; } = Adapter;
 }
 
-public class OpenFactorySource(ISQLOpenFactory Factory) : DatabaseSource
+public class OpenFactorySource(ISQLOpenFactory Factory) : IDatabaseSource
 {
     public ISQLOpenFactory Factory { get; init; } = Factory;
 }
@@ -45,8 +45,7 @@ public class PowerSyncDatabaseOptions() : BasePowerSyncDatabaseOptions()
     /// <summary> 
     /// Source for a SQLite database connection.
     /// </summary>
-    public DatabaseSource Database { get; set; } = null!;
-
+    public IDatabaseSource Database { get; set; } = null!;
 }
 
 public class PowerSyncDBEvent : StreamingSyncImplementationEvent
@@ -63,6 +62,25 @@ public interface IPowerSyncDatabase : IEventStream<PowerSyncDBEvent>
     public Task<CrudBatch?> GetCrudBatch(int limit);
 
     public Task<CrudTransaction?> GetNextCrudTransaction();
+
+    Task<NonQueryResult> Execute(string query, object[]? parameters = null);
+
+    Task<T[]> GetAll<T>(string sql, params object[]? parameters);
+
+    Task<T?> GetOptional<T>(string sql, params object[]? parameters);
+
+    Task<T> Get<T>(string sql, params object[]? parameters);
+
+    Task<T> ReadLock<T>(Func<ILockContext, Task<T>> fn, DBLockOptions? options = null);
+
+    Task<T> ReadTransaction<T>(Func<ITransaction, Task<T>> fn, DBLockOptions? options = null);
+
+    Task WriteLock(Func<ILockContext, Task> fn, DBLockOptions? options = null);
+    Task<T> WriteLock<T>(Func<ILockContext, Task<T>> fn, DBLockOptions? options = null);
+
+    Task WriteTransaction(Func<ITransaction, Task> fn, DBLockOptions? options = null);
+    Task<T> WriteTransaction<T>(Func<ITransaction, Task<T>> fn, DBLockOptions? options = null);
+
 }
 
 public class PowerSyncDatabase : EventStream<PowerSyncDBEvent>, IPowerSyncDatabase
@@ -102,9 +120,6 @@ public PowerSyncDatabase(PowerSyncDatabaseOptions options)
         }
         else if (options.Database is SQLOpenOptions openOptions)
         {
-            // TODO default to MDSQLite factory for now
-            // Can be broken out, rename this class to Abstract
-            // `this.openDBAdapter(options)`
             Database = new MDSQLiteAdapter(new MDSQLiteAdapterOptions
             {
                 Name = openOptions.DbFilename,
@@ -346,7 +361,6 @@ public async Task DisconnectAndClear()
         await Disconnect();
         await WaitForReady();
 
-        // TODO CL bool clearLocal = options?.ClearLocal ?? false;
         bool clearLocal = true;
 
         await Database.WriteTransaction(async tx =>
@@ -364,12 +378,6 @@ await Database.WriteTransaction(async tx =>
         base.Close();
         await WaitForReady();
 
-        // TODO CL
-        // if (options.Disconnect)
-        // {
-        //     await Disconnect();
-        // }
-
         syncStreamImplementation?.Close();
         BucketStorageAdapter?.Close();
 

PowerSync/PowerSync.Common/Client/SQLOpenFactory.cs

@@ -2,7 +2,7 @@ namespace PowerSync.Common.Client;
 
 using PowerSync.Common.DB;
 
-public class SQLOpenOptions : DatabaseSource
+public class SQLOpenOptions : IDatabaseSource
 {
     /// <summary>
     /// Filename for the database.

PowerSync/PowerSync.Common/Client/Sync/Stream/Remote.cs

@@ -50,7 +50,6 @@ public Remote(IPowerSyncBackendConnector connector)
 
         credentials = await connector.FetchCredentials();
 
-        // TODO CL trailing forward slash check
         return credentials;
     }
 
@@ -155,7 +154,6 @@ private async Task<HttpRequestMessage> BuildRequest(HttpMethod method, string pa
 
         if (string.IsNullOrEmpty(credentials.Token))
         {
-            // TODO CL error status code 401
             var error = new HttpRequestException("Not signed in");
             throw error;
         }

PowerSync/PowerSync.Common/Client/Sync/Stream/StreamingSyncImplementation.cs

@@ -131,7 +131,6 @@ public StreamingSyncImplementation(StreamingSyncImplementationOptions options)
 
         CancellationTokenSource = null;
 
-        // TODO CL throttling
         TriggerCrudUpload = () =>
         {
             if (!SyncStatus.Connected || SyncStatus.DataFlowStatus.Uploading)

PowerSync/PowerSync.Common/DB/Schema/Table.cs

@@ -2,9 +2,6 @@ namespace PowerSync.Common.DB.Schema;
 
 using Newtonsoft.Json;
 
-// TODO CL Need to port this to C#
-// export const InvalidSQLCharacters = /["'%,.#\s[\]]/;
-
 public class TableOptions(
     Dictionary<string, List<string>>? indexes = null,
     bool? localOnly = null,

PowerSync/PowerSync.Common/MDSQLite/MDSQLiteConnection.cs

@@ -142,7 +142,6 @@ public async Task<QueryResult> ExecuteQuery(string query, object[]? parameters =
             var row = new Dictionary<string, object>();
             for (int i = 0; i < reader.FieldCount; i++)
             {
-                // TODO: What should we do with null values?
                 row[reader.GetName(i)] = reader.IsDBNull(i) ? null : reader.GetValue(i);
             }
             rows.Add(row);
@@ -164,8 +163,6 @@ public async Task<T[]> GetAll<T>(string sql, object[]? parameters = null)
 
         var items = new List<T>();
 
-        // TODO: Improve mapping errors for when the result fields don't match the target type.
-        // TODO: This conversion may be a performance bottleneck, it's the easiest mechamisn for getting result typing.
         foreach (var row in result.Rows.Array)
         {
             if (row != null)
@@ -197,8 +194,6 @@ public async Task<T[]> GetAll<T>(string sql, object[]? parameters = null)
             return default;
         }
 
-        // TODO: Improve mapping errors for when the result fields don't match the target type.
-        // TODO: This conversion may be a performance bottleneck, it's the easiest mechamisn for getting result typing.
         string json = JsonConvert.SerializeObject(firstRow);
         return JsonConvert.DeserializeObject<T>(json);
     }