@@ -53,7 +53,6 @@ export class TypeInfo {
53
53
private _directive : Maybe < GraphQLDirective > ;
54
54
private _argument : Maybe < GraphQLArgument > ;
55
55
private _enumValue : Maybe < GraphQLEnumValue > ;
56
- private _getFieldDef : GetFieldDefFn ;
57
56
58
57
constructor (
59
58
schema : GraphQLSchema ,
@@ -62,9 +61,6 @@ export class TypeInfo {
62
61
* beginning somewhere other than documents.
63
62
*/
64
63
initialType ?: Maybe < GraphQLType > ,
65
-
66
- /** @deprecated will be removed in 17.0.0 */
67
- getFieldDefFn ?: GetFieldDefFn ,
68
64
) {
69
65
this . _schema = schema ;
70
66
this . _typeStack = [ ] ;
@@ -75,7 +71,6 @@ export class TypeInfo {
75
71
this . _directive = null ;
76
72
this . _argument = null ;
77
73
this . _enumValue = null ;
78
- this . _getFieldDef = getFieldDefFn ?? getFieldDef ;
79
74
if ( initialType ) {
80
75
if ( isInputType ( initialType ) ) {
81
76
this . _inputTypeStack . push ( initialType ) ;
@@ -160,7 +155,7 @@ export class TypeInfo {
160
155
let fieldDef ;
161
156
let fieldType : unknown ;
162
157
if ( parentType ) {
163
- fieldDef = this . _getFieldDef ( schema , parentType , node ) ;
158
+ fieldDef = getFieldDef ( schema , parentType , node ) ;
164
159
if ( fieldDef ) {
165
160
fieldType = fieldDef . type ;
166
161
}
@@ -291,37 +286,34 @@ export class TypeInfo {
291
286
}
292
287
}
293
288
294
- type GetFieldDefFn = (
295
- schema : GraphQLSchema ,
296
- parentType : GraphQLType ,
297
- fieldNode : FieldNode ,
298
- ) => Maybe < GraphQLField < unknown , unknown > > ;
299
-
300
289
/**
301
290
* Not exactly the same as the executor's definition of getFieldDef, in this
302
291
* statically evaluated environment we do not always have an Object type,
303
292
* and need to handle Interface and Union types.
304
293
*/
305
294
function getFieldDef (
306
295
schema : GraphQLSchema ,
307
- parentType : GraphQLType ,
296
+ parentType : GraphQLCompositeType ,
308
297
fieldNode : FieldNode ,
309
298
) : Maybe < GraphQLField < unknown , unknown > > {
310
- const name = fieldNode . name . value ;
299
+ const fieldName = fieldNode . name . value ;
311
300
if (
312
- name === SchemaMetaFieldDef . name &&
301
+ fieldName === SchemaMetaFieldDef . name &&
313
302
schema . getQueryType ( ) === parentType
314
303
) {
315
304
return SchemaMetaFieldDef ;
316
305
}
317
- if ( name === TypeMetaFieldDef . name && schema . getQueryType ( ) === parentType ) {
306
+ if (
307
+ fieldName === TypeMetaFieldDef . name &&
308
+ schema . getQueryType ( ) === parentType
309
+ ) {
318
310
return TypeMetaFieldDef ;
319
311
}
320
- if ( name === TypeNameMetaFieldDef . name && isCompositeType ( parentType ) ) {
312
+ if ( fieldName === TypeNameMetaFieldDef . name && isCompositeType ( parentType ) ) {
321
313
return TypeNameMetaFieldDef ;
322
314
}
323
315
if ( isObjectType ( parentType ) || isInterfaceType ( parentType ) ) {
324
- return parentType . getFields ( ) [ name ] ;
316
+ return parentType . getFields ( ) [ fieldName ] ;
325
317
}
326
318
}
327
319
0 commit comments