graphql 15.0.0 → 15.1.0

package/polyfills/arrayFrom.js

@@ -25,8 +25,7 @@ var arrayFrom = Array.from || function (obj, mapFn, thisArg) {
     for (var i = 0; !(step = iterator.next()).done; ++i) {
       result.push(mapFn.call(thisArg, step.value, i)); // Infinite Iterators could cause forEach to run forever.
       // After a very large number of iterations, produce an error.
-
-      /* istanbul ignore if */
+      // istanbul ignore if (Too big to actually test)
 
       if (i > 9999999) {
         throw new TypeError('Near-infinite iteration.');

package/polyfills/arrayFrom.js.flow

@@ -32,7 +32,7 @@ const arrayFrom =
         result.push(mapFn.call(thisArg, step.value, i));
         // Infinite Iterators could cause forEach to run forever.
         // After a very large number of iterations, produce an error.
-        /* istanbul ignore if */
+        // istanbul ignore if (Too big to actually test)
         if (i > 9999999) {
           throw new TypeError('Near-infinite iteration.');
         }

package/polyfills/arrayFrom.mjs

@@ -18,8 +18,7 @@ var arrayFrom = Array.from || function (obj, mapFn, thisArg) {
     for (var i = 0; !(step = iterator.next()).done; ++i) {
       result.push(mapFn.call(thisArg, step.value, i)); // Infinite Iterators could cause forEach to run forever.
       // After a very large number of iterations, produce an error.
-
-      /* istanbul ignore if */
+      // istanbul ignore if (Too big to actually test)
 
       if (i > 9999999) {
         throw new TypeError('Near-infinite iteration.');

package/polyfills/symbols.js

@@ -5,16 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.SYMBOL_TO_STRING_TAG = exports.SYMBOL_ASYNC_ITERATOR = exports.SYMBOL_ITERATOR = void 0;
 // In ES2015 (or a polyfilled) environment, this will be Symbol.iterator
-
-/* istanbul ignore next (See: https://github.com/graphql/graphql-js/issues/2317) */
+// istanbul ignore next (See: 'https://github.com/graphql/graphql-js/issues/2317')
 var SYMBOL_ITERATOR = typeof Symbol === 'function' ? Symbol.iterator : '@@iterator'; // In ES2017 (or a polyfilled) environment, this will be Symbol.asyncIterator
-
-/* istanbul ignore next (See: https://github.com/graphql/graphql-js/issues/2317) */
+// istanbul ignore next (See: 'https://github.com/graphql/graphql-js/issues/2317')
 
 exports.SYMBOL_ITERATOR = SYMBOL_ITERATOR;
 var SYMBOL_ASYNC_ITERATOR = // $FlowFixMe Flow doesn't define `Symbol.asyncIterator` yet
-typeof Symbol === 'function' ? Symbol.asyncIterator : '@@asyncIterator';
-/* istanbul ignore next (See: https://github.com/graphql/graphql-js/issues/2317) */
+typeof Symbol === 'function' ? Symbol.asyncIterator : '@@asyncIterator'; // istanbul ignore next (See: 'https://github.com/graphql/graphql-js/issues/2317')
 
 exports.SYMBOL_ASYNC_ITERATOR = SYMBOL_ASYNC_ITERATOR;
 var SYMBOL_TO_STRING_TAG = // $FlowFixMe Flow doesn't define `Symbol.toStringTag` yet

package/polyfills/symbols.js.flow

@@ -1,17 +1,17 @@
 // @flow strict
 
 // In ES2015 (or a polyfilled) environment, this will be Symbol.iterator
-/* istanbul ignore next (See: https://github.com/graphql/graphql-js/issues/2317) */
+// istanbul ignore next (See: 'https://github.com/graphql/graphql-js/issues/2317')
 export const SYMBOL_ITERATOR: string =
   typeof Symbol === 'function' ? Symbol.iterator : '@@iterator';
 
 // In ES2017 (or a polyfilled) environment, this will be Symbol.asyncIterator
-/* istanbul ignore next (See: https://github.com/graphql/graphql-js/issues/2317) */
+// istanbul ignore next (See: 'https://github.com/graphql/graphql-js/issues/2317')
 export const SYMBOL_ASYNC_ITERATOR: string =
   // $FlowFixMe Flow doesn't define `Symbol.asyncIterator` yet
   typeof Symbol === 'function' ? Symbol.asyncIterator : '@@asyncIterator';
 
-/* istanbul ignore next (See: https://github.com/graphql/graphql-js/issues/2317) */
+// istanbul ignore next (See: 'https://github.com/graphql/graphql-js/issues/2317')
 export const SYMBOL_TO_STRING_TAG: string =
   // $FlowFixMe Flow doesn't define `Symbol.toStringTag` yet
   typeof Symbol === 'function' ? Symbol.toStringTag : '@@toStringTag';

package/polyfills/symbols.mjs

@@ -1,13 +1,10 @@
 // In ES2015 (or a polyfilled) environment, this will be Symbol.iterator
-
-/* istanbul ignore next (See: https://github.com/graphql/graphql-js/issues/2317) */
+// istanbul ignore next (See: 'https://github.com/graphql/graphql-js/issues/2317')
 export var SYMBOL_ITERATOR = typeof Symbol === 'function' ? Symbol.iterator : '@@iterator'; // In ES2017 (or a polyfilled) environment, this will be Symbol.asyncIterator
-
-/* istanbul ignore next (See: https://github.com/graphql/graphql-js/issues/2317) */
+// istanbul ignore next (See: 'https://github.com/graphql/graphql-js/issues/2317')
 
 export var SYMBOL_ASYNC_ITERATOR = // $FlowFixMe Flow doesn't define `Symbol.asyncIterator` yet
-typeof Symbol === 'function' ? Symbol.asyncIterator : '@@asyncIterator';
-/* istanbul ignore next (See: https://github.com/graphql/graphql-js/issues/2317) */
+typeof Symbol === 'function' ? Symbol.asyncIterator : '@@asyncIterator'; // istanbul ignore next (See: 'https://github.com/graphql/graphql-js/issues/2317')
 
 export var SYMBOL_TO_STRING_TAG = // $FlowFixMe Flow doesn't define `Symbol.toStringTag` yet
 typeof Symbol === 'function' ? Symbol.toStringTag : '@@toStringTag';

package/subscription/subscribe.d.ts

@@ -1,4 +1,5 @@
-import Maybe from '../tsutils/Maybe';
+import { Maybe } from '../jsutils/Maybe';
+
 import { DocumentNode } from '../language/ast';
 import { ExecutionResult } from '../execution/execute';
 import { GraphQLSchema } from '../type/schema';

package/type/definition.d.ts

@@ -1,7 +1,8 @@
 // FIXME
 /* eslint-disable import/no-cycle */
 
-import Maybe from '../tsutils/Maybe';
+import { Maybe } from '../jsutils/Maybe';
+
 import { PromiseOrValue } from '../jsutils/PromiseOrValue';
 import { Path } from '../jsutils/Path';
 
@@ -172,9 +173,9 @@ export function assertAbstractType(type: any): GraphQLAbstractType;
  */
 interface GraphQLList<T extends GraphQLType> {
   readonly ofType: T;
-  toString(): string;
-  toJSON(): string;
-  inspect(): string;
+  toString: () => string;
+  toJSON: () => string;
+  inspect: () => string;
 }
 
 interface _GraphQLList<T extends GraphQLType> {
@@ -206,9 +207,9 @@ export const GraphQLList: _GraphQLList<GraphQLType>;
  */
 interface GraphQLNonNull<T extends GraphQLNullableType> {
   readonly ofType: T;
-  toString(): string;
-  toJSON(): string;
-  inspect(): string;
+  toString: () => string;
+  toJSON: () => string;
+  inspect: () => string;
 }
 
 interface _GraphQLNonNull<T extends GraphQLNullableType> {
@@ -240,12 +241,15 @@ export function isNullableType(type: any): type is GraphQLNullableType;
 
 export function assertNullableType(type: any): GraphQLNullableType;
 
-export function getNullableType(type: void): undefined;
+// FIXME Disabled because of https://github.com/yaacovCR/graphql-tools-fork/issues/40#issuecomment-586671219
+// tslint:disable:unified-signatures
+export function getNullableType(type: undefined): undefined;
 export function getNullableType<T extends GraphQLNullableType>(type: T): T;
 export function getNullableType<T extends GraphQLNullableType>(
   // eslint-disable-next-line @typescript-eslint/unified-signatures
   type: GraphQLNonNull<T>,
 ): T;
+// tslint:enable:unified-signatures
 
 /**
  * These named types do not include modifiers like List or NonNull.
@@ -262,7 +266,7 @@ export function isNamedType(type: any): type is GraphQLNamedType;
 
 export function assertNamedType(type: any): GraphQLNamedType;
 
-export function getNamedType(type: void): undefined;
+export function getNamedType(type: undefined): undefined;
 export function getNamedType(type: GraphQLType): GraphQLNamedType;
 
 /**
@@ -291,6 +295,7 @@ export type Thunk<T> = (() => T) | T;
 export class GraphQLScalarType {
   name: string;
   description: Maybe<string>;
+  specifiedByUrl: Maybe<string>;
   serialize: GraphQLScalarSerializer<any>;
   parseValue: GraphQLScalarValueParser<any>;
   parseLiteral: GraphQLScalarLiteralParser<any>;
@@ -301,6 +306,7 @@ export class GraphQLScalarType {
   constructor(config: Readonly<GraphQLScalarTypeConfig<any, any>>);
 
   toConfig(): GraphQLScalarTypeConfig<any, any> & {
+    specifiedByUrl: Maybe<string>;
     serialize: GraphQLScalarSerializer<any>;
     parseValue: GraphQLScalarValueParser<any>;
     parseLiteral: GraphQLScalarLiteralParser<any>;
@@ -327,8 +333,9 @@ export type GraphQLScalarLiteralParser<TInternal> = (
 export interface GraphQLScalarTypeConfig<TInternal, TExternal> {
   name: string;
   description?: Maybe<string>;
+  specifiedByUrl?: Maybe<string>;
   // Serializes an internal value to include in a response.
-  serialize: GraphQLScalarSerializer<TExternal>;
+  serialize?: GraphQLScalarSerializer<TExternal>;
   // Parses an externally provided value to use as an input.
   parseValue?: GraphQLScalarValueParser<TInternal>;
   // Parses an externally provided literal value to use as an input.
@@ -467,9 +474,9 @@ export interface GraphQLFieldConfig<
   astNode?: Maybe<FieldDefinitionNode>;
 }
 
-export type GraphQLFieldConfigArgumentMap = {
+export interface GraphQLFieldConfigArgumentMap {
   [key: string]: GraphQLArgumentConfig;
-};
+}
 
 export interface GraphQLArgumentConfig {
   description?: Maybe<string>;
@@ -479,9 +486,9 @@ export interface GraphQLArgumentConfig {
   astNode?: Maybe<InputValueDefinitionNode>;
 }
 
-export type GraphQLFieldConfigMap<TSource, TContext> = {
+export interface GraphQLFieldConfigMap<TSource, TContext> {
   [key: string]: GraphQLFieldConfig<TSource, TContext>;
-};
+}
 
 export interface GraphQLField<
   TSource,
@@ -511,9 +518,9 @@ export interface GraphQLArgument {
 
 export function isRequiredArgument(arg: GraphQLArgument): boolean;
 
-export type GraphQLFieldMap<TSource, TContext> = {
+export interface GraphQLFieldMap<TSource, TContext> {
   [key: string]: GraphQLField<TSource, TContext>;
-};
+}
 
 /**
  * Interface Type Definition
@@ -690,9 +697,9 @@ export interface GraphQLEnumTypeConfig {
   extensionASTNodes?: Maybe<ReadonlyArray<EnumTypeExtensionNode>>;
 }
 
-export type GraphQLEnumValueConfigMap = {
+export interface GraphQLEnumValueConfigMap {
   [key: string]: GraphQLEnumValueConfig;
-};
+}
 
 export interface GraphQLEnumValueConfig {
   description?: Maybe<string>;
@@ -770,9 +777,9 @@ export interface GraphQLInputFieldConfig {
   astNode?: Maybe<InputValueDefinitionNode>;
 }
 
-export type GraphQLInputFieldConfigMap = {
+export interface GraphQLInputFieldConfigMap {
   [key: string]: GraphQLInputFieldConfig;
-};
+}
 
 export interface GraphQLInputField {
   name: string;
@@ -785,4 +792,6 @@ export interface GraphQLInputField {
 
 export function isRequiredInputField(field: GraphQLInputField): boolean;
 
-export type GraphQLInputFieldMap = { [key: string]: GraphQLInputField };
+export interface GraphQLInputFieldMap {
+  [key: string]: GraphQLInputField;
+}

package/type/definition.js

@@ -70,7 +70,7 @@ var _isObjectLike = _interopRequireDefault(require("../jsutils/isObjectLike"));
 
 var _identityFunc = _interopRequireDefault(require("../jsutils/identityFunc"));
 
-var _defineToJSON = _interopRequireDefault(require("../jsutils/defineToJSON"));
+var _defineInspect = _interopRequireDefault(require("../jsutils/defineInspect"));
 
 var _suggestionList = _interopRequireDefault(require("../jsutils/suggestionList"));
 
@@ -330,12 +330,17 @@ GraphQLList.prototype.toString = function toString() {
   return '[' + String(this.ofType) + ']';
 };
 
+GraphQLList.prototype.toJSON = function toJSON() {
+  return this.toString();
+};
+
 Object.defineProperty(GraphQLList.prototype, _symbols.SYMBOL_TO_STRING_TAG, {
   get: function get() {
     return 'GraphQLList';
   }
-});
-(0, _defineToJSON.default)(GraphQLList);
+}); // Print a simplified form when appearing in `inspect` and `util.inspect`.
+
+(0, _defineInspect.default)(GraphQLList);
 /**
  * Non-Null Type Wrapper
  *
@@ -380,12 +385,17 @@ GraphQLNonNull.prototype.toString = function toString() {
   return String(this.ofType) + '!';
 };
 
+GraphQLNonNull.prototype.toJSON = function toJSON() {
+  return this.toString();
+};
+
 Object.defineProperty(GraphQLNonNull.prototype, _symbols.SYMBOL_TO_STRING_TAG, {
   get: function get() {
     return 'GraphQLNonNull';
   }
-});
-(0, _defineToJSON.default)(GraphQLNonNull);
+}); // Print a simplified form when appearing in `inspect` and `util.inspect`.
+
+(0, _defineInspect.default)(GraphQLNonNull);
 /**
  * These types wrap and modify other types
  */
@@ -504,6 +514,7 @@ var GraphQLScalarType = /*#__PURE__*/function () {
     var parseValue = (_config$parseValue = config.parseValue) !== null && _config$parseValue !== void 0 ? _config$parseValue : _identityFunc.default;
     this.name = config.name;
     this.description = config.description;
+    this.specifiedByUrl = config.specifiedByUrl;
     this.serialize = (_config$serialize = config.serialize) !== null && _config$serialize !== void 0 ? _config$serialize : _identityFunc.default;
     this.parseValue = parseValue;
     this.parseLiteral = (_config$parseLiteral = config.parseLiteral) !== null && _config$parseLiteral !== void 0 ? _config$parseLiteral : function (node) {
@@ -513,6 +524,7 @@ var GraphQLScalarType = /*#__PURE__*/function () {
     this.astNode = config.astNode;
     this.extensionASTNodes = undefineIfEmpty(config.extensionASTNodes);
     typeof config.name === 'string' || (0, _devAssert.default)(0, 'Must provide name.');
+    config.specifiedByUrl == null || typeof config.specifiedByUrl === 'string' || (0, _devAssert.default)(0, "".concat(this.name, " must provide \"specifiedByUrl\" as a string, ") + "but got: ".concat((0, _inspect.default)(config.specifiedByUrl), "."));
     config.serialize == null || typeof config.serialize === 'function' || (0, _devAssert.default)(0, "".concat(this.name, " must provide \"serialize\" function. If this custom Scalar is also used as an input type, ensure \"parseValue\" and \"parseLiteral\" functions are also provided."));
 
     if (config.parseLiteral) {
@@ -528,6 +540,7 @@ var GraphQLScalarType = /*#__PURE__*/function () {
     return {
       name: this.name,
       description: this.description,
+      specifiedByUrl: this.specifiedByUrl,
       serialize: this.serialize,
       parseValue: this.parseValue,
       parseLiteral: this.parseLiteral,
@@ -539,6 +552,10 @@ var GraphQLScalarType = /*#__PURE__*/function () {
 
   _proto.toString = function toString() {
     return this.name;
+  };
+
+  _proto.toJSON = function toJSON() {
+    return this.toString();
   } // $FlowFixMe Flow doesn't support computed properties yet
   ;
 
@@ -550,10 +567,11 @@ var GraphQLScalarType = /*#__PURE__*/function () {
   }]);
 
   return GraphQLScalarType;
-}();
+}(); // Print a simplified form when appearing in `inspect` and `util.inspect`.
+
 
 exports.GraphQLScalarType = GraphQLScalarType;
-(0, _defineToJSON.default)(GraphQLScalarType);
+(0, _defineInspect.default)(GraphQLScalarType);
 
 /**
  * Object Type Definition
@@ -639,6 +657,10 @@ var GraphQLObjectType = /*#__PURE__*/function () {
 
   _proto2.toString = function toString() {
     return this.name;
+  };
+
+  _proto2.toJSON = function toJSON() {
+    return this.toString();
   } // $FlowFixMe Flow doesn't support computed properties yet
   ;
 
@@ -650,10 +672,11 @@ var GraphQLObjectType = /*#__PURE__*/function () {
   }]);
 
   return GraphQLObjectType;
-}();
+}(); // Print a simplified form when appearing in `inspect` and `util.inspect`.
+
 
 exports.GraphQLObjectType = GraphQLObjectType;
-(0, _defineToJSON.default)(GraphQLObjectType);
+(0, _defineInspect.default)(GraphQLObjectType);
 
 function defineInterfaces(config) {
   var _resolveThunk;
@@ -809,6 +832,10 @@ var GraphQLInterfaceType = /*#__PURE__*/function () {
 
   _proto3.toString = function toString() {
     return this.name;
+  };
+
+  _proto3.toJSON = function toJSON() {
+    return this.toString();
   } // $FlowFixMe Flow doesn't support computed properties yet
   ;
 
@@ -820,10 +847,11 @@ var GraphQLInterfaceType = /*#__PURE__*/function () {
   }]);
 
   return GraphQLInterfaceType;
-}();
+}(); // Print a simplified form when appearing in `inspect` and `util.inspect`.
+
 
 exports.GraphQLInterfaceType = GraphQLInterfaceType;
-(0, _defineToJSON.default)(GraphQLInterfaceType);
+(0, _defineInspect.default)(GraphQLInterfaceType);
 
 /**
  * Union Type Definition
@@ -887,6 +915,10 @@ var GraphQLUnionType = /*#__PURE__*/function () {
 
   _proto4.toString = function toString() {
     return this.name;
+  };
+
+  _proto4.toJSON = function toJSON() {
+    return this.toString();
   } // $FlowFixMe Flow doesn't support computed properties yet
   ;
 
@@ -898,10 +930,11 @@ var GraphQLUnionType = /*#__PURE__*/function () {
   }]);
 
   return GraphQLUnionType;
-}();
+}(); // Print a simplified form when appearing in `inspect` and `util.inspect`.
+
 
 exports.GraphQLUnionType = GraphQLUnionType;
-(0, _defineToJSON.default)(GraphQLUnionType);
+(0, _defineInspect.default)(GraphQLUnionType);
 
 function defineTypes(config) {
   var types = resolveThunk(config.types);
@@ -1032,6 +1065,10 @@ var GraphQLEnumType
 
   _proto5.toString = function toString() {
     return this.name;
+  };
+
+  _proto5.toJSON = function toJSON() {
+    return this.toString();
   } // $FlowFixMe Flow doesn't support computed properties yet
   ;
 
@@ -1043,10 +1080,11 @@ var GraphQLEnumType
   }]);
 
   return GraphQLEnumType;
-}();
+}(); // Print a simplified form when appearing in `inspect` and `util.inspect`.
+
 
 exports.GraphQLEnumType = GraphQLEnumType;
-(0, _defineToJSON.default)(GraphQLEnumType);
+(0, _defineInspect.default)(GraphQLEnumType);
 
 function didYouMeanEnumValue(enumType, unknownValueStr) {
   var allNames = enumType.getValues().map(function (value) {
@@ -1140,6 +1178,10 @@ var GraphQLInputObjectType = /*#__PURE__*/function () {
 
   _proto6.toString = function toString() {
     return this.name;
+  };
+
+  _proto6.toJSON = function toJSON() {
+    return this.toString();
   } // $FlowFixMe Flow doesn't support computed properties yet
   ;
 
@@ -1151,10 +1193,11 @@ var GraphQLInputObjectType = /*#__PURE__*/function () {
   }]);
 
   return GraphQLInputObjectType;
-}();
+}(); // Print a simplified form when appearing in `inspect` and `util.inspect`.
+
 
 exports.GraphQLInputObjectType = GraphQLInputObjectType;
-(0, _defineToJSON.default)(GraphQLInputObjectType);
+(0, _defineInspect.default)(GraphQLInputObjectType);
 
 function defineInputFieldMap(config) {
   var fieldMap = resolveThunk(config.fields);

package/type/definition.js.flow

@@ -17,7 +17,7 @@ import instanceOf from '../jsutils/instanceOf';
 import didYouMean from '../jsutils/didYouMean';
 import isObjectLike from '../jsutils/isObjectLike';
 import identityFunc from '../jsutils/identityFunc';
-import defineToJSON from '../jsutils/defineToJSON';
+import defineInspect from '../jsutils/defineInspect';
 import suggestionList from '../jsutils/suggestionList';
 import { type PromiseOrValue } from '../jsutils/PromiseOrValue';
 import {
@@ -373,13 +373,18 @@ export function GraphQLList(ofType) {
   return '[' + String(this.ofType) + ']';
 };
 
+(GraphQLList.prototype: any).toJSON = function toJSON() {
+  return this.toString();
+};
+
 Object.defineProperty(GraphQLList.prototype, SYMBOL_TO_STRING_TAG, {
   get() {
     return 'GraphQLList';
   },
 });
 
-defineToJSON(GraphQLList);
+// Print a simplified form when appearing in `inspect` and `util.inspect`.
+defineInspect(GraphQLList);
 
 /**
  * Non-Null Type Wrapper
@@ -424,13 +429,18 @@ export function GraphQLNonNull(ofType) {
   return String(this.ofType) + '!';
 };
 
+(GraphQLNonNull.prototype: any).toJSON = function toJSON() {
+  return this.toString();
+};
+
 Object.defineProperty(GraphQLNonNull.prototype, SYMBOL_TO_STRING_TAG, {
   get() {
     return 'GraphQLNonNull';
   },
 });
 
-defineToJSON(GraphQLNonNull);
+// Print a simplified form when appearing in `inspect` and `util.inspect`.
+defineInspect(GraphQLNonNull);
 
 /**
  * These types wrap and modify other types
@@ -568,6 +578,7 @@ function undefineIfEmpty<T>(arr: ?$ReadOnlyArray<T>): ?$ReadOnlyArray<T> {
 export class GraphQLScalarType {
   name: string;
   description: ?string;
+  specifiedByUrl: ?string;
   serialize: GraphQLScalarSerializer<mixed>;
   parseValue: GraphQLScalarValueParser<mixed>;
   parseLiteral: GraphQLScalarLiteralParser<mixed>;
@@ -579,6 +590,7 @@ export class GraphQLScalarType {
     const parseValue = config.parseValue ?? identityFunc;
     this.name = config.name;
     this.description = config.description;
+    this.specifiedByUrl = config.specifiedByUrl;
     this.serialize = config.serialize ?? identityFunc;
     this.parseValue = parseValue;
     this.parseLiteral =
@@ -588,6 +600,14 @@ export class GraphQLScalarType {
     this.extensionASTNodes = undefineIfEmpty(config.extensionASTNodes);
 
     devAssert(typeof config.name === 'string', 'Must provide name.');
+
+    devAssert(
+      config.specifiedByUrl == null ||
+        typeof config.specifiedByUrl === 'string',
+      `${this.name} must provide "specifiedByUrl" as a string, ` +
+        `but got: ${inspect(config.specifiedByUrl)}.`,
+    );
+
     devAssert(
       config.serialize == null || typeof config.serialize === 'function',
       `${this.name} must provide "serialize" function. If this custom Scalar is also used as an input type, ensure "parseValue" and "parseLiteral" functions are also provided.`,
@@ -613,6 +633,7 @@ export class GraphQLScalarType {
     return {
       name: this.name,
       description: this.description,
+      specifiedByUrl: this.specifiedByUrl,
       serialize: this.serialize,
       parseValue: this.parseValue,
       parseLiteral: this.parseLiteral,
@@ -626,13 +647,18 @@ export class GraphQLScalarType {
     return this.name;
   }
 
+  toJSON(): string {
+    return this.toString();
+  }
+
   // $FlowFixMe Flow doesn't support computed properties yet
   get [SYMBOL_TO_STRING_TAG]() {
     return 'GraphQLScalarType';
   }
 }
 
-defineToJSON(GraphQLScalarType);
+// Print a simplified form when appearing in `inspect` and `util.inspect`.
+defineInspect(GraphQLScalarType);
 
 export type GraphQLScalarSerializer<TExternal> = (
   outputValue: mixed,
@@ -650,6 +676,7 @@ export type GraphQLScalarLiteralParser<TInternal> = (
 export type GraphQLScalarTypeConfig<TInternal, TExternal> = {|
   name: string,
   description?: ?string,
+  specifiedByUrl?: ?string,
   // Serializes an internal value to include in a response.
   serialize?: GraphQLScalarSerializer<TExternal>,
   // Parses an externally provided value to use as an input.
@@ -764,13 +791,18 @@ export class GraphQLObjectType {
     return this.name;
   }
 
+  toJSON(): string {
+    return this.toString();
+  }
+
   // $FlowFixMe Flow doesn't support computed properties yet
   get [SYMBOL_TO_STRING_TAG]() {
     return 'GraphQLObjectType';
   }
 }
 
-defineToJSON(GraphQLObjectType);
+// Print a simplified form when appearing in `inspect` and `util.inspect`.
+defineInspect(GraphQLObjectType);
 
 function defineInterfaces(
   config: $ReadOnly<
@@ -1074,13 +1106,18 @@ export class GraphQLInterfaceType {
     return this.name;
   }
 
+  toJSON(): string {
+    return this.toString();
+  }
+
   // $FlowFixMe Flow doesn't support computed properties yet
   get [SYMBOL_TO_STRING_TAG]() {
     return 'GraphQLInterfaceType';
   }
 }
 
-defineToJSON(GraphQLInterfaceType);
+// Print a simplified form when appearing in `inspect` and `util.inspect`.
+defineInspect(GraphQLInterfaceType);
 
 export type GraphQLInterfaceTypeConfig<TSource, TContext> = {|
   name: string,
@@ -1176,13 +1213,18 @@ export class GraphQLUnionType {
     return this.name;
   }
 
+  toJSON(): string {
+    return this.toString();
+  }
+
   // $FlowFixMe Flow doesn't support computed properties yet
   get [SYMBOL_TO_STRING_TAG]() {
     return 'GraphQLUnionType';
   }
 }
 
-defineToJSON(GraphQLUnionType);
+// Print a simplified form when appearing in `inspect` and `util.inspect`.
+defineInspect(GraphQLUnionType);
 
 function defineTypes(
   config: $ReadOnly<GraphQLUnionTypeConfig<mixed, mixed>>,
@@ -1349,13 +1391,18 @@ export class GraphQLEnumType /* <T> */ {
     return this.name;
   }
 
+  toJSON(): string {
+    return this.toString();
+  }
+
   // $FlowFixMe Flow doesn't support computed properties yet
   get [SYMBOL_TO_STRING_TAG]() {
     return 'GraphQLEnumType';
   }
 }
 
-defineToJSON(GraphQLEnumType);
+// Print a simplified form when appearing in `inspect` and `util.inspect`.
+defineInspect(GraphQLEnumType);
 
 function didYouMeanEnumValue(
   enumType: GraphQLEnumType,
@@ -1501,13 +1548,18 @@ export class GraphQLInputObjectType {
     return this.name;
   }
 
+  toJSON(): string {
+    return this.toString();
+  }
+
   // $FlowFixMe Flow doesn't support computed properties yet
   get [SYMBOL_TO_STRING_TAG]() {
     return 'GraphQLInputObjectType';
   }
 }
 
-defineToJSON(GraphQLInputObjectType);
+// Print a simplified form when appearing in `inspect` and `util.inspect`.
+defineInspect(GraphQLInputObjectType);
 
 function defineInputFieldMap(
   config: $ReadOnly<GraphQLInputObjectTypeConfig>,