Skip to content

Commit aa573e8

Browse files
twoftwof
authored
Remove CCN (#3999)
We're winding down work on CCN in favor of True Schema Nullability. More context: graphql/nullability-wg#37
1 parent bd2fe71 commit aa573e8

File tree

16 files changed

+9
-716
lines changed

16 files changed

+9
-716
lines changed

‎src/__testUtils__/kitchenSinkQuery.ts‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,6 @@ query queryName($foo: ComplexType, $site: Site = MOBILE) @onQuery {
1010
...frag @onFragmentSpread
1111
}
1212
}
13-
14-
field3!
15-
field4?
16-
requiredField5: field5!
17-
requiredSelectionSet(first: 10)! @directive {
18-
field
19-
}
20-
21-
unsetListItemsRequiredList: listField[]!
22-
requiredListItemsUnsetList: listField[!]
23-
requiredListItemsRequiredList: listField[!]!
24-
unsetListItemsOptionalList: listField[]?
25-
optionalListItemsUnsetList: listField[?]
26-
optionalListItemsOptionalList: listField[?]?
27-
multidimensionalList: listField[[[!]!]!]!
2813
}
2914
... @skip(unless: $foo) {
3015
id

‎src/index.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,6 @@ export {
233233
isDefinitionNode,
234234
isExecutableDefinitionNode,
235235
isSelectionNode,
236-
isNullabilityAssertionNode,
237236
isValueNode,
238237
isConstValueNode,
239238
isTypeNode,
@@ -266,10 +265,6 @@ export type {
266265
FieldNode,
267266
ArgumentNode,
268267
FragmentArgumentNode,
269-
NullabilityAssertionNode,
270-
NonNullAssertionNode,
271-
ErrorBoundaryNode,
272-
ListNullabilityOperatorNode,
273268
ConstArgumentNode,
274269
FragmentSpreadNode,
275270
InlineFragmentNode,

‎src/language/__tests__/lexer-test.ts‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -944,13 +944,6 @@ describe('Lexer', () => {
944944
value: undefined,
945945
});
946946

947-
expect(lexOne('?')).to.contain({
948-
kind: TokenKind.QUESTION_MARK,
949-
start: 0,
950-
end: 1,
951-
value: undefined,
952-
});
953-
954947
expect(lexOne('$')).to.contain({
955948
kind: TokenKind.DOLLAR,
956949
start: 0,
@@ -1196,7 +1189,6 @@ describe('isPunctuatorTokenKind', () => {
11961189

11971190
it('returns true for punctuator tokens', () => {
11981191
expect(isPunctuatorToken('!')).to.equal(true);
1199-
expect(isPunctuatorToken('?')).to.equal(true);
12001192
expect(isPunctuatorToken('$')).to.equal(true);
12011193
expect(isPunctuatorToken('&')).to.equal(true);
12021194
expect(isPunctuatorToken('(')).to.equal(true);

‎src/language/__tests__/parser-test.ts‎

Lines changed: 1 addition & 210 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ import { parse, parseConstValue, parseType, parseValue } from '../parser.js';
1515
import { Source } from '../source.js';
1616
import { TokenKind } from '../tokenKind.js';
1717

18-
function parseCCN(source: string) {
19-
return parse(source, { experimentalClientControlledNullability: true });
20-
}
21-
2218
function expectSyntaxError(text: string) {
2319
return expectToThrowJSON(() => parse(text));
2420
}
@@ -173,7 +169,7 @@ describe('Parser', () => {
173169
});
174170

175171
it('parses kitchen sink', () => {
176-
expect(() => parseCCN(kitchenSinkQuery)).to.not.throw();
172+
expect(() => parse(kitchenSinkQuery)).to.not.throw();
177173
});
178174

179175
it('allows non-keywords anywhere a Name is allowed', () => {
@@ -244,206 +240,6 @@ describe('Parser', () => {
244240
).to.not.throw();
245241
});
246242

247-
it('parses required field', () => {
248-
const result = parseCCN('{ requiredField! }');
249-
250-
expectJSON(result).toDeepNestedProperty(
251-
'definitions[0].selectionSet.selections[0].nullabilityAssertion',
252-
{
253-
kind: Kind.NON_NULL_ASSERTION,
254-
loc: { start: 15, end: 16 },
255-
nullabilityAssertion: undefined,
256-
},
257-
);
258-
});
259-
260-
it('parses optional field', () => {
261-
expect(() => parseCCN('{ optionalField? }')).to.not.throw();
262-
});
263-
264-
it('does not parse field with multiple designators', () => {
265-
expect(() => parseCCN('{ optionalField?! }')).to.throw(
266-
'Syntax Error: Expected Name, found "!".',
267-
);
268-
269-
expect(() => parseCCN('{ optionalField!? }')).to.throw(
270-
'Syntax Error: Expected Name, found "?".',
271-
);
272-
});
273-
274-
it('parses required with alias', () => {
275-
expect(() => parseCCN('{ requiredField: field! }')).to.not.throw();
276-
});
277-
278-
it('parses optional with alias', () => {
279-
expect(() => parseCCN('{ requiredField: field? }')).to.not.throw();
280-
});
281-
282-
it('does not parse aliased field with bang on left of colon', () => {
283-
expect(() => parseCCN('{ requiredField!: field }')).to.throw();
284-
});
285-
286-
it('does not parse aliased field with question mark on left of colon', () => {
287-
expect(() => parseCCN('{ requiredField?: field }')).to.throw();
288-
});
289-
290-
it('does not parse aliased field with bang on left and right of colon', () => {
291-
expect(() => parseCCN('{ requiredField!: field! }')).to.throw();
292-
});
293-
294-
it('does not parse aliased field with question mark on left and right of colon', () => {
295-
expect(() => parseCCN('{ requiredField?: field? }')).to.throw();
296-
});
297-
298-
it('does not parse designator on query', () => {
299-
expect(() => parseCCN('query? { field }')).to.throw();
300-
});
301-
302-
it('parses required within fragment', () => {
303-
expect(() =>
304-
parseCCN('fragment MyFragment on Query { field! }'),
305-
).to.not.throw();
306-
});
307-
308-
it('parses optional within fragment', () => {
309-
expect(() =>
310-
parseCCN('fragment MyFragment on Query { field? }'),
311-
).to.not.throw();
312-
});
313-
314-
it('parses field with required list elements', () => {
315-
const result = parseCCN('{ field[!] }');
316-
317-
expectJSON(result).toDeepNestedProperty(
318-
'definitions[0].selectionSet.selections[0].nullabilityAssertion',
319-
{
320-
kind: Kind.LIST_NULLABILITY_OPERATOR,
321-
loc: { start: 7, end: 10 },
322-
nullabilityAssertion: {
323-
kind: Kind.NON_NULL_ASSERTION,
324-
loc: { start: 8, end: 9 },
325-
nullabilityAssertion: undefined,
326-
},
327-
},
328-
);
329-
});
330-
331-
it('parses field with optional list elements', () => {
332-
const result = parseCCN('{ field[?] }');
333-
334-
expectJSON(result).toDeepNestedProperty(
335-
'definitions[0].selectionSet.selections[0].nullabilityAssertion',
336-
{
337-
kind: Kind.LIST_NULLABILITY_OPERATOR,
338-
loc: { start: 7, end: 10 },
339-
nullabilityAssertion: {
340-
kind: Kind.ERROR_BOUNDARY,
341-
loc: { start: 8, end: 9 },
342-
nullabilityAssertion: undefined,
343-
},
344-
},
345-
);
346-
});
347-
348-
it('parses field with required list', () => {
349-
const result = parseCCN('{ field[]! }');
350-
351-
expectJSON(result).toDeepNestedProperty(
352-
'definitions[0].selectionSet.selections[0].nullabilityAssertion',
353-
{
354-
kind: Kind.NON_NULL_ASSERTION,
355-
loc: { start: 7, end: 10 },
356-
nullabilityAssertion: {
357-
kind: Kind.LIST_NULLABILITY_OPERATOR,
358-
loc: { start: 7, end: 9 },
359-
nullabilityAssertion: undefined,
360-
},
361-
},
362-
);
363-
});
364-
365-
it('parses field with optional list', () => {
366-
const result = parseCCN('{ field[]? }');
367-
368-
expectJSON(result).toDeepNestedProperty(
369-
'definitions[0].selectionSet.selections[0].nullabilityAssertion',
370-
{
371-
kind: Kind.ERROR_BOUNDARY,
372-
loc: { start: 7, end: 10 },
373-
nullabilityAssertion: {
374-
kind: Kind.LIST_NULLABILITY_OPERATOR,
375-
loc: { start: 7, end: 9 },
376-
nullabilityAssertion: undefined,
377-
},
378-
},
379-
);
380-
});
381-
382-
it('parses multidimensional field with mixed list elements', () => {
383-
const result = parseCCN('{ field[[[?]!]]! }');
384-
385-
expectJSON(result).toDeepNestedProperty(
386-
'definitions[0].selectionSet.selections[0].nullabilityAssertion',
387-
{
388-
kind: Kind.NON_NULL_ASSERTION,
389-
loc: { start: 7, end: 16 },
390-
nullabilityAssertion: {
391-
kind: Kind.LIST_NULLABILITY_OPERATOR,
392-
loc: { start: 7, end: 15 },
393-
nullabilityAssertion: {
394-
kind: Kind.LIST_NULLABILITY_OPERATOR,
395-
loc: { start: 8, end: 14 },
396-
nullabilityAssertion: {
397-
kind: Kind.NON_NULL_ASSERTION,
398-
loc: { start: 9, end: 13 },
399-
nullabilityAssertion: {
400-
kind: Kind.LIST_NULLABILITY_OPERATOR,
401-
loc: { start: 9, end: 12 },
402-
nullabilityAssertion: {
403-
kind: Kind.ERROR_BOUNDARY,
404-
loc: { start: 10, end: 11 },
405-
nullabilityAssertion: undefined,
406-
},
407-
},
408-
},
409-
},
410-
},
411-
},
412-
);
413-
});
414-
415-
it('does not parse field with unbalanced brackets', () => {
416-
expect(() => parseCCN('{ field[[] }')).to.throw(
417-
'Syntax Error: Expected "]", found "}".',
418-
);
419-
420-
expect(() => parseCCN('{ field[]] }')).to.throw(
421-
'Syntax Error: Expected Name, found "]".',
422-
);
423-
424-
expect(() => parse('{ field] }')).to.throw(
425-
'Syntax Error: Expected Name, found "]".',
426-
);
427-
428-
expect(() => parseCCN('{ field[ }')).to.throw(
429-
'Syntax Error: Expected "]", found "}".',
430-
);
431-
});
432-
433-
it('does not parse field with assorted invalid nullability designators', () => {
434-
expect(() => parseCCN('{ field[][] }')).to.throw(
435-
'Syntax Error: Expected Name, found "[".',
436-
);
437-
438-
expect(() => parseCCN('{ field[!!] }')).to.throw(
439-
'Syntax Error: Expected "]", found "!".',
440-
);
441-
442-
expect(() => parseCCN('{ field[]?! }')).to.throw(
443-
'Syntax Error: Expected Name, found "!".',
444-
);
445-
});
446-
447243
it('creates ast', () => {
448244
const result = parse(dedent`
449245
{
@@ -494,7 +290,6 @@ describe('Parser', () => {
494290
loc: { start: 9, end: 14 },
495291
},
496292
],
497-
nullabilityAssertion: undefined,
498293
directives: [],
499294
selectionSet: {
500295
kind: Kind.SELECTION_SET,
@@ -510,7 +305,6 @@ describe('Parser', () => {
510305
value: 'id',
511306
},
512307
arguments: [],
513-
nullabilityAssertion: undefined,
514308
directives: [],
515309
selectionSet: undefined,
516310
},
@@ -524,7 +318,6 @@ describe('Parser', () => {
524318
value: 'name',
525319
},
526320
arguments: [],
527-
nullabilityAssertion: undefined,
528321
directives: [],
529322
selectionSet: undefined,
530323
},
@@ -572,7 +365,6 @@ describe('Parser', () => {
572365
value: 'node',
573366
},
574367
arguments: [],
575-
nullabilityAssertion: undefined,
576368
directives: [],
577369
selectionSet: {
578370
kind: Kind.SELECTION_SET,
@@ -588,7 +380,6 @@ describe('Parser', () => {
588380
value: 'id',
589381
},
590382
arguments: [],
591-
nullabilityAssertion: undefined,
592383
directives: [],
593384
selectionSet: undefined,
594385
},

‎src/language/__tests__/predicates-test.ts‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import {
88
isConstValueNode,
99
isDefinitionNode,
1010
isExecutableDefinitionNode,
11-
isNullabilityAssertionNode,
1211
isSelectionNode,
1312
isTypeDefinitionNode,
1413
isTypeExtensionNode,
@@ -63,14 +62,6 @@ describe('AST node predicates', () => {
6362
]);
6463
});
6564

66-
it('isNullabilityAssertionNode', () => {
67-
expect(filterNodes(isNullabilityAssertionNode)).to.deep.equal([
68-
'ListNullabilityOperator',
69-
'NonNullAssertion',
70-
'ErrorBoundary',
71-
]);
72-
});
73-
7465
it('isValueNode', () => {
7566
expect(filterNodes(isValueNode)).to.deep.equal([
7667
'Variable',

‎src/language/__tests__/printer-test.ts‎

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -225,17 +225,11 @@ describe('Printer: Query document', () => {
225225
});
226226

227227
it('prints kitchen sink without altering ast', () => {
228-
const ast = parse(kitchenSinkQuery, {
229-
noLocation: true,
230-
experimentalClientControlledNullability: true,
231-
});
228+
const ast = parse(kitchenSinkQuery, { noLocation: true });
232229

233230
const astBeforePrintCall = JSON.stringify(ast);
234231
const printed = print(ast);
235-
const printedAST = parse(printed, {
236-
noLocation: true,
237-
experimentalClientControlledNullability: true,
238-
});
232+
const printedAST = parse(printed, { noLocation: true });
239233

240234
expect(printedAST).to.deep.equal(ast);
241235
expect(JSON.stringify(ast)).to.equal(astBeforePrintCall);
@@ -253,19 +247,6 @@ describe('Printer: Query document', () => {
253247
...frag @onFragmentSpread
254248
}
255249
}
256-
field3!
257-
field4?
258-
requiredField5: field5!
259-
requiredSelectionSet(first: 10)! @directive {
260-
field
261-
}
262-
unsetListItemsRequiredList: listField[]!
263-
requiredListItemsUnsetList: listField[!]
264-
requiredListItemsRequiredList: listField[!]!
265-
unsetListItemsOptionalList: listField[]?
266-
optionalListItemsUnsetList: listField[?]
267-
optionalListItemsOptionalList: listField[?]?
268-
multidimensionalList: listField[[[!]!]!]!
269250
}
270251
... @skip(unless: $foo) {
271252
id

0 commit comments

Comments
 (0)