Deploy 87c1bc3 to NPM branch

Travis CI · Travis CI · commit 2796e1fbd0c2 · 2018-01-08T20:43:10.000Z
diff --git a/error/GraphQLError.js.flow b/error/GraphQLError.js.flow
@@ -84,7 +84,7 @@ declare class GraphQLError extends Error {
   +originalError: ?Error;
 
   /**
-   * The original error thrown from a field resolver during execution.
+   * Extension fields to add to the formatted error.
    */
   +extensions: ?{ [key: string]: mixed };
 }
diff --git a/module/error/GraphQLError.js.flow b/module/error/GraphQLError.js.flow
@@ -84,7 +84,7 @@ declare class GraphQLError extends Error {
   +originalError: ?Error;
 
   /**
-   * The original error thrown from a field resolver during execution.
+   * Extension fields to add to the formatted error.
    */
   +extensions: ?{ [key: string]: mixed };
 }
diff --git a/module/type/schema.js b/module/type/schema.js
@@ -13,7 +13,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 import { isObjectType, isInterfaceType, isUnionType, isInputObjectType, isWrappingType } from './definition';
 
-import { GraphQLDirective, specifiedDirectives } from './directives';
+import { GraphQLDirective, isDirective, specifiedDirectives } from './directives';
 
 import { __Schema } from './introspection';
 import find from '../jsutils/find';
@@ -88,7 +88,17 @@ export var GraphQLSchema = function () {
       initialTypes = initialTypes.concat(types);
     }
 
-    this._typeMap = initialTypes.reduce(typeMapReducer, Object.create(null));
+    // Keep track of all types referenced within the schema.
+    var typeMap = Object.create(null);
+
+    // First by deeply visiting all initial types.
+    typeMap = initialTypes.reduce(typeMapReducer, typeMap);
+
+    // Then by deeply visiting all directive types.
+    typeMap = this._directives.reduce(typeMapDirectiveReducer, typeMap);
+
+    // Storing the resulting map for reference by the schema.
+    this._typeMap = typeMap;
 
     // Keep track of all implementations by interface name.
     this._implementations = Object.create(null);
@@ -213,4 +223,14 @@ function typeMapReducer(map, type) {
   }
 
   return reducedMap;
+}
+
+function typeMapDirectiveReducer(map, directive) {
+  // Directives are not validated until validateSchema() is called.
+  if (!isDirective(directive)) {
+    return map;
+  }
+  return directive.args.reduce(function (_map, arg) {
+    return typeMapReducer(_map, arg.type);
+  }, map);
 }
diff --git a/module/type/schema.js.flow b/module/type/schema.js.flow
@@ -22,7 +22,11 @@ import type {
   GraphQLInterfaceType,
 } from './definition';
 import type { SchemaDefinitionNode } from '../language/ast';
-import { GraphQLDirective, specifiedDirectives } from './directives';
+import {
+  GraphQLDirective,
+  isDirective,
+  specifiedDirectives,
+} from './directives';
 import type { GraphQLError } from '../error/GraphQLError';
 import { __Schema } from './introspection';
 import find from '../jsutils/find';
@@ -121,10 +125,17 @@ export class GraphQLSchema {
       initialTypes = initialTypes.concat(types);
     }
 
-    this._typeMap = initialTypes.reduce(
-      typeMapReducer,
-      (Object.create(null): TypeMap),
-    );
+    // Keep track of all types referenced within the schema.
+    let typeMap: TypeMap = Object.create(null);
+
+    // First by deeply visiting all initial types.
+    typeMap = initialTypes.reduce(typeMapReducer, typeMap);
+
+    // Then by deeply visiting all directive types.
+    typeMap = this._directives.reduce(typeMapDirectiveReducer, typeMap);
+
+    // Storing the resulting map for reference by the schema.
+    this._typeMap = typeMap;
 
     // Keep track of all implementations by interface name.
     this._implementations = Object.create(null);
@@ -269,3 +280,17 @@ function typeMapReducer(map: TypeMap, type: ?GraphQLType): TypeMap {
 
   return reducedMap;
 }
+
+function typeMapDirectiveReducer(
+  map: TypeMap,
+  directive: ?GraphQLDirective,
+): TypeMap {
+  // Directives are not validated until validateSchema() is called.
+  if (!isDirective(directive)) {
+    return map;
+  }
+  return directive.args.reduce(
+    (_map, arg) => typeMapReducer(_map, arg.type),
+    map,
+  );
+}
diff --git a/type/schema.js b/type/schema.js
@@ -108,7 +108,17 @@ var GraphQLSchema = exports.GraphQLSchema = function () {
       initialTypes = initialTypes.concat(types);
     }
 
-    this._typeMap = initialTypes.reduce(typeMapReducer, Object.create(null));
+    // Keep track of all types referenced within the schema.
+    var typeMap = Object.create(null);
+
+    // First by deeply visiting all initial types.
+    typeMap = initialTypes.reduce(typeMapReducer, typeMap);
+
+    // Then by deeply visiting all directive types.
+    typeMap = this._directives.reduce(typeMapDirectiveReducer, typeMap);
+
+    // Storing the resulting map for reference by the schema.
+    this._typeMap = typeMap;
 
     // Keep track of all implementations by interface name.
     this._implementations = Object.create(null);
@@ -233,4 +243,14 @@ function typeMapReducer(map, type) {
   }
 
   return reducedMap;
+}
+
+function typeMapDirectiveReducer(map, directive) {
+  // Directives are not validated until validateSchema() is called.
+  if (!(0, _directives.isDirective)(directive)) {
+    return map;
+  }
+  return directive.args.reduce(function (_map, arg) {
+    return typeMapReducer(_map, arg.type);
+  }, map);
 }
diff --git a/type/schema.js.flow b/type/schema.js.flow
@@ -22,7 +22,11 @@ import type {
   GraphQLInterfaceType,
 } from './definition';
 import type { SchemaDefinitionNode } from '../language/ast';
-import { GraphQLDirective, specifiedDirectives } from './directives';
+import {
+  GraphQLDirective,
+  isDirective,
+  specifiedDirectives,
+} from './directives';
 import type { GraphQLError } from '../error/GraphQLError';
 import { __Schema } from './introspection';
 import find from '../jsutils/find';
@@ -121,10 +125,17 @@ export class GraphQLSchema {
       initialTypes = initialTypes.concat(types);
     }
 
-    this._typeMap = initialTypes.reduce(
-      typeMapReducer,
-      (Object.create(null): TypeMap),
-    );
+    // Keep track of all types referenced within the schema.
+    let typeMap: TypeMap = Object.create(null);
+
+    // First by deeply visiting all initial types.
+    typeMap = initialTypes.reduce(typeMapReducer, typeMap);
+
+    // Then by deeply visiting all directive types.
+    typeMap = this._directives.reduce(typeMapDirectiveReducer, typeMap);
+
+    // Storing the resulting map for reference by the schema.
+    this._typeMap = typeMap;
 
     // Keep track of all implementations by interface name.
     this._implementations = Object.create(null);
@@ -269,3 +280,17 @@ function typeMapReducer(map: TypeMap, type: ?GraphQLType): TypeMap {
 
   return reducedMap;
 }
+
+function typeMapDirectiveReducer(
+  map: TypeMap,
+  directive: ?GraphQLDirective,
+): TypeMap {
+  // Directives are not validated until validateSchema() is called.
+  if (!isDirective(directive)) {
+    return map;
+  }
+  return directive.args.reduce(
+    (_map, arg) => typeMapReducer(_map, arg.type),
+    map,
+  );
+}

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ declare class GraphQLError extends Error {`
`84`	`84`	`+originalError: ?Error;`
`85`	`85`
`86`	`86`	`/**`
`87`		`- * The original error thrown from a field resolver during execution.`
	`87`	`+ * Extension fields to add to the formatted error.`
`88`	`88`	`*/`
`89`	`89`	`+extensions: ?{ [key: string]: mixed };`
`90`	`90`	`}`