Gateway: pass through errors encountered when running final execute (#…

…159)
apollographql · Jun 4, 2021 · 9045f55 · 9045f55
1 parent 4e4bb33
commit 9045f55
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/gateway-js/src/executeQueryPlan.ts b/gateway-js/src/executeQueryPlan.ts
@@ -81,7 +81,7 @@ export async function executeQueryPlan<TContext>(
   // the original query.
   // It is also used to allow execution of introspection queries though.
   try {
-    ({ data } = await execute({
+    const executionResult = await execute({
       schema: operationContext.schema,
       document: {
         kind: Kind.DOCUMENT,
@@ -94,7 +94,11 @@ export async function executeQueryPlan<TContext>(
       variableValues: requestContext.request.variables,
       // See also `wrapSchemaWithAliasResolver` in `gateway-js/src/index.ts`.
       fieldResolver: defaultFieldResolverWithAliasSupport,
-    }));
+    });
+    data = executionResult.data;
+    if (executionResult.errors?.length) {
+      errors.push(...executionResult.errors)
+    }
   } catch (error) {
     return { errors: [error] };
   }