Merge pull request #697 from graphql/is-leaf

Fix: isLeafType matches type definition.

Author: leebyron

src/type/definition.js

@@ -135,10 +135,9 @@ export type GraphQLLeafType =
   GraphQLEnumType;
 
 export function isLeafType(type: ?GraphQLType): boolean {
-  const namedType = getNamedType(type);
   return (
-    namedType instanceof GraphQLScalarType ||
-    namedType instanceof GraphQLEnumType
+    type instanceof GraphQLScalarType ||
+    type instanceof GraphQLEnumType
   );
 }
 

src/validation/rules/ScalarLeafs.js

@@ -11,7 +11,7 @@
 import type { ValidationContext } from '../index';
 import { GraphQLError } from '../../error';
 import type { FieldNode } from '../../language/ast';
-import { isLeafType } from '../../type/definition';
+import { getNamedType, isLeafType } from '../../type/definition';
 import type { GraphQLType } from '../../type/definition';
 
 
@@ -42,7 +42,7 @@ export function ScalarLeafs(context: ValidationContext): any {
     Field(node: FieldNode) {
       const type = context.getType();
       if (type) {
-        if (isLeafType(type)) {
+        if (isLeafType(getNamedType(type))) {
           if (node.selectionSet) {
             context.reportError(new GraphQLError(
               noSubselectionAllowedMessage(node.name.value, type),