Merge wrappers into type/definition to fix circular imports (#1275)

src/execution/execute.js

@@ -33,7 +33,6 @@ import {
   isListType,
   isNonNullType,
 } from '../type/definition';
-import type { GraphQLList } from '../type/wrappers';
 import type {
   GraphQLObjectType,
   GraphQLOutputType,
@@ -43,6 +42,7 @@ import type {
   GraphQLFieldResolver,
   GraphQLResolveInfo,
   ResponsePath,
+  GraphQLList,
 } from '../type/definition';
 import { GraphQLSchema } from '../type/schema';
 import {

src/type/__tests__/schema-test.js

@@ -12,11 +12,11 @@ import {
   GraphQLString,
   GraphQLInputObjectType,
   GraphQLDirective,
+  GraphQLList,
 } from '../';
 
 import { describe, it } from 'mocha';
 import { expect } from 'chai';
-import { GraphQLList } from '../wrappers';
 
 const InterfaceType = new GraphQLInterfaceType({
   name: 'Interface',

src/type/definition.js

@@ -32,7 +32,6 @@ import type {
 } from '../language/ast';
 import type { GraphQLSchema } from './schema';
 import type { MaybePromise } from '../jsutils/MaybePromise';
-import { GraphQLList, GraphQLNonNull } from './wrappers';
 
 // Predicates & Assertions
 
@@ -315,6 +314,86 @@ export function assertAbstractType(type: mixed): GraphQLAbstractType {
   return type;
 }
 
+/**
+ * List Type Wrapper
+ *
+ * A list is a wrapping type which points to another type.
+ * Lists are often created within the context of defining the fields of
+ * an object type.
+ *
+ * Example:
+ *
+ *     const PersonType = new GraphQLObjectType({
+ *       name: 'Person',
+ *       fields: () => ({
+ *         parents: { type: GraphQLList(PersonType) },
+ *         children: { type: GraphQLList(PersonType) },
+ *       })
+ *     })
+ *
+ */
+declare class GraphQLList<+T: GraphQLType> {
+  +ofType: T;
+  static <T>(ofType: T): GraphQLList<T>;
+  // Note: constructors cannot be used for covariant types. Drop the "new".
+  constructor(ofType: any): void;
+}
+// eslint-disable-next-line no-redeclare
+export function GraphQLList(ofType) {
+  if (this instanceof GraphQLList) {
+    this.ofType = assertType(ofType);
+  } else {
+    return new GraphQLList(ofType);
+  }
+}
+
+// Also provide toJSON and inspect aliases for toString.
+const listProto: any = GraphQLList.prototype;
+listProto.toString = listProto.toJSON = listProto.inspect = function toString() {
+  return '[' + String(this.ofType) + ']';
+};
+
+/**
+ * Non-Null Type Wrapper
+ *
+ * A non-null is a wrapping type which points to another type.
+ * Non-null types enforce that their values are never null and can ensure
+ * an error is raised if this ever occurs during a request. It is useful for
+ * fields which you can make a strong guarantee on non-nullability, for example
+ * usually the id field of a database row will never be null.
+ *
+ * Example:
+ *
+ *     const RowType = new GraphQLObjectType({
+ *       name: 'Row',
+ *       fields: () => ({
+ *         id: { type: GraphQLNonNull(GraphQLString) },
+ *       })
+ *     })
+ *
+ * Note: the enforcement of non-nullability occurs within the executor.
+ */
+declare class GraphQLNonNull<+T: GraphQLNullableType> {
+  +ofType: T;
+  static <T>(ofType: T): GraphQLNonNull<T>;
+  // Note: constructors cannot be used for covariant types. Drop the "new".
+  constructor(ofType: any): void;
+}
+// eslint-disable-next-line no-redeclare
+export function GraphQLNonNull(ofType) {
+  if (this instanceof GraphQLNonNull) {
+    this.ofType = assertNullableType(ofType);
+  } else {
+    return new GraphQLNonNull(ofType);
+  }
+}
+
+// Also provide toJSON and inspect aliases for toString.
+const nonNullProto: any = GraphQLNonNull.prototype;
+nonNullProto.toString = nonNullProto.toJSON = nonNullProto.inspect = function toString() {
+  return String(this.ofType) + '!';
+};
+
 /**
  * These types wrap and modify other types
  */

src/type/directives.js

@@ -11,7 +11,7 @@ import type {
   GraphQLFieldConfigArgumentMap,
   GraphQLArgument,
 } from './definition';
-import { GraphQLNonNull } from './wrappers';
+import { GraphQLNonNull } from './definition';
 import { GraphQLString, GraphQLBoolean } from './scalars';
 import instanceOf from '../jsutils/instanceOf';
 import invariant from '../jsutils/invariant';

src/type/index.js

@@ -63,13 +63,10 @@ export {
   GraphQLUnionType,
   GraphQLEnumType,
   GraphQLInputObjectType,
-} from './definition';
-
-export {
   // Type Wrappers
   GraphQLList,
   GraphQLNonNull,
-} from './wrappers';
+} from './definition';
 
 export {
   // Predicate

src/type/introspection.js

@@ -14,6 +14,8 @@ import { print } from '../language/printer';
 import {
   GraphQLObjectType,
   GraphQLEnumType,
+  GraphQLList,
+  GraphQLNonNull,
   isScalarType,
   isObjectType,
   isInterfaceType,
@@ -25,7 +27,6 @@ import {
   isAbstractType,
   isNamedType,
 } from './definition';
-import { GraphQLList, GraphQLNonNull } from '../type/wrappers';
 import { GraphQLString, GraphQLBoolean } from './scalars';
 import { DirectiveLocation } from '../language/directiveLocation';
 import type { GraphQLField } from './definition';

src/utilities/buildASTSchema.js

@@ -49,10 +49,10 @@ import {
   GraphQLUnionType,
   GraphQLEnumType,
   GraphQLInputObjectType,
+  GraphQLList,
+  GraphQLNonNull,
 } from '../type/definition';
 
-import { GraphQLList, GraphQLNonNull } from '../type/wrappers';
-
 import {
   GraphQLDirective,
   GraphQLSkipDirective,

src/utilities/buildClientSchema.js

@@ -25,13 +25,13 @@ import {
   GraphQLUnionType,
   GraphQLEnumType,
   GraphQLInputObjectType,
+  GraphQLList,
+  GraphQLNonNull,
   assertNullableType,
   assertObjectType,
   assertInterfaceType,
 } from '../type/definition';
 
-import { GraphQLList, GraphQLNonNull } from '../type/wrappers';
-
 import type {
   GraphQLType,
   GraphQLInputType,

src/utilities/extendSchema.js

@@ -23,11 +23,12 @@ import {
   isUnionType,
   isListType,
   isNonNullType,
+  GraphQLList,
+  GraphQLNonNull,
   GraphQLObjectType,
   GraphQLInterfaceType,
   GraphQLUnionType,
 } from '../type/definition';
-import { GraphQLList, GraphQLNonNull } from '../type/wrappers';
 
 import { GraphQLDirective } from '../type/directives';
 

src/utilities/lexicographicSortSchema.js

@@ -12,14 +12,15 @@ import keyValMap from '../jsutils/keyValMap';
 import objectValues from '../jsutils/objectValues';
 import { GraphQLSchema } from '../type/schema';
 import { GraphQLDirective } from '../type/directives';
-import { GraphQLList, GraphQLNonNull } from '../type/wrappers';
 import type { GraphQLNamedType } from '../type/definition';
 import {
   GraphQLObjectType,
   GraphQLInterfaceType,
   GraphQLUnionType,
   GraphQLEnumType,
   GraphQLInputObjectType,
+  GraphQLList,
+  GraphQLNonNull,
   isListType,
   isNonNullType,
   isScalarType,

src/utilities/typeFromAST.js

@@ -13,7 +13,7 @@ import type {
   ListTypeNode,
   NonNullTypeNode,
 } from '../language/ast';
-import { GraphQLList, GraphQLNonNull } from '../type/wrappers';
+import { GraphQLList, GraphQLNonNull } from '../type/definition';
 import type { GraphQLNamedType } from '../type/definition';
 import type { GraphQLSchema } from '../type/schema';
 

src/validation/rules/VariablesInAllowedPosition.js

@@ -10,8 +10,7 @@
 import type ValidationContext from '../ValidationContext';
 import { GraphQLError } from '../../error';
 import type { ASTVisitor } from '../../language/visitor';
-import { isNonNullType } from '../../type/definition';
-import { GraphQLNonNull } from '../../type/wrappers';
+import { GraphQLNonNull, isNonNullType } from '../../type/definition';
 import { isTypeSubTypeOf } from '../../utilities/typeComparators';
 import { typeFromAST } from '../../utilities/typeFromAST';
 import type { GraphQLType } from '../../type/definition';