Move GraphQL-specific utils to tools

src/executor/executor.js

@@ -12,7 +12,7 @@ import { GraphQLError, locatedError } from '../error';
 import find from '../utils/find';
 import invariant from '../utils/invariant';
 import isNullish from '../utils/isNullish';
-import typeFromAST from '../utils/typeFromAST';
+import { typeFromAST } from '../tools/typeFromAST';
 import { Kind } from '../language';
 import { getVariableValues, getArgumentValues } from './values';
 import {

src/executor/values.js

@@ -12,8 +12,8 @@ import { GraphQLError } from '../error';
 import invariant from '../utils/invariant';
 import isNullish from '../utils/isNullish';
 import keyMap from '../utils/keyMap';
-import typeFromAST from '../utils/typeFromAST';
-import valueFromAST from '../utils/valueFromAST';
+import { typeFromAST } from '../tools/typeFromAST';
+import { valueFromAST } from '../tools/valueFromAST';
 import { print } from '../language/printer';
 import {
   isInputType,
@@ -112,7 +112,8 @@ function isValidValue(type: GraphQLInputType, value: any): boolean {
     if (isNullish(value)) {
       return false;
     }
-    return isValidValue(type.ofType, value);
+    var nullableType: GraphQLInputType = (type.ofType: any);
+    return isValidValue(nullableType, value);
   }
 
   if (isNullish(value)) {
@@ -121,7 +122,7 @@ function isValidValue(type: GraphQLInputType, value: any): boolean {
 
   // Lists accept a non-list value as a list of one.
   if (type instanceof GraphQLList) {
-    var itemType = type.ofType;
+    var itemType: GraphQLInputType = (type.ofType: any);
     if (Array.isArray(value)) {
       return value.every(item => isValidValue(itemType, item));
     } else {
@@ -165,15 +166,16 @@ function coerceValue(type: GraphQLInputType, value: any): any {
   if (type instanceof GraphQLNonNull) {
     // Note: we're not checking that the result of coerceValue is non-null.
     // We only call this function after calling isValidValue.
-    return coerceValue(type.ofType, value);
+    var nullableType: GraphQLInputType = (type.ofType: any);
+    return coerceValue(nullableType, value);
   }
 
   if (isNullish(value)) {
     return null;
   }
 
   if (type instanceof GraphQLList) {
-    var itemType = type.ofType;
+    var itemType: GraphQLInputType = (type.ofType: any);
     // TODO: support iterable input
     if (Array.isArray(value)) {
       return value.map(item => coerceValue(itemType, item));

src/utils/TypeInfo.js → src/tools/TypeInfo.js

@@ -8,7 +8,7 @@
  *  of patent rights can be found in the PATENTS file in the same directory.
  */
 
-import { Kind } from '../language';
+import * as Kind from '../language/kinds';
 import type { Field } from '../language/ast';
 import {
   isCompositeType,
@@ -36,16 +36,16 @@ import {
 } from '../type/introspection';
 import type { GraphQLSchema } from '../type/schema';
 import type { Node } from '../language/ast';
-import typeFromAST from './typeFromAST';
-import find from './find';
+import { typeFromAST } from './typeFromAST';
+import find from '../utils/find';
 
 
 /**
  * TypeInfo is a utility class which, given a GraphQL schema, can keep track
  * of the current field and type definitions at any point in a GraphQL document
  * AST during a recursive descent by calling `enter(node)` and `leave(node)`.
  */
-export default class TypeInfo {
+export class TypeInfo {
   _schema: GraphQLSchema;
   _typeStack: Array<?GraphQLOutputType>;
   _parentTypeStack: Array<?GraphQLCompositeType>;

src/utils/__tests__/astFromValue.js → src/tools/__tests__/astFromValue.js

@@ -9,13 +9,13 @@
 
 import { describe, it } from 'mocha';
 import { expect } from 'chai';
-import astFromValue from '../astFromValue';
+import { astFromValue } from '../astFromValue';
 import {
   GraphQLEnumType,
   GraphQLInputObjectType,
-  GraphQLList
-} from '../../type/definition';
-import { GraphQLFloat } from '../../type/scalars';
+  GraphQLList,
+  GraphQLFloat,
+} from '../../type';
 
 
 describe('astFromValue', () => {

src/utils/astFromValue.js → src/tools/astFromValue.js

@@ -47,7 +47,7 @@ import { GraphQLFloat } from '../type/scalars';
  * | Number        | Int / Float          |
  *
  */
-export default function astFromValue(
+export function astFromValue(
   value: any,
   type?: ?GraphQLType
 ): ?Value {

src/tools/buildASTSchema.js

@@ -10,7 +10,7 @@
 import isNullish from '../utils/isNullish';
 import keyMap from '../utils/keyMap';
 import keyValMap from '../utils/keyValMap';
-import valueFromAST from '../utils/valueFromAST';
+import { valueFromAST } from './valueFromAST';
 
 import {
   LIST_TYPE,

src/tools/buildClientSchema.js

@@ -11,10 +11,8 @@
 import invariant from '../utils/invariant';
 import keyMap from '../utils/keyMap';
 import keyValMap from '../utils/keyValMap';
-import valueFromAST from '../utils/valueFromAST';
-
+import { valueFromAST } from './valueFromAST';
 import { parseValue } from '../language/parser';
-
 import { GraphQLSchema } from '../type/schema';
 
 import {

src/tools/index.js

@@ -22,3 +22,29 @@ export {
   printSchema,
   printIntrospectionSchema,
 } from './schemaPrinter';
+
+// Create a GraphQLType from a GraphQL language AST
+export {
+  typeFromAST
+} from './typeFromAST';
+
+// Create a JavaScript value from a GraphQL language AST
+export {
+  valueFromAST
+} from './valueFromAST';
+
+// Create a GraphQL language AST from a JavaScript value
+export {
+  astFromValue
+} from './astFromValue';
+
+// A helper to use within recursive-descent visitors which need to be aware of
+// the GraphQL type system.
+export {
+  TypeInfo
+} from './TypeInfo';
+
+// Determine if AST values adhere to a GraphQL type
+export {
+  isValidLiteralValue
+} from './isValidLiteralValue';

src/utils/isValidLiteralValue.js → src/tools/isValidLiteralValue.js

@@ -22,9 +22,9 @@ import {
   GraphQLNonNull
 } from '../type/definition';
 import type { GraphQLInputType } from '../type/definition';
-import invariant from './invariant';
-import keyMap from './keyMap';
-import isNullish from './isNullish';
+import invariant from '../utils/invariant';
+import keyMap from '../utils/keyMap';
+import isNullish from '../utils/isNullish';
 
 
 /**
@@ -34,7 +34,7 @@ import isNullish from './isNullish';
  * Note that this only validates literal values, variables are assumed to
  * provide values of the correct type.
  */
-export default function isValidLiteralValue(
+export function isValidLiteralValue(
   type: GraphQLInputType,
   valueAST: Value
 ): boolean {

src/tools/schemaPrinter.js

@@ -10,7 +10,7 @@
 
 import invariant from '../utils/invariant';
 import isNullish from '../utils/isNullish';
-import astFromValue from '../utils/astFromValue';
+import { astFromValue } from '../tools/astFromValue';
 import { print } from '../language/printer';
 import type { GraphQLSchema } from '../type/schema';
 import type { GraphQLNamedType } from '../type/definition';

src/utils/typeFromAST.js → src/tools/typeFromAST.js

@@ -8,15 +8,15 @@
  *  of patent rights can be found in the PATENTS file in the same directory.
  */
 
-import invariant from './invariant';
+import invariant from '../utils/invariant';
 import { NAMED_TYPE, LIST_TYPE, NON_NULL_TYPE } from '../language/kinds';
 import type { Type } from '../language/ast';
 import { GraphQLList, GraphQLNonNull } from '../type/definition';
 import type { GraphQLType } from '../type/definition';
 import type { GraphQLSchema } from '../type/schema';
 
 
-export default function typeFromAST(
+export function typeFromAST(
   schema: GraphQLSchema,
   inputTypeAST: Type
 ): ?GraphQLType {

src/utils/valueFromAST.js → src/tools/valueFromAST.js

@@ -8,10 +8,10 @@
  *  of patent rights can be found in the PATENTS file in the same directory.
  */
 
-import keyMap from './keyMap';
-import invariant from './invariant';
-import isNullish from './isNullish';
-import { Kind } from '../language';
+import keyMap from '../utils/keyMap';
+import invariant from '../utils/invariant';
+import isNullish from '../utils/isNullish';
+import * as Kind from '../language/kinds';
 import {
   GraphQLScalarType,
   GraphQLEnumType,
@@ -43,7 +43,7 @@ import type {
  * | Int / Float          | Number        |
  *
  */
-export default function valueFromAST(
+export function valueFromAST(
   valueAST: ?Value,
   type: GraphQLInputType,
   variables?: ?{ [key: string]: any }

src/type/introspection.js

@@ -8,7 +8,7 @@
  *  of patent rights can be found in the PATENTS file in the same directory.
  */
 
-import astFromValue from '../utils/astFromValue';
+import { astFromValue } from '../tools/astFromValue';
 import { print } from '../language/printer';
 import {
   GraphQLScalarType,

src/validator/index.js

@@ -25,7 +25,7 @@ import type {
   GraphQLArgument
 } from '../type/definition';
 import type { GraphQLDirective } from '../type/directives';
-import TypeInfo from '../utils/TypeInfo';
+import { TypeInfo } from '../tools/TypeInfo';
 import { allRules } from './allRules';
 
 

src/validator/rules/ArgumentsOfCorrectType.js

@@ -12,7 +12,7 @@ import type { ValidationContext } from '../index';
 
 import { GraphQLError } from '../../error';
 import { print } from '../../language/printer';
-import isValidLiteralValue from '../../utils/isValidLiteralValue';
+import { isValidLiteralValue } from '../../tools/isValidLiteralValue';
 import { badValueMessage } from '../errors';
 
 

src/validator/rules/DefaultValuesOfCorrectType.js

@@ -13,7 +13,7 @@ import type { ValidationContext } from '../index';
 import { GraphQLError } from '../../error';
 import { print } from '../../language/printer';
 import { GraphQLNonNull } from '../../type/definition';
-import isValidLiteralValue from '../../utils/isValidLiteralValue';
+import { isValidLiteralValue } from '../../tools/isValidLiteralValue';
 import {
   defaultForNonNullArgMessage,
   badValueForDefaultArgMessage,

src/validator/rules/OverlappingFieldsCanBeMerged.js

@@ -26,7 +26,7 @@ import type {
   GraphQLType,
   GraphQLFieldDefinition
 } from '../../type/definition';
-import typeFromAST from '../../utils/typeFromAST';
+import { typeFromAST } from '../../tools/typeFromAST';
 import find from '../../utils/find';
 
 

src/validator/rules/PossibleFragmentSpreads.js

@@ -17,7 +17,7 @@ import {
   GraphQLUnionType
 } from '../../type/definition';
 import keyMap from '../../utils/keyMap';
-import typeFromAST from '../../utils/typeFromAST';
+import { typeFromAST } from '../../tools/typeFromAST';
 import {
   typeIncompatibleSpreadMessage,
   typeIncompatibleAnonSpreadMessage,

src/validator/rules/VariablesAreInputTypes.js

@@ -13,7 +13,7 @@ import type { VariableDefinition } from '../../language/ast';
 import { GraphQLError } from '../../error';
 import { print } from '../../language/printer';
 import { isInputType } from '../../type/definition';
-import typeFromAST from '../../utils/typeFromAST';
+import { typeFromAST } from '../../tools/typeFromAST';
 import { nonInputTypeOnVarMessage } from '../errors';
 
 

src/validator/rules/VariablesInAllowedPosition.js

@@ -9,7 +9,7 @@
  */
 
 import type { ValidationContext } from '../index';
-import typeFromAST from '../../utils/typeFromAST';
+import { typeFromAST } from '../../tools/typeFromAST';
 import { GraphQLError } from '../../error';
 import { GraphQLList, GraphQLNonNull } from '../../type/definition';
 import { badVarPosMessage } from '../errors';