@powersync/node 0.0.0-dev-20260503073249 → 0.0.0-dev-20260630141119

package/lib/db/WorkerConnectionPool.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"WorkerConnectionPool.d.ts","sourceRoot":"","sources":["../../src/db/WorkerConnectionPool.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,SAAS,EACT,aAAa,EACb,WAAW,EACX,WAAW,EACX,WAAW,EACZ,MAAM,mBAAmB,CAAC;AAI3B,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAA8B,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAE9E,MAAM,MAAM,wBAAwB,GAAG,WAAW,GAAG;IACnD,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;CACrE,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,WAAW,GAAG,wBAAwB,CAAC;AAQ9E;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,SAAS;IACjD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqB;IAC7C,SAAgB,IAAI,EAAE,MAAM,CAAC;IAE7B,OAAO,CAAC,eAAe,CAAC,CAA8B;IACtD,OAAO,CAAC,eAAe,CAAC,CAA8B;gBAE1C,OAAO,EAAE,kBAAkB;IAWjC,UAAU;IA4FV,KAAK;IAaL,QAAQ,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,gBAAgB,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,SAAS,GAAG,OAAO,CAAC,CAAC,CAAC;IAStG,SAAS,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,gBAAgB,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,SAAS,GAAG,OAAO,CAAC,CAAC,CAAC;IAsBvG,aAAa;CAUpB"}

package/lib/db/WorkerConnectionPool.js

@@ -2,8 +2,8 @@ import * as Comlink from 'comlink';
 import fs from 'node:fs/promises';
 import * as path from 'node:path';
 import { Worker } from 'node:worker_threads';
-import { BaseObserver, DBAdapterDefaultMixin, Semaphore, timeoutSignal } from '@powersync/common';
-import { isBundledToCommonJs } from '../utils/modules.js';
+import { DBAdapter } from '@powersync/common';
+import { Semaphore, timeoutSignal } from '@powersync/shared-internals';
 import { RemoteConnection } from './RemoteConnection.js';
 const READ_CONNECTIONS = 5;
 const defaultDatabaseImplementation = {
@@ -12,7 +12,7 @@ const defaultDatabaseImplementation = {
 /**
  * Adapter for better-sqlite3
  */
-export class WorkerConnectionPool extends BaseObserver {
+export class WorkerConnectionPool extends DBAdapter {
     options;
     name;
     writeConnection;
@@ -43,16 +43,9 @@ export class WorkerConnectionPool extends BaseObserver {
             dbFilePath = path.join(this.options.dbLocation, dbFilePath);
         }
         const openWorker = async (isWriter) => {
-            const isCommonJsModule = isBundledToCommonJs;
-            let worker;
             const workerName = isWriter ? `write ${dbFilePath}` : `read ${dbFilePath}`;
             const workerFactory = this.options.openWorker ?? ((...args) => new Worker(...args));
-            if (isCommonJsModule) {
-                worker = workerFactory(path.resolve(__dirname, 'DefaultWorker.cjs'), { name: workerName });
-            }
-            else {
-                worker = workerFactory(new URL('./DefaultWorker.js', import.meta.url), { name: workerName });
-            }
+            const worker = workerFactory(new URL('./DefaultWorker.js', import.meta.url), { name: workerName });
             const listeners = new WeakMap();
             const comlink = Comlink.wrap({
                 postMessage: worker.postMessage.bind(worker),
@@ -85,16 +78,13 @@ export class WorkerConnectionPool extends BaseObserver {
                 implementation: this.options.implementation ?? defaultDatabaseImplementation
             }));
             if (isWriter) {
-                await database.execute("SELECT powersync_update_hooks('install');", []);
+                await database.executeRaw("SELECT powersync_update_hooks('install');", []);
             }
             const connection = new RemoteConnection(worker, comlink, database);
             if (this.options.initializeConnection) {
                 await this.options.initializeConnection(connection, isWriter);
             }
-            if (!isWriter) {
-                await connection.execute('pragma query_only = true');
-            }
-            else {
+            if (isWriter) {
                 // We only need to enable this on the writer connection.
                 // We can get `database is locked` errors if we enable this on concurrently opening read connections.
                 await connection.execute('pragma journal_mode = WAL');
@@ -138,13 +128,11 @@ export class WorkerConnectionPool extends BaseObserver {
                 return await fn(item);
             }
             finally {
-                const serializedUpdates = await item.executeRaw("SELECT powersync_update_hooks('get');", []);
+                const { rawRows: serializedUpdates } = await item.executeRaw("SELECT powersync_update_hooks('get');", []);
                 const updates = JSON.parse(serializedUpdates[0][0]);
                 if (updates.length > 0) {
                     const event = {
-                        tables: updates,
-                        groupedUpdates: {},
-                        rawUpdates: []
+                        tables: updates
                     };
                     this.iterateListeners((cb) => cb.tablesUpdated?.(event));
                 }
@@ -165,6 +153,4 @@ export class WorkerConnectionPool extends BaseObserver {
         }
     }
 }
-export class WorkerPoolDatabaseAdapter extends DBAdapterDefaultMixin(WorkerConnectionPool) {
-}
 //# sourceMappingURL=WorkerConnectionPool.js.map

package/lib/db/WorkerConnectionPool.js.map

@@ -1 +1 @@
-{"version":3,"file":"WorkerConnectionPool.js","sourceRoot":"","sources":["../../src/db/WorkerConnectionPool.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"WorkerConnectionPool.js","sourceRoot":"","sources":["../../src/db/WorkerConnectionPool.ts"],"names":[],"mappings":"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"}

package/lib/db/options.d.ts

@@ -42,3 +42,4 @@ export interface NodeSQLOpenOptions extends SQLOpenOptions {
      */
     initializeConnection?: (db: LockContext, isWriter: boolean) => Promise<void>;
 }
+//# sourceMappingURL=options.d.ts.map

package/lib/db/options.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../src/db/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEhE,MAAM,MAAM,YAAY,GAAG,CAAC,GAAG,IAAI,EAAE,qBAAqB,CAAC,OAAO,MAAM,CAAC,KAAK,YAAY,CAAC,OAAO,MAAM,CAAC,CAAC;AAE1G;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,gBAAgB,CAAC;CACxB;AAED;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,aAAa,CAAC;CACrB;AAED,MAAM,MAAM,0BAA0B,GAAG,oBAAoB,GAAG,iBAAiB,CAAC;AAElF;;;GAGG;AACH,MAAM,WAAW,kBAAmB,SAAQ,cAAc;IACxD,cAAc,CAAC,EAAE,0BAA0B,CAAC;IAE5C;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,YAAY,CAAC;IAE1B;;;;OAIG;IACH,oBAAoB,CAAC,EAAE,CAAC,EAAE,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9E"}

package/lib/index.d.ts

@@ -1,3 +1,5 @@
 export * from '@powersync/common';
 export * from './db/PowerSyncDatabase.js';
+export * from './db/options.js';
 export * from './attachments/NodeFileSystemAdapter.js';
+//# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,cAAc,mBAAmB,CAAC;AAElC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,iBAAiB,CAAC;AAEhC,cAAc,wCAAwC,CAAC"}

package/lib/index.js

@@ -1,5 +1,6 @@
 // Re export to only require one import in client side code
 export * from '@powersync/common';
 export * from './db/PowerSyncDatabase.js';
+export * from './db/options.js';
 export * from './attachments/NodeFileSystemAdapter.js';
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,2DAA2D;AAC3D,cAAc,mBAAmB,CAAC;AAElC,cAAc,2BAA2B,CAAC;AAE1C,cAAc,wCAAwC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,2DAA2D;AAC3D,cAAc,mBAAmB,CAAC;AAElC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,iBAAiB,CAAC;AAEhC,cAAc,wCAAwC,CAAC"}

package/lib/sync/stream/NodeRemote.d.ts

@@ -1,7 +1,13 @@
-import { type ILogger, AbstractRemote, AbstractRemoteOptions, BSONImplementation, RemoteConnector } from '@powersync/common';
+import { AbstractRemote, FetchOptions, RemoteConnector } from '@powersync/shared-internals';
 import { Dispatcher } from 'undici';
+import { PowerSyncLogger } from '@powersync/common';
+import type { WebSocketSyncStreamPlatform, WebSocketSupport } from '@powersync/shared-internals/websockets';
 export declare const STREAMING_POST_TIMEOUT_MS = 30000;
-export type NodeCustomConnectionOptions = {
+export interface NodeRemoteOptions {
+    /**
+     * @internal Only meant to be used for tests.
+     */
+    customFetch?: typeof fetch;
     /**
      * Optional custom dispatcher for HTTP or WEB_SOCKET connections.
      *
@@ -9,15 +15,16 @@ export type NodeCustomConnectionOptions = {
      * or other connection options.
      */
     dispatcher?: Dispatcher;
-};
-export type NodeRemoteOptions = AbstractRemoteOptions & NodeCustomConnectionOptions;
+}
 export declare class NodeRemote extends AbstractRemote {
     protected connector: RemoteConnector;
-    protected logger: ILogger;
     private wsDispatcher;
-    constructor(connector: RemoteConnector, logger?: ILogger, options?: Partial<NodeRemoteOptions>);
-    protected createSocket(url: string): globalThis.WebSocket;
+    private fetchImpl;
+    constructor(connector: RemoteConnector, logger: PowerSyncLogger, options?: NodeRemoteOptions);
+    protected fetch({ resource, request }: FetchOptions): Promise<Response>;
+    protected loadWebSocketSupport(platform: WebSocketSyncStreamPlatform): Promise<WebSocketSupport>;
+    createSocket(url: string): globalThis.WebSocket;
     protected getWebsocketDispatcher(url: string): Dispatcher;
     getUserAgent(): string;
-    getBSON(): Promise<BSONImplementation>;
 }
+//# sourceMappingURL=NodeRemote.d.ts.map

package/lib/sync/stream/NodeRemote.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"NodeRemote.d.ts","sourceRoot":"","sources":["../../../src/sync/stream/NodeRemote.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC5F,OAAO,EAAE,UAAU,EAAoF,MAAM,QAAQ,CAAC;AACtH,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,2BAA2B,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAE5G,eAAO,MAAM,yBAAyB,QAAS,CAAC;AAEhD,MAAM,WAAW,iBAAiB;IAChC;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,KAAK,CAAC;IAE3B;;;;;OAKG;IACH,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED,qBAAa,UAAW,SAAQ,cAAc;IAK1C,SAAS,CAAC,SAAS,EAAE,eAAe;IAJtC,OAAO,CAAC,YAAY,CAAyB;IAC7C,OAAO,CAAC,SAAS,CAAe;gBAGpB,SAAS,EAAE,eAAe,EACpC,MAAM,EAAE,eAAe,EACvB,OAAO,CAAC,EAAE,iBAAiB;IAmB7B,SAAS,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC;cAIvD,oBAAoB,CAAC,QAAQ,EAAE,2BAA2B,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAUtG,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAC,SAAS;IAe/C,SAAS,CAAC,sBAAsB,CAAC,GAAG,EAAE,MAAM;IAc5C,YAAY,IAAI,MAAM;CAQvB"}

package/lib/sync/stream/NodeRemote.js

@@ -1,30 +1,37 @@
 import * as os from 'node:os';
-import { AbstractRemote, DEFAULT_REMOTE_LOGGER, FetchImplementationProvider } from '@powersync/common';
-import { BSON } from 'bson';
+import { AbstractRemote } from '@powersync/shared-internals';
 import { EnvHttpProxyAgent, getGlobalDispatcher, ProxyAgent, WebSocket as UndiciWebSocket } from 'undici';
 export const STREAMING_POST_TIMEOUT_MS = 30_000;
-class NodeFetchProvider extends FetchImplementationProvider {
-    getFetch() {
-        return fetch.bind(globalThis);
-    }
-}
 export class NodeRemote extends AbstractRemote {
     connector;
-    logger;
     wsDispatcher;
-    constructor(connector, logger = DEFAULT_REMOTE_LOGGER, options) {
-        const fetchDispatcher = options?.dispatcher ?? defaultFetchDispatcher();
-        super(connector, logger, {
-            fetchImplementation: options?.fetchImplementation ?? new NodeFetchProvider(),
-            fetchOptions: {
-                dispatcher: fetchDispatcher
-            },
-            ...(options ?? {})
-        });
+    fetchImpl;
+    constructor(connector, logger, options) {
+        super(connector, logger);
         this.connector = connector;
-        this.logger = logger;
+        this.fetchImpl =
+            options?.customFetch ??
+                ((resource, init) => {
+                    const dispatcher = options?.dispatcher ?? defaultFetchDispatcher();
+                    return fetch(resource, {
+                        // @ts-expect-error
+                        dispatcher,
+                        ...init
+                    });
+                });
         this.wsDispatcher = options?.dispatcher;
     }
+    fetch({ resource, request }) {
+        return this.fetchImpl(resource, request);
+    }
+    async loadWebSocketSupport(platform) {
+        if (!websockets) {
+            // loadWebSocketSupport being called concurrently is safe, the import resolves to the same module in that case.
+            const module = await import('@powersync/shared-internals/websockets');
+            websockets = new module.WebSocketSupport(platform);
+        }
+        return websockets;
+    }
     createSocket(url) {
         // Create dedicated dispatcher for this WebSocket
         const baseDispatcher = this.getWebsocketDispatcher(url);
@@ -58,9 +65,6 @@ export class NodeRemote extends AbstractRemote {
             `${os.platform()}/${os.release()}`
         ].join(' ');
     }
-    async getBSON() {
-        return BSON;
-    }
 }
 function defaultFetchDispatcher() {
     // EnvHttpProxyAgent automatically uses HTTP_PROXY, HTTPS_PROXY and NO_PROXY env vars by default.
@@ -76,4 +80,5 @@ function getProxyForProtocol(protocol) {
         process.env[`all_proxy`] ??
         process.env[`ALL_PROXY`]);
 }
+let websockets;
 //# sourceMappingURL=NodeRemote.js.map

package/lib/sync/stream/NodeRemote.js.map

@@ -1 +1 @@
-{"version":3,"file":"NodeRemote.js","sourceRoot":"","sources":["../../../src/sync/stream/NodeRemote.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"NodeRemote.js","sourceRoot":"","sources":["../../../src/sync/stream/NodeRemote.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAE9B,OAAO,EAAE,cAAc,EAAiC,MAAM,6BAA6B,CAAC;AAC5F,OAAO,EAAc,iBAAiB,EAAE,mBAAmB,EAAE,UAAU,EAAE,SAAS,IAAI,eAAe,EAAE,MAAM,QAAQ,CAAC;AAItH,MAAM,CAAC,MAAM,yBAAyB,GAAG,MAAM,CAAC;AAiBhD,MAAM,OAAO,UAAW,SAAQ,cAAc;IAKhC;IAJJ,YAAY,CAAyB;IACrC,SAAS,CAAe;IAEhC,YACY,SAA0B,EACpC,MAAuB,EACvB,OAA2B;QAE3B,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAJf,cAAS,GAAT,SAAS,CAAiB;QAMpC,IAAI,CAAC,SAAS;YACZ,OAAO,EAAE,WAAW;gBACpB,CAAC,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE;oBAClB,MAAM,UAAU,GAAG,OAAO,EAAE,UAAU,IAAI,sBAAsB,EAAE,CAAC;oBAEnE,OAAO,KAAK,CAAC,QAAQ,EAAE;wBACrB,mBAAmB;wBACnB,UAAU;wBACV,GAAG,IAAI;qBACR,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;QAEL,IAAI,CAAC,YAAY,GAAG,OAAO,EAAE,UAAU,CAAC;IAC1C,CAAC;IAES,KAAK,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAgB;QACjD,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC3C,CAAC;IAES,KAAK,CAAC,oBAAoB,CAAC,QAAqC;QACxE,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,+GAA+G;YAC/G,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,wCAAwC,CAAC,CAAC;YACtE,UAAU,GAAG,IAAI,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACrD,CAAC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,YAAY,CAAC,GAAW;QACtB,iDAAiD;QACjD,MAAM,cAAc,GAAG,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;QAExD,6CAA6C;QAC7C,MAAM,EAAE,GAAG,IAAI,eAAe,CAAC,GAAG,EAAE;YAClC,UAAU,EAAE,cAAc;YAC1B,OAAO,EAAE;gBACP,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE;aAClC;SACF,CAAC,CAAC;QAEH,OAAO,EAA0B,CAAC;IACpC,CAAC;IAES,sBAAsB,CAAC,GAAW;QAC1C,IAAI,IAAI,CAAC,YAAY,IAAI,IAAI,EAAE,CAAC;YAC9B,OAAO,IAAI,CAAC,YAAY,CAAC;QAC3B,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACxD,MAAM,KAAK,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QAC5C,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;YAClB,OAAO,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;aAAM,CAAC;YACN,OAAO,mBAAmB,EAAE,CAAC;QAC/B,CAAC;IACH,CAAC;IAED,YAAY;QACV,OAAO;YACL,KAAK,CAAC,YAAY,EAAE;YACpB,gBAAgB;YAChB,QAAQ,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE;YAC/B,GAAG,EAAE,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,OAAO,EAAE,EAAE;SACnC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACd,CAAC;CACF;AAED,SAAS,sBAAsB;IAC7B,iGAAiG;IACjG,4BAA4B;IAC5B,OAAO,IAAI,iBAAiB,CAAC;QAC3B,SAAS,EAAE,mBAAmB,CAAC,MAAM,CAAC;QACtC,UAAU,EAAE,mBAAmB,CAAC,OAAO,CAAC;KACzC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB,CAAC,QAAgB;IAC3C,OAAO,CACL,OAAO,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC;QAC9C,OAAO,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC;QAC9C,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;QACxB,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CACzB,CAAC;AACJ,CAAC;AAED,IAAI,UAAwC,CAAC"}

package/lib/sync/stream/NodeStreamingSyncImplementation.d.ts

@@ -1,4 +1,4 @@
-import { AbstractStreamingSyncImplementation, AbstractStreamingSyncImplementationOptions, LockOptions, LockType, Mutex } from '@powersync/common';
+import { AbstractStreamingSyncImplementation, AbstractStreamingSyncImplementationOptions, LockOptions, LockType, Mutex } from '@powersync/shared-internals';
 export declare class NodeStreamingSyncImplementation extends AbstractStreamingSyncImplementation {
     locks: Map<LockType, Mutex>;
     constructor(options: AbstractStreamingSyncImplementationOptions);
@@ -8,3 +8,4 @@ export declare class NodeStreamingSyncImplementation extends AbstractStreamingSy
     initLocks(): void;
     obtainLock<T>(lockOptions: LockOptions<T>): Promise<T>;
 }
+//# sourceMappingURL=NodeStreamingSyncImplementation.d.ts.map

package/lib/sync/stream/NodeStreamingSyncImplementation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"NodeStreamingSyncImplementation.d.ts","sourceRoot":"","sources":["../../../src/sync/stream/NodeStreamingSyncImplementation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mCAAmC,EACnC,0CAA0C,EAC1C,WAAW,EACX,QAAQ,EACR,KAAK,EACN,MAAM,6BAA6B,CAAC;AAQrC,qBAAa,+BAAgC,SAAQ,mCAAmC;IACtF,KAAK,EAAG,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;gBAEjB,OAAO,EAAE,0CAA0C;IAK/D;;OAEG;IACH,SAAS;IAgBT,UAAU,CAAC,CAAC,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;CASvD"}

package/lib/sync/stream/NodeStreamingSyncImplementation.js

@@ -1,11 +1,11 @@
-import { AbstractStreamingSyncImplementation, LockType, Mutex } from '@powersync/common';
+import { AbstractStreamingSyncImplementation, LockType, Mutex } from '@powersync/shared-internals';
 /**
  * Global locks which prevent multiple instances from syncing
  * concurrently.
  */
 const LOCKS = new Map();
 export class NodeStreamingSyncImplementation extends AbstractStreamingSyncImplementation {
-    locks;
+    locks; // initialized by initLocks()
     constructor(options) {
         super(options);
         this.initLocks();

package/lib/sync/stream/NodeStreamingSyncImplementation.js.map

@@ -1 +1 @@
-{"version":3,"file":"NodeStreamingSyncImplementation.js","sourceRoot":"","sources":["../../../src/sync/stream/NodeStreamingSyncImplementation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mCAAmC,EAGnC,QAAQ,EACR,KAAK,EACN,MAAM,mBAAmB,CAAC;AAE3B;;;GAGG;AACH,MAAM,KAAK,GAAG,IAAI,GAAG,EAAgC,CAAC;AAEtD,MAAM,OAAO,+BAAgC,SAAQ,mCAAmC;IACtF,KAAK,CAAuB;IAE5B,YAAY,OAAmD;QAC7D,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,SAAS,EAAE,CAAC;IACnB,CAAC;IAED;;OAEG;IACH,SAAS;QACP,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QACpC,IAAI,UAAU,IAAI,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;YACxC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC;YACpC,OAAO;QACT,CAAC;QAED,IAAI,CAAC,KAAK,GAAG,IAAI,GAAG,EAAmB,CAAC;QACxC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,KAAK,EAAE,CAAC,CAAC;QAC3C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,KAAK,EAAE,CAAC,CAAC;QAE3C,IAAI,UAAU,EAAE,CAAC;YACf,KAAK,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;IAED,UAAU,CAAI,WAA2B;QACvC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAC9C,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,aAAa,WAAW,CAAC,IAAI,YAAY,CAAC,CAAC;QAC7D,CAAC;QACD,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,IAAI,EAAE;YAClC,OAAO,WAAW,CAAC,QAAQ,EAAE,CAAC;QAChC,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACzB,CAAC;CACF"}
+{"version":3,"file":"NodeStreamingSyncImplementation.js","sourceRoot":"","sources":["../../../src/sync/stream/NodeStreamingSyncImplementation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mCAAmC,EAGnC,QAAQ,EACR,KAAK,EACN,MAAM,6BAA6B,CAAC;AAErC;;;GAGG;AACH,MAAM,KAAK,GAAG,IAAI,GAAG,EAAgC,CAAC;AAEtD,MAAM,OAAO,+BAAgC,SAAQ,mCAAmC;IACtF,KAAK,CAAwB,CAAC,6BAA6B;IAE3D,YAAY,OAAmD;QAC7D,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,SAAS,EAAE,CAAC;IACnB,CAAC;IAED;;OAEG;IACH,SAAS;QACP,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QACpC,IAAI,UAAU,IAAI,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;YACxC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC;YACpC,OAAO;QACT,CAAC;QAED,IAAI,CAAC,KAAK,GAAG,IAAI,GAAG,EAAmB,CAAC;QACxC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,KAAK,EAAE,CAAC,CAAC;QAC3C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,KAAK,EAAE,CAAC,CAAC;QAE3C,IAAI,UAAU,EAAE,CAAC;YACf,KAAK,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;IAED,UAAU,CAAI,WAA2B;QACvC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAC9C,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,aAAa,WAAW,CAAC,IAAI,YAAY,CAAC,CAAC;QAC7D,CAAC;QACD,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,IAAI,EAAE;YAClC,OAAO,WAAW,CAAC,QAAQ,EAAE,CAAC;QAChC,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACzB,CAAC;CACF"}

package/lib/worker.d.ts

@@ -1 +1,2 @@
 export * from './db/SqliteWorker.js';
+//# sourceMappingURL=worker.d.ts.map

package/lib/worker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../src/worker.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@powersync/node",
-  "version": "0.0.0-dev-20260503073249",
+  "version": "0.0.0-dev-20260630141119",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
@@ -16,24 +16,14 @@
   "type": "module",
   "exports": {
     ".": {
-      "import": {
-        "types": "./lib/index.d.ts",
-        "default": "./lib/index.js"
-      },
-      "require": {
-        "types": "./dist/bundle.d.cts",
-        "default": "./dist/bundle.cjs"
-      }
+      "types": "./lib/index.d.ts",
+      "import": "./lib/index.js",
+      "module-sync": "./lib/index.js"
     },
     "./worker.js": {
-      "import": {
-        "types": "./lib/worker.d.ts",
-        "default": "./lib/worker.js"
-      },
-      "require": {
-        "types": "./dist/worker.d.cts",
-        "default": "./dist/worker.cjs"
-      }
+      "types": "./lib/worker.d.ts",
+      "import": "./lib/worker.js",
+      "module-sync": "./lib/worker.js"
     },
     "./package.json": "./package.json"
   },
@@ -48,7 +38,7 @@
   },
   "homepage": "https://docs.powersync.com/",
   "peerDependencies": {
-    "@powersync/common": "0.0.0-dev-20260503073249",
+    "@powersync/common": "0.0.0-dev-20260630141119",
     "better-sqlite3": "12.x"
   },
   "peerDependenciesMeta": {
@@ -57,21 +47,20 @@
     }
   },
   "dependencies": {
-    "bson": "^6.10.4",
     "comlink": "^4.4.2",
     "undici": "^7.11.0",
-    "@powersync/common": "0.0.0-dev-20260503073249"
+    "@powersync/common": "0.0.0-dev-20260630141119",
+    "@powersync/shared-internals": "1.0.0"
   },
   "devDependencies": {
     "@types/node": "^24.0.0",
-    "better-sqlite3": "^12.2.0",
+    "better-sqlite3": "^12.10.0",
+    "@types/better-sqlite3": "^7.6.13",
+    "bson": "^6.10.4",
     "drizzle-orm": "^0.44.7",
-    "js-logger": "^1.6.1",
-    "rollup": "^4.52.5",
-    "rollup-plugin-dts": "^6.2.1",
-    "typescript": "^5.5.3",
-    "vitest": "^3.2.4",
-    "@powersync/drizzle-driver": "0.7.3"
+    "typescript": "^6.0.3",
+    "vitest": "^4.1.8",
+    "@powersync/drizzle-driver": "0.0.0-dev-20260630141119"
   },
   "keywords": [
     "data sync",
@@ -82,11 +71,11 @@
   ],
   "scripts": {
     "prepare:core": "node download_core.js",
-    "build": " pnpm prepare:core && tsc -b && rollup --config",
-    "build:prod": "pnpm prepare:core && tsc -b && rollup --config",
+    "build": " pnpm prepare:core && tsc -b",
+    "build:prod": "pnpm prepare:core && tsc -b",
     "clean": "rm -rf lib dist tsconfig.tsbuildinfo",
     "watch": "tsc -b -w",
     "test": " pnpm prepare:core && vitest",
-    "test:exports": "attw --pack . --ignore-rules no-resolution"
+    "test:exports": "attw --pack . --ignore-rules no-resolution cjs-resolves-to-esm"
   }
 }

package/src/db/AsyncDatabase.ts

@@ -1,12 +1,9 @@
-import { QueryResult } from '@powersync/common';
+import { BaseQueryResult, QueryResult, RawQueryResult } from '@powersync/common';
 import { NodeDatabaseImplementation } from './options.js';
 
-export type ProxiedQueryResult = Omit<QueryResult, 'rows'> & {
-  rows?: {
-    _array: any[];
-    length: number;
-  };
-};
+export interface MappedQueryResult extends BaseQueryResult {
+  rows?: unknown[];
+}
 
 export interface AsyncDatabaseOpenOptions {
   path: string;
@@ -19,8 +16,8 @@ export interface AsyncDatabaseOpener {
 }
 
 export interface AsyncDatabase {
-  execute: (query: string, params: any[]) => Promise<ProxiedQueryResult>;
-  executeRaw: (query: string, params: any[]) => Promise<any[][]>;
-  executeBatch: (query: string, params: any[][]) => Promise<ProxiedQueryResult>;
+  execute: (query: string, params: any[]) => Promise<MappedQueryResult>;
+  executeRaw: (query: string, params: any[]) => Promise<RawQueryResult>;
+  executeBatch: (query: string, params: any[][]) => Promise<QueryResult<never>>;
   close: () => Promise<void>;
 }

package/src/db/BetterSqliteWorker.ts

@@ -1,7 +1,8 @@
 import type { Database } from 'better-sqlite3';
-import { AsyncDatabase, AsyncDatabaseOpenOptions } from './AsyncDatabase.js';
+import { AsyncDatabase, AsyncDatabaseOpenOptions, MappedQueryResult } from './AsyncDatabase.js';
 import { PowerSyncWorkerOptions } from './SqliteWorker.js';
 import { threadId } from 'node:worker_threads';
+import { QueryResult, queryResultWithoutRows, RawQueryResult, SqliteValue } from '@powersync/common';
 
 class BlockingAsyncDatabase implements AsyncDatabase {
   private readonly db: Database;
@@ -16,16 +17,13 @@ class BlockingAsyncDatabase implements AsyncDatabase {
     this.db.close();
   }
 
-  async execute(query: string, params: any[]) {
+  async execute(query: string, params: any[]): Promise<MappedQueryResult> {
     const stmt = this.db.prepare(query);
     if (stmt.reader) {
       const rows = stmt.all(params);
       return {
         rowsAffected: 0,
-        rows: {
-          _array: rows,
-          length: rows.length
-        }
+        rows
       };
     } else {
       const info = stmt.run(params);
@@ -36,18 +34,28 @@ class BlockingAsyncDatabase implements AsyncDatabase {
     }
   }
 
-  async executeRaw(query: string, params: any[]) {
+  async executeRaw(query: string, params: any[]): Promise<RawQueryResult> {
     const stmt = this.db.prepare(query);
-
     if (stmt.reader) {
-      return stmt.raw().all(params) as any[][];
+      stmt.raw();
+      const rows = stmt.all(params);
+      return {
+        rowsAffected: 0,
+        columnNames: stmt.columns().map((c) => c.name),
+        rawRows: rows as SqliteValue[][]
+      };
     } else {
-      stmt.raw().run(params);
-      return [];
+      const info = stmt.run(params);
+      return {
+        rowsAffected: info.changes,
+        insertId: Number(info.lastInsertRowid),
+        rawRows: [],
+        columnNames: []
+      };
     }
   }
 
-  async executeBatch(query: string, params: any[][]) {
+  async executeBatch(query: string, params: any[][]): Promise<QueryResult<never>> {
     params = params ?? [];
 
     let rowsAffected = 0;
@@ -58,13 +66,13 @@ class BlockingAsyncDatabase implements AsyncDatabase {
       rowsAffected += info.changes;
     }
 
-    return { rowsAffected };
+    return queryResultWithoutRows({ rowsAffected });
   }
 }
 
 export async function openDatabase(worker: PowerSyncWorkerOptions, options: AsyncDatabaseOpenOptions) {
   const BetterSQLite3Database = await worker.loadBetterSqlite3();
-  const baseDB = new BetterSQLite3Database(options.path);
+  const baseDB = new BetterSQLite3Database(options.path, { readonly: !options.isWriter });
   baseDB.loadExtension(worker.extensionPath(), 'sqlite3_powersync_init');
 
   const asyncDb = new BlockingAsyncDatabase(baseDB);

package/src/db/NodeSqliteWorker.ts

@@ -1,9 +1,9 @@
 import type { DatabaseSync } from 'node:sqlite';
 import { threadId } from 'node:worker_threads';
 
-import { dynamicImport } from '../utils/modules.js';
-import { AsyncDatabase, AsyncDatabaseOpenOptions } from './AsyncDatabase.js';
+import { AsyncDatabase, AsyncDatabaseOpenOptions, MappedQueryResult } from './AsyncDatabase.js';
 import { PowerSyncWorkerOptions } from './SqliteWorker.js';
+import { QueryResult, queryResultWithoutRows, RawQueryResult, SqliteValue } from '@powersync/common';
 
 class BlockingNodeDatabase implements AsyncDatabase {
   private readonly db: DatabaseSync;
@@ -18,25 +18,27 @@ class BlockingNodeDatabase implements AsyncDatabase {
     this.db.close();
   }
 
-  async execute(query: string, params: any[]) {
+  async execute(query: string, params: any[]): Promise<MappedQueryResult> {
     const stmt = this.db.prepare(query);
     const rows = stmt.all(...params);
     return {
       rowsAffected: 0,
-      rows: {
-        _array: rows,
-        length: rows.length
-      }
+      rows
     };
   }
 
-  async executeRaw(query: string, params: any[]) {
+  async executeRaw(query: string, params: any[]): Promise<RawQueryResult> {
     const stmt = this.db.prepare(query);
     (stmt as any).setReturnArrays(true); // Missing in @types/node, https://nodejs.org/api/sqlite.html#statementsetreturnarraysenabled
-    return stmt.all(...params) as any as any[][];
+
+    const rows = stmt.all(...params) as any as SqliteValue[][];
+    return {
+      rawRows: rows,
+      columnNames: stmt.columns().map((c) => c.name!)
+    };
   }
 
-  async executeBatch(query: string, params: any[][]) {
+  async executeBatch(query: string, params: any[][]): Promise<QueryResult<never>> {
     params = params ?? [];
 
     let rowsAffected = 0;
@@ -47,16 +49,17 @@ class BlockingNodeDatabase implements AsyncDatabase {
       rowsAffected += info.changes as number;
     }
 
-    return { rowsAffected };
+    return queryResultWithoutRows({ rowsAffected });
   }
 }
 
 export async function openDatabase(worker: PowerSyncWorkerOptions, options: AsyncDatabaseOpenOptions) {
   // NOTE: We want to import node:sqlite dynamically, to avoid bundlers unconditionally requiring node:sqlite in the
   // end, since that would make us incompatible with older Node.JS versions.
-  const { DatabaseSync } = await dynamicImport('node:sqlite');
+  const { DatabaseSync } = await import('node:sqlite');
 
-  const baseDB = new DatabaseSync(options.path, { allowExtension: true });
+  const baseDB = new DatabaseSync(options.path, { allowExtension: true, readOnly: !options.isWriter });
+  // @ts-expect-error (type definition is wrong)
   baseDB.loadExtension(worker.extensionPath(), 'sqlite3_powersync_init');
 
   return new BlockingNodeDatabase(baseDB, options.isWriter);