Run onFetchDone hooks even if onFetch has ended early with a response (#8658)

Author: enisdenjo

.changeset/quiet-swans-cross.md

@@ -0,0 +1,5 @@
+---
+'@graphql-mesh/utils': patch
+---
+
+Run onFetchDone hooks even if onFetch has ended early with a response

packages/legacy/utils/src/wrapFetchWithHooks.ts

@@ -78,11 +78,8 @@ export function wrapFetchWithHooks<TContext>(
           onFetchDoneHooks,
         ),
       function handleIterationResult() {
-        if (response$) {
-          return response$;
-        }
         return handleMaybePromise(
-          () => fetchFn(url, options, context, info),
+          () => response$ || fetchFn(url, options, context, info),
           function (response: Response) {
             return handleMaybePromise(
               () =>

packages/legacy/utils/test/fetch-instrumentation.spec.ts

@@ -27,4 +27,16 @@ describe('Fetch instrumentation', () => {
     expect(await res.json()).toEqual({ hello: 'world' });
     expect(receivedExecutionRequest).toBe(executionRequest);
   });
+  it('should call onFetchDone when onFetch ends with response early', async () => {
+    const onFetchDoneFn = jest.fn();
+    const early = new Response('Early response');
+    const wrappedFetch = wrapFetchWithHooks([
+      ({ endResponse }) => {
+        endResponse(early);
+        return onFetchDoneFn;
+      },
+    ]);
+    await wrappedFetch('http://localhost:4000');
+    expect(onFetchDoneFn).toHaveBeenCalledWith(expect.objectContaining({ response: early }));
+  });
 });