Skip to content

Commit 0b8bbda

Browse files
committed
use AbstractType predicate
1 parent 0180818 commit 0b8bbda

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

src/executor/executor.js

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ import { getVariableValues, getArgumentValues } from './values';
1818
import {
1919
GraphQLScalarType,
2020
GraphQLObjectType,
21-
GraphQLInterfaceType,
22-
GraphQLUnionType,
2321
GraphQLEnumType,
2422
GraphQLList,
25-
GraphQLNonNull
23+
GraphQLNonNull,
24+
isAbstractType
2625
} from '../type/definition';
2726
import type {
2827
GraphQLFieldDefinition,
29-
GraphQLType
28+
GraphQLType,
29+
GraphQLAbstractType
3030
} from '../type/definition';
3131
import type { GraphQLSchema } from '../type/schema';
3232
import {
@@ -410,9 +410,8 @@ function doesFragmentConditionMatch(
410410
if (conditionalType === type) {
411411
return true;
412412
}
413-
if (conditionalType instanceof GraphQLInterfaceType ||
414-
conditionalType instanceof GraphQLUnionType) {
415-
return conditionalType.isPossibleType(type);
413+
if (isAbstractType(conditionalType)) {
414+
return ((conditionalType: any): GraphQLAbstractType).isPossibleType(type);
416415
}
417416
return false;
418417
}
@@ -622,8 +621,8 @@ function completeValue(
622621

623622
var objectType: ?GraphQLObjectType =
624623
fieldType instanceof GraphQLObjectType ? fieldType :
625-
fieldType instanceof GraphQLInterfaceType ||
626-
fieldType instanceof GraphQLUnionType ? fieldType.resolveType(result) :
624+
isAbstractType(fieldType) ?
625+
((fieldType: any): GraphQLAbstractType).resolveType(result) :
627626
null;
628627

629628
if (!objectType) {

src/type/definition.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ export class GraphQLInterfaceType {
459459

460460
function getTypeOf(
461461
value: any,
462-
abstractType: GraphQLInterfaceType | GraphQLUnionType
462+
abstractType: GraphQLAbstractType
463463
): ?GraphQLObjectType {
464464
var possibleTypes = abstractType.getPossibleTypes();
465465
for (var i = 0; i < possibleTypes.length; i++) {

0 commit comments

Comments
 (0)