From 5672a045332ea835e6ff7ce862c7c2a46729363b Mon Sep 17 00:00:00 2001
From: enisdenjo <badurinadenis@gmail.com>
Date: Thu, 27 Aug 2020 23:53:24 +0200
Subject: [PATCH] fix(server): use subscription specific formatter for queries
 and mutations too

---
 src/server.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/server.ts b/src/server.ts
index 0f4309eb..4396f70d 100644
--- a/src/server.ts
+++ b/src/server.ts
@@ -426,9 +426,14 @@ export function createServer(
                 }
               } else {
                 let result = subscriptionOrResult;
+                // use the root formater first
                 if (formatExecutionResult) {
                   result = await formatExecutionResult(ctx, result);
                 }
+                // use the subscription specific formatter
+                if (executionResultFormatter) {
+                  result = await executionResultFormatter(ctx, result);
+                }
                 await sendMessage<MessageType.Next>(ctx, {
                   id: message.id,
                   type: MessageType.Next,
@@ -448,9 +453,14 @@ export function createServer(
               // operationAST.operation === 'query' || 'mutation'
 
               let result = await execute(execArgs);
+              // use the root formater first
               if (formatExecutionResult) {
                 result = await formatExecutionResult(ctx, result);
               }
+              // use the subscription specific formatter
+              if (executionResultFormatter) {
+                result = await executionResultFormatter(ctx, result);
+              }
               await sendMessage<MessageType.Next>(ctx, {
                 id: message.id,
                 type: MessageType.Next,