Update buildEnum.js

Author: migueloller

src/build/__tests__/buildEnum-test.js

@@ -2,41 +2,42 @@ import { GraphQLEnumType } from 'graphql/type';
 import { parse } from 'graphql/language';
 import buildEnum, { buildEnumValueConfigMap } from '../buildEnum';
 
-const generateEnumAST = ({ description, name = 'Enum', values = ['VALUE'] } = {}) => parse(`
+const generateEnumNode = ({ description, name = 'Enum', values = ['VALUE'] } = {}) => parse(`
   # ${description === undefined ? '' : description}
   enum ${name} {
     ${values.join('\n')}
   }
 `).definitions[0];
 const generateEnumValueConfigMap = ({
   name = 'VALUE',
-  value = 'VALUE',
-  description,
+  value,
   deprecationReason,
-} = {}) => ({ [name]: { value, description, deprecationReason } });
+  description,
+} = {}) => (name ? ({ [name]: { value, deprecationReason, description } }) : {});
 
 describe('buildEnumValueConfigMap()', () => {
-  it('should work with minimal AST', () => {
-    expect(buildEnumValueConfigMap(generateEnumAST())).toEqual(generateEnumValueConfigMap());
+  it('builds with minimal AST', () => {
+    expect(buildEnumValueConfigMap(generateEnumNode())).toEqual(generateEnumValueConfigMap());
   });
 
-  it('should work with description in AST', () => {
+  it('builds with description in AST', () => {
     const description = 'Another description.';
-    expect(buildEnumValueConfigMap(generateEnumAST({
+    expect(buildEnumValueConfigMap(generateEnumNode({
       values: [`# ${description}\nVALUE`],
     }))).toEqual(generateEnumValueConfigMap({ description }));
   });
 
-  it('should work with `value` in config map', () => {
-    const value = 'value';
-    expect(buildEnumValueConfigMap(generateEnumAST(), { VALUE: { value } }))
-      .toEqual(generateEnumValueConfigMap({ value }));
+  it('builds with deprecation directive in AST', () => {
+    const deprecationReason = 'A reason.';
+    expect(buildEnumValueConfigMap(generateEnumNode({
+      values: [`VALUE @deprecated(reason: "${deprecationReason}")`],
+    }))).toEqual(generateEnumValueConfigMap({ deprecationReason }));
   });
 
-  it('should work with `deprecationReason` in config map', () => {
-    const deprecationReason = 'A reason.';
-    expect(buildEnumValueConfigMap(generateEnumAST(), { VALUE: { deprecationReason } }))
-      .toEqual(generateEnumValueConfigMap({ deprecationReason }));
+  it('builds with `value` in config map', () => {
+    const value = 'value';
+    expect(buildEnumValueConfigMap(generateEnumNode(), { VALUE: { value } }))
+      .toEqual(generateEnumValueConfigMap({ value }));
   });
 });
 
@@ -47,17 +48,17 @@ describe('buildEnum()', () => {
     description,
   } = {}) => new GraphQLEnumType({ name, values, description });
 
-  it('should work with minimal AST', () => {
-    expect(buildEnum(generateEnumAST())).toEqual(generateEnumType());
+  it('builds with minimal AST', () => {
+    expect(buildEnum(generateEnumNode())).toEqual(generateEnumType());
   });
 
-  it('should work with description in AST', () => {
+  it('builds with description in AST', () => {
     const config = { description: 'A description.' };
-    expect(buildEnum(generateEnumAST(config))).toEqual(generateEnumType(config));
+    expect(buildEnum(generateEnumNode(config))).toEqual(generateEnumType(config));
   });
 
-  it('should work with `values` in config', () => {
+  it('builds with `values` in config', () => {
     const config = { values: { VALUE: { value: 'value' } } };
-    expect(buildEnum(generateEnumAST(), config)).toEqual(generateEnumType(config));
+    expect(buildEnum(generateEnumNode(), config)).toEqual(generateEnumType(config));
   });
 });

src/build/buildEnum.js

@@ -1,25 +1,40 @@
-import { GraphQLEnumType } from 'graphql/type';
-import { getDescription } from 'graphql/utilities/buildASTSchema';
+/* @flow */
 
-export const buildEnumValueConfigMap = (enumAST, configMap = {}) =>
-  enumAST.values.reduce((map, enumValueAST) => {
-    const name = enumValueAST.name.value;
-    const config = configMap[name] || {};
-    // set enum value to it's name by default
-    const value = 'value' in config ? config.value : name;
-    const description = getDescription(enumValueAST);
-    const enumValueConfig = { value };
-    if ('deprecationReason' in config) enumValueConfig.deprecationReason = config.deprecationReason;
-    if (description) enumValueConfig.description = description;
-    return { ...map, [name]: enumValueConfig };
-  }, {});
+import type { EnumTypeDefinitionNode } from 'graphql/language';
+import { GraphQLEnumType } from 'graphql/type';
+import getDeprecationReason from './getDeprecationReason';
+import getDescription from './getDescription';
 
-export default function buildEnum(enumAST, { values } = {}) {
-  const enumTypeConfig = {
-    name: enumAST.name.value,
-    values: buildEnumValueConfigMap(enumAST, values),
+type BuildEnumValueConfigMapConfigMap = {
+  [valueName: string]: {
+    value?: any;
   };
-  const description = getDescription(enumAST);
-  if (description) enumTypeConfig.description = description;
-  return new GraphQLEnumType(enumTypeConfig);
+};
+
+export function buildEnumValueConfigMap(
+  node: EnumTypeDefinitionNode,
+  configMap?: BuildEnumValueConfigMapConfigMap = {},
+) {
+  return node.values.reduce((map, valueNode) => ({
+    ...map,
+    [valueNode.name.value]: {
+      ...configMap[valueNode.name.value],
+      deprecationReason: getDeprecationReason(valueNode.directives),
+      description: getDescription(valueNode),
+    },
+  }), {});
+}
+
+type BuildEnumConfig = {
+  values?: BuildEnumValueConfigMapConfigMap;
+};
+
+export default function buildEnum(node: EnumTypeDefinitionNode, config?: BuildEnumConfig = {}) {
+  const { values, ...rest } = config;
+  return new GraphQLEnumType({
+    ...rest,
+    name: node.name.value,
+    values: buildEnumValueConfigMap(node, values),
+    description: getDescription(node),
+  });
 }