Merge pull request #479 from iamchenxin/flow-r7

Update to Flow 0.32

Author: leebyron

package.json

@@ -69,7 +69,7 @@
     "eslint-plugin-babel": "3.3.0",
     "eslint-plugin-flow-vars": "0.4.0",
     "eslint-plugin-flowtype": "2.3.1",
-    "flow-bin": "0.29.0",
+    "flow-bin": "0.32.0",
     "isparta": "4.0.0",
     "mocha": "2.5.3",
     "sane": "1.3.4"

src/error/GraphQLError.js

@@ -108,8 +108,9 @@ export function GraphQLError( // eslint-disable-line no-redeclare
   }
 
   let _locations;
-  if (_source && _positions) {
-    _locations = _positions.map(pos => getLocation(_source, pos));
+  const _source2 = _source; // seems here Flow need a const to resolve type.
+  if (_source2 && _positions) {
+    _locations = _positions.map(pos => getLocation(_source2, pos));
   }
 
   Object.defineProperties(this, {

src/execution/execute.js

@@ -15,7 +15,7 @@ import find from '../jsutils/find';
 import invariant from '../jsutils/invariant';
 import isNullish from '../jsutils/isNullish';
 import { typeFromAST } from '../utilities/typeFromAST';
-import { Kind } from '../language';
+import * as Kind from '../language/kinds';
 import { getVariableValues, getArgumentValues } from './values';
 import {
   GraphQLScalarType,

src/language/index.js

@@ -1,4 +1,4 @@
-/**
+/** @flow
  *  Copyright (c) 2015, Facebook, Inc.
  *  All rights reserved.
  *

src/language/kinds.js

@@ -1,4 +1,4 @@
-/**
+/** @flow
  *  Copyright (c) 2015, Facebook, Inc.
  *  All rights reserved.
  *

src/type/scalars.js

@@ -9,7 +9,7 @@
  */
 
 import { GraphQLScalarType } from './definition';
-import { Kind } from '../language';
+import * as Kind from '../language/kinds';
 
 // As per the GraphQL Spec, Integers are only treated as valid when a valid
 // 32-bit signed integer, providing the broadest support across platforms.

src/type/schema.js

@@ -262,7 +262,7 @@ function typeMapReducer(map: TypeMap, type: ?GraphQLType): TypeMap {
     Object.keys(fieldMap).forEach(fieldName => {
       const field = fieldMap[fieldName];
 
-      if (field.args) {
+      if ((typeof field.args === 'object') && Array.isArray(field.args)) {
         const fieldArgTypes = field.args.map(arg => arg.type);
         reducedMap = fieldArgTypes.reduce(typeMapReducer, reducedMap);
       }

src/utilities/isValidJSValue.js

@@ -27,12 +27,13 @@ import type { GraphQLInputType } from '../type/definition';
  * accepted for that type. This is primarily useful for validating the
  * runtime values of query variables.
  */
-export function isValidJSValue(value: mixed, type: GraphQLInputType): [string] {
+export function isValidJSValue(value: mixed, type: GraphQLInputType):
+Array<string> {
   // A value must be provided if the type is non-null.
   if (type instanceof GraphQLNonNull) {
     if (isNullish(value)) {
       if (type.ofType.name) {
-        return [ `Expected "${type.ofType.name}!", found null.` ];
+        return [ `Expected "${String(type.ofType.name)}!", found null.` ];
       }
       return [ 'Expected non-null value, found null.' ];
     }

src/utilities/isValidLiteralValue.js

@@ -38,12 +38,12 @@ import isNullish from '../jsutils/isNullish';
 export function isValidLiteralValue(
   type: GraphQLInputType,
   valueAST: Value
-): [ string ] {
+): Array<string> {
   // A value must be provided if the type is non-null.
   if (type instanceof GraphQLNonNull) {
     if (!valueAST) {
       if (type.ofType.name) {
-        return [ `Expected "${type.ofType.name}!", found null.` ];
+        return [ `Expected "${String(type.ofType.name)}!", found null.` ];
       }
       return [ 'Expected non-null value, found null.' ];
     }

src/validation/rules/OverlappingFieldsCanBeMerged.js

@@ -732,7 +732,7 @@ function _collectFieldsAndFragmentNames(
       case INLINE_FRAGMENT:
         const typeCondition = selection.typeCondition;
         const inlineFragmentType = typeCondition ?
-          typeFromAST(context.getSchema(), selection.typeCondition) :
+          typeFromAST(context.getSchema(), typeCondition) :
           parentType;
         _collectFieldsAndFragmentNames(
           context,