@@ -51,22 +51,9 @@ import type { GraphQLSchema } from './schema';
51
51
* These are all of the possible kinds of types.
52
52
*/
53
53
export type GraphQLType =
54
- | GraphQLScalarType
55
- | GraphQLObjectType
56
- | GraphQLInterfaceType
57
- | GraphQLUnionType
58
- | GraphQLEnumType
59
- | GraphQLInputObjectType
54
+ | GraphQLNamedType
60
55
| GraphQLList < GraphQLType >
61
- | GraphQLNonNull <
62
- | GraphQLScalarType
63
- | GraphQLObjectType
64
- | GraphQLInterfaceType
65
- | GraphQLUnionType
66
- | GraphQLEnumType
67
- | GraphQLInputObjectType
68
- | GraphQLList < GraphQLType >
69
- > ;
56
+ | GraphQLNonNull < GraphQLNullableType > ;
70
57
71
58
export function isType ( type : unknown ) : type is GraphQLType {
72
59
return (
@@ -207,9 +194,7 @@ export function assertNonNullType(type: unknown): GraphQLNonNull<GraphQLType> {
207
194
* These types may be used as input types for arguments and directives.
208
195
*/
209
196
export type GraphQLNullableInputType =
210
- | GraphQLScalarType
211
- | GraphQLEnumType
212
- | GraphQLInputObjectType
197
+ | GraphQLNamedInputType
213
198
| GraphQLList < GraphQLInputType > ;
214
199
215
200
export type GraphQLInputType =
@@ -236,11 +221,7 @@ export function assertInputType(type: unknown): GraphQLInputType {
236
221
* These types may be used as output types as the result of fields.
237
222
*/
238
223
export type GraphQLNullableOutputType =
239
- | GraphQLScalarType
240
- | GraphQLObjectType
241
- | GraphQLInterfaceType
242
- | GraphQLUnionType
243
- | GraphQLEnumType
224
+ | GraphQLNamedOutputType
244
225
| GraphQLList < GraphQLOutputType > ;
245
226
246
227
export type GraphQLOutputType =
@@ -430,14 +411,7 @@ export function assertWrappingType(type: unknown): GraphQLWrappingType {
430
411
/**
431
412
* These types can all accept null as a value.
432
413
*/
433
- export type GraphQLNullableType =
434
- | GraphQLScalarType
435
- | GraphQLObjectType
436
- | GraphQLInterfaceType
437
- | GraphQLUnionType
438
- | GraphQLEnumType
439
- | GraphQLInputObjectType
440
- | GraphQLList < GraphQLType > ;
414
+ export type GraphQLNullableType = GraphQLNamedType | GraphQLList < GraphQLType > ;
441
415
442
416
export function isNullableType ( type : unknown ) : type is GraphQLNullableType {
443
417
return isType ( type ) && ! isNonNullType ( type ) ;
0 commit comments