Use default import

Author: simolus3

packages/node/rollup.config.mjs

@@ -9,13 +9,6 @@ const plugin = () => {
       } else {
         return await this.resolve(source, importer, options);
       }
-    },
-    resolveImportMeta: (property) => {
-      if (property == 'isBundlingToCommonJs') {
-        return 'true';
-      }
-
-      return null;
     }
   };
 };

packages/node/src/db/BetterSqliteWorker.ts

@@ -2,7 +2,6 @@ import type { Database } from 'better-sqlite3';
 import { AsyncDatabase, AsyncDatabaseOpenOptions } from './AsyncDatabase.js';
 import { PowerSyncWorkerOptions } from './SqliteWorker.js';
 import { threadId } from 'node:worker_threads';
-import { dynamicImport } from '../utils/modules.js';
 
 class BlockingAsyncDatabase implements AsyncDatabase {
   private readonly db: Database;
@@ -63,8 +62,8 @@ class BlockingAsyncDatabase implements AsyncDatabase {
   }
 }
 
-export async function openDatabase(worker: PowerSyncWorkerOptions, options: AsyncDatabaseOpenOptions, pkg: string) {
-  const BetterSQLite3Database: typeof Database = (await dynamicImport(pkg)).default;
+export async function openDatabase(worker: PowerSyncWorkerOptions, options: AsyncDatabaseOpenOptions) {
+  const BetterSQLite3Database = await worker.loadBetterSqlite3();
   const baseDB = new BetterSQLite3Database(options.path);
   baseDB.pragma('journal_mode = WAL');
   baseDB.loadExtension(worker.extensionPath(), 'sqlite3_powersync_init');

packages/node/src/db/SqliteWorker.ts

@@ -7,6 +7,7 @@ import { openDatabase as openBetterSqliteDatabase } from './BetterSqliteWorker.j
 import { openDatabase as openNodeDatabase } from './NodeSqliteWorker.js';
 import { AsyncDatabase, AsyncDatabaseOpener, AsyncDatabaseOpenOptions } from './AsyncDatabase.js';
 import { isBundledToCommonJs } from '../utils/modules.js';
+import { dynamicImport } from '../utils/modules.js';
 
 export interface PowerSyncWorkerOptions {
   /**
@@ -15,6 +16,11 @@ export interface PowerSyncWorkerOptions {
    * @returns The absolute path of the PowerSync SQLite core extensions library.
    */
   extensionPath: () => string;
+
+  /**
+   * A function that returns the `Database` constructor from the `better-sqlite3` package.
+   */
+  loadBetterSqlite3: () => Promise<any>;
 }
 
 export function startPowerSyncWorker(options?: Partial<PowerSyncWorkerOptions>) {
@@ -43,6 +49,10 @@ export function startPowerSyncWorker(options?: Partial<PowerSyncWorkerOptions>)
 
       return resolved;
     },
+    async loadBetterSqlite3() {
+      const module = await dynamicImport('better-sqlite3');
+      return module.default;
+    },
     ...options
   };
 
@@ -62,7 +72,7 @@ class DatabaseOpenHelper implements AsyncDatabaseOpener {
     const implementation = options.implementation;
     switch (implementation.type) {
       case 'better-sqlite3':
-        database = await openBetterSqliteDatabase(this.options, options, implementation.package ?? 'better-sqlite3');
+        database = await openBetterSqliteDatabase(this.options, options);
         break;
       case 'node:sqlite':
         database = await openNodeDatabase(this.options, options);

packages/node/src/db/WorkerConnectionPool.ts

@@ -29,8 +29,7 @@ export type BetterSQLite3Transaction = Transaction & BetterSQLite3LockContext;
 const READ_CONNECTIONS = 5;
 
 const defaultDatabaseImplementation: NodeDatabaseImplementation = {
-  type: 'better-sqlite3',
-  package: 'better-sqlite3'
+  type: 'better-sqlite3'
 };
 
 /**

packages/node/src/db/options.ts

@@ -8,13 +8,6 @@ export type WorkerOpener = (...args: ConstructorParameters<typeof Worker>) => In
  */
 export interface BetterSqlite3Options {
   type: 'better-sqlite3';
-  /**
-   * The package import to resolve for better-sqlite3.
-   *
-   * While this defaults to `better-sqlite3`, this allows using forked better-sqlite3 packages, such as those used for
-   * encryption.
-   */
-  package?: string;
 }
 
 /**