Properly copy options

Author: simolus3

packages/powersync_core/lib/src/database/native/native_powersync_database.dart

@@ -120,7 +120,7 @@ class PowerSyncDatabaseImpl
   @internal
   Future<void> connectInternal({
     required PowerSyncBackendConnector connector,
-    required SyncOptions options,
+    required ResolvedSyncOptions options,
     required AbortController abort,
     required Zone asyncWorkZone,
   }) async {
@@ -135,7 +135,6 @@ class PowerSyncDatabaseImpl
     SendPort? initPort;
     final hasInitPort = Completer<void>();
     final receivedIsolateExit = Completer<void>();
-    final resolved = ResolvedSyncOptions(options);
 
     Future<void> waitForShutdown() async {
       // Only complete the abortion signal after the isolate shuts down. This
@@ -183,7 +182,7 @@ class PowerSyncDatabaseImpl
           final port = initPort = data[1] as SendPort;
           hasInitPort.complete();
           var crudStream = database
-              .onChange(['ps_crud'], throttle: resolved.crudThrottleTime);
+              .onChange(['ps_crud'], throttle: options.crudThrottleTime);
           crudUpdateSubscription = crudStream.listen((event) {
             port.send(['update']);
           });
@@ -245,7 +244,7 @@ class PowerSyncDatabaseImpl
       _PowerSyncDatabaseIsolateArgs(
         receiveMessages.sendPort,
         dbRef,
-        resolved,
+        options,
         crudMutex.shared,
         syncMutex.shared,
       ),

packages/powersync_core/lib/src/database/powersync_database_impl_stub.dart

@@ -115,7 +115,7 @@ class PowerSyncDatabaseImpl
     required PowerSyncBackendConnector connector,
     required AbortController abort,
     required Zone asyncWorkZone,
-    required SyncOptions options,
+    required ResolvedSyncOptions options,
   }) {
     throw UnimplementedError();
   }

packages/powersync_core/lib/src/database/powersync_db_mixin.dart

@@ -289,11 +289,10 @@ mixin PowerSyncDatabaseMixin implements SqliteConnection {
     // the lock for the connection.
     await initialize();
 
-    final resolvedOptions = SyncOptions(
-      crudThrottleTime: options?.crudThrottleTime ?? crudThrottleTime,
-      // ignore: deprecated_member_use_from_same_package
-      retryDelay: options?.retryDelay ?? retryDelay,
-      params: options?.params ?? params,
+    final resolvedOptions = ResolvedSyncOptions.resolve(
+      options,
+      crudThrottleTime: crudThrottleTime,
+      params: params,
     );
 
     // ignore: deprecated_member_use_from_same_package
@@ -362,7 +361,7 @@ mixin PowerSyncDatabaseMixin implements SqliteConnection {
   @internal
   Future<void> connectInternal({
     required PowerSyncBackendConnector connector,
-    required SyncOptions options,
+    required ResolvedSyncOptions options,
     required AbortController abort,
     required Zone asyncWorkZone,
   });

packages/powersync_core/lib/src/database/web/web_powersync_database.dart

@@ -118,10 +118,8 @@ class PowerSyncDatabaseImpl
     required PowerSyncBackendConnector connector,
     required AbortController abort,
     required Zone asyncWorkZone,
-    required SyncOptions options,
+    required ResolvedSyncOptions options,
   }) async {
-    final resolved = ResolvedSyncOptions(options);
-
     final storage = BucketStorage(database);
     StreamingSync sync;
     // Try using a shared worker for the synchronization implementation to avoid
@@ -130,7 +128,7 @@ class PowerSyncDatabaseImpl
       sync = await SyncWorkerHandle.start(
         database: this,
         connector: connector,
-        options: options,
+        options: options.source,
         workerUri: Uri.base.resolve('/powersync_sync.worker.js'),
       );
     } catch (e) {
@@ -139,13 +137,13 @@ class PowerSyncDatabaseImpl
         e,
       );
       final crudStream =
-          database.onChange(['ps_crud'], throttle: resolved.crudThrottleTime);
+          database.onChange(['ps_crud'], throttle: options.crudThrottleTime);
 
       sync = StreamingSyncImplementation(
         adapter: storage,
         connector: InternalConnector.wrap(connector, this),
         crudUpdateTriggerStream: crudStream,
-        options: resolved,
+        options: options,
         client: BrowserClient(),
         // Only allows 1 sync implementation to run at a time per database
         // This should be global (across tabs) when using Navigator locks.

packages/powersync_core/lib/src/sync/options.dart

@@ -33,6 +33,18 @@ final class SyncOptions {
     this.params,
     this.syncImplementation = SyncClientImplementation.defaultClient,
   });
+
+  SyncOptions _copyWith({
+    Duration? crudThrottleTime,
+    Map<String, dynamic>? params,
+  }) {
+    return SyncOptions(
+      crudThrottleTime: crudThrottleTime ?? this.crudThrottleTime,
+      retryDelay: retryDelay,
+      params: params ?? this.params,
+      syncImplementation: syncImplementation,
+    );
+  }
 }
 
 /// The PowerSync SDK offers two different implementations for receiving sync
@@ -63,6 +75,17 @@ enum SyncClientImplementation {
 
 @internal
 extension type ResolvedSyncOptions(SyncOptions source) {
+  factory ResolvedSyncOptions.resolve(
+    SyncOptions? source, {
+    Duration? crudThrottleTime,
+    Map<String, dynamic>? params,
+  }) {
+    return ResolvedSyncOptions((source ?? SyncOptions())._copyWith(
+      crudThrottleTime: crudThrottleTime,
+      params: params,
+    ));
+  }
+
   Duration get crudThrottleTime =>
       source.crudThrottleTime ?? const Duration(milliseconds: 10);