Improve updateSettings even further

Author: stevensJourney

packages/common/src/client/watched/processors/AbstractQueryProcessor.ts

@@ -79,26 +79,22 @@ export abstract class AbstractQueryProcessor<
     return this.options.watchOptions.reportFetching ?? true;
   }
 
-  /**
-   * Updates the underlying query.
-   */
-  async updateSettings(settings: Settings) {
+  protected async updateSettingsInternal(settings: Settings) {
     // Abort any previous requests
     this.abortController.abort();
 
-    this.options.watchOptions = settings;
     // Keep track of this controller's abort status
     const abortController = new AbortController();
     // Allow this to be aborted externally
     this.abortController = abortController;
 
-    await this.initialized;
-
     // This may have been aborted while awaiting or if multiple calls to `updateSettings` were made
     if (abortController.signal.aborted) {
       return;
     }
 
+    this.options.watchOptions = settings;
+
     if (!this.state.isFetching && this.reportFetching) {
       await this.updateState({
         isFetching: true
@@ -113,6 +109,14 @@ export abstract class AbstractQueryProcessor<
     );
   }
 
+  /**
+   * Updates the underlying query.
+   */
+  async updateSettings(settings: Settings) {
+    await this.initialized;
+    return this.updateSettingsInternal(settings);
+  }
+
   /**
    * This method is used to link a query to the subscribers of this listener class.
    * This method should perform actual query watching and report results via {@link updateState} method.
@@ -163,8 +167,8 @@ export abstract class AbstractQueryProcessor<
     };
 
     // Initial setup
-    this.runWithReporting(async () => {
-      await this.updateSettings(this.options.watchOptions);
+    await this.runWithReporting(async () => {
+      await this.updateSettingsInternal(this.options.watchOptions);
     });
   }
 

packages/web/tests/watch.test.ts

@@ -766,12 +766,14 @@ describe('Watch Tests', { sequential: true }, () => {
 
     await vi.waitFor(
       () => {
+        console.log(JSON.stringify(states));
         expect(states[states.length - 1].isFetching).false;
         expect(states[states.length - 1].data[0].result).eq(100);
       },
       { timeout: 3000 }
     );
     dispose();
+    console.log(JSON.stringify(states));
   });
 
   it('should report differential query results', async () => {