Merge pull request graphql#1027 from APIs-guru/excuteArgs

Add missing ExecutionArgs export
LubomirIgonda1 · Sep 8, 2017 · eb01a23 · eb01a23
2 parents b84b69f + 7086160
commit eb01a23
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 15 deletions.
diff --git a/src/execution/index.js b/src/execution/index.js
@@ -1,3 +1,4 @@
+/* @flow */
 /**
  *  Copyright (c) 2015, Facebook, Inc.
  *  All rights reserved.
@@ -10,4 +11,4 @@
 export { execute, defaultFieldResolver, responsePathAsArray } from './execute';
 export { getDirectiveValues } from './values';
 
-export type { ExecutionResult } from './execute';
+export type { ExecutionArgs, ExecutionResult } from './execute';
diff --git a/src/language/lexer.js b/src/language/lexer.js
@@ -1,4 +1,4 @@
-/* @flow /
+/* @flow */
 /**
  *  Copyright (c) 2015, Facebook, Inc.
  *  All rights reserved.

diff --git a/src/subscription/asyncIteratorReject.js b/src/subscription/asyncIteratorReject.js
@@ -1,12 +1,11 @@
+/* @flow */
 /**
  * Copyright (c) 2017, Facebook, Inc.
  * All rights reserved.
  *
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
- *
- * @flow
  */
 
 import { $$asyncIterator } from 'iterall';

diff --git a/src/subscription/index.js b/src/subscription/index.js
@@ -1,12 +1,11 @@
+/* @flow */
 /**
  * Copyright (c) 2017, Facebook, Inc.
  * All rights reserved.
  *
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
- *
- * @flow
  */
 
 export { subscribe, createSourceEventStream } from './subscribe';
diff --git a/src/subscription/mapAsyncIterator.js b/src/subscription/mapAsyncIterator.js
@@ -1,12 +1,11 @@
+/* @flow */
 /**
  * Copyright (c) 2017, Facebook, Inc.
  * All rights reserved.
  *
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
- *
- * @flow
  */
 
 import { $$asyncIterator, getAsyncIterator } from 'iterall';

diff --git a/src/subscription/subscribe.js b/src/subscription/subscribe.js
@@ -1,12 +1,11 @@
+/* @flow */
 /**
  * Copyright (c) 2017, Facebook, Inc.
  * All rights reserved.
  *
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
- *
- * @flow
  */
 
 import { isAsyncIterable } from 'iterall';

diff --git a/src/validation/index.js b/src/validation/index.js
@@ -1,3 +1,4 @@
+/* @flow */
 /**
  *  Copyright (c) 2015, Facebook, Inc.
  *  All rights reserved.

diff --git a/src/validation/rules/KnownArgumentNames.js b/src/validation/rules/KnownArgumentNames.js
@@ -15,17 +15,16 @@ import invariant from '../../jsutils/invariant';
 import suggestionList from '../../jsutils/suggestionList';
 import quotedOrList from '../../jsutils/quotedOrList';
 import * as Kind from '../../language/kinds';
-import type { GraphQLType } from '../../type/definition';
 
 
 export function unknownArgMessage(
   argName: string,
   fieldName: string,
-  type: GraphQLType,
+  typeName: string,
   suggestedArgs: Array<string>
 ): string {
   let message = `Unknown argument "${argName}" on field "${fieldName}" of ` +
-    `type "${String(type)}".`;
+    `type "${typeName}".`;
   if (suggestedArgs.length) {
     message += ` Did you mean ${quotedOrList(suggestedArgs)}?`;
   }

diff --git a/src/validation/rules/PossibleFragmentSpreads.js b/src/validation/rules/PossibleFragmentSpreads.js
@@ -12,6 +12,7 @@ import type { ValidationContext } from '../index';
 import { GraphQLError } from '../../error';
 import { doTypesOverlap } from '../../utilities/typeComparators';
 import { typeFromAST } from '../../utilities/typeFromAST';
+import { isCompositeType } from '../../type/definition';
 import type { GraphQLType } from '../../type/definition';
 
 
@@ -44,8 +45,8 @@ export function PossibleFragmentSpreads(context: ValidationContext): any {
     InlineFragment(node) {
       const fragType = context.getType();
       const parentType = context.getParentType();
-      if (fragType &&
-          parentType &&
+      if (isCompositeType(fragType) &&
+          isCompositeType(parentType) &&
           !doTypesOverlap(context.getSchema(), fragType, parentType)) {
         context.reportError(new GraphQLError(
           typeIncompatibleAnonSpreadMessage(parentType, fragType),