chunk

Author: glasser

packages/server/src/errorNormalize.ts

@@ -8,7 +8,7 @@ import {
 import { ApolloServerErrorCode } from './errors/index.js';
 import type { HTTPGraphQLHead } from './externalTypes/http.js';
 import {
-  isHTTPGraphQLHead,
+  HeaderMap,
   mergeHTTPGraphQLHead,
   newHTTPGraphQLHead,
 } from './runHttpQuery.js';
@@ -68,8 +68,11 @@ export function normalizeAndFormatErrors(
         ApolloServerErrorCode.INTERNAL_SERVER_ERROR,
     };
 
-    if (isHTTPGraphQLHead(extensions.http)) {
-      mergeHTTPGraphQLHead(httpFromErrors, extensions.http);
+    if (isPartialHTTPGraphQLHead(extensions.http)) {
+      mergeHTTPGraphQLHead(httpFromErrors, {
+        headers: new HeaderMap(),
+        ...extensions.http,
+      });
       delete extensions.http;
     }
 
@@ -98,3 +101,12 @@ export function ensureGraphQLError(maybeError: unknown): GraphQLError {
     ? error
     : new GraphQLError(error.message, { originalError: error });
 }
+
+function isPartialHTTPGraphQLHead(x: unknown): x is Partial<HTTPGraphQLHead> {
+  return (
+    !!x &&
+    typeof x === 'object' &&
+    (!('status' in x) || typeof (x as any).status === 'number') &&
+    (!('headers' in x) || (x as any).headers instanceof Map)
+  );
+}

packages/server/src/runHttpQuery.ts

@@ -248,16 +248,6 @@ export function newHTTPGraphQLHead(status?: number): HTTPGraphQLHead {
   };
 }
 
-export function isHTTPGraphQLHead(x: unknown): x is HTTPGraphQLHead {
-  return (
-    !!x &&
-    typeof x === 'object' &&
-    (!('status' in x) || typeof (x as any).status === 'number') &&
-    'headers' in x &&
-    (x as any).headers instanceof Map
-  );
-}
-
 // Updates `target` with status code and headers from `source`. For now let's
 // consider it undefined what happens if both have a status code set or both set
 // the same header.
@@ -268,7 +258,9 @@ export function mergeHTTPGraphQLHead(
   if (source.status) {
     target.status = source.status;
   }
-  for (const [name, value] of source.headers) {
-    target.headers.set(name, value);
+  if (source.headers) {
+    for (const [name, value] of source.headers) {
+      target.headers.set(name, value);
+    }
   }
 }