Batch the executor in the right place

graphql-hive · Feb 6, 2025 · 00da557 · 00da557
1 parent 5480395
commit 00da557
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/packages/fusion-runtime/src/utils.ts b/packages/fusion-runtime/src/utils.ts
@@ -13,7 +13,7 @@ import {
   loggerForExecutionRequest,
   requestIdByRequest,
 } from '@graphql-mesh/utils';
-import { createBatchingExecutor } from '@graphql-tools/batch-execute';
+import { getBatchingExecutor } from '@graphql-tools/batch-execute';
 import {
   DelegationPlanBuilder,
   MergedTypeResolver,
@@ -222,9 +222,6 @@ export function getOnSubgraphExecute({
             if (isDisposable(executor_)) {
               transportExecutorStack.use(executor_);
             }
-            if (batch) {
-              executor = createBatchingExecutor(executor_);
-            }
             // Wraps the transport executor with hooks
             executor = wrapExecutorWithHooks({
               executor: executor_,
@@ -243,6 +240,9 @@ export function getOnSubgraphExecute({
       // Caches the lazy executor to prevent race conditions
       subgraphExecutorMap.set(subgraphName, executor);
     }
+    if (batch) {
+      executor = getBatchingExecutor(executionRequest.context || subgraphExecutorMap, executor);
+    }
     return executor(executionRequest);
   };
 }