graphql 14.1.1 → 14.3.1

package/type/validate.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -8,9 +8,15 @@
  */
 
 import find from '../polyfills/find';
+import flatMap from '../polyfills/flatMap';
 import objectValues from '../polyfills/objectValues';
 import objectEntries from '../polyfills/objectEntries';
 import {
+  type GraphQLObjectType,
+  type GraphQLInterfaceType,
+  type GraphQLUnionType,
+  type GraphQLEnumType,
+  type GraphQLInputObjectType,
   isObjectType,
   isInterfaceType,
   isUnionType,
@@ -21,26 +27,17 @@ import {
   isOutputType,
   isRequiredArgument,
 } from './definition';
-import type {
-  GraphQLObjectType,
-  GraphQLInterfaceType,
-  GraphQLUnionType,
-  GraphQLEnumType,
-  GraphQLInputObjectType,
-} from './definition';
-import { isDirective } from './directives';
-import type { GraphQLDirective } from './directives';
+import { type GraphQLDirective, isDirective } from './directives';
 import { isIntrospectionType } from './introspection';
-import { assertSchema } from './schema';
-import type { GraphQLSchema } from './schema';
+import { type GraphQLSchema, assertSchema } from './schema';
 import inspect from '../jsutils/inspect';
 import { GraphQLError } from '../error/GraphQLError';
-import type {
-  ASTNode,
-  FieldDefinitionNode,
-  InputValueDefinitionNode,
-  NamedTypeNode,
-  TypeNode,
+import {
+  type ASTNode,
+  type FieldDefinitionNode,
+  type InputValueDefinitionNode,
+  type NamedTypeNode,
+  type TypeNode,
 } from '../language/ast';
 import { isValidNameError } from '../utilities/assertValidName';
 import { isEqualType, isTypeSubTypeOf } from '../utilities/typeComparators';
@@ -100,7 +97,7 @@ class SchemaValidationContext {
     message: string,
     nodes?: $ReadOnlyArray<?ASTNode> | ?ASTNode,
   ): void {
-    const _nodes = (Array.isArray(nodes) ? nodes : [nodes]).filter(Boolean);
+    const _nodes = Array.isArray(nodes) ? nodes.filter(Boolean) : nodes;
     this.addError(new GraphQLError(message, _nodes));
   }
 
@@ -548,16 +545,7 @@ function getAllSubNodes<T: ASTNode, K: ASTNode, L: ASTNode>(
   object: SDLDefinedObject<T, K>,
   getter: (T | K) => ?(L | $ReadOnlyArray<L>),
 ): $ReadOnlyArray<L> {
-  let result = [];
-  for (const astNode of getAllNodes(object)) {
-    if (astNode) {
-      const subNodes = getter(astNode);
-      if (subNodes) {
-        result = result.concat(subNodes);
-      }
-    }
-  }
-  return result;
+  return flatMap(getAllNodes(object), item => getter(item) || []);
 }
 
 function getImplementsInterfaceNode(

package/type/validate.mjs

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -7,6 +7,7 @@
  * 
  */
 import find from '../polyfills/find';
+import flatMap from '../polyfills/flatMap';
 import objectValues from '../polyfills/objectValues';
 import objectEntries from '../polyfills/objectEntries';
 import { isObjectType, isInterfaceType, isUnionType, isEnumType, isInputObjectType, isNamedType, isInputType, isOutputType, isRequiredArgument } from './definition';
@@ -70,7 +71,7 @@ function () {
   var _proto = SchemaValidationContext.prototype;
 
   _proto.reportError = function reportError(message, nodes) {
-    var _nodes = (Array.isArray(nodes) ? nodes : [nodes]).filter(Boolean);
+    var _nodes = Array.isArray(nodes) ? nodes.filter(Boolean) : nodes;
 
     this.addError(new GraphQLError(message, _nodes));
   };
@@ -652,39 +653,9 @@ function getAllNodes(object) {
 }
 
 function getAllSubNodes(object, getter) {
-  var result = [];
-  var _iteratorNormalCompletion14 = true;
-  var _didIteratorError14 = false;
-  var _iteratorError14 = undefined;
-
-  try {
-    for (var _iterator14 = getAllNodes(object)[Symbol.iterator](), _step14; !(_iteratorNormalCompletion14 = (_step14 = _iterator14.next()).done); _iteratorNormalCompletion14 = true) {
-      var astNode = _step14.value;
-
-      if (astNode) {
-        var subNodes = getter(astNode);
-
-        if (subNodes) {
-          result = result.concat(subNodes);
-        }
-      }
-    }
-  } catch (err) {
-    _didIteratorError14 = true;
-    _iteratorError14 = err;
-  } finally {
-    try {
-      if (!_iteratorNormalCompletion14 && _iterator14.return != null) {
-        _iterator14.return();
-      }
-    } finally {
-      if (_didIteratorError14) {
-        throw _iteratorError14;
-      }
-    }
-  }
-
-  return result;
+  return flatMap(getAllNodes(object), function (item) {
+    return getter(item) || [];
+  });
 }
 
 function getImplementsInterfaceNode(type, iface) {
@@ -721,29 +692,29 @@ function getAllFieldArgNodes(type, fieldName, argName) {
   var fieldNode = getFieldNode(type, fieldName);
 
   if (fieldNode && fieldNode.arguments) {
-    var _iteratorNormalCompletion15 = true;
-    var _didIteratorError15 = false;
-    var _iteratorError15 = undefined;
+    var _iteratorNormalCompletion14 = true;
+    var _didIteratorError14 = false;
+    var _iteratorError14 = undefined;
 
     try {
-      for (var _iterator15 = fieldNode.arguments[Symbol.iterator](), _step15; !(_iteratorNormalCompletion15 = (_step15 = _iterator15.next()).done); _iteratorNormalCompletion15 = true) {
-        var node = _step15.value;
+      for (var _iterator14 = fieldNode.arguments[Symbol.iterator](), _step14; !(_iteratorNormalCompletion14 = (_step14 = _iterator14.next()).done); _iteratorNormalCompletion14 = true) {
+        var node = _step14.value;
 
         if (node.name.value === argName) {
           argNodes.push(node);
         }
       }
     } catch (err) {
-      _didIteratorError15 = true;
-      _iteratorError15 = err;
+      _didIteratorError14 = true;
+      _iteratorError14 = err;
     } finally {
       try {
-        if (!_iteratorNormalCompletion15 && _iterator15.return != null) {
-          _iterator15.return();
+        if (!_iteratorNormalCompletion14 && _iterator14.return != null) {
+          _iterator14.return();
         }
       } finally {
-        if (_didIteratorError15) {
-          throw _iteratorError15;
+        if (_didIteratorError14) {
+          throw _iteratorError14;
         }
       }
     }
@@ -776,4 +747,4 @@ function getUnionMemberTypeNodes(union, typeName) {
   }).filter(function (typeNode) {
     return typeNode.name.value === typeName;
   });
-}
+}

package/utilities/TypeInfo.js

@@ -18,7 +18,7 @@ var _typeFromAST = require("./typeFromAST");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -36,7 +36,9 @@ var TypeInfo =
 function () {
   function TypeInfo(schema, // NOTE: this experimental optional second parameter is only needed in order
   // to support non-spec-compliant codebases. You should never need to use it.
+  // It may disappear in the future.
   getFieldDefFn, // Initial type may be provided in rare cases to facilitate traversals
+  // beginning somewhere other than documents.
   initialType) {
     this._schema = schema;
     this._typeStack = [];
@@ -122,128 +124,146 @@ function () {
 
     switch (node.kind) {
       case _kinds.Kind.SELECTION_SET:
-        var namedType = (0, _definition.getNamedType)(this.getType());
+        {
+          var namedType = (0, _definition.getNamedType)(this.getType());
 
-        this._parentTypeStack.push((0, _definition.isCompositeType)(namedType) ? namedType : undefined);
+          this._parentTypeStack.push((0, _definition.isCompositeType)(namedType) ? namedType : undefined);
 
-        break;
+          break;
+        }
 
       case _kinds.Kind.FIELD:
-        var parentType = this.getParentType();
-        var fieldDef;
-        var fieldType;
+        {
+          var parentType = this.getParentType();
+          var fieldDef;
+          var fieldType;
 
-        if (parentType) {
-          fieldDef = this._getFieldDef(schema, parentType, node);
+          if (parentType) {
+            fieldDef = this._getFieldDef(schema, parentType, node);
 
-          if (fieldDef) {
-            fieldType = fieldDef.type;
+            if (fieldDef) {
+              fieldType = fieldDef.type;
+            }
           }
-        }
 
-        this._fieldDefStack.push(fieldDef);
+          this._fieldDefStack.push(fieldDef);
 
-        this._typeStack.push((0, _definition.isOutputType)(fieldType) ? fieldType : undefined);
+          this._typeStack.push((0, _definition.isOutputType)(fieldType) ? fieldType : undefined);
 
-        break;
+          break;
+        }
 
       case _kinds.Kind.DIRECTIVE:
         this._directive = schema.getDirective(node.name.value);
         break;
 
       case _kinds.Kind.OPERATION_DEFINITION:
-        var type;
-
-        if (node.operation === 'query') {
-          type = schema.getQueryType();
-        } else if (node.operation === 'mutation') {
-          type = schema.getMutationType();
-        } else if (node.operation === 'subscription') {
-          type = schema.getSubscriptionType();
-        }
+        {
+          var type;
+
+          if (node.operation === 'query') {
+            type = schema.getQueryType();
+          } else if (node.operation === 'mutation') {
+            type = schema.getMutationType();
+          } else if (node.operation === 'subscription') {
+            type = schema.getSubscriptionType();
+          }
 
-        this._typeStack.push((0, _definition.isObjectType)(type) ? type : undefined);
+          this._typeStack.push((0, _definition.isObjectType)(type) ? type : undefined);
 
-        break;
+          break;
+        }
 
       case _kinds.Kind.INLINE_FRAGMENT:
       case _kinds.Kind.FRAGMENT_DEFINITION:
-        var typeConditionAST = node.typeCondition;
-        var outputType = typeConditionAST ? (0, _typeFromAST.typeFromAST)(schema, typeConditionAST) : (0, _definition.getNamedType)(this.getType());
+        {
+          var typeConditionAST = node.typeCondition;
+          var outputType = typeConditionAST ? (0, _typeFromAST.typeFromAST)(schema, typeConditionAST) : (0, _definition.getNamedType)(this.getType());
 
-        this._typeStack.push((0, _definition.isOutputType)(outputType) ? outputType : undefined);
+          this._typeStack.push((0, _definition.isOutputType)(outputType) ? outputType : undefined);
 
-        break;
+          break;
+        }
 
       case _kinds.Kind.VARIABLE_DEFINITION:
-        var inputType = (0, _typeFromAST.typeFromAST)(schema, node.type);
+        {
+          var inputType = (0, _typeFromAST.typeFromAST)(schema, node.type);
 
-        this._inputTypeStack.push((0, _definition.isInputType)(inputType) ? inputType : undefined);
+          this._inputTypeStack.push((0, _definition.isInputType)(inputType) ? inputType : undefined);
 
-        break;
+          break;
+        }
 
       case _kinds.Kind.ARGUMENT:
-        var argDef;
-        var argType;
-        var fieldOrDirective = this.getDirective() || this.getFieldDef();
-
-        if (fieldOrDirective) {
-          argDef = (0, _find.default)(fieldOrDirective.args, function (arg) {
-            return arg.name === node.name.value;
-          });
-
-          if (argDef) {
-            argType = argDef.type;
+        {
+          var argDef;
+          var argType;
+          var fieldOrDirective = this.getDirective() || this.getFieldDef();
+
+          if (fieldOrDirective) {
+            argDef = (0, _find.default)(fieldOrDirective.args, function (arg) {
+              return arg.name === node.name.value;
+            });
+
+            if (argDef) {
+              argType = argDef.type;
+            }
           }
-        }
 
-        this._argument = argDef;
+          this._argument = argDef;
 
-        this._defaultValueStack.push(argDef ? argDef.defaultValue : undefined);
+          this._defaultValueStack.push(argDef ? argDef.defaultValue : undefined);
 
-        this._inputTypeStack.push((0, _definition.isInputType)(argType) ? argType : undefined);
+          this._inputTypeStack.push((0, _definition.isInputType)(argType) ? argType : undefined);
 
-        break;
+          break;
+        }
 
       case _kinds.Kind.LIST:
-        var listType = (0, _definition.getNullableType)(this.getInputType());
-        var itemType = (0, _definition.isListType)(listType) ? listType.ofType : listType; // List positions never have a default value.
+        {
+          var listType = (0, _definition.getNullableType)(this.getInputType());
+          var itemType = (0, _definition.isListType)(listType) ? listType.ofType : listType; // List positions never have a default value.
 
-        this._defaultValueStack.push(undefined);
+          this._defaultValueStack.push(undefined);
 
-        this._inputTypeStack.push((0, _definition.isInputType)(itemType) ? itemType : undefined);
+          this._inputTypeStack.push((0, _definition.isInputType)(itemType) ? itemType : undefined);
 
-        break;
+          break;
+        }
 
       case _kinds.Kind.OBJECT_FIELD:
-        var objectType = (0, _definition.getNamedType)(this.getInputType());
-        var inputFieldType;
-        var inputField;
+        {
+          var objectType = (0, _definition.getNamedType)(this.getInputType());
+          var inputFieldType;
+          var inputField;
 
-        if ((0, _definition.isInputObjectType)(objectType)) {
-          inputField = objectType.getFields()[node.name.value];
+          if ((0, _definition.isInputObjectType)(objectType)) {
+            inputField = objectType.getFields()[node.name.value];
 
-          if (inputField) {
-            inputFieldType = inputField.type;
+            if (inputField) {
+              inputFieldType = inputField.type;
+            }
           }
-        }
 
-        this._defaultValueStack.push(inputField ? inputField.defaultValue : undefined);
+          this._defaultValueStack.push(inputField ? inputField.defaultValue : undefined);
 
-        this._inputTypeStack.push((0, _definition.isInputType)(inputFieldType) ? inputFieldType : undefined);
+          this._inputTypeStack.push((0, _definition.isInputType)(inputFieldType) ? inputFieldType : undefined);
 
-        break;
+          break;
+        }
 
       case _kinds.Kind.ENUM:
-        var enumType = (0, _definition.getNamedType)(this.getInputType());
-        var enumValue;
+        {
+          var enumType = (0, _definition.getNamedType)(this.getInputType());
+          var enumValue;
 
-        if ((0, _definition.isEnumType)(enumType)) {
-          enumValue = enumType.getValue(node.value);
-        }
+          if ((0, _definition.isEnumType)(enumType)) {
+            enumValue = enumType.getValue(node.value);
+          }
 
-        this._enumValue = enumValue;
-        break;
+          this._enumValue = enumValue;
+          break;
+        }
     }
   };
 
@@ -329,4 +349,4 @@ function getFieldDef(schema, parentType, fieldNode) {
   if ((0, _definition.isObjectType)(parentType) || (0, _definition.isInterfaceType)(parentType)) {
     return parentType.getFields()[name];
   }
-}
+}

package/utilities/TypeInfo.js.flow

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,6 +10,14 @@
 import find from '../polyfills/find';
 import { Kind } from '../language/kinds';
 import {
+  type GraphQLType,
+  type GraphQLInputType,
+  type GraphQLOutputType,
+  type GraphQLCompositeType,
+  type GraphQLField,
+  type GraphQLArgument,
+  type GraphQLInputField,
+  type GraphQLEnumValue,
   isObjectType,
   isInterfaceType,
   isEnumType,
@@ -21,24 +29,14 @@ import {
   getNullableType,
   getNamedType,
 } from '../type/definition';
-import type {
-  GraphQLType,
-  GraphQLInputType,
-  GraphQLOutputType,
-  GraphQLCompositeType,
-  GraphQLField,
-  GraphQLArgument,
-  GraphQLInputField,
-  GraphQLEnumValue,
-} from '../type/definition';
-import type { GraphQLDirective } from '../type/directives';
+import { type GraphQLDirective } from '../type/directives';
 import {
   SchemaMetaFieldDef,
   TypeMetaFieldDef,
   TypeNameMetaFieldDef,
 } from '../type/introspection';
-import type { GraphQLSchema } from '../type/schema';
-import type { ASTNode, FieldNode } from '../language/ast';
+import { type GraphQLSchema } from '../type/schema';
+import { type ASTNode, type FieldNode } from '../language/ast';
 import { typeFromAST } from './typeFromAST';
 
 /**
@@ -146,13 +144,14 @@ export class TypeInfo {
     // checked before continuing since TypeInfo is used as part of validation
     // which occurs before guarantees of schema and document validity.
     switch (node.kind) {
-      case Kind.SELECTION_SET:
+      case Kind.SELECTION_SET: {
         const namedType: mixed = getNamedType(this.getType());
         this._parentTypeStack.push(
           isCompositeType(namedType) ? namedType : undefined,
         );
         break;
-      case Kind.FIELD:
+      }
+      case Kind.FIELD: {
         const parentType = this.getParentType();
         let fieldDef;
         let fieldType: mixed;
@@ -165,10 +164,11 @@ export class TypeInfo {
         this._fieldDefStack.push(fieldDef);
         this._typeStack.push(isOutputType(fieldType) ? fieldType : undefined);
         break;
+      }
       case Kind.DIRECTIVE:
         this._directive = schema.getDirective(node.name.value);
         break;
-      case Kind.OPERATION_DEFINITION:
+      case Kind.OPERATION_DEFINITION: {
         let type: mixed;
         if (node.operation === 'query') {
           type = schema.getQueryType();
@@ -179,21 +179,24 @@ export class TypeInfo {
         }
         this._typeStack.push(isObjectType(type) ? type : undefined);
         break;
+      }
       case Kind.INLINE_FRAGMENT:
-      case Kind.FRAGMENT_DEFINITION:
+      case Kind.FRAGMENT_DEFINITION: {
         const typeConditionAST = node.typeCondition;
         const outputType: mixed = typeConditionAST
           ? typeFromAST(schema, typeConditionAST)
           : getNamedType(this.getType());
         this._typeStack.push(isOutputType(outputType) ? outputType : undefined);
         break;
-      case Kind.VARIABLE_DEFINITION:
+      }
+      case Kind.VARIABLE_DEFINITION: {
         const inputType: mixed = typeFromAST(schema, node.type);
         this._inputTypeStack.push(
           isInputType(inputType) ? inputType : undefined,
         );
         break;
-      case Kind.ARGUMENT:
+      }
+      case Kind.ARGUMENT: {
         let argDef;
         let argType: mixed;
         const fieldOrDirective = this.getDirective() || this.getFieldDef();
@@ -210,7 +213,8 @@ export class TypeInfo {
         this._defaultValueStack.push(argDef ? argDef.defaultValue : undefined);
         this._inputTypeStack.push(isInputType(argType) ? argType : undefined);
         break;
-      case Kind.LIST:
+      }
+      case Kind.LIST: {
         const listType: mixed = getNullableType(this.getInputType());
         const itemType: mixed = isListType(listType)
           ? listType.ofType
@@ -219,7 +223,8 @@ export class TypeInfo {
         this._defaultValueStack.push(undefined);
         this._inputTypeStack.push(isInputType(itemType) ? itemType : undefined);
         break;
-      case Kind.OBJECT_FIELD:
+      }
+      case Kind.OBJECT_FIELD: {
         const objectType: mixed = getNamedType(this.getInputType());
         let inputFieldType: GraphQLInputType | void;
         let inputField: GraphQLInputField | void;
@@ -236,7 +241,8 @@ export class TypeInfo {
           isInputType(inputFieldType) ? inputFieldType : undefined,
         );
         break;
-      case Kind.ENUM:
+      }
+      case Kind.ENUM: {
         const enumType: mixed = getNamedType(this.getInputType());
         let enumValue;
         if (isEnumType(enumType)) {
@@ -244,6 +250,7 @@ export class TypeInfo {
         }
         this._enumValue = enumValue;
         break;
+      }
     }
   }