fix(gateway-runtime): Add subgraphName to ExecutionRequest (#1313)

Author: EmrysMyrddin

.changeset/big-dolls-invent.md

@@ -0,0 +1,10 @@
+---
+'@graphql-mesh/fusion-runtime': minor
+---
+
+Breaking Change: Removed `subgraphNameByExecutionRequest` weak map. Subgraph name is now stored in the execution request itself.
+
+```diff
+- const subgraphName = subgraphNameByExecutionRequest.get(executionRequest)
++ const subgraphName = executionRequest.subgraphName
+```

.changeset/lovely-turtles-sing.md

@@ -0,0 +1,6 @@
+---
+'@graphql-tools/delegate': minor
+'@graphql-hive/gateway-runtime': minor
+---
+
+Added `subgraphName` to `ExecutionRequest` for easier plugin developpment.

.changeset/red-teachers-love.md

@@ -0,0 +1,10 @@
+---
+'@graphql-hive/plugin-aws-sigv4': patch
+'@graphql-mesh/fusion-runtime': patch
+'@graphql-tools/batch-execute': patch
+'@graphql-tools/delegate': patch
+'@graphql-hive/gateway-runtime': patch
+'@graphql-tools/wrap': patch
+---
+
+Fixed subgraph name being lost when execution requests get batched together.

e2e/header-propagation/gateway.config.ts

@@ -2,7 +2,11 @@ import { defineConfig } from '@graphql-hive/gateway';
 
 export const gatewayConfig = defineConfig({
   propagateHeaders: {
-    fromClientToSubgraphs({ request }) {
+    fromClientToSubgraphs({ request, subgraphName }) {
+      if (subgraphName !== 'upstream') {
+        return;
+      }
+
       return {
         authorization: request.headers.get('authorization') ?? 'default',
         'session-cookie-id':

e2e/header-propagation/header-propagation.e2e.ts

@@ -34,6 +34,41 @@ it('propagates headers to subgraphs', async () => {
   });
 });
 
+it('propagates headers to subgraphs with batching', async () => {
+  await using gw = await gateway({
+    supergraph: {
+      with: 'apollo',
+      services: [await service('upstream')],
+    },
+  });
+  const result = await gw.execute({
+    query: /* GraphQL */ `
+      query {
+        h1: headers {
+          sessionCookieId
+        }
+        h2: headers {
+          authorization
+        }
+      }
+    `,
+    headers: {
+      authorization: 'Bearer token',
+      'session-cookie-id': 'session-cookie',
+    },
+  });
+  expect(result).toEqual({
+    data: {
+      h1: {
+        sessionCookieId: 'session-cookie',
+      },
+      h2: {
+        authorization: 'Bearer token',
+      },
+    },
+  });
+});
+
 it('sends default headers to subgraphs', async () => {
   await using gw = await gateway({
     supergraph: {

e2e/header-propagation/services/upstream.ts

@@ -31,8 +31,8 @@ const server = new ApolloServer<ExpressContextFunctionArgument>({
       }
 
       type Headers {
-        authorization: String!
-        sessionCookieId: String!
+        authorization: String
+        sessionCookieId: String
       }
     `),
     resolvers: resolvers as GraphQLResolverMap<unknown>,

package.json

@@ -66,6 +66,7 @@
     "@graphql-mesh/types": "0.104.6",
     "@graphql-mesh/utils": "0.104.6",
     "@graphql-tools/delegate": "workspace:^",
+    "@graphql-tools/utils": "10.9.0-alpha-20250710200000-fde1c74a0c2fa4f651cbeed5b2091aeda7afb162",
     "@opentelemetry/otlp-exporter-base@npm:0.202.0": "patch:@opentelemetry/otlp-exporter-base@npm%3A0.202.0#~/.yarn/patches/@opentelemetry-otlp-exporter-base-npm-0.202.0-f6f29c2eeb.patch",
     "@rollup/plugin-node-resolve@npm:^15.2.3": "patch:@rollup/plugin-node-resolve@npm%3A16.0.1#~/.yarn/patches/@rollup-plugin-node-resolve-npm-16.0.1-2936474bab.patch",
     "@vitest/snapshot": "patch:@vitest/snapshot@npm:3.1.2#~/.yarn/patches/@vitest-snapshot-npm-3.1.1-4d18cf86dc.patch",

packages/batch-execute/src/mergeRequests.ts

@@ -61,6 +61,7 @@ export function mergeRequests(
     request: ExecutionRequest,
   ) => Record<string, any>,
 ): ExecutionRequest {
+  const subgraphName = requests[0]!.subgraphName;
   const mergedVariables: Record<string, any> = Object.create(null);
   const mergedVariableDefinitions: Array<VariableDefinitionNode> = [];
   const mergedSelections: Array<SelectionNode> = [];
@@ -114,6 +115,7 @@ export function mergeRequests(
   }
 
   return {
+    subgraphName,
     document: {
       kind: Kind.DOCUMENT,
       definitions: [mergedOperationDefinition, ...mergedFragmentDefinitions],

packages/delegate/src/createRequest.ts

@@ -37,6 +37,7 @@ export function getDelegatingOperation(
 }
 
 export function createRequest({
+  subgraphName,
   sourceSchema,
   sourceParentType,
   sourceFieldName,
@@ -167,6 +168,7 @@ export function createRequest({
   };
 
   return {
+    subgraphName,
     document,
     variables: newVariables,
     rootValue: targetRootValue,

packages/delegate/src/delegateToSchema.ts

@@ -54,6 +54,7 @@ export function delegateToSchema<
   } = options;
 
   const request = createRequest({
+    subgraphName: (schema as SubschemaConfig).name,
     sourceSchema: info.schema,
     sourceParentType: info.parentType,
     sourceFieldName: info.fieldName,