rootvalue execution request

Author: enisdenjo

packages/fusion-runtime/src/utils.ts

@@ -300,7 +300,7 @@ export function wrapExecutorWithHooks({
     baseExecutionRequest.info =
       baseExecutionRequest.info || ({} as GraphQLResolveInfo);
     baseExecutionRequest.info.executionRequest = baseExecutionRequest;
-    // TODO: Fix this in onFetch hook handler of @graphql-mesh/utils
+    // this rootValue will be set in the info value for field.resolvers in non-graphql requests
     // TODO: Also consider if a subgraph can ever rely on the gateway's rootValue?
     baseExecutionRequest.rootValue = {
       executionRequest: baseExecutionRequest,

packages/runtime/src/plugins/useUpstreamRetry.ts

@@ -182,11 +182,8 @@ export function useUpstreamRetry<TContext extends Record<string, any>>(
         }
       }
     },
-    onFetch({ info, executionRequest }) {
-      // if there's no execution request, it's a subgraph request
+    onFetch({ executionRequest }) {
       // TODO: Also consider what happens when there are multiple fetch calls for a single subgraph request
-      // @ts-expect-error - we know that it might have executionRequest property
-      executionRequest ||= info?.rootValue?.executionRequest;
       if (executionRequest) {
         return function onFetchDone({ response }) {
           executionRequestResponseMap.set(executionRequest, response);

packages/runtime/src/wrapFetchWithHooks.ts

@@ -45,7 +45,11 @@ export function wrapFetchWithHooks<TContext>(
               // @ts-expect-error TODO: why?
               info,
               get executionRequest() {
-                return info?.executionRequest;
+                return (
+                  info?.executionRequest ||
+                  // @ts-expect-error might be in the root value, see packages/fusion-runtime/src/utils.ts
+                  info?.rootValue?.executionRequest
+                );
               },
               endResponse(newResponse) {
                 response$ = newResponse;