feat: fixed the beforeSource remote hooks

Author: nvyasadobe

src/handleBeforeSourceHooks.ts

@@ -28,9 +28,9 @@ export interface BeforeSourceHookBuildConfig {
  * @param fnBuildConfig Build configuration.
  */
 const getBeforeSourceHookHandler = (fnBuildConfig: BeforeSourceHookBuildConfig) => {
-	return async (fnExecConfig: SourceHookExecConfig) => {
+	return async (fnExecConfig: SourceHookExecConfig): Promise<void> => {
 		const { baseDir, logger, beforeSource, memoizedFns } = fnBuildConfig;
-		const { payload, sourceName } = fnExecConfig;
+		const { payload, sourceName, updateRequest } = fnExecConfig;
 
 		const beforeSourceHooks = beforeSource || [];
 
@@ -65,10 +65,25 @@ const getBeforeSourceHookHandler = (fnBuildConfig: BeforeSourceHookBuildConfig)
 			if (hookFn) {
 				try {
 					const hooksResponse = await hookFn(payload);
+					if (!hooksResponse) {
+						continue;
+					}
 					if (hookConfig.blocking) {
 						if (hooksResponse.status.toUpperCase() === HookStatus.ERROR) {
 							throw new Error(hooksResponse.message);
 						}
+
+						// Handle request modification from hook data using callback pattern (like beforeAll)
+						if (hooksResponse.data?.request) {
+							// Use callback to apply modifications (consistent with beforeAll pattern)
+							if (updateRequest) {
+								updateRequest(hooksResponse.data.request);
+							} else {
+								logger.warn(
+									'beforeSource hook returned request modifications but no updateRequest callback provided',
+								);
+							}
+						}
 					}
 				} catch (err: unknown) {
 					handleHookExecutionError(err, logger, 'beforeSource');

src/index.ts

@@ -206,10 +206,37 @@ export default async function hooksPlugin(config: PluginConfig): Promise<HooksPl
 							sourceName,
 						};
 
+						// Provide callback to update request
+						const updateRequest = (modifications: RequestInit) => {
+							const { headers: newHeaders, ...otherModifications } = modifications;
+
+							// Handle header merging properly
+							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>) };
+								}
+								// Merge new headers
+								Object.assign(mergedHeaders, newHeaders);
+								options.headers = mergedHeaders;
+							}
+							// Apply other modifications (including body with modified query)
+							Object.assign(options, otherModifications);
+						};
+
+						// Execute hook with callback (consistent with beforeAll pattern)
 						await beforeSourceHookHandler({
 							payload,
 							hookType: 'beforeSource',
 							sourceName,
+							updateRequest,
 						});
 					} catch (err: unknown) {
 						throw new GraphQLError(

src/utils/hookResolver.ts

@@ -57,6 +57,7 @@ export interface SourceHookExecConfig {
 	payload: BeforeSourceHookFunctionPayload | AfterSourceHookFunctionPayload;
 	hookType: 'beforeSource' | 'afterSource';
 	sourceName: string;
+	updateRequest?: (modifications: RequestInit) => void; // Optional callback for beforeSource
 }
 
 async function getHookFunction(