buildSchema lookup for enum value in resolvers

Author: langpavel

src/utilities/buildASTSchema.js

@@ -74,7 +74,8 @@ import {
 } from '../type/schema';
 
 export type TypeFieldResolverMap = ObjMap<
-  ObjMap<GraphQLFieldResolver<mixed, mixed, mixed>>,
+  | ObjMap<GraphQLFieldResolver<mixed, mixed, mixed>> /* type and interface */
+  | ObjMap<any> /* enum */,
 >;
 
 export type BuildSchemaOptions = {
@@ -259,22 +260,14 @@ export class ASTDefinitionBuilder {
     field: FieldDefinitionNode,
     typeName?: string,
   ): GraphQLFieldConfig<mixed, mixed> {
-    const resolve =
-      (typeName &&
-        this._options &&
-        this._options.resolvers &&
-        this._options.resolvers[typeName] &&
-        this._options.resolvers[typeName][field.name.value]) ||
-      undefined;
-
     return {
       // 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.
       type: (this.getWrappedType(field.type): any),
       description: getDescription(field, this._options),
       args: keyByNameNode(field.arguments || [], arg => this.buildArg(arg)),
-      resolve,
+      resolve: this._lookupResolver(typeName, field.name.value),
       deprecationReason: getDeprecationReason(field),
       astNode: field,
     };
@@ -306,8 +299,12 @@ export class ASTDefinitionBuilder {
     };
   }
 
-  buildEnumValue(value: EnumValueDefinitionNode): GraphQLEnumValueConfig {
+  buildEnumValue(
+    value: EnumValueDefinitionNode,
+    typeName?: string,
+  ): GraphQLEnumValueConfig {
     return {
+      value: this._lookupResolver(typeName, value.name.value),
       description: getDescription(value, this._options),
       deprecationReason: getDeprecationReason(value),
       astNode: value,
@@ -389,11 +386,14 @@ export class ASTDefinitionBuilder {
 
   _makeEnumDef(astNode: EnumTypeDefinitionNode) {
     const valueNodes = astNode.values || [];
+    const name = astNode.name.value;
 
     return new GraphQLEnumType({
-      name: astNode.name.value,
+      name,
       description: getDescription(astNode, this._options),
-      values: keyByNameNode(valueNodes, value => this.buildEnumValue(value)),
+      values: keyByNameNode(valueNodes, value =>
+        this.buildEnumValue(value, name),
+      ),
       astNode,
     });
   }
@@ -437,6 +437,17 @@ export class ASTDefinitionBuilder {
       astNode: def,
     });
   }
+
+  _lookupResolver(typeName: ?string, key: string) {
+    return (
+      (typeName &&
+        this._options &&
+        this._options.resolvers &&
+        this._options.resolvers[typeName] &&
+        this._options.resolvers[typeName][key]) ||
+      undefined
+    );
+  }
 }
 
 function keyByNameNode<T: { +name: NameNode, ... }, V>(

src/utilities/extendSchema.js

@@ -314,7 +314,7 @@ export function extendSchema(
         ...keyValMap(
           valueNodes,
           value => value.name.value,
-          value => astBuilder.buildEnumValue(value),
+          value => astBuilder.buildEnumValue(value, config.name),
         ),
       },
       extensionASTNodes: config.extensionASTNodes.concat(extensions),