@powersync/common 1.20.1 → 1.21.0

package/lib/client/AbstractPowerSyncDatabase.d.ts

@@ -76,6 +76,7 @@ export interface WatchOnChangeHandler {
 }
 export interface PowerSyncDBListener extends StreamingSyncImplementationListener {
     initialized: () => void;
+    schemaChanged: (schema: Schema) => void;
 }
 export interface PowerSyncCloseOptions {
     /**
@@ -92,6 +93,7 @@ export declare const DEFAULT_POWERSYNC_DB_OPTIONS: {
     logger: Logger.ILogger;
     crudUploadThrottleMs: number;
 };
+export declare const DEFAULT_CRUD_BATCH_LIMIT = 100;
 /**
  * Requesting nested or recursive locks can block the application in some circumstances.
  * This default lock timeout will act as a failsafe to throw an error if a lock cannot
@@ -232,7 +234,7 @@ export declare abstract class AbstractPowerSyncDatabase extends BaseObserver<Pow
      * data by transaction. One batch may contain data from multiple transactions,
      * and a single transaction may be split over multiple batches.
      */
-    getCrudBatch(limit: number): Promise<CrudBatch | null>;
+    getCrudBatch(limit?: number): Promise<CrudBatch | null>;
     /**
      * Get the next recorded transaction to upload.
      *

package/lib/client/AbstractPowerSyncDatabase.js

@@ -14,6 +14,7 @@ import { CrudBatch } from './sync/bucket/CrudBatch.js';
 import { CrudEntry } from './sync/bucket/CrudEntry.js';
 import { CrudTransaction } from './sync/bucket/CrudTransaction.js';
 import { DEFAULT_CRUD_UPLOAD_THROTTLE_MS } from './sync/stream/AbstractStreamingSyncImplementation.js';
+import { runOnSchemaChange } from './runOnSchemaChange.js';
 const POWERSYNC_TABLE_MATCH = /(^ps_data__|^ps_data_local__)/;
 const DEFAULT_DISCONNECT_CLEAR_OPTIONS = {
     clearLocal: true
@@ -27,6 +28,7 @@ export const DEFAULT_POWERSYNC_DB_OPTIONS = {
     logger: Logger.get('PowerSyncDatabase'),
     crudUploadThrottleMs: DEFAULT_CRUD_UPLOAD_THROTTLE_MS
 };
+export const DEFAULT_CRUD_BATCH_LIMIT = 100;
 /**
  * Requesting nested or recursive locks can block the application in some circumstances.
  * This default lock timeout will act as a failsafe to throw an error if a lock cannot
@@ -210,6 +212,8 @@ export class AbstractPowerSyncDatabase extends BaseObserver {
         }
         this._schema = schema;
         await this.database.execute('SELECT powersync_replace_schema(?)', [JSON.stringify(this.schema.toJSON())]);
+        await this.database.refreshSchema();
+        this.iterateListeners(async (cb) => cb.schemaChanged?.(schema));
     }
     /**
      * Wait for initialization to complete.
@@ -326,7 +330,7 @@ export class AbstractPowerSyncDatabase extends BaseObserver {
      * data by transaction. One batch may contain data from multiple transactions,
      * and a single transaction may be split over multiple batches.
      */
-    async getCrudBatch(limit) {
+    async getCrudBatch(limit = DEFAULT_CRUD_BATCH_LIMIT) {
         const result = await this.getAll(`SELECT id, tx_id, data FROM ${PSInternalTable.CRUD} ORDER BY id ASC LIMIT ?`, [limit + 1]);
         const all = result.map((row) => CrudEntry.fromRow(row)) ?? [];
         let haveMore = false;
@@ -502,7 +506,7 @@ export class AbstractPowerSyncDatabase extends BaseObserver {
         if (!onResult) {
             throw new Error('onResult is required');
         }
-        (async () => {
+        const watchQuery = async (abortSignal) => {
             try {
                 const resolvedTables = await this.resolveTables(sql, parameters, options);
                 // Fetch initial data
@@ -521,13 +525,16 @@ export class AbstractPowerSyncDatabase extends BaseObserver {
                     onError
                 }, {
                     ...(options ?? {}),
-                    tables: resolvedTables
+                    tables: resolvedTables,
+                    // Override the abort signal since we intercept it
+                    signal: abortSignal
                 });
             }
             catch (error) {
                 onError?.(error);
             }
-        })();
+        };
+        runOnSchemaChange(watchQuery, this, options);
     }
     /**
      * Execute a read query every time the source tables are modified.
@@ -536,17 +543,18 @@ export class AbstractPowerSyncDatabase extends BaseObserver {
      */
     watchWithAsyncGenerator(sql, parameters, options) {
         return new EventIterator((eventOptions) => {
-            (async () => {
-                const resolvedTables = await this.resolveTables(sql, parameters, options);
-                // Fetch initial data
-                eventOptions.push(await this.executeReadOnly(sql, parameters));
-                for await (const event of this.onChangeWithAsyncGenerator({
-                    ...(options ?? {}),
-                    tables: resolvedTables
-                })) {
-                    eventOptions.push(await this.executeReadOnly(sql, parameters));
+            const handler = {
+                onResult: (result) => {
+                    eventOptions.push(result);
+                },
+                onError: (error) => {
+                    eventOptions.fail(error);
                 }
-            })();
+            };
+            this.watchWithCallback(sql, parameters, handler, options);
+            options?.signal?.addEventListener('abort', () => {
+                eventOptions.stop();
+            });
         });
     }
     async resolveTables(sql, parameters, options) {

package/lib/client/runOnSchemaChange.d.ts

@@ -0,0 +1,2 @@
+import { AbstractPowerSyncDatabase, SQLWatchOptions } from './AbstractPowerSyncDatabase.js';
+export declare function runOnSchemaChange(callback: (signal: AbortSignal) => void, db: AbstractPowerSyncDatabase, options?: SQLWatchOptions): void;

package/lib/client/runOnSchemaChange.js

@@ -0,0 +1,23 @@
+export function runOnSchemaChange(callback, db, options) {
+    const triggerWatchedQuery = () => {
+        const abortController = new AbortController();
+        let disposeSchemaListener = null;
+        const stopWatching = () => {
+            abortController.abort('Abort triggered');
+            disposeSchemaListener?.();
+            disposeSchemaListener = null;
+            // Stop listening to upstream abort for this watch
+            options?.signal?.removeEventListener('abort', stopWatching);
+        };
+        options?.signal?.addEventListener('abort', stopWatching);
+        disposeSchemaListener = db.registerListener({
+            schemaChanged: async () => {
+                stopWatching();
+                // Re trigger the watched query (recursively), setTimeout ensures that we don't modify the list of listeners while iterating through them
+                setTimeout(() => triggerWatchedQuery(), 0);
+            }
+        });
+        callback(abortController.signal);
+    };
+    triggerWatchedQuery();
+}

package/lib/db/DBAdapter.d.ts

@@ -90,6 +90,10 @@ export interface DBAdapter extends BaseObserverInterface<DBAdapterListener>, DBG
     readTransaction: <T>(fn: (tx: Transaction) => Promise<T>, options?: DBLockOptions) => Promise<T>;
     writeLock: <T>(fn: (tx: LockContext) => Promise<T>, options?: DBLockOptions) => Promise<T>;
     writeTransaction: <T>(fn: (tx: Transaction) => Promise<T>, options?: DBLockOptions) => Promise<T>;
+    /**
+     * This method refreshes the schema information across all connections. This is for advanced use cases, and should generally not be needed.
+     */
+    refreshSchema: () => Promise<void>;
 }
 export declare function isBatchedUpdateNotification(update: BatchedUpdateNotification | UpdateNotification): update is BatchedUpdateNotification;
 export declare function extractTableUpdates(update: BatchedUpdateNotification | UpdateNotification): string[];

package/lib/index.d.ts

@@ -4,6 +4,7 @@ export * from './client/SQLOpenFactory.js';
 export * from './client/connection/PowerSyncBackendConnector.js';
 export * from './client/connection/PowerSyncCredentials.js';
 export * from './client/sync/bucket/BucketStorageAdapter.js';
+export { runOnSchemaChange } from './client/runOnSchemaChange.js';
 export { UpdateType, CrudEntry, OpId } from './client/sync/bucket/CrudEntry.js';
 export * from './client/sync/bucket/SqliteBucketStorage.js';
 export * from './client/sync/bucket/CrudBatch.js';

package/lib/index.js

@@ -4,6 +4,7 @@ export * from './client/SQLOpenFactory.js';
 export * from './client/connection/PowerSyncBackendConnector.js';
 export * from './client/connection/PowerSyncCredentials.js';
 export * from './client/sync/bucket/BucketStorageAdapter.js';
+export { runOnSchemaChange } from './client/runOnSchemaChange.js';
 export { UpdateType, CrudEntry } from './client/sync/bucket/CrudEntry.js';
 export * from './client/sync/bucket/SqliteBucketStorage.js';
 export * from './client/sync/bucket/CrudBatch.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@powersync/common",
-  "version": "1.20.1",
+  "version": "1.21.0",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"