Skip to content

Uniform parsing of queries with short-hand syntax with regular queries #1094

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 30, 2017
Merged

Uniform parsing of queries with short-hand syntax with regular queries #1094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ceff6f7
Fix parsing of regular queries
lebedev Nov 19, 2017
c25a0cf
Add test to prevent future regressions
lebedev Nov 23, 2017
1a1f3d5
Default to empty array when parsing
leebyron Nov 30, 2017
01fdce6
Empty array for variable definitions in tests
leebyron Nov 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 51 additions & 1 deletion src/language/__tests__/parser-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ describe('Parser', () => {
loc: { start: 0, end: 40 },
operation: 'query',
name: null,
variableDefinitions: null,
variableDefinitions: [],
directives: [],
selectionSet:
{ kind: Kind.SELECTION_SET,
Expand Down Expand Up @@ -270,6 +270,56 @@ describe('Parser', () => {
);
});

it('creates ast from nameless query without variables', () => {

const source = new Source(`query {
node {
id
}
}
`);
const result = parse(source);

expect(result).to.containSubset(
{ kind: Kind.DOCUMENT,
loc: { start: 0, end: 30 },
definitions:
[ { kind: Kind.OPERATION_DEFINITION,
loc: { start: 0, end: 29 },
operation: 'query',
name: null,
variableDefinitions: [],
directives: [],
selectionSet:
{ kind: Kind.SELECTION_SET,
loc: { start: 6, end: 29 },
selections:
[ { kind: Kind.FIELD,
loc: { start: 10, end: 27 },
alias: null,
name:
{ kind: Kind.NAME,
loc: { start: 10, end: 14 },
value: 'node' },
arguments: [],
directives: [],
selectionSet:
{ kind: Kind.SELECTION_SET,
loc: { start: 15, end: 27 },
selections:
[ { kind: Kind.FIELD,
loc: { start: 21, end: 23 },
alias: null,
name:
{ kind: Kind.NAME,
loc: { start: 21, end: 23 },
value: 'id' },
arguments: [],
directives: [],
selectionSet: null } ] } } ] } } ] }
);
});

it('allows parsing without source location information', () => {
const source = new Source('{ id }');
const result = parse(source, { noLocation: true });
Expand Down
9 changes: 4 additions & 5 deletions src/language/parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,17 +275,16 @@ function parseOperationDefinition(lexer: Lexer<*>): OperationDefinitionNode {
kind: OPERATION_DEFINITION,
operation: 'query',
name: null,
variableDefinitions: null,
variableDefinitions: [],
directives: [],
selectionSet: parseSelectionSet(lexer),
loc: loc(lexer, start)
};
}
const operation = parseOperationType(lexer);
let name;
if (peek(lexer, TokenKind.NAME)) {
name = parseName(lexer);
}
const name = peek(lexer, TokenKind.NAME) ?
parseName(lexer) :
null;
return {
kind: OPERATION_DEFINITION,
operation,
Expand Down