feat: minor correction and updated headers merge logic

Author: nvyasadobe

src/index.ts

@@ -25,6 +25,7 @@ import {
 	AfterSourceHookFunctionPayload,
 	BeforeSourceHookFunctionPayload,
 	PLUGIN_HOOKS_ERROR_CODES,
+	UpdateRequestFn,
 } from './types';
 import getBeforeSourceHookHandler from './handleBeforeSourceHooks';
 import type { YogaLogger, Plugin, YogaInitialContext } from 'graphql-yoga';
@@ -207,27 +208,19 @@ export default async function hooksPlugin(config: PluginConfig): Promise<HooksPl
 						};
 
 						// Provide callback to update request
-						const updateRequest = (modifications: RequestInit) => {
+						const updateRequest: UpdateRequestFn = (modifications: RequestInit) => {
 							const { headers: newHeaders, ...otherModifications } = modifications;
-
-							// Handle header merging properly
+							// Handle header merging
 							if (newHeaders) {
 								const originalHeaders = options.headers || {};
-								let mergedHeaders: Record<string, string> = {};
-
-								// Handle different header formats
 								if (originalHeaders instanceof Headers) {
-									originalHeaders.forEach((value, key) => {
-										mergedHeaders[key] = value;
-									});
-								} else if (originalHeaders && typeof originalHeaders === 'object') {
-									mergedHeaders = { ...(originalHeaders as Record<string, string>) };
+									const headersObj = Object.fromEntries(originalHeaders.entries());
+									options.headers = { ...headersObj, ...newHeaders };
+								} else {
+									options.headers = { ...originalHeaders, ...newHeaders };
 								}
-								// Merge new headers
-								Object.assign(mergedHeaders, newHeaders);
-								options.headers = mergedHeaders;
 							}
-							// Apply other modifications (including body with modified query)
+							// Apply other modifications
 							Object.assign(options, otherModifications);
 						};
 

src/types.ts

@@ -145,5 +145,10 @@ export enum HookStatus {
 	ERROR = 'ERROR',
 }
 
+/**
+ * Type for the updateRequest callback function
+ */
+export type UpdateRequestFn = (modifications: RequestInit) => void;
+
 // Export error codes for uniform error handling
 export { PLUGIN_HOOKS_ERROR_CODES, type PluginHooksErrorCode } from './errors';

src/utils/hookResolver.ts

@@ -17,6 +17,7 @@ import type {
 	HookConfig,
 	HookFunction,
 	MemoizedFns,
+	UpdateRequestFn,
 } from '../types';
 //@ts-expect-error The dynamic import is a workaround for cjs
 import importFn from '../dynamicImport';
@@ -57,7 +58,7 @@ export interface SourceHookExecConfig {
 	payload: BeforeSourceHookFunctionPayload | AfterSourceHookFunctionPayload;
 	hookType: 'beforeSource' | 'afterSource';
 	sourceName: string;
-	updateRequest?: (modifications: RequestInit) => void; // Optional callback for beforeSource
+	updateRequest?: UpdateRequestFn; // Optional callback for beforeSource
 }
 
 async function getHookFunction(