graphql 15.1.0 → 15.4.0

package/type/directives.js.flow

@@ -1,32 +1,25 @@
 // @flow strict
-
 import objectEntries from '../polyfills/objectEntries';
 import { SYMBOL_TO_STRING_TAG } from '../polyfills/symbols';
 
+import type { ReadOnlyObjMap, ReadOnlyObjMapLike } from '../jsutils/ObjMap';
 import inspect from '../jsutils/inspect';
 import toObjMap from '../jsutils/toObjMap';
 import devAssert from '../jsutils/devAssert';
 import instanceOf from '../jsutils/instanceOf';
 import isObjectLike from '../jsutils/isObjectLike';
 import defineInspect from '../jsutils/defineInspect';
-import {
-  type ReadOnlyObjMap,
-  type ReadOnlyObjMapLike,
-} from '../jsutils/ObjMap';
 
-import { type DirectiveDefinitionNode } from '../language/ast';
-import {
-  DirectiveLocation,
-  type DirectiveLocationEnum,
-} from '../language/directiveLocation';
+import type { DirectiveDefinitionNode } from '../language/ast';
+import type { DirectiveLocationEnum } from '../language/directiveLocation';
+import { DirectiveLocation } from '../language/directiveLocation';
 
-import { GraphQLString, GraphQLBoolean } from './scalars';
-import {
-  type GraphQLFieldConfigArgumentMap,
-  type GraphQLArgument,
-  argsToArgsConfig,
-  GraphQLNonNull,
+import type {
+  GraphQLArgument,
+  GraphQLFieldConfigArgumentMap,
 } from './definition';
+import { GraphQLString, GraphQLBoolean } from './scalars';
+import { argsToArgsConfig, GraphQLNonNull } from './definition';
 
 /**
  * Test if the given value is a GraphQL directive.
@@ -86,6 +79,7 @@ export class GraphQLDirective {
       description: argConfig.description,
       type: argConfig.type,
       defaultValue: argConfig.defaultValue,
+      deprecationReason: argConfig.deprecationReason,
       extensions: argConfig.extensions && toObjMap(argConfig.extensions),
       astNode: argConfig.astNode,
     }));
@@ -116,7 +110,7 @@ export class GraphQLDirective {
     return this.toString();
   }
 
-  // $FlowFixMe Flow doesn't support computed properties yet
+  // $FlowFixMe[unsupported-syntax] Flow doesn't support computed properties yet
   get [SYMBOL_TO_STRING_TAG]() {
     return 'GraphQLDirective';
   }
@@ -149,7 +143,7 @@ export const GraphQLIncludeDirective = new GraphQLDirective({
   ],
   args: {
     if: {
-      type: GraphQLNonNull(GraphQLBoolean),
+      type: new GraphQLNonNull(GraphQLBoolean),
       description: 'Included when true.',
     },
   },
@@ -169,7 +163,7 @@ export const GraphQLSkipDirective = new GraphQLDirective({
   ],
   args: {
     if: {
-      type: GraphQLNonNull(GraphQLBoolean),
+      type: new GraphQLNonNull(GraphQLBoolean),
       description: 'Skipped when true.',
     },
   },
@@ -186,7 +180,12 @@ export const DEFAULT_DEPRECATION_REASON = 'No longer supported';
 export const GraphQLDeprecatedDirective = new GraphQLDirective({
   name: 'deprecated',
   description: 'Marks an element of a GraphQL schema as no longer supported.',
-  locations: [DirectiveLocation.FIELD_DEFINITION, DirectiveLocation.ENUM_VALUE],
+  locations: [
+    DirectiveLocation.FIELD_DEFINITION,
+    DirectiveLocation.ARGUMENT_DEFINITION,
+    DirectiveLocation.INPUT_FIELD_DEFINITION,
+    DirectiveLocation.ENUM_VALUE,
+  ],
   args: {
     reason: {
       type: GraphQLString,
@@ -206,7 +205,7 @@ export const GraphQLSpecifiedByDirective = new GraphQLDirective({
   locations: [DirectiveLocation.SCALAR],
   args: {
     url: {
-      type: GraphQLNonNull(GraphQLString),
+      type: new GraphQLNonNull(GraphQLString),
       description: 'The URL that specifies the behaviour of this scalar.',
     },
   },

package/type/directives.mjs

@@ -55,6 +55,7 @@ export var GraphQLDirective = /*#__PURE__*/function () {
         description: argConfig.description,
         type: argConfig.type,
         defaultValue: argConfig.defaultValue,
+        deprecationReason: argConfig.deprecationReason,
         extensions: argConfig.extensions && toObjMap(argConfig.extensions),
         astNode: argConfig.astNode
       };
@@ -81,7 +82,7 @@ export var GraphQLDirective = /*#__PURE__*/function () {
 
   _proto.toJSON = function toJSON() {
     return this.toString();
-  } // $FlowFixMe Flow doesn't support computed properties yet
+  } // $FlowFixMe[unsupported-syntax] Flow doesn't support computed properties yet
   ;
 
   _createClass(GraphQLDirective, [{
@@ -105,7 +106,7 @@ export var GraphQLIncludeDirective = new GraphQLDirective({
   locations: [DirectiveLocation.FIELD, DirectiveLocation.FRAGMENT_SPREAD, DirectiveLocation.INLINE_FRAGMENT],
   args: {
     if: {
-      type: GraphQLNonNull(GraphQLBoolean),
+      type: new GraphQLNonNull(GraphQLBoolean),
       description: 'Included when true.'
     }
   }
@@ -120,7 +121,7 @@ export var GraphQLSkipDirective = new GraphQLDirective({
   locations: [DirectiveLocation.FIELD, DirectiveLocation.FRAGMENT_SPREAD, DirectiveLocation.INLINE_FRAGMENT],
   args: {
     if: {
-      type: GraphQLNonNull(GraphQLBoolean),
+      type: new GraphQLNonNull(GraphQLBoolean),
       description: 'Skipped when true.'
     }
   }
@@ -137,7 +138,7 @@ export var DEFAULT_DEPRECATION_REASON = 'No longer supported';
 export var GraphQLDeprecatedDirective = new GraphQLDirective({
   name: 'deprecated',
   description: 'Marks an element of a GraphQL schema as no longer supported.',
-  locations: [DirectiveLocation.FIELD_DEFINITION, DirectiveLocation.ENUM_VALUE],
+  locations: [DirectiveLocation.FIELD_DEFINITION, DirectiveLocation.ARGUMENT_DEFINITION, DirectiveLocation.INPUT_FIELD_DEFINITION, DirectiveLocation.ENUM_VALUE],
   args: {
     reason: {
       type: GraphQLString,
@@ -156,7 +157,7 @@ export var GraphQLSpecifiedByDirective = new GraphQLDirective({
   locations: [DirectiveLocation.SCALAR],
   args: {
     url: {
-      type: GraphQLNonNull(GraphQLString),
+      type: new GraphQLNonNull(GraphQLString),
       description: 'The URL that specifies the behaviour of this scalar.'
     }
   }

package/type/index.d.ts

@@ -8,6 +8,7 @@ export {
   // GraphQL Schema definition
   GraphQLSchema,
   GraphQLSchemaConfig,
+  GraphQLSchemaExtensions,
 } from './schema';
 
 export {
@@ -75,28 +76,38 @@ export {
   Thunk,
   GraphQLArgument,
   GraphQLArgumentConfig,
+  GraphQLArgumentExtensions,
   GraphQLEnumTypeConfig,
+  GraphQLEnumTypeExtensions,
   GraphQLEnumValue,
   GraphQLEnumValueConfig,
   GraphQLEnumValueConfigMap,
+  GraphQLEnumValueExtensions,
   GraphQLField,
   GraphQLFieldConfig,
   GraphQLFieldConfigArgumentMap,
   GraphQLFieldConfigMap,
+  GraphQLFieldExtensions,
   GraphQLFieldMap,
   GraphQLFieldResolver,
   GraphQLInputField,
   GraphQLInputFieldConfig,
   GraphQLInputFieldConfigMap,
+  GraphQLInputFieldExtensions,
   GraphQLInputFieldMap,
   GraphQLInputObjectTypeConfig,
+  GraphQLInputObjectTypeExtensions,
   GraphQLInterfaceTypeConfig,
+  GraphQLInterfaceTypeExtensions,
   GraphQLIsTypeOfFn,
   GraphQLObjectTypeConfig,
+  GraphQLObjectTypeExtensions,
   GraphQLResolveInfo,
   GraphQLScalarTypeConfig,
+  GraphQLScalarTypeExtensions,
   GraphQLTypeResolver,
   GraphQLUnionTypeConfig,
+  GraphQLUnionTypeExtensions,
   GraphQLScalarSerializer,
   GraphQLScalarValueParser,
   GraphQLScalarLiteralParser,
@@ -120,6 +131,7 @@ export {
   DEFAULT_DEPRECATION_REASON,
   // type
   GraphQLDirectiveConfig,
+  GraphQLDirectiveExtensions,
 } from './directives';
 
 // Common built-in scalar instances.

package/type/index.js

@@ -496,14 +496,14 @@ Object.defineProperty(exports, "assertValidSchema", {
   }
 });
 
-var _schema = require("./schema");
+var _schema = require("./schema.js");
 
-var _definition = require("./definition");
+var _definition = require("./definition.js");
 
-var _directives = require("./directives");
+var _directives = require("./directives.js");
 
-var _scalars = require("./scalars");
+var _scalars = require("./scalars.js");
 
-var _introspection = require("./introspection");
+var _introspection = require("./introspection.js");
 
-var _validate = require("./validate");
+var _validate = require("./validate.js");

package/type/index.js.flow

@@ -1,5 +1,4 @@
 // @flow strict
-
 export type { Path as ResponsePath } from '../jsutils/Path';
 
 export {

package/type/introspection.js

@@ -6,27 +6,24 @@ Object.defineProperty(exports, "__esModule", {
 exports.isIntrospectionType = isIntrospectionType;
 exports.introspectionTypes = exports.TypeNameMetaFieldDef = exports.TypeMetaFieldDef = exports.SchemaMetaFieldDef = exports.__TypeKind = exports.TypeKind = exports.__EnumValue = exports.__InputValue = exports.__Field = exports.__Type = exports.__DirectiveLocation = exports.__Directive = exports.__Schema = void 0;
 
-var _objectValues = _interopRequireDefault(require("../polyfills/objectValues"));
+var _objectValues = _interopRequireDefault(require("../polyfills/objectValues.js"));
 
-var _inspect = _interopRequireDefault(require("../jsutils/inspect"));
+var _inspect = _interopRequireDefault(require("../jsutils/inspect.js"));
 
-var _invariant = _interopRequireDefault(require("../jsutils/invariant"));
+var _invariant = _interopRequireDefault(require("../jsutils/invariant.js"));
 
-var _printer = require("../language/printer");
+var _printer = require("../language/printer.js");
 
-var _directiveLocation = require("../language/directiveLocation");
+var _directiveLocation = require("../language/directiveLocation.js");
 
-var _astFromValue = require("../utilities/astFromValue");
+var _astFromValue = require("../utilities/astFromValue.js");
 
-var _scalars = require("./scalars");
+var _scalars = require("./scalars.js");
 
-var _definition = require("./definition");
+var _definition = require("./definition.js");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-// FIXME
-
-/* eslint-disable import/no-cycle */
 var __Schema = new _definition.GraphQLObjectType({
   name: '__Schema',
   description: 'A GraphQL Schema defines the capabilities of a GraphQL server. It exposes all available types and directives on the server, as well as the entry points for query, mutation, and subscription operations.',
@@ -40,14 +37,14 @@ var __Schema = new _definition.GraphQLObjectType({
       },
       types: {
         description: 'A list of all types supported by this server.',
-        type: (0, _definition.GraphQLNonNull)((0, _definition.GraphQLList)((0, _definition.GraphQLNonNull)(__Type))),
+        type: new _definition.GraphQLNonNull(new _definition.GraphQLList(new _definition.GraphQLNonNull(__Type))),
         resolve: function resolve(schema) {
           return (0, _objectValues.default)(schema.getTypeMap());
         }
       },
       queryType: {
         description: 'The type that query operations will be rooted at.',
-        type: (0, _definition.GraphQLNonNull)(__Type),
+        type: new _definition.GraphQLNonNull(__Type),
         resolve: function resolve(schema) {
           return schema.getQueryType();
         }
@@ -68,7 +65,7 @@ var __Schema = new _definition.GraphQLObjectType({
       },
       directives: {
         description: 'A list of all directives supported by this server.',
-        type: (0, _definition.GraphQLNonNull)((0, _definition.GraphQLList)((0, _definition.GraphQLNonNull)(__Directive))),
+        type: new _definition.GraphQLNonNull(new _definition.GraphQLList(new _definition.GraphQLNonNull(__Directive))),
         resolve: function resolve(schema) {
           return schema.getDirectives();
         }
@@ -85,7 +82,7 @@ var __Directive = new _definition.GraphQLObjectType({
   fields: function fields() {
     return {
       name: {
-        type: (0, _definition.GraphQLNonNull)(_scalars.GraphQLString),
+        type: new _definition.GraphQLNonNull(_scalars.GraphQLString),
         resolve: function resolve(directive) {
           return directive.name;
         }
@@ -97,19 +94,19 @@ var __Directive = new _definition.GraphQLObjectType({
         }
       },
       isRepeatable: {
-        type: (0, _definition.GraphQLNonNull)(_scalars.GraphQLBoolean),
+        type: new _definition.GraphQLNonNull(_scalars.GraphQLBoolean),
         resolve: function resolve(directive) {
           return directive.isRepeatable;
         }
       },
       locations: {
-        type: (0, _definition.GraphQLNonNull)((0, _definition.GraphQLList)((0, _definition.GraphQLNonNull)(__DirectiveLocation))),
+        type: new _definition.GraphQLNonNull(new _definition.GraphQLList(new _definition.GraphQLNonNull(__DirectiveLocation))),
         resolve: function resolve(directive) {
           return directive.locations;
         }
       },
       args: {
-        type: (0, _definition.GraphQLNonNull)((0, _definition.GraphQLList)((0, _definition.GraphQLNonNull)(__InputValue))),
+        type: new _definition.GraphQLNonNull(new _definition.GraphQLList(new _definition.GraphQLNonNull(__InputValue))),
         resolve: function resolve(directive) {
           return directive.args;
         }
@@ -211,7 +208,7 @@ var __Type = new _definition.GraphQLObjectType({
   fields: function fields() {
     return {
       kind: {
-        type: (0, _definition.GraphQLNonNull)(__TypeKind),
+        type: new _definition.GraphQLNonNull(__TypeKind),
         resolve: function resolve(type) {
           if ((0, _definition.isScalarType)(type)) {
             return TypeKind.SCALAR;
@@ -269,7 +266,7 @@ var __Type = new _definition.GraphQLObjectType({
         }
       },
       fields: {
-        type: (0, _definition.GraphQLList)((0, _definition.GraphQLNonNull)(__Field)),
+        type: new _definition.GraphQLList(new _definition.GraphQLNonNull(__Field)),
         args: {
           includeDeprecated: {
             type: _scalars.GraphQLBoolean,
@@ -281,21 +278,14 @@ var __Type = new _definition.GraphQLObjectType({
 
           if ((0, _definition.isObjectType)(type) || (0, _definition.isInterfaceType)(type)) {
             var fields = (0, _objectValues.default)(type.getFields());
-
-            if (!includeDeprecated) {
-              fields = fields.filter(function (field) {
-                return !field.isDeprecated;
-              });
-            }
-
-            return fields;
+            return includeDeprecated ? fields : fields.filter(function (field) {
+              return field.deprecationReason == null;
+            });
           }
-
-          return null;
         }
       },
       interfaces: {
-        type: (0, _definition.GraphQLList)((0, _definition.GraphQLNonNull)(__Type)),
+        type: new _definition.GraphQLList(new _definition.GraphQLNonNull(__Type)),
         resolve: function resolve(type) {
           if ((0, _definition.isObjectType)(type) || (0, _definition.isInterfaceType)(type)) {
             return type.getInterfaces();
@@ -303,7 +293,7 @@ var __Type = new _definition.GraphQLObjectType({
         }
       },
       possibleTypes: {
-        type: (0, _definition.GraphQLList)((0, _definition.GraphQLNonNull)(__Type)),
+        type: new _definition.GraphQLList(new _definition.GraphQLNonNull(__Type)),
         resolve: function resolve(type, _args, _context, _ref2) {
           var schema = _ref2.schema;
 
@@ -313,7 +303,7 @@ var __Type = new _definition.GraphQLObjectType({
         }
       },
       enumValues: {
-        type: (0, _definition.GraphQLList)((0, _definition.GraphQLNonNull)(__EnumValue)),
+        type: new _definition.GraphQLList(new _definition.GraphQLNonNull(__EnumValue)),
         args: {
           includeDeprecated: {
             type: _scalars.GraphQLBoolean,
@@ -325,22 +315,28 @@ var __Type = new _definition.GraphQLObjectType({
 
           if ((0, _definition.isEnumType)(type)) {
             var values = type.getValues();
-
-            if (!includeDeprecated) {
-              values = values.filter(function (value) {
-                return !value.isDeprecated;
-              });
-            }
-
-            return values;
+            return includeDeprecated ? values : values.filter(function (field) {
+              return field.deprecationReason == null;
+            });
           }
         }
       },
       inputFields: {
-        type: (0, _definition.GraphQLList)((0, _definition.GraphQLNonNull)(__InputValue)),
-        resolve: function resolve(type) {
+        type: new _definition.GraphQLList(new _definition.GraphQLNonNull(__InputValue)),
+        args: {
+          includeDeprecated: {
+            type: _scalars.GraphQLBoolean,
+            defaultValue: false
+          }
+        },
+        resolve: function resolve(type, _ref4) {
+          var includeDeprecated = _ref4.includeDeprecated;
+
           if ((0, _definition.isInputObjectType)(type)) {
-            return (0, _objectValues.default)(type.getFields());
+            var values = (0, _objectValues.default)(type.getFields());
+            return includeDeprecated ? values : values.filter(function (field) {
+              return field.deprecationReason == null;
+            });
           }
         }
       },
@@ -362,7 +358,7 @@ var __Field = new _definition.GraphQLObjectType({
   fields: function fields() {
     return {
       name: {
-        type: (0, _definition.GraphQLNonNull)(_scalars.GraphQLString),
+        type: new _definition.GraphQLNonNull(_scalars.GraphQLString),
         resolve: function resolve(field) {
           return field.name;
         }
@@ -374,21 +370,30 @@ var __Field = new _definition.GraphQLObjectType({
         }
       },
       args: {
-        type: (0, _definition.GraphQLNonNull)((0, _definition.GraphQLList)((0, _definition.GraphQLNonNull)(__InputValue))),
-        resolve: function resolve(field) {
-          return field.args;
+        type: new _definition.GraphQLNonNull(new _definition.GraphQLList(new _definition.GraphQLNonNull(__InputValue))),
+        args: {
+          includeDeprecated: {
+            type: _scalars.GraphQLBoolean,
+            defaultValue: false
+          }
+        },
+        resolve: function resolve(field, _ref5) {
+          var includeDeprecated = _ref5.includeDeprecated;
+          return includeDeprecated ? field.args : field.args.filter(function (arg) {
+            return arg.deprecationReason == null;
+          });
         }
       },
       type: {
-        type: (0, _definition.GraphQLNonNull)(__Type),
+        type: new _definition.GraphQLNonNull(__Type),
         resolve: function resolve(field) {
           return field.type;
         }
       },
       isDeprecated: {
-        type: (0, _definition.GraphQLNonNull)(_scalars.GraphQLBoolean),
+        type: new _definition.GraphQLNonNull(_scalars.GraphQLBoolean),
         resolve: function resolve(field) {
-          return field.isDeprecated;
+          return field.deprecationReason != null;
         }
       },
       deprecationReason: {
@@ -409,7 +414,7 @@ var __InputValue = new _definition.GraphQLObjectType({
   fields: function fields() {
     return {
       name: {
-        type: (0, _definition.GraphQLNonNull)(_scalars.GraphQLString),
+        type: new _definition.GraphQLNonNull(_scalars.GraphQLString),
         resolve: function resolve(inputValue) {
           return inputValue.name;
         }
@@ -421,7 +426,7 @@ var __InputValue = new _definition.GraphQLObjectType({
         }
       },
       type: {
-        type: (0, _definition.GraphQLNonNull)(__Type),
+        type: new _definition.GraphQLNonNull(__Type),
         resolve: function resolve(inputValue) {
           return inputValue.type;
         }
@@ -435,6 +440,18 @@ var __InputValue = new _definition.GraphQLObjectType({
           var valueAST = (0, _astFromValue.astFromValue)(defaultValue, type);
           return valueAST ? (0, _printer.print)(valueAST) : null;
         }
+      },
+      isDeprecated: {
+        type: new _definition.GraphQLNonNull(_scalars.GraphQLBoolean),
+        resolve: function resolve(field) {
+          return field.deprecationReason != null;
+        }
+      },
+      deprecationReason: {
+        type: _scalars.GraphQLString,
+        resolve: function resolve(obj) {
+          return obj.deprecationReason;
+        }
       }
     };
   }
@@ -448,7 +465,7 @@ var __EnumValue = new _definition.GraphQLObjectType({
   fields: function fields() {
     return {
       name: {
-        type: (0, _definition.GraphQLNonNull)(_scalars.GraphQLString),
+        type: new _definition.GraphQLNonNull(_scalars.GraphQLString),
         resolve: function resolve(enumValue) {
           return enumValue.name;
         }
@@ -460,9 +477,9 @@ var __EnumValue = new _definition.GraphQLObjectType({
         }
       },
       isDeprecated: {
-        type: (0, _definition.GraphQLNonNull)(_scalars.GraphQLBoolean),
+        type: new _definition.GraphQLNonNull(_scalars.GraphQLBoolean),
         resolve: function resolve(enumValue) {
-          return enumValue.isDeprecated;
+          return enumValue.deprecationReason != null;
         }
       },
       deprecationReason: {
@@ -535,11 +552,11 @@ var __TypeKind = new _definition.GraphQLEnumType({
 exports.__TypeKind = __TypeKind;
 var SchemaMetaFieldDef = {
   name: '__schema',
-  type: (0, _definition.GraphQLNonNull)(__Schema),
+  type: new _definition.GraphQLNonNull(__Schema),
   description: 'Access the current type schema of this server.',
   args: [],
-  resolve: function resolve(_source, _args, _context, _ref4) {
-    var schema = _ref4.schema;
+  resolve: function resolve(_source, _args, _context, _ref6) {
+    var schema = _ref6.schema;
     return schema;
   },
   isDeprecated: false,
@@ -555,14 +572,15 @@ var TypeMetaFieldDef = {
   args: [{
     name: 'name',
     description: undefined,
-    type: (0, _definition.GraphQLNonNull)(_scalars.GraphQLString),
+    type: new _definition.GraphQLNonNull(_scalars.GraphQLString),
     defaultValue: undefined,
+    deprecationReason: undefined,
     extensions: undefined,
     astNode: undefined
   }],
-  resolve: function resolve(_source, _ref5, _context, _ref6) {
-    var name = _ref5.name;
-    var schema = _ref6.schema;
+  resolve: function resolve(_source, _ref7, _context, _ref8) {
+    var name = _ref7.name;
+    var schema = _ref8.schema;
     return schema.getType(name);
   },
   isDeprecated: false,
@@ -573,11 +591,11 @@ var TypeMetaFieldDef = {
 exports.TypeMetaFieldDef = TypeMetaFieldDef;
 var TypeNameMetaFieldDef = {
   name: '__typename',
-  type: (0, _definition.GraphQLNonNull)(_scalars.GraphQLString),
+  type: new _definition.GraphQLNonNull(_scalars.GraphQLString),
   description: 'The name of the current Object type at runtime.',
   args: [],
-  resolve: function resolve(_source, _args, _context, _ref7) {
-    var parentType = _ref7.parentType;
+  resolve: function resolve(_source, _args, _context, _ref9) {
+    var parentType = _ref9.parentType;
     return parentType.name;
   },
   isDeprecated: false,
@@ -590,8 +608,8 @@ var introspectionTypes = Object.freeze([__Schema, __Directive, __DirectiveLocati
 exports.introspectionTypes = introspectionTypes;
 
 function isIntrospectionType(type) {
-  return introspectionTypes.some(function (_ref8) {
-    var name = _ref8.name;
+  return introspectionTypes.some(function (_ref10) {
+    var name = _ref10.name;
     return type.name === name;
   });
 }