[Fix] Watched queries retriggers (#102)

Author: stevensJourney

.changeset/metal-vans-grin.md

@@ -0,0 +1,5 @@
+---
+'@journeyapps/powersync-sdk-common': patch
+---
+
+Fixed regression where watched queries would update for table changes in external (not in query) tables.

.changeset/shaggy-apples-lick.md

@@ -0,0 +1,5 @@
+---
+'@journeyapps/powersync-sdk-web': patch
+---
+
+Minor code cleanup for shared sync worker.

packages/powersync-sdk-common/src/client/AbstractPowerSyncDatabase.ts

@@ -592,9 +592,12 @@ export abstract class AbstractPowerSyncDatabase extends BaseObserver<PowerSyncDB
       const flushTableUpdates = throttle(
         () => {
           if (changedTables.size > 0) {
-            eventOptions.push({
-              changedTables: [...changedTables]
-            });
+            const intersection = Array.from(changedTables.values()).filter((change) => watchedTables.has(change));
+            if (intersection.length) {
+              eventOptions.push({
+                changedTables: intersection
+              });
+            }
           }
           changedTables.clear();
         },

packages/powersync-sdk-web/src/db/sync/SharedWebStreamingSyncImplementation.ts

@@ -42,8 +42,12 @@ class SharedSyncClientProvider extends AbstractSharedSyncClientProvider {
     };
   }
 
-  uploadCrud(): Promise<void> {
-    return this.options.uploadCrud();
+  async uploadCrud(): Promise<void> {
+    /**
+     * Don't return anything here, just incase something which is not
+     * serializable is returned from the `uploadCrud` function.
+     */
+    await this.options.uploadCrud();
   }
 
   get logger() {

packages/powersync-sdk-web/src/worker/sync/SharedSyncImplementation.ts

@@ -205,7 +205,7 @@ export class SharedSyncImplementation
 
   async disconnect() {
     this.abortController?.abort('Disconnected');
-    this.iterateListeners((l) => l.statusChanged?.(new SyncStatus({ connected: false })));
+    this.updateAllStatuses({ connected: false });
   }
 
   /**

packages/powersync-sdk-web/tests/watch.test.ts

@@ -101,4 +101,46 @@ describe('Watch Tests', () => {
     // There should be one initial result plus one throttled result
     expect(receivedUpdatesCount).equals(2);
   });
+
+  it('should only watch tables inside query', async () => {
+    const assetsAbortController = new AbortController();
+
+    const watchAssets = powersync.watch('SELECT count() AS count FROM assets', [], {
+      signal: assetsAbortController.signal
+    });
+
+    const customersAbortController = new AbortController();
+
+    const watchCustomers = powersync.watch('SELECT count() AS count FROM customers', [], {
+      signal: customersAbortController.signal
+    });
+
+    let receivedAssetsUpdatesCount = 0;
+    // Listen to assets updates
+    (async () => {
+      for await (const update of watchAssets) {
+        receivedAssetsUpdatesCount++;
+      }
+    })();
+
+    let receivedCustomersUpdatesCount = 0;
+    (async () => {
+      for await (const update of watchCustomers) {
+        receivedCustomersUpdatesCount++;
+      }
+    })();
+
+    // Create the inserts as fast as possible
+    await powersync.execute('INSERT INTO assets(id, make, customer_id) VALUES (uuid(), ?, ?)', ['test', uuid()]);
+
+    await new Promise<void>((resolve) => setTimeout(resolve, throttleDuration * 2));
+    assetsAbortController.abort();
+    customersAbortController.abort();
+
+    // There should be one initial result plus one throttled result
+    expect(receivedAssetsUpdatesCount).equals(2);
+
+    // Only the initial result should have yielded.
+    expect(receivedCustomersUpdatesCount).equals(1);
+  });
 });