graphql 15.0.0 → 15.1.0

package/utilities/extendSchema.js

@@ -138,17 +138,17 @@ function extendSchemaImpl(schemaConfig, documentAST, options) {
     typeMap[name] = (_stdTypeMap$name = stdTypeMap[name]) !== null && _stdTypeMap$name !== void 0 ? _stdTypeMap$name : buildType(typeNode);
   }
 
-  var operationTypes = _objectSpread({
+  var operationTypes = _objectSpread(_objectSpread({
     // Get the extended root operation types.
     query: schemaConfig.query && replaceNamedType(schemaConfig.query),
     mutation: schemaConfig.mutation && replaceNamedType(schemaConfig.mutation),
     subscription: schemaConfig.subscription && replaceNamedType(schemaConfig.subscription)
-  }, schemaDef && getOperationTypes([schemaDef]), {}, getOperationTypes(schemaExtensions)); // Then produce and return a Schema config with these types.
+  }, schemaDef && getOperationTypes([schemaDef])), getOperationTypes(schemaExtensions)); // Then produce and return a Schema config with these types.
 
 
-  return _objectSpread({
+  return _objectSpread(_objectSpread({
     description: (_schemaDef = schemaDef) === null || _schemaDef === void 0 ? void 0 : (_schemaDef$descriptio = _schemaDef.description) === null || _schemaDef$descriptio === void 0 ? void 0 : _schemaDef$descriptio.value
-  }, operationTypes, {
+  }, operationTypes), {}, {
     types: (0, _objectValues.default)(typeMap),
     directives: [].concat(schemaConfig.directives.map(replaceDirective), directiveDefs.map(buildDirective)),
     extensions: undefined,
@@ -177,7 +177,7 @@ function extendSchemaImpl(schemaConfig, documentAST, options) {
 
   function replaceDirective(directive) {
     var config = directive.toConfig();
-    return new _directives.GraphQLDirective(_objectSpread({}, config, {
+    return new _directives.GraphQLDirective(_objectSpread(_objectSpread({}, config), {}, {
       args: (0, _mapValue.default)(config.args, extendArg)
     }));
   }
@@ -206,16 +206,15 @@ function extendSchemaImpl(schemaConfig, documentAST, options) {
 
     if ((0, _definition.isEnumType)(type)) {
       return extendEnumType(type);
-    }
+    } // istanbul ignore else (See: 'https://github.com/graphql/graphql-js/issues/2618')
+
 
-    /* istanbul ignore else */
     if ((0, _definition.isInputObjectType)(type)) {
       return extendInputObjectType(type);
-    } // Not reachable. All possible types have been considered.
+    } // istanbul ignore next (Not reachable. All possible types have been considered)
 
 
-    /* istanbul ignore next */
-    (0, _invariant.default)(false, 'Unexpected type: ' + (0, _inspect.default)(type));
+    false || (0, _invariant.default)(0, 'Unexpected type: ' + (0, _inspect.default)(type));
   }
 
   function extendInputObjectType(type) {
@@ -223,13 +222,13 @@ function extendSchemaImpl(schemaConfig, documentAST, options) {
 
     var config = type.toConfig();
     var extensions = (_typeExtensionsMap$co = typeExtensionsMap[config.name]) !== null && _typeExtensionsMap$co !== void 0 ? _typeExtensionsMap$co : [];
-    return new _definition.GraphQLInputObjectType(_objectSpread({}, config, {
+    return new _definition.GraphQLInputObjectType(_objectSpread(_objectSpread({}, config), {}, {
       fields: function fields() {
-        return _objectSpread({}, (0, _mapValue.default)(config.fields, function (field) {
-          return _objectSpread({}, field, {
+        return _objectSpread(_objectSpread({}, (0, _mapValue.default)(config.fields, function (field) {
+          return _objectSpread(_objectSpread({}, field), {}, {
             type: replaceType(field.type)
           });
-        }), {}, buildInputFieldMap(extensions));
+        })), buildInputFieldMap(extensions));
       },
       extensionASTNodes: config.extensionASTNodes.concat(extensions)
     }));
@@ -240,8 +239,8 @@ function extendSchemaImpl(schemaConfig, documentAST, options) {
 
     var config = type.toConfig();
     var extensions = (_typeExtensionsMap$ty = typeExtensionsMap[type.name]) !== null && _typeExtensionsMap$ty !== void 0 ? _typeExtensionsMap$ty : [];
-    return new _definition.GraphQLEnumType(_objectSpread({}, config, {
-      values: _objectSpread({}, config.values, {}, buildEnumValueMap(extensions)),
+    return new _definition.GraphQLEnumType(_objectSpread(_objectSpread({}, config), {}, {
+      values: _objectSpread(_objectSpread({}, config.values), buildEnumValueMap(extensions)),
       extensionASTNodes: config.extensionASTNodes.concat(extensions)
     }));
   }
@@ -251,7 +250,17 @@ function extendSchemaImpl(schemaConfig, documentAST, options) {
 
     var config = type.toConfig();
     var extensions = (_typeExtensionsMap$co2 = typeExtensionsMap[config.name]) !== null && _typeExtensionsMap$co2 !== void 0 ? _typeExtensionsMap$co2 : [];
-    return new _definition.GraphQLScalarType(_objectSpread({}, config, {
+    var specifiedByUrl = config.specifiedByUrl;
+
+    for (var _i8 = 0; _i8 < extensions.length; _i8++) {
+      var _getSpecifiedByUrl;
+
+      var extensionNode = extensions[_i8];
+      specifiedByUrl = (_getSpecifiedByUrl = getSpecifiedByUrl(extensionNode)) !== null && _getSpecifiedByUrl !== void 0 ? _getSpecifiedByUrl : specifiedByUrl;
+    }
+
+    return new _definition.GraphQLScalarType(_objectSpread(_objectSpread({}, config), {}, {
+      specifiedByUrl: specifiedByUrl,
       extensionASTNodes: config.extensionASTNodes.concat(extensions)
     }));
   }
@@ -261,12 +270,12 @@ function extendSchemaImpl(schemaConfig, documentAST, options) {
 
     var config = type.toConfig();
     var extensions = (_typeExtensionsMap$co3 = typeExtensionsMap[config.name]) !== null && _typeExtensionsMap$co3 !== void 0 ? _typeExtensionsMap$co3 : [];
-    return new _definition.GraphQLObjectType(_objectSpread({}, config, {
+    return new _definition.GraphQLObjectType(_objectSpread(_objectSpread({}, config), {}, {
       interfaces: function interfaces() {
         return [].concat(type.getInterfaces().map(replaceNamedType), buildInterfaces(extensions));
       },
       fields: function fields() {
-        return _objectSpread({}, (0, _mapValue.default)(config.fields, extendField), {}, buildFieldMap(extensions));
+        return _objectSpread(_objectSpread({}, (0, _mapValue.default)(config.fields, extendField)), buildFieldMap(extensions));
       },
       extensionASTNodes: config.extensionASTNodes.concat(extensions)
     }));
@@ -277,12 +286,12 @@ function extendSchemaImpl(schemaConfig, documentAST, options) {
 
     var config = type.toConfig();
     var extensions = (_typeExtensionsMap$co4 = typeExtensionsMap[config.name]) !== null && _typeExtensionsMap$co4 !== void 0 ? _typeExtensionsMap$co4 : [];
-    return new _definition.GraphQLInterfaceType(_objectSpread({}, config, {
+    return new _definition.GraphQLInterfaceType(_objectSpread(_objectSpread({}, config), {}, {
       interfaces: function interfaces() {
         return [].concat(type.getInterfaces().map(replaceNamedType), buildInterfaces(extensions));
       },
       fields: function fields() {
-        return _objectSpread({}, (0, _mapValue.default)(config.fields, extendField), {}, buildFieldMap(extensions));
+        return _objectSpread(_objectSpread({}, (0, _mapValue.default)(config.fields, extendField)), buildFieldMap(extensions));
       },
       extensionASTNodes: config.extensionASTNodes.concat(extensions)
     }));
@@ -293,7 +302,7 @@ function extendSchemaImpl(schemaConfig, documentAST, options) {
 
     var config = type.toConfig();
     var extensions = (_typeExtensionsMap$co5 = typeExtensionsMap[config.name]) !== null && _typeExtensionsMap$co5 !== void 0 ? _typeExtensionsMap$co5 : [];
-    return new _definition.GraphQLUnionType(_objectSpread({}, config, {
+    return new _definition.GraphQLUnionType(_objectSpread(_objectSpread({}, config), {}, {
       types: function types() {
         return [].concat(type.getTypes().map(replaceNamedType), buildUnionTypes(extensions));
       },
@@ -302,14 +311,14 @@ function extendSchemaImpl(schemaConfig, documentAST, options) {
   }
 
   function extendField(field) {
-    return _objectSpread({}, field, {
+    return _objectSpread(_objectSpread({}, field), {}, {
       type: replaceType(field.type),
       args: (0, _mapValue.default)(field.args, extendArg)
     });
   }
 
   function extendArg(arg) {
-    return _objectSpread({}, arg, {
+    return _objectSpread(_objectSpread({}, arg), {}, {
       type: replaceType(arg.type)
     });
   }
@@ -317,16 +326,15 @@ function extendSchemaImpl(schemaConfig, documentAST, options) {
   function getOperationTypes(nodes) {
     var opTypes = {};
 
-    for (var _i8 = 0; _i8 < nodes.length; _i8++) {
+    for (var _i10 = 0; _i10 < nodes.length; _i10++) {
       var _node$operationTypes;
 
-      var node = nodes[_i8];
-
-      /* istanbul ignore next (See https://github.com/graphql/graphql-js/issues/2203) */
+      var node = nodes[_i10];
+      // istanbul ignore next (See: 'https://github.com/graphql/graphql-js/issues/2203')
       var operationTypesNodes = (_node$operationTypes = node.operationTypes) !== null && _node$operationTypes !== void 0 ? _node$operationTypes : [];
 
-      for (var _i10 = 0; _i10 < operationTypesNodes.length; _i10++) {
-        var operationType = operationTypesNodes[_i10];
+      for (var _i12 = 0; _i12 < operationTypesNodes.length; _i12++) {
+        var operationType = operationTypesNodes[_i12];
         opTypes[operationType.operation] = getNamedType(operationType.type);
       }
     } // Note: While this could make early assertions to get the correctly
@@ -380,16 +388,15 @@ function extendSchemaImpl(schemaConfig, documentAST, options) {
   function buildFieldMap(nodes) {
     var fieldConfigMap = Object.create(null);
 
-    for (var _i12 = 0; _i12 < nodes.length; _i12++) {
+    for (var _i14 = 0; _i14 < nodes.length; _i14++) {
       var _node$fields;
 
-      var node = nodes[_i12];
-
-      /* istanbul ignore next (See https://github.com/graphql/graphql-js/issues/2203) */
+      var node = nodes[_i14];
+      // istanbul ignore next (See: 'https://github.com/graphql/graphql-js/issues/2203')
       var nodeFields = (_node$fields = node.fields) !== null && _node$fields !== void 0 ? _node$fields : [];
 
-      for (var _i14 = 0; _i14 < nodeFields.length; _i14++) {
-        var field = nodeFields[_i14];
+      for (var _i16 = 0; _i16 < nodeFields.length; _i16++) {
+        var field = nodeFields[_i16];
         fieldConfigMap[field.name.value] = {
           // Note: While this could make assertions to get the correctly typed
           // value, that would throw immediately while type system validation
@@ -407,12 +414,12 @@ function extendSchemaImpl(schemaConfig, documentAST, options) {
   }
 
   function buildArgumentMap(args) {
-    /* istanbul ignore next (See https://github.com/graphql/graphql-js/issues/2203) */
+    // istanbul ignore next (See: 'https://github.com/graphql/graphql-js/issues/2203')
     var argsNodes = args !== null && args !== void 0 ? args : [];
     var argConfigMap = Object.create(null);
 
-    for (var _i16 = 0; _i16 < argsNodes.length; _i16++) {
-      var arg = argsNodes[_i16];
+    for (var _i18 = 0; _i18 < argsNodes.length; _i18++) {
+      var arg = argsNodes[_i18];
       // Note: While this could make assertions to get the correctly typed
       // value, that would throw immediately while type system validation
       // with validateSchema() will produce more actionable results.
@@ -431,16 +438,15 @@ function extendSchemaImpl(schemaConfig, documentAST, options) {
   function buildInputFieldMap(nodes) {
     var inputFieldMap = Object.create(null);
 
-    for (var _i18 = 0; _i18 < nodes.length; _i18++) {
+    for (var _i20 = 0; _i20 < nodes.length; _i20++) {
       var _node$fields2;
 
-      var node = nodes[_i18];
-
-      /* istanbul ignore next (See https://github.com/graphql/graphql-js/issues/2203) */
+      var node = nodes[_i20];
+      // istanbul ignore next (See: 'https://github.com/graphql/graphql-js/issues/2203')
       var fieldsNodes = (_node$fields2 = node.fields) !== null && _node$fields2 !== void 0 ? _node$fields2 : [];
 
-      for (var _i20 = 0; _i20 < fieldsNodes.length; _i20++) {
-        var field = fieldsNodes[_i20];
+      for (var _i22 = 0; _i22 < fieldsNodes.length; _i22++) {
+        var field = fieldsNodes[_i22];
         // Note: While this could make assertions to get the correctly typed
         // value, that would throw immediately while type system validation
         // with validateSchema() will produce more actionable results.
@@ -460,16 +466,15 @@ function extendSchemaImpl(schemaConfig, documentAST, options) {
   function buildEnumValueMap(nodes) {
     var enumValueMap = Object.create(null);
 
-    for (var _i22 = 0; _i22 < nodes.length; _i22++) {
+    for (var _i24 = 0; _i24 < nodes.length; _i24++) {
       var _node$values;
 
-      var node = nodes[_i22];
-
-      /* istanbul ignore next (See https://github.com/graphql/graphql-js/issues/2203) */
+      var node = nodes[_i24];
+      // istanbul ignore next (See: 'https://github.com/graphql/graphql-js/issues/2203')
       var valuesNodes = (_node$values = node.values) !== null && _node$values !== void 0 ? _node$values : [];
 
-      for (var _i24 = 0; _i24 < valuesNodes.length; _i24++) {
-        var value = valuesNodes[_i24];
+      for (var _i26 = 0; _i26 < valuesNodes.length; _i26++) {
+        var value = valuesNodes[_i26];
         enumValueMap[value.name.value] = {
           description: getDescription(value, options),
           deprecationReason: getDeprecationReason(value),
@@ -484,16 +489,15 @@ function extendSchemaImpl(schemaConfig, documentAST, options) {
   function buildInterfaces(nodes) {
     var interfaces = [];
 
-    for (var _i26 = 0; _i26 < nodes.length; _i26++) {
+    for (var _i28 = 0; _i28 < nodes.length; _i28++) {
       var _node$interfaces;
 
-      var node = nodes[_i26];
-
-      /* istanbul ignore next (See https://github.com/graphql/graphql-js/issues/2203) */
+      var node = nodes[_i28];
+      // istanbul ignore next (See: 'https://github.com/graphql/graphql-js/issues/2203')
       var interfacesNodes = (_node$interfaces = node.interfaces) !== null && _node$interfaces !== void 0 ? _node$interfaces : [];
 
-      for (var _i28 = 0; _i28 < interfacesNodes.length; _i28++) {
-        var type = interfacesNodes[_i28];
+      for (var _i30 = 0; _i30 < interfacesNodes.length; _i30++) {
+        var type = interfacesNodes[_i30];
         // Note: While this could make assertions to get the correctly typed
         // values below, that would throw immediately while type system
         // validation with validateSchema() will produce more actionable
@@ -508,16 +512,15 @@ function extendSchemaImpl(schemaConfig, documentAST, options) {
   function buildUnionTypes(nodes) {
     var types = [];
 
-    for (var _i30 = 0; _i30 < nodes.length; _i30++) {
+    for (var _i32 = 0; _i32 < nodes.length; _i32++) {
       var _node$types;
 
-      var node = nodes[_i30];
-
-      /* istanbul ignore next (See https://github.com/graphql/graphql-js/issues/2203) */
+      var node = nodes[_i32];
+      // istanbul ignore next (See: 'https://github.com/graphql/graphql-js/issues/2203')
       var typeNodes = (_node$types = node.types) !== null && _node$types !== void 0 ? _node$types : [];
 
-      for (var _i32 = 0; _i32 < typeNodes.length; _i32++) {
-        var type = typeNodes[_i32];
+      for (var _i34 = 0; _i34 < typeNodes.length; _i34++) {
+        var type = typeNodes[_i34];
         // Note: While this could make assertions to get the correctly typed
         // values below, that would throw immediately while type system
         // validation with validateSchema() will produce more actionable
@@ -613,6 +616,7 @@ function extendSchemaImpl(schemaConfig, documentAST, options) {
           return new _definition.GraphQLScalarType({
             name: name,
             description: description,
+            specifiedByUrl: getSpecifiedByUrl(astNode),
             astNode: astNode,
             extensionASTNodes: _extensionASTNodes4
           });
@@ -634,11 +638,10 @@ function extendSchemaImpl(schemaConfig, documentAST, options) {
             extensionASTNodes: _extensionASTNodes5
           });
         }
-    } // Not reachable. All possible type definition nodes have been considered.
+    } // istanbul ignore next (Not reachable. All possible type definition nodes have been considered)
 
 
-    /* istanbul ignore next */
-    (0, _invariant.default)(false, 'Unexpected type definition node: ' + (0, _inspect.default)(astNode));
+    false || (0, _invariant.default)(0, 'Unexpected type definition node: ' + (0, _inspect.default)(astNode));
   }
 }
 
@@ -654,6 +657,15 @@ function getDeprecationReason(node) {
   var deprecated = (0, _values.getDirectiveValues)(_directives.GraphQLDeprecatedDirective, node);
   return deprecated === null || deprecated === void 0 ? void 0 : deprecated.reason;
 }
+/**
+ * Given a scalar node, returns the string value for the specifiedByUrl.
+ */
+
+
+function getSpecifiedByUrl(node) {
+  var specifiedBy = (0, _values.getDirectiveValues)(_directives.GraphQLSpecifiedByDirective, node);
+  return specifiedBy === null || specifiedBy === void 0 ? void 0 : specifiedBy.url;
+}
 /**
  * Given an ast node, returns its string description.
  * @deprecated: provided to ease adoption and will be removed in v16.

package/utilities/extendSchema.js.flow

@@ -39,6 +39,8 @@ import {
   type EnumTypeExtensionNode,
   type EnumValueDefinitionNode,
   type DirectiveDefinitionNode,
+  type ScalarTypeDefinitionNode,
+  type ScalarTypeExtensionNode,
 } from '../language/ast';
 
 import { assertValidSDLExtension } from '../validation/validate';
@@ -50,6 +52,7 @@ import { introspectionTypes, isIntrospectionType } from '../type/introspection';
 import {
   GraphQLDirective,
   GraphQLDeprecatedDirective,
+  GraphQLSpecifiedByDirective,
 } from '../type/directives';
 import {
   type GraphQLSchemaValidationOptions,
@@ -279,11 +282,12 @@ export function extendSchemaImpl(
     if (isEnumType(type)) {
       return extendEnumType(type);
     }
+    // istanbul ignore else (See: 'https://github.com/graphql/graphql-js/issues/2618')
     if (isInputObjectType(type)) {
       return extendInputObjectType(type);
     }
 
-    // Not reachable. All possible types have been considered.
+    // istanbul ignore next (Not reachable. All possible types have been considered)
     invariant(false, 'Unexpected type: ' + inspect((type: empty)));
   }
 
@@ -324,8 +328,14 @@ export function extendSchemaImpl(
     const config = type.toConfig();
     const extensions = typeExtensionsMap[config.name] ?? [];
 
+    let specifiedByUrl = config.specifiedByUrl;
+    for (const extensionNode of extensions) {
+      specifiedByUrl = getSpecifiedByUrl(extensionNode) ?? specifiedByUrl;
+    }
+
     return new GraphQLScalarType({
       ...config,
+      specifiedByUrl,
       extensionASTNodes: config.extensionASTNodes.concat(extensions),
     });
   }
@@ -406,7 +416,7 @@ export function extendSchemaImpl(
   |} {
     const opTypes = {};
     for (const node of nodes) {
-      /* istanbul ignore next (See https://github.com/graphql/graphql-js/issues/2203) */
+      // istanbul ignore next (See: 'https://github.com/graphql/graphql-js/issues/2203')
       const operationTypesNodes = node.operationTypes ?? [];
 
       for (const operationType of operationTypesNodes) {
@@ -465,7 +475,7 @@ export function extendSchemaImpl(
   ): GraphQLFieldConfigMap<mixed, mixed> {
     const fieldConfigMap = Object.create(null);
     for (const node of nodes) {
-      /* istanbul ignore next (See https://github.com/graphql/graphql-js/issues/2203) */
+      // istanbul ignore next (See: 'https://github.com/graphql/graphql-js/issues/2203')
       const nodeFields = node.fields ?? [];
 
       for (const field of nodeFields) {
@@ -487,7 +497,7 @@ export function extendSchemaImpl(
   function buildArgumentMap(
     args: ?$ReadOnlyArray<InputValueDefinitionNode>,
   ): GraphQLFieldConfigArgumentMap {
-    /* istanbul ignore next (See https://github.com/graphql/graphql-js/issues/2203) */
+    // istanbul ignore next (See: 'https://github.com/graphql/graphql-js/issues/2203')
     const argsNodes = args ?? [];
 
     const argConfigMap = Object.create(null);
@@ -514,7 +524,7 @@ export function extendSchemaImpl(
   ): GraphQLInputFieldConfigMap {
     const inputFieldMap = Object.create(null);
     for (const node of nodes) {
-      /* istanbul ignore next (See https://github.com/graphql/graphql-js/issues/2203) */
+      // istanbul ignore next (See: 'https://github.com/graphql/graphql-js/issues/2203')
       const fieldsNodes = node.fields ?? [];
 
       for (const field of fieldsNodes) {
@@ -539,7 +549,7 @@ export function extendSchemaImpl(
   ): GraphQLEnumValueConfigMap {
     const enumValueMap = Object.create(null);
     for (const node of nodes) {
-      /* istanbul ignore next (See https://github.com/graphql/graphql-js/issues/2203) */
+      // istanbul ignore next (See: 'https://github.com/graphql/graphql-js/issues/2203')
       const valuesNodes = node.values ?? [];
 
       for (const value of valuesNodes) {
@@ -563,7 +573,7 @@ export function extendSchemaImpl(
   ): Array<GraphQLInterfaceType> {
     const interfaces = [];
     for (const node of nodes) {
-      /* istanbul ignore next (See https://github.com/graphql/graphql-js/issues/2203) */
+      // istanbul ignore next (See: 'https://github.com/graphql/graphql-js/issues/2203')
       const interfacesNodes = node.interfaces ?? [];
 
       for (const type of interfacesNodes) {
@@ -582,7 +592,7 @@ export function extendSchemaImpl(
   ): Array<GraphQLObjectType> {
     const types = [];
     for (const node of nodes) {
-      /* istanbul ignore next (See https://github.com/graphql/graphql-js/issues/2203) */
+      // istanbul ignore next (See: 'https://github.com/graphql/graphql-js/issues/2203')
       const typeNodes = node.types ?? [];
 
       for (const type of typeNodes) {
@@ -658,6 +668,7 @@ export function extendSchemaImpl(
         return new GraphQLScalarType({
           name,
           description,
+          specifiedByUrl: getSpecifiedByUrl(astNode),
           astNode,
           extensionASTNodes,
         });
@@ -676,7 +687,7 @@ export function extendSchemaImpl(
       }
     }
 
-    // Not reachable. All possible type definition nodes have been considered.
+    // istanbul ignore next (Not reachable. All possible type definition nodes have been considered)
     invariant(
       false,
       'Unexpected type definition node: ' + inspect((astNode: empty)),
@@ -700,6 +711,16 @@ function getDeprecationReason(
   return (deprecated?.reason: any);
 }
 
+/**
+ * Given a scalar node, returns the string value for the specifiedByUrl.
+ */
+function getSpecifiedByUrl(
+  node: ScalarTypeDefinitionNode | ScalarTypeExtensionNode,
+): ?string {
+  const specifiedBy = getDirectiveValues(GraphQLSpecifiedByDirective, node);
+  return (specifiedBy?.url: any);
+}
+
 /**
  * Given an ast node, returns its string description.
  * @deprecated: provided to ease adoption and will be removed in v16.