Skip to content
Open
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
1 change: 1 addition & 0 deletions cspell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ ignoreRegExpList:

words:
- graphiql
- metafield
- uncoerce
- uncoerced

Expand Down
6 changes: 6 additions & 0 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ export {
parseValue,
parseConstValue,
parseType,
parseSchemaCoordinate,
// Print
print,
// Visit
Expand All @@ -255,6 +256,7 @@ export {
isTypeDefinitionNode,
isTypeSystemExtensionNode,
isTypeExtensionNode,
isSchemaCoordinateNode,
} from './language/index.js';

export type {
Expand Down Expand Up @@ -327,6 +329,7 @@ export type {
UnionTypeExtensionNode,
EnumTypeExtensionNode,
InputObjectTypeExtensionNode,
SchemaCoordinateNode,
} from './language/index.js';

// Execute GraphQL queries.
Expand Down Expand Up @@ -496,6 +499,8 @@ export {
findBreakingChanges,
findDangerousChanges,
findSchemaChanges,
resolveSchemaCoordinate,
resolveASTSchemaCoordinate,
} from './utilities/index.js';

export type {
Expand Down Expand Up @@ -526,4 +531,5 @@ export type {
SafeChange,
DangerousChange,
TypedQueryDocumentNode,
ResolvedSchemaElement,
} from './utilities/index.js';
182 changes: 181 additions & 1 deletion src/language/__tests__/parser-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,13 @@ import { kitchenSinkQuery } from '../../__testUtils__/kitchenSinkQuery.js';
import { inspect } from '../../jsutils/inspect.js';

import { Kind } from '../kinds.js';
import { parse, parseConstValue, parseType, parseValue } from '../parser.js';
import {
parse,
parseConstValue,
parseSchemaCoordinate,
parseType,
parseValue,
} from '../parser.js';
import { Source } from '../source.js';
import { TokenKind } from '../tokenKind.js';

Expand Down Expand Up @@ -679,4 +685,178 @@ describe('Parser', () => {
});
});
});

describe('parseSchemaCoordinate', () => {
it('parses Name', () => {
const result = parseSchemaCoordinate('MyType');
expectJSON(result).toDeepEqual({
kind: Kind.TYPE_COORDINATE,
loc: { start: 0, end: 6 },
name: {
kind: Kind.NAME,
loc: { start: 0, end: 6 },
value: 'MyType',
},
});
});

it('parses Name . Name', () => {
const result = parseSchemaCoordinate('MyType.field');
expectJSON(result).toDeepEqual({
kind: Kind.MEMBER_COORDINATE,
loc: { start: 0, end: 12 },
name: {
kind: Kind.NAME,
loc: { start: 0, end: 6 },
value: 'MyType',
},
memberName: {
kind: Kind.NAME,
loc: { start: 7, end: 12 },
value: 'field',
},
});
});

it('rejects Name . Name . Name', () => {
expect(() => parseSchemaCoordinate('MyType.field.deep'))
.to.throw()
.to.deep.include({
message: 'Syntax Error: Expected <EOF>, found ..',
locations: [{ line: 1, column: 13 }],
});
});

it('parses Name . Name ( Name : )', () => {
const result = parseSchemaCoordinate('MyType.field(arg:)');
expectJSON(result).toDeepEqual({
kind: Kind.ARGUMENT_COORDINATE,
loc: { start: 0, end: 18 },
name: {
kind: Kind.NAME,
loc: { start: 0, end: 6 },
value: 'MyType',
},
fieldName: {
kind: Kind.NAME,
loc: { start: 7, end: 12 },
value: 'field',
},
argumentName: {
kind: Kind.NAME,
loc: { start: 13, end: 16 },
value: 'arg',
},
});
});

it('rejects Name . Name ( Name : Name )', () => {
expect(() => parseSchemaCoordinate('MyType.field(arg: value)'))
.to.throw()
.to.deep.include({
message: 'Syntax Error: Invalid character: " ".',
locations: [{ line: 1, column: 18 }],
});
});

it('parses @ Name', () => {
const result = parseSchemaCoordinate('@myDirective');
expectJSON(result).toDeepEqual({
kind: Kind.DIRECTIVE_COORDINATE,
loc: { start: 0, end: 12 },
name: {
kind: Kind.NAME,
loc: { start: 1, end: 12 },
value: 'myDirective',
},
});
});

it('parses @ Name ( Name : )', () => {
const result = parseSchemaCoordinate('@myDirective(arg:)');
expectJSON(result).toDeepEqual({
kind: Kind.DIRECTIVE_ARGUMENT_COORDINATE,
loc: { start: 0, end: 18 },
name: {
kind: Kind.NAME,
loc: { start: 1, end: 12 },
value: 'myDirective',
},
argumentName: {
kind: Kind.NAME,
loc: { start: 13, end: 16 },
value: 'arg',
},
});
});

it('parses __Type', () => {
const result = parseSchemaCoordinate('__Type');
expectJSON(result).toDeepEqual({
kind: Kind.TYPE_COORDINATE,
loc: { start: 0, end: 6 },
name: {
kind: Kind.NAME,
loc: { start: 0, end: 6 },
value: '__Type',
},
});
});

it('parses Type.__metafield', () => {
const result = parseSchemaCoordinate('Type.__metafield');
expectJSON(result).toDeepEqual({
kind: Kind.MEMBER_COORDINATE,
loc: { start: 0, end: 16 },
name: {
kind: Kind.NAME,
loc: { start: 0, end: 4 },
value: 'Type',
},
memberName: {
kind: Kind.NAME,
loc: { start: 5, end: 16 },
value: '__metafield',
},
});
});

it('parses Type.__metafield(arg:)', () => {
const result = parseSchemaCoordinate('Type.__metafield(arg:)');
expectJSON(result).toDeepEqual({
kind: Kind.ARGUMENT_COORDINATE,
loc: { start: 0, end: 22 },
name: {
kind: Kind.NAME,
loc: { start: 0, end: 4 },
value: 'Type',
},
fieldName: {
kind: Kind.NAME,
loc: { start: 5, end: 16 },
value: '__metafield',
},
argumentName: {
kind: Kind.NAME,
loc: { start: 17, end: 20 },
value: 'arg',
},
});
});

it('rejects @ Name . Name', () => {
expect(() => parseSchemaCoordinate('@myDirective.field'))
.to.throw()
.to.deep.include({
message: 'Syntax Error: Expected <EOF>, found ..',
locations: [{ line: 1, column: 13 }],
});
});

it('accepts a Source object', () => {
expect(parseSchemaCoordinate('MyType')).to.deep.equal(
parseSchemaCoordinate(new Source('MyType')),
);
});
});
});
11 changes: 11 additions & 0 deletions src/language/__tests__/predicates-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
isConstValueNode,
isDefinitionNode,
isExecutableDefinitionNode,
isSchemaCoordinateNode,
isSelectionNode,
isTypeDefinitionNode,
isTypeExtensionNode,
Expand Down Expand Up @@ -141,4 +142,14 @@ describe('AST node predicates', () => {
'UnionTypeExtension',
]);
});

it('isSchemaCoordinateNode', () => {
expect(filterNodes(isSchemaCoordinateNode)).to.deep.equal([
'ArgumentCoordinate',
'DirectiveArgumentCoordinate',
'DirectiveCoordinate',
'MemberCoordinate',
'TypeCoordinate',
]);
});
});
31 changes: 30 additions & 1 deletion src/language/__tests__/printer-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { dedent, dedentString } from '../../__testUtils__/dedent.js';
import { kitchenSinkQuery } from '../../__testUtils__/kitchenSinkQuery.js';

import { Kind } from '../kinds.js';
import { parse } from '../parser.js';
import { parse, parseSchemaCoordinate } from '../parser.js';
import { print } from '../printer.js';

describe('Printer: Query document', () => {
Expand Down Expand Up @@ -299,4 +299,33 @@ describe('Printer: Query document', () => {
`),
);
});

it('prints schema coordinates', () => {
expect(print(parseSchemaCoordinate('Name'))).to.equal('Name');
expect(print(parseSchemaCoordinate('Name.field'))).to.equal('Name.field');
expect(print(parseSchemaCoordinate('Name.field(arg:)'))).to.equal(
'Name.field(arg:)',
);
expect(print(parseSchemaCoordinate('@name'))).to.equal('@name');
expect(print(parseSchemaCoordinate('@name(arg:)'))).to.equal('@name(arg:)');
expect(print(parseSchemaCoordinate('__Type'))).to.equal('__Type');
expect(print(parseSchemaCoordinate('Type.__metafield'))).to.equal(
'Type.__metafield',
);
expect(print(parseSchemaCoordinate('Type.__metafield(arg:)'))).to.equal(
'Type.__metafield(arg:)',
);
});

it('throws syntax error for ignored tokens in schema coordinates', () => {
expect(() => print(parseSchemaCoordinate('# foo\nName'))).to.throw(
'Syntax Error: Invalid character: "#"',
);
expect(() => print(parseSchemaCoordinate('\nName'))).to.throw(
'Syntax Error: Invalid character: U+000A.',
);
expect(() => print(parseSchemaCoordinate('Name .field'))).to.throw(
'Syntax Error: Invalid character: " "',
);
});
});
52 changes: 52 additions & 0 deletions src/language/__tests__/schemaCoordinateLexer-test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
import { expect } from 'chai';
import { describe, it } from 'mocha';

import { expectToThrowJSON } from '../../__testUtils__/expectJSON.js';

import { SchemaCoordinateLexer } from '../schemaCoordinateLexer.js';
import { Source } from '../source.js';
import { TokenKind } from '../tokenKind.js';

function lexSecond(str: string) {
const lexer = new SchemaCoordinateLexer(new Source(str));
lexer.advance();
return lexer.advance();
}

function expectSyntaxError(text: string) {
return expectToThrowJSON(() => lexSecond(text));
}

describe('SchemaCoordinateLexer', () => {
it('can be stringified', () => {
const lexer = new SchemaCoordinateLexer(new Source('Name.field'));
expect(Object.prototype.toString.call(lexer)).to.equal(
'[object SchemaCoordinateLexer]',
);
});

it('tracks a schema coordinate', () => {
const lexer = new SchemaCoordinateLexer(new Source('Name.field'));
expect(lexer.advance()).to.contain({
kind: TokenKind.NAME,
start: 0,
end: 4,
value: 'Name',
});
});

it('forbids ignored tokens', () => {
const lexer = new SchemaCoordinateLexer(new Source('\nName.field'));
expectToThrowJSON(() => lexer.advance()).to.deep.equal({
message: 'Syntax Error: Invalid character: U+000A.',
locations: [{ line: 1, column: 1 }],
});
});

it('lex reports a useful syntax errors', () => {
expectSyntaxError('Foo .bar').to.deep.equal({
message: 'Syntax Error: Invalid character: " ".',
locations: [{ line: 1, column: 4 }],
});
});
});
Loading
Loading