fix flow errors by annotating null prototypes (#1048)

Author: asiandrummer

.flowconfig

@@ -12,4 +12,4 @@
 experimental.const_params=true
 
 [version]
-^0.54.0
+^0.56.0

package.json

@@ -56,7 +56,7 @@
     "eslint": "4.4.1",
     "eslint-plugin-babel": "4.1.2",
     "eslint-plugin-flowtype": "2.35.0",
-    "flow-bin": "^0.54.0",
+    "flow-bin": "0.56.0",
     "isparta": "4.0.0",
     "mocha": "3.5.0",
     "sane": "2.0.0"

src/execution/execute.js

@@ -8,10 +8,11 @@
  */
 
 import { forEach, isCollection } from 'iterall';
-
 import { GraphQLError, locatedError } from '../error';
 import invariant from '../jsutils/invariant';
 import isNullish from '../jsutils/isNullish';
+import type {ObjMap} from '../jsutils/ObjMap';
+
 import { typeFromAST } from '../utilities/typeFromAST';
 import * as Kind from '../language/kinds';
 import {
@@ -84,11 +85,11 @@ import type {
  */
 export type ExecutionContext = {
   schema: GraphQLSchema;
-  fragments: {[key: string]: FragmentDefinitionNode};
+  fragments: ObjMap<FragmentDefinitionNode>;
   rootValue: mixed;
   contextValue: mixed;
   operation: OperationDefinitionNode;
-  variableValues: {[key: string]: mixed};
+  variableValues: ObjMap<mixed>,
   fieldResolver: GraphQLFieldResolver<any, any>;
   errors: Array<GraphQLError>;
 };
@@ -278,14 +279,13 @@ export function buildExecutionContext(
   document: DocumentNode,
   rootValue: mixed,
   contextValue: mixed,
-  rawVariableValues: ?{[key: string]: mixed},
+  rawVariableValues: ?ObjMap<mixed>,
   operationName: ?string,
   fieldResolver: ?GraphQLFieldResolver<any, any>
 ): ExecutionContext {
   const errors: Array<GraphQLError> = [];
   let operation: ?OperationDefinitionNode;
-  const fragments: {[name: string]: FragmentDefinitionNode} =
-    Object.create(null);
+  const fragments: ObjMap<FragmentDefinitionNode> = Object.create(null);
   document.definitions.forEach(definition => {
     switch (definition.kind) {
       case Kind.OPERATION_DEFINITION:
@@ -340,7 +340,7 @@ function executeOperation(
   exeContext: ExecutionContext,
   operation: OperationDefinitionNode,
   rootValue: mixed
-): ?{[key: string]: mixed} {
+): ?(Promise<?ObjMap<mixed>> | ObjMap<mixed>) {
   const type = getOperationRootType(exeContext.schema, operation);
   const fields = collectFields(
     exeContext,
@@ -420,8 +420,8 @@ function executeFieldsSerially(
   parentType: GraphQLObjectType,
   sourceValue: mixed,
   path: ResponsePath,
-  fields: {[key: string]: Array<FieldNode>}
-): Promise<{[key: string]: mixed}> {
+  fields: ObjMap<Array<FieldNode>>,
+): Promise<ObjMap<mixed>> {
   return Object.keys(fields).reduce(
     (prevPromise, responseName) => prevPromise.then(results => {
       const fieldNodes = fields[responseName];
@@ -459,8 +459,8 @@ function executeFields(
   parentType: GraphQLObjectType,
   sourceValue: mixed,
   path: ResponsePath,
-  fields: {[key: string]: Array<FieldNode>}
-): {[key: string]: mixed} {
+  fields: ObjMap<Array<FieldNode>>,
+): Promise<ObjMap<mixed>> | ObjMap<mixed> {
   let containsPromise = false;
 
   const finalResults = Object.keys(fields).reduce(
@@ -510,9 +510,9 @@ export function collectFields(
   exeContext: ExecutionContext,
   runtimeType: GraphQLObjectType,
   selectionSet: SelectionSetNode,
-  fields: {[key: string]: Array<FieldNode>},
-  visitedFragmentNames: {[key: string]: boolean}
-): {[key: string]: Array<FieldNode>} {
+  fields: ObjMap<Array<FieldNode>>,
+  visitedFragmentNames: ObjMap<boolean>,
+): ObjMap<Array<FieldNode>> {
   for (let i = 0; i < selectionSet.selections.length; i++) {
     const selection = selectionSet.selections[i];
     switch (selection.kind) {
@@ -621,9 +621,7 @@ function doesFragmentConditionMatch(
  * This is akin to bluebird's `Promise.props`, but implemented only using
  * `Promise.all` so it will work with any implementation of ES6 promises.
  */
-function promiseForObject<T>(
-  object: {[key: string]: Promise<T>}
-): Promise<{[key: string]: T}> {
+function promiseForObject<T>(object: ObjMap<Promise<T>>): Promise<ObjMap<T>> {
   const keys = Object.keys(object);
   const valuesAndPromises = keys.map(name => object[name]);
   return Promise.all(valuesAndPromises).then(

src/execution/values.js

@@ -51,8 +51,8 @@ import type {
 export function getVariableValues(
   schema: GraphQLSchema,
   varDefNodes: Array<VariableDefinitionNode>,
-  inputs: { [key: string]: mixed }
-): { [key: string]: mixed } {
+  inputs: { [key: string]: mixed, __proto__: null }
+): { [key: string]: mixed, __proto__: null } {
   const coercedValues = Object.create(null);
   for (let i = 0; i < varDefNodes.length; i++) {
     const varDefNode = varDefNodes[i];
@@ -105,8 +105,8 @@ export function getVariableValues(
 export function getArgumentValues(
   def: GraphQLField<*, *> | GraphQLDirective,
   node: FieldNode | DirectiveNode,
-  variableValues?: ?{ [key: string]: mixed }
-): { [key: string]: mixed } {
+  variableValues?: ?{ [key: string]: mixed, __proto__: null }
+): { [key: string]: mixed, __proto__: null } {
   const argDefs = def.args;
   const argNodes = node.arguments;
   if (!argDefs || !argNodes) {
@@ -174,8 +174,8 @@ export function getArgumentValues(
 export function getDirectiveValues(
   directiveDef: GraphQLDirective,
   node: { directives?: ?Array<DirectiveNode> },
-  variableValues?: ?{ [key: string]: mixed }
-): void | { [key: string]: mixed } {
+  variableValues?: ?{ [key: string]: mixed, __proto__: null }
+): void | { [key: string]: mixed, __proto__: null } {
   const directiveNode = node.directives && find(
     node.directives,
     directive => directive.name.value === directiveDef.name

src/jsutils/ObjMap.js

@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+export type ObjMap<T> = { [key: string]: T, __proto__: null };

src/jsutils/keyMap.js

@@ -7,6 +7,8 @@
  * @flow
  */
 
+import type {ObjMap} from './ObjMap';
+
 /**
  * Creates a keyed JS object from an array, given a function to produce the keys
  * for each value in the array.
@@ -33,7 +35,7 @@
 export default function keyMap<T>(
   list: Array<T>,
   keyFn: (item: T) => string
-): {[key: string]: T} {
+): ObjMap<T> {
   return list.reduce(
     (map, item) => ((map[keyFn(item)] = item), map),
     Object.create(null)

src/jsutils/keyValMap.js

@@ -7,6 +7,8 @@
  * @flow
  */
 
+import type {ObjMap} from './ObjMap';
+
 /**
  * Creates a keyed JS object from an array, given a function to produce the keys
  * and a function to produce the values from each item in the array.
@@ -28,7 +30,7 @@ export default function keyValMap<T, V>(
   list: Array<T>,
   keyFn: (item: T) => string,
   valFn: (item: T) => V
-): {[key: string]: V} {
+): ObjMap<V> {
   return list.reduce(
     (map, item) => ((map[keyFn(item)] = valFn(item)), map),
     Object.create(null)

src/type/definition.js

@@ -9,6 +9,7 @@
 
 import invariant from '../jsutils/invariant';
 import isNullish from '../jsutils/isNullish';
+import type {ObjMap} from '../jsutils/ObjMap';
 import * as Kind from '../language/kinds';
 import { assertValidName } from '../utilities/assertValidName';
 import type {
@@ -624,7 +625,7 @@ export type GraphQLIsTypeOfFn<TSource, TContext> = (
 
 export type GraphQLFieldResolver<TSource, TContext> = (
   source: TSource,
-  args: { [argName: string]: any },
+  args: ObjMap<any>,
   context: TContext,
   info: GraphQLResolveInfo
 ) => mixed;
@@ -636,10 +637,10 @@ export type GraphQLResolveInfo = {
   parentType: GraphQLCompositeType;
   path: ResponsePath;
   schema: GraphQLSchema;
-  fragments: { [fragmentName: string]: FragmentDefinitionNode };
+  fragments: ObjMap<FragmentDefinitionNode>;
   rootValue: mixed;
   operation: OperationDefinitionNode;
-  variableValues: { [variableName: string]: mixed };
+  variableValues: ObjMap<mixed>;
 };
 
 export type ResponsePath = { prev: ResponsePath, key: string | number } | void;
@@ -654,9 +655,7 @@ export type GraphQLFieldConfig<TSource, TContext> = {
   astNode?: ?FieldDefinitionNode;
 };
 
-export type GraphQLFieldConfigArgumentMap = {
-  [argName: string]: GraphQLArgumentConfig;
-};
+export type GraphQLFieldConfigArgumentMap = ObjMap<GraphQLArgumentConfig>;
 
 export type GraphQLArgumentConfig = {
   type: GraphQLInputType;
@@ -665,9 +664,8 @@ export type GraphQLArgumentConfig = {
   astNode?: ?InputValueDefinitionNode;
 };
 
-export type GraphQLFieldConfigMap<TSource, TContext> = {
-  [fieldName: string]: GraphQLFieldConfig<TSource, TContext>;
-};
+export type GraphQLFieldConfigMap<TSource, TContext> =
+  ObjMap<GraphQLFieldConfig<TSource, TContext>>;
 
 export type GraphQLField<TSource, TContext> = {
   name: string;
@@ -689,9 +687,8 @@ export type GraphQLArgument = {
   astNode?: ?InputValueDefinitionNode;
 };
 
-export type GraphQLFieldMap<TSource, TContext> = {
-  [fieldName: string]: GraphQLField<TSource, TContext>;
-};
+export type GraphQLFieldMap<TSource, TContext> =
+  ObjMap<GraphQLField<TSource, TContext>>;
 
 
 
@@ -918,7 +915,7 @@ export class GraphQLEnumType/* <T> */ {
   _enumConfig: GraphQLEnumTypeConfig/* <T> */;
   _values: Array<GraphQLEnumValue/* <T> */>;
   _valueLookup: Map<any/* T */, GraphQLEnumValue>;
-  _nameLookup: { [valueName: string]: GraphQLEnumValue };
+  _nameLookup: ObjMap<GraphQLEnumValue>;
 
   constructor(config: GraphQLEnumTypeConfig/* <T> */): void {
     this.name = config.name;
@@ -981,7 +978,7 @@ export class GraphQLEnumType/* <T> */ {
     return this._valueLookup;
   }
 
-  _getNameLookup(): { [valueName: string]: GraphQLEnumValue } {
+  _getNameLookup(): ObjMap<GraphQLEnumValue> {
     if (!this._nameLookup) {
       const lookup = Object.create(null);
       this.getValues().forEach(value => {
@@ -1055,9 +1052,8 @@ export type GraphQLEnumTypeConfig/* <T> */ = {
   isIntrospection?: boolean;
 };
 
-export type GraphQLEnumValueConfigMap/* <T> */ = {
-  [valueName: string]: GraphQLEnumValueConfig/* <T> */;
-};
+export type GraphQLEnumValueConfigMap/* <T> */ =
+  ObjMap<GraphQLEnumValueConfig/* <T> */>;
 
 export type GraphQLEnumValueConfig/* <T> */ = {
   value?: any/* T */;
@@ -1179,9 +1175,8 @@ export type GraphQLInputFieldConfig = {
   astNode?: ?InputValueDefinitionNode;
 };
 
-export type GraphQLInputFieldConfigMap = {
-  [fieldName: string]: GraphQLInputFieldConfig;
-};
+export type GraphQLInputFieldConfigMap =
+  ObjMap<GraphQLInputFieldConfig>;
 
 export type GraphQLInputField = {
   name: string;
@@ -1191,9 +1186,8 @@ export type GraphQLInputField = {
   astNode?: ?InputValueDefinitionNode;
 };
 
-export type GraphQLInputFieldMap = {
-  [fieldName: string]: GraphQLInputField;
-};
+export type GraphQLInputFieldMap =
+  ObjMap<GraphQLInputField>;
 
 
 

src/type/schema.js

@@ -25,6 +25,7 @@ import { GraphQLDirective, specifiedDirectives } from './directives';
 import { __Schema } from './introspection';
 import find from '../jsutils/find';
 import invariant from '../jsutils/invariant';
+import type {ObjMap} from '../jsutils/ObjMap';
 import { isEqualType, isTypeSubTypeOf } from '../utilities/typeComparators';
 
 
@@ -61,10 +62,8 @@ export class GraphQLSchema {
   _subscriptionType: ?GraphQLObjectType;
   _directives: Array<GraphQLDirective>;
   _typeMap: TypeMap;
-  _implementations: { [interfaceName: string]: Array<GraphQLObjectType> };
-  _possibleTypeMap: ?{
-    [abstractName: string]: { [possibleName: string]: boolean }
-  };
+  _implementations: ObjMap<Array<GraphQLObjectType>>;
+  _possibleTypeMap: ?ObjMap<{[possibleName: string]: boolean}>;
 
   constructor(config: GraphQLSchemaConfig): void {
     invariant(
@@ -221,7 +220,7 @@ export class GraphQLSchema {
   }
 }
 
-type TypeMap = { [typeName: string]: GraphQLNamedType };
+type TypeMap = ObjMap<GraphQLNamedType>;
 
 type GraphQLSchemaConfig = {
   query: GraphQLObjectType;

src/utilities/buildASTSchema.js

@@ -9,6 +9,7 @@
 
 import invariant from '../jsutils/invariant';
 import keyValMap from '../jsutils/keyValMap';
+import type {ObjMap} from '../jsutils/ObjMap';
 import { valueFromAST } from './valueFromAST';
 import { TokenKind } from '../language/lexer';
 import { parse } from '../language/parser';
@@ -133,7 +134,7 @@ export function buildASTSchema(ast: DocumentNode): GraphQLSchema {
   let schemaDef: ?SchemaDefinitionNode;
 
   const typeDefs: Array<TypeDefinitionNode> = [];
-  const nodeMap: {[name: string]: TypeDefinitionNode} = Object.create(null);
+  const nodeMap: ObjMap<TypeDefinitionNode> = Object.create(null);
   const directiveDefs: Array<DirectiveDefinitionNode> = [];
   for (let i = 0; i < ast.definitions.length; i++) {
     const d = ast.definitions[i];