Skip to content

Commit 662e3ec

Browse files
committed
Merge pull request #6 from steveluscher/error-formatter
Update the error formatter
2 parents fb9f98d + 12b6855 commit 662e3ec

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

src/__forks__/formatRequestErrors.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,20 @@ export default function formatRequestErrors(request, errors) {
2020
return errors.map(({locations, message}, ii) => {
2121
var prefix = (ii + 1) + '. ';
2222
var indent = ' '.repeat(prefix.length);
23-
return (
24-
prefix + message + '\n' +
25-
locations.map(({column, line}) => {
23+
24+
//custom errors thrown in graphql-server may not have locations
25+
var locationMessage = locations ?
26+
('\n' + locations.map(({column, line}) => {
2627
var queryLine = queryLines[line - 1];
2728
var offset = Math.min(column - 1, CONTEXT_BEFORE);
2829
return [
2930
queryLine.substr(column - 1 - offset, CONTEXT_LENGTH),
3031
' '.repeat(offset) + '^^^'
3132
].map(messageLine => indent + messageLine).join('\n');
32-
}).join('\n')
33-
);
33+
}).join('\n')) :
34+
'';
35+
36+
return prefix + message + locationMessage;
37+
3438
}).join('\n');
3539
}

0 commit comments

Comments
 (0)