Review feedback

Author: simolus3

packages/node/src/db/BetterSQLite3DBAdapter.ts

@@ -42,8 +42,8 @@ export class BetterSQLite3DBAdapter extends BaseObserver<DBAdapterListener> impl
   constructor(options: NodeSQLOpenOptions) {
     super();
 
-    if (options.readWorkers != null && options.readWorkers < 1) {
-      throw `Needs at least one worker for reads, got ${options.readWorkers}`;
+    if (options.readWorkerCount != null && options.readWorkerCount < 1) {
+      throw `Needs at least one worker for reads, got ${options.readWorkerCount}`;
     }
 
     this.options = options;
@@ -65,7 +65,7 @@ export class BetterSQLite3DBAdapter extends BaseObserver<DBAdapterListener> impl
       if (isCommonJsModule) {
         worker = workerFactory(path.resolve(__dirname, 'DefaultWorker.cjs'), { name: workerName });
       } else {
-        worker = workerFactory(new URL('./DefaultWorker.js', import.meta.url), { name: workerName });
+        worker = workerFactory(new URL('./DefaultWorker.js', import.meta.url), { name: workerName});
       }
 
       const listeners = new WeakMap<EventListenerOrEventListenerObject, (e: any) => void>();
@@ -108,7 +108,7 @@ export class BetterSQLite3DBAdapter extends BaseObserver<DBAdapterListener> impl
     // Open the writer first to avoid multiple threads enabling WAL concurrently (causing "database is locked" errors).
     this.writeConnection = await openWorker(true);
     const createWorkers: Promise<RemoteConnection>[] = [];
-    const amountOfReaders = this.options.readWorkers ?? READ_CONNECTIONS;
+    const amountOfReaders = this.options.readWorkerCount ?? READ_CONNECTIONS;
     for (let i = 0; i < amountOfReaders; i++) {
       createWorkers.push(openWorker(false));
     }

packages/node/src/db/SqliteWorker.ts

@@ -114,7 +114,6 @@ export interface PowerSyncWorkerOptions {
 
 export function startPowerSyncWorker(options?: Partial<PowerSyncWorkerOptions>) {
   const resolvedOptions: PowerSyncWorkerOptions = {
-    ...options,
     extensionPath() {
       const isCommonJsModule = import.meta.isBundlingToCommonJs ?? false;
 
@@ -138,7 +137,8 @@ export function startPowerSyncWorker(options?: Partial<PowerSyncWorkerOptions>)
       }
 
       return resolved;
-    }
+    },
+    ...options,
   };
 
   Comlink.expose(new BetterSqliteWorker(resolvedOptions), parentPort! as Comlink.Endpoint);

packages/node/src/db/options.ts

@@ -1,6 +1,8 @@
 import { type Worker } from 'node:worker_threads';
 import { SQLOpenOptions } from '@powersync/common';
 
+export type OpenWorker = (...args: ConstructorParameters<typeof Worker>) => InstanceType<typeof Worker>;
+
 /**
  * The {@link SQLOpenOptions} available across all PowerSync SDKs for JavaScript extended with
  * Node.JS-specific options.
@@ -10,13 +12,13 @@ export interface NodeSQLOpenOptions extends SQLOpenOptions {
    * The Node.JS SDK will use one worker to run writing queries and additional workers to run reads.
    * This option controls how many workers to use for reads.
    */
-  readWorkers?: number;
+  readWorkerCount?: number;
   /**
    * A callback to allow customizing how the Node.JS SDK loads workers. This can be customized to
    * use workers at different paths.
    *
    * @param args The arguments that would otherwise be passed to the {@link Worker} constructor.
    * @returns the resolved worker.
    */
-  openWorker?: (...args: ConstructorParameters<typeof Worker>) => InstanceType<typeof Worker>;
+  openWorker?: OpenWorker;
 }

packages/node/tests/PowerSyncDatabase.test.ts

@@ -11,7 +11,7 @@ test('validates options', async () => {
       schema: AppSchema,
       database: {
         dbFilename: '/dev/null',
-        readWorkers: 0
+        readWorkerCount: 0,
       }
     });
     await database.init();
@@ -28,7 +28,7 @@ test('can customize loading workers', async () => {
       dbFilename: 'test.db',
       dbLocation: directory,
       openWorker: openFunction as any,
-      readWorkers: 2
+      readWorkerCount: 2
     }
   });