Defer client's teardown operations

urql-graphql · Sep 13, 2024 · afffed6 · afffed6
1 parent 150c94d
commit afffed6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/packages/core/src/client.test.ts b/packages/core/src/client.test.ts
@@ -181,7 +181,7 @@ describe('promisified methods', () => {
 });
 
 describe('synchronous methods', () => {
-  it('readQuery', () => {
+  it('readQuery', async () => {
     const result = client.readQuery(
       gql`
         {
@@ -193,9 +193,8 @@ describe('synchronous methods', () => {
       { example: 1234 }
     );
 
-    expect(receivedOps.length).toBe(2);
+    expect(receivedOps.length).toBe(1);
     expect(receivedOps[0].kind).toBe('query');
-    expect(receivedOps[1].kind).toBe('teardown');
     expect(result).toEqual({
       operation: {
         ...query,
@@ -204,6 +203,9 @@ describe('synchronous methods', () => {
         kind: 'query',
       },
     });
+
+    await Promise.resolve();
+    expect(receivedOps[1].kind).toBe('teardown');
   });
 });
 

diff --git a/packages/core/src/client.ts b/packages/core/src/client.ts
@@ -586,9 +586,11 @@ export const Client: new (opts: ClientOptions) => Client = function Client(
     }
   }
 
-  function flushOperations() {
+  function flushOperations(operation?: Operation | void) {
     if (!isOperationBatchActive) {
-      Promise.resolve().then(dispatchOperation);
+      Promise.resolve(operation).then(dispatchOperation);
+    } else if (operation) {
+      queue.unshift(operation);
     }
   }
 
@@ -677,10 +679,9 @@ export const Client: new (opts: ClientOptions) => Client = function Client(
           for (let i = queue.length - 1; i >= 0; i--)
             if (queue[i].key === operation.key) queue.splice(i, 1);
           // Dispatch a teardown signal for the stopped operation
-          queue.unshift(
+          flushOperations(
             makeOperation('teardown', operation, operation.context)
           );
-          flushOperations();
         })
       );
     } else {