Skip to content
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

Jump to bottom

Use AST abbreviation consistently #1734

Merged
merged 1 commit into from
Feb 14, 2019
Merged

Use AST abbreviation consistently #1734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
40 changes: 20 additions & 20 deletions src/language/__tests__/printer-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,44 +28,44 @@ describe('Printer: Query document', () => {
});

it('produces helpful error messages', () => {
const badAst1 = { random: 'Data' };
const badAST = { random: 'Data' };
// $DisableFlowOnNegativeTest
expect(() => print(badAst1)).to.throw(
expect(() => print(badAST)).to.throw(
'Invalid AST Node: { random: "Data" }',
);
});

it('correctly prints non-query operations without name', () => {
const queryAstShorthanded = parse('query { id, name }');
expect(print(queryAstShorthanded)).to.equal(dedent`
const queryASTShorthanded = parse('query { id, name }');
expect(print(queryASTShorthanded)).to.equal(dedent`
{
id
name
}
`);

const mutationAst = parse('mutation { id, name }');
expect(print(mutationAst)).to.equal(dedent`
const mutationAST = parse('mutation { id, name }');
expect(print(mutationAST)).to.equal(dedent`
mutation {
id
name
}
`);

const queryAstWithArtifacts = parse(
const queryASTWithArtifacts = parse(
'query ($foo: TestType) @testDirective { id, name }',
);
expect(print(queryAstWithArtifacts)).to.equal(dedent`
expect(print(queryASTWithArtifacts)).to.equal(dedent`
query ($foo: TestType) @testDirective {
id
name
}
`);

const mutationAstWithArtifacts = parse(
const mutationASTWithArtifacts = parse(
'mutation ($foo: TestType) @testDirective { id, name }',
);
expect(print(mutationAstWithArtifacts)).to.equal(dedent`
expect(print(mutationASTWithArtifacts)).to.equal(dedent`
mutation ($foo: TestType) @testDirective {
id
name
Expand All @@ -74,24 +74,24 @@ describe('Printer: Query document', () => {
});

it('prints query with variable directives', () => {
const queryAstWithVariableDirective = parse(
const queryASTWithVariableDirective = parse(
'query ($foo: TestType = {a: 123} @testDirective(if: true) @test) { id }',
);
expect(print(queryAstWithVariableDirective)).to.equal(dedent`
expect(print(queryASTWithVariableDirective)).to.equal(dedent`
query ($foo: TestType = {a: 123} @testDirective(if: true) @test) {
id
}
`);
});

it('Experimental: prints fragment with variable directives', () => {
const queryAstWithVariableDirective = parse(
const queryASTWithVariableDirective = parse(
'fragment Foo($foo: TestType @test) on TestType @testDirective { id }',
{
experimentalFragmentVariables: true,
},
);
expect(print(queryAstWithVariableDirective)).to.equal(dedent`
expect(print(queryASTWithVariableDirective)).to.equal(dedent`
fragment Foo($foo: TestType @test) on TestType @testDirective {
id
}
Expand All @@ -100,18 +100,18 @@ describe('Printer: Query document', () => {

describe('block string', () => {
it('correctly prints single-line with leading space', () => {
const mutationAstWithArtifacts = parse(
const mutationASTWithArtifacts = parse(
'{ field(arg: """ space-led value""") }',
);
expect(print(mutationAstWithArtifacts)).to.equal(dedent`
expect(print(mutationASTWithArtifacts)).to.equal(dedent`
{
field(arg: """ space-led value""")
}
`);
});

it('correctly prints string with a first line indentation', () => {
const mutationAstWithArtifacts = parse(`
const mutationASTWithArtifacts = parse(`
{
field(arg: """
first
Expand All @@ -120,7 +120,7 @@ describe('Printer: Query document', () => {
""")
}
`);
expect(print(mutationAstWithArtifacts)).to.equal(dedent`
expect(print(mutationASTWithArtifacts)).to.equal(dedent`
{
field(arg: """
first
Expand All @@ -132,13 +132,13 @@ describe('Printer: Query document', () => {
});

it('correctly prints single-line with leading space and quotation', () => {
const mutationAstWithArtifacts = parse(`
const mutationASTWithArtifacts = parse(`
{
field(arg: """ space-led value "quoted string"
""")
}
`);
expect(print(mutationAstWithArtifacts)).to.equal(dedent`
expect(print(mutationASTWithArtifacts)).to.equal(dedent`
{
field(arg: """ space-led value "quoted string"
""")
Expand Down
4 changes: 2 additions & 2 deletions src/language/__tests__/schema-printer-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ describe('Printer: SDL document', () => {
});

it('produces helpful error messages', () => {
const badAst1 = { random: 'Data' };
const badAST = { random: 'Data' };
// $DisableFlowOnNegativeTest
expect(() => print(badAst1)).to.throw(
expect(() => print(badAST)).to.throw(
'Invalid AST Node: { random: "Data" }',
);
});
Expand Down
28 changes: 14 additions & 14 deletions src/language/__tests__/visitor-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ describe('Visitor', () => {

let selectionSet;

const editedAst = visit(ast, {
const editedAST = visit(ast, {
OperationDefinition: {
enter(node) {
checkVisitorFnArgs(ast, arguments);
Expand All @@ -153,7 +153,7 @@ describe('Visitor', () => {
},
});

expect(editedAst).to.deep.equal({
expect(editedAST).to.deep.equal({
...ast,
definitions: [
{
Expand All @@ -170,7 +170,7 @@ describe('Visitor', () => {

const { definitions } = ast;

const editedAst = visit(ast, {
const editedAST = visit(ast, {
Document: {
enter(node) {
checkVisitorFnArgs(ast, arguments);
Expand All @@ -191,7 +191,7 @@ describe('Visitor', () => {
},
});

expect(editedAst).to.deep.equal({
expect(editedAST).to.deep.equal({
...ast,
didEnter: true,
didLeave: true,
Expand All @@ -200,7 +200,7 @@ describe('Visitor', () => {

it('allows for editing on enter', () => {
const ast = parse('{ a, b, c { a, b, c } }', { noLocation: true });
const editedAst = visit(ast, {
const editedAST = visit(ast, {
enter(node) {
checkVisitorFnArgs(ast, arguments);
if (node.kind === 'Field' && node.name.value === 'b') {
Expand All @@ -213,14 +213,14 @@ describe('Visitor', () => {
parse('{ a, b, c { a, b, c } }', { noLocation: true }),
);

expect(editedAst).to.deep.equal(
expect(editedAST).to.deep.equal(
parse('{ a, c { a, c } }', { noLocation: true }),
);
});

it('allows for editing on leave', () => {
const ast = parse('{ a, b, c { a, b, c } }', { noLocation: true });
const editedAst = visit(ast, {
const editedAST = visit(ast, {
leave(node) {
checkVisitorFnArgs(ast, arguments, /* isEdited */ true);
if (node.kind === 'Field' && node.name.value === 'b') {
Expand All @@ -233,7 +233,7 @@ describe('Visitor', () => {
parse('{ a, b, c { a, b, c } }', { noLocation: true }),
);

expect(editedAst).to.deep.equal(
expect(editedAST).to.deep.equal(
parse('{ a, c { a, c } }', { noLocation: true }),
);
});
Expand Down Expand Up @@ -1169,7 +1169,7 @@ describe('Visitor', () => {
const visited = [];

const ast = parse('{ a, b, c { a, b, c } }', { noLocation: true });
const editedAst = visit(
const editedAST = visit(
ast,
visitInParallel([
{
Expand Down Expand Up @@ -1197,7 +1197,7 @@ describe('Visitor', () => {
parse('{ a, b, c { a, b, c } }', { noLocation: true }),
);

expect(editedAst).to.deep.equal(
expect(editedAST).to.deep.equal(
parse('{ a, c { a, c } }', { noLocation: true }),
);

Expand Down Expand Up @@ -1233,7 +1233,7 @@ describe('Visitor', () => {
const visited = [];

const ast = parse('{ a, b, c { a, b, c } }', { noLocation: true });
const editedAst = visit(
const editedAST = visit(
ast,
visitInParallel([
{
Expand Down Expand Up @@ -1261,7 +1261,7 @@ describe('Visitor', () => {
parse('{ a, b, c { a, b, c } }', { noLocation: true }),
);

expect(editedAst).to.deep.equal(
expect(editedAST).to.deep.equal(
parse('{ a, c { a, c } }', { noLocation: true }),
);

Expand Down Expand Up @@ -1392,7 +1392,7 @@ describe('Visitor', () => {
const typeInfo = new TypeInfo(testSchema);

const ast = parse('{ human(id: 4) { name, pets }, alien }');
const editedAst = visit(
const editedAST = visit(
ast,
visitWithTypeInfo(typeInfo, {
enter(node) {
Expand Down Expand Up @@ -1454,7 +1454,7 @@ describe('Visitor', () => {
print(parse('{ human(id: 4) { name, pets }, alien }')),
);

expect(print(editedAst)).to.deep.equal(
expect(print(editedAST)).to.deep.equal(
print(
parse(
'{ human(id: 4) { name, pets { __typename } }, alien { __typename } }',
Expand Down
4 changes: 2 additions & 2 deletions src/subscription/__tests__/subscribe-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ async function createSubscription(pubsub, schema = emailSchema, ast, vars) {
});
}

const defaultAst = parse(`
const defaultAST = parse(`
subscription ($priority: Int = 0) {
importantEmail(priority: $priority) {
email {
Expand All @@ -129,7 +129,7 @@ async function createSubscription(pubsub, schema = emailSchema, ast, vars) {
// `subscribe` returns Promise<AsyncIterator | ExecutionResult>
return {
sendImportantEmail,
subscription: await subscribe(schema, ast || defaultAst, data, null, vars),
subscription: await subscribe(schema, ast || defaultAST, data, null, vars),
};
}

Expand Down