Add optional raw response processing to query context

inc/config/http-query-context/http-query-context.php

@@ -20,4 +20,6 @@ public function get_request_headers( array $input_variables ): array;
 	public function get_request_body( array $input_variables ): array|null;
 	public function get_query_name(): string;
 	public function get_query_runner(): QueryRunnerInterface;
+	public function is_collection(): bool;
+	public function process_response( string $raw_response_data, array $input_variables ): string;
 }

inc/config/query-context/query-context.php

@@ -160,4 +160,12 @@ public function get_query_name(): string {
 	public function get_query_runner(): QueryRunnerInterface {
 		return new QueryRunner( $this );
 	}
+
+	public function is_collection(): bool {
+		return $this->output_variables['is_collection'] ?? false;
+	}
+
+	public function process_response( string $raw_response_data, array $input_variables ): string {
+		return $raw_response_data;
+	}
 }

inc/config/query-runner/query-runner.php

@@ -99,22 +99,23 @@ public function execute( array $input_variables ): array|WP_Error {
 		}
 
 		// The body is a stream... if we need to read it in chunks, etc. we can do so here.
-		$response_data = $response->getBody()->getContents();
+		$raw_response_data = $response->getBody()->getContents();
 
-		$is_collection = $this->query_context->output_variables['is_collection'] ?? false;
-
-		if ( isset( $response_data['errors'][0]['message'] ) ) {
+		if ( isset( $raw_response_data['errors'][0]['message'] ) ) {
 			$logger = LoggerManager::instance();
-			$logger->warning( sprintf( 'Query error: %s', esc_html( $response_data['errors'][0]['message'] ) ) );
+			$logger->warning( sprintf( 'Query error: %s', esc_html( $raw_response_data['errors'][0]['message'] ) ) );
 		}
 
+		// Optionally process the raw response data using query context custom logic.
+		$response_data = $this->query_context->process_response( $raw_response_data, $input_variables );
+
 		// This method always returns an array, even if it's a single item. This
 		// ensures a consistent response shape. The requestor is expected to inspect
 		// is_collection and unwrap if necessary.
-		$results = $this->map_fields( $response_data, $is_collection );
+		$results = $this->map_fields( $response_data );
 
 		return [
-			'is_collection' => $is_collection,
+			'is_collection' => $this->query_context->is_collection(),
 			'metadata'      => $this->query_context->get_metadata( $response, $results ),
 			'results'       => $results,
 		];
@@ -126,6 +127,12 @@ private function get_field_value( array|string $field_value, string $default_val
 			: ( $field_value[0] ?? $default_value );
 
 		switch ( $field_type ) {
+			case 'base64':
+				return base64_decode( $field_value_single );
+
+			case 'html':
+				return $field_value_single;
+
 			case 'price':
 				return sprintf( '$%s', number_format( $field_value_single, 2 ) );
 
@@ -136,15 +143,15 @@ private function get_field_value( array|string $field_value, string $default_val
 		return $field_value_single;
 	}
 
-	private function map_fields( $response_data, $is_collection = false ): array|null {
+	private function map_fields( $response_data ): array|null {
 		$root             = $response_data;
 		$output_variables = $this->query_context->output_variables;
 
 		if ( ! empty( $output_variables['root_path'] ) ) {
 			$json = new JsonObject( $root );
 			$root = $json->get( $output_variables['root_path'] );
 		} else {
-			$root = $is_collection ? $root : [ $root ];
+			$root = $this->query_context->is_collection() ? $root : [ $root ];
 		}
 
 		if ( empty( $root ) || empty( $output_variables['mappings'] ) ) {

tests/inc/config/QueryRunnerTest.php

@@ -7,8 +7,8 @@
 use Psr\Http\Message\ResponseInterface;
 use RemoteDataBlocks\Config\QueryRunner;
 use RemoteDataBlocks\Config\QueryRunnerInterface;
-use RemoteDataBlocks\Config\HttpQueryContext;
 use RemoteDataBlocks\Config\HttpDatasourceConfig;
+use RemoteDataBlocks\Config\QueryContext;
 use RemoteDataBlocks\HttpClient;
 use WP_Error;
 
@@ -21,6 +21,8 @@ class QueryRunnerTest extends TestCase {
 	protected function setUp(): void {
 		parent::setUp();
 
+		$this->http_client = $this->createMock( HttpClient::class );
+
 		$this->http_datasource = new class() implements HttpDatasourceConfig {
 			private $endpoint = 'https://api.example.com';
 			private $headers  = [ 'Content-Type' => 'application/json' ];
@@ -46,15 +48,15 @@ public function set_headers( array $headers ): void {
 			}
 		};
 
-		$this->query_context = new class($this->http_datasource) implements HttpQueryContext {
+		$this->query_context = new class($this->http_datasource, $this->http_client) extends QueryContext {
 			private $http_datasource;
 			private $http_client;
 			private $request_method = 'GET';
 			private $request_body   = [ 'query' => 'test' ];
 
-			public function __construct( HttpDatasourceConfig $http_datasource ) {
+			public function __construct( HttpDatasourceConfig $http_datasource, HttpClient $http_client ) {
 				$this->http_datasource = $http_datasource;
-				$this->http_client     = new HttpClient();
+				$this->http_client     = $http_client;
 			}
 
 			public function get_endpoint( array $input_variables = [] ): string {
@@ -89,10 +91,6 @@ public function get_query_runner(): QueryRunnerInterface {
 				return new QueryRunner( $this, $this->http_client );
 			}
 
-			public function set_http_client( HttpClient $http_client ): void {
-				$this->http_client = $http_client;
-			}
-
 			public function set_request_method( string $method ): void {
 				$this->request_method = $method;
 			}
@@ -103,9 +101,6 @@ public function set_request_body( array $body ): void {
 
 			public array $output_variables = [];
 		};
-
-		$this->http_client = $this->createMock( HttpClient::class );
-		$this->query_context->set_http_client( $this->http_client );
 	}
 
 	public function testExecuteSuccessfulRequest() {