Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/gold-apricots-report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@0no-co/graphql.web": minor
---

Add support for executable definitions as defined in https://github.com/graphql/graphql-spec/pull/1170
278 changes: 278 additions & 0 deletions src/__tests__/description.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,278 @@
import { describe, it, expect } from 'vitest';
import { parse } from '../parser';
import { print } from '../printer';
import type {
OperationDefinitionNode,
VariableDefinitionNode,
FragmentDefinitionNode,
} from '../ast';

describe('GraphQL descriptions', () => {
describe('OperationDefinition descriptions', () => {
it('parses operation with description', () => {
const source = `
"""
Request the current status of a time machine and its operator.
"""
query GetTimeMachineStatus {
timeMachine {
id
status
}
}
`;

const doc = parse(source, { noLocation: true });
const operation = doc.definitions[0] as OperationDefinitionNode;

expect(operation.description).toBeDefined();
expect(operation.description?.value).toBe(
'Request the current status of a time machine and its operator.'
);
expect(operation.description?.block).toBe(true);
});

it('parses operation with single-line description', () => {
const source = `
"Simple query description"
query SimpleQuery {
field
}
`;

const doc = parse(source, { noLocation: true });
const operation = doc.definitions[0] as OperationDefinitionNode;

expect(operation.description).toBeDefined();
expect(operation.description?.value).toBe('Simple query description');
expect(operation.description?.block).toBe(false);
});

it('does not allow description on anonymous operations', () => {
const source = `
"This should fail"
{
field
}
`;

expect(() => parse(source)).toThrow();
});

it('parses mutation with description', () => {
const source = `
"""
Create a new time machine entry.
"""
mutation CreateTimeMachine($input: TimeMachineInput!) {
createTimeMachine(input: $input) {
id
}
}
`;

const doc = parse(source, { noLocation: true });
const operation = doc.definitions[0] as OperationDefinitionNode;

expect(operation.description).toBeDefined();
expect(operation.description?.value).toBe('Create a new time machine entry.');
});
});

describe('VariableDefinition descriptions', () => {
it('parses variable with description', () => {
const source = `
query GetTimeMachineStatus(
"The unique serial number of the time machine to inspect."
$machineId: ID!

"""
The year to check the status for.
**Warning:** certain years may trigger an anomaly in the space-time continuum.
"""
$year: Int
) {
timeMachine(id: $machineId) {
status(year: $year)
}
}
`;

const doc = parse(source, { noLocation: true });
const operation = doc.definitions[0] as OperationDefinitionNode;
const variables = operation.variableDefinitions as VariableDefinitionNode[];

expect(variables[0].description).toBeDefined();
expect(variables[0].description?.value).toBe(
'The unique serial number of the time machine to inspect.'
);
expect(variables[0].description?.block).toBe(false);

expect(variables[1].description).toBeDefined();
expect(variables[1].description?.value).toBe(
'The year to check the status for.\n**Warning:** certain years may trigger an anomaly in the space-time continuum.'
);
expect(variables[1].description?.block).toBe(true);
});

it('parses mixed variables with and without descriptions', () => {
const source = `
query Mixed(
"Described variable"
$described: String
$undescribed: Int
) {
field
}
`;

const doc = parse(source, { noLocation: true });
const operation = doc.definitions[0] as OperationDefinitionNode;
const variables = operation.variableDefinitions as VariableDefinitionNode[];

expect(variables[0].description).toBeDefined();
expect(variables[0].description?.value).toBe('Described variable');
expect(variables[1].description).toBeUndefined();
});
});

describe('FragmentDefinition descriptions', () => {
it('parses fragment with description', () => {
const source = `
"Time machine details."
fragment TimeMachineDetails on TimeMachine {
id
model
lastMaintenance
}
`;

const doc = parse(source, { noLocation: true });
const fragment = doc.definitions[0] as FragmentDefinitionNode;

expect(fragment.description).toBeDefined();
expect(fragment.description?.value).toBe('Time machine details.');
expect(fragment.description?.block).toBe(false);
});

it('parses fragment with block description', () => {
const source = `
"""
Comprehensive time machine information
including maintenance history and operational status.
"""
fragment FullTimeMachineInfo on TimeMachine {
id
model
lastMaintenance
operationalStatus
}
`;

const doc = parse(source, { noLocation: true });
const fragment = doc.definitions[0] as FragmentDefinitionNode;

expect(fragment.description).toBeDefined();
expect(fragment.description?.value).toBe(
'Comprehensive time machine information\nincluding maintenance history and operational status.'
);
expect(fragment.description?.block).toBe(true);
});
});

describe('print with descriptions', () => {
it('prints operation description correctly', () => {
const source = `"""
Request the current status of a time machine and its operator.
"""
query GetTimeMachineStatus {
timeMachine {
id
}
}`;

const doc = parse(source, { noLocation: true });
const printed = print(doc);

expect(printed).toContain('"""');
expect(printed).toContain('Request the current status of a time machine and its operator.');
});

it('prints variable descriptions correctly', () => {
const source = `query GetStatus(
"Machine ID"
$id: ID!
) {
field
}`;

const doc = parse(source, { noLocation: true });
const printed = print(doc);

expect(printed).toContain('"Machine ID"');
});

it('prints fragment description correctly', () => {
const source = `"Details fragment"
fragment Details on Type {
field
}`;

const doc = parse(source, { noLocation: true });
const printed = print(doc);

expect(printed).toContain('"Details fragment"');
});
});

describe('roundtrip parsing and printing', () => {
it('maintains descriptions through parse and print cycle', () => {
const source = `"""
Request the current status of a time machine and its operator.
"""
query GetTimeMachineStatus(
"The unique serial number of the time machine to inspect."
$machineId: ID!

"""
The year to check the status for.
**Warning:** certain years may trigger an anomaly in the space-time continuum.
"""
$year: Int
) {
timeMachine(id: $machineId) {
...TimeMachineDetails
operator {
name
licenseLevel
}
status(year: $year)
}
}

"Time machine details."
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interestingly this seems to add newlines at the front and end when parsed

fragment TimeMachineDetails on TimeMachine {
id
model
lastMaintenance
}`;

const doc = parse(source, { noLocation: true });
const printed = print(doc);
const reparsed = parse(printed, { noLocation: true });

const operation = doc.definitions[0] as OperationDefinitionNode;
const reparsedOperation = reparsed.definitions[0] as OperationDefinitionNode;

// The printed/reparsed cycle may have slightly different formatting but same content
expect(reparsedOperation.description?.value?.trim()).toBe(
operation.description?.value?.trim()
);

const fragment = doc.definitions[1] as FragmentDefinitionNode;
const reparsedFragment = reparsed.definitions[1] as FragmentDefinitionNode;

expect(reparsedFragment.description?.value).toBe(fragment.description?.value);
});
});
});
9 changes: 6 additions & 3 deletions src/ast.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,12 @@ export type ExecutableDefinitionNode = Or<
>;

export type OperationDefinitionNode = Or<
GraphQL.OperationDefinitionNode,
GraphQL.OperationDefinitionNode & { description?: StringValueNode },
{
readonly kind: Kind.OPERATION_DEFINITION;
readonly operation: OperationTypeNode;
readonly name?: NameNode;
readonly description?: StringValueNode;
readonly variableDefinitions?: ReadonlyArray<VariableDefinitionNode>;
readonly directives?: ReadonlyArray<DirectiveNode>;
readonly selectionSet: SelectionSetNode;
Expand All @@ -116,12 +117,13 @@ export type OperationDefinitionNode = Or<
>;

export type VariableDefinitionNode = Or<
GraphQL.VariableDefinitionNode,
GraphQL.VariableDefinitionNode & { description?: StringValueNode },
{
readonly kind: Kind.VARIABLE_DEFINITION;
readonly variable: VariableNode;
readonly type: TypeNode;
readonly defaultValue?: ConstValueNode;
readonly description?: StringValueNode;
readonly directives?: ReadonlyArray<ConstDirectiveNode>;
readonly loc?: Location;
}
Expand Down Expand Up @@ -205,10 +207,11 @@ export type InlineFragmentNode = Or<
>;

export type FragmentDefinitionNode = Or<
GraphQL.FragmentDefinitionNode,
GraphQL.FragmentDefinitionNode & { description?: StringValueNode },
{
readonly kind: Kind.FRAGMENT_DEFINITION;
readonly name: NameNode;
readonly description?: StringValueNode;
readonly typeCondition: NamedTypeNode;
readonly directives?: ReadonlyArray<DirectiveNode>;
readonly selectionSet: SelectionSetNode;
Expand Down
Loading
Loading