fix(server): use subscription specific formatter for queries and muta…

…tions too
ilijaNL · Aug 27, 2020 · 5672a04 · 5672a04
1 parent 0303c09
commit 5672a04
Showing 1 changed file with 10 additions and 0 deletions.
diff --git 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,