Allow IEnumResolver values to be number type (#568)

* Allow IEnumResolver values to be number type

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ### vNEXT
 
-* ...
+* IEnumResolver value can be a `number` type
 
 ### v2.17.0
 

src/Interfaces.ts

@@ -49,7 +49,7 @@ export type ITypeDefinitions = ITypedef | ITypedef[];
 export type IResolverObject = {
   [key: string]: IFieldResolver<any, any> | IResolverOptions;
 };
-export type IEnumResolver = { [key: string]: string };
+export type IEnumResolver = { [key: string]: string | number };
 export interface IResolvers {
   [key: string]:
     | (() => any)

src/test/testMergeSchemas.ts

@@ -68,12 +68,20 @@ let enumTest = `
     RED
   }
 
+  """
+  A type that uses an Enum with a numeric constant.
+  """
+  enum NumericEnum {
+    TEST
+  }
+
   schema {
     query: Query
   }
 
   type Query {
     color: Color
+    numericEnum: NumericEnum
   }
 `;
 
@@ -157,12 +165,18 @@ if (process.env.GRAPHQL_VERSION === '^0.11') {
       RED
     }
 
+    # A type that uses an Enum with a numeric constant.
+    enum NumericEnum {
+      TEST
+    }
+
     schema {
       query: Query
     }
 
     type Query {
       color: Color
+      numericEnum: NumericEnum
     }
   `;
 
@@ -232,6 +246,9 @@ testCombinations.forEach(async combination => {
             parseValue: value => value,
             parseLiteral: () => null,
           }),
+          NumericEnum: {
+            TEST: 1
+          },
           Color: {
             RED: '#EA3232',
           },
@@ -287,6 +304,9 @@ testCombinations.forEach(async combination => {
             color() {
               return '#EA3232';
             },
+            numericEnum() {
+              return 1;
+            },
             delegateInterfaceTest(parent, args, context, info) {
               return info.mergeInfo.delegate(
                 'query',
@@ -449,10 +469,16 @@ testCombinations.forEach(async combination => {
             Color: {
               RED: '#EA3232',
             },
+            NumericEnum: {
+              TEST: 1
+            },
             Query: {
               color() {
                 return '#EA3232';
               },
+              numericEnum() {
+                return 1;
+              },
             },
           },
         });
@@ -461,6 +487,7 @@ testCombinations.forEach(async combination => {
           `
             query {
               color
+              numericEnum
             }
           `,
         );
@@ -470,13 +497,15 @@ testCombinations.forEach(async combination => {
           `
             query {
               color
+              numericEnum
             }
           `,
         );
 
         expect(enumResult).to.deep.equal({
           data: {
             color: 'RED',
+            numericEnum: 'TEST'
           },
         });
         expect(mergedResult).to.deep.equal(enumResult);
@@ -1556,6 +1585,10 @@ bookingById(id: $b1) {
           'A type that uses an Enum.',
         );
 
+        expect(mergedSchema.getType('NumericEnum').description).to.equal(
+          'A type that uses an Enum with a numeric constant.',
+        );
+
         expect(mergedSchema.getType('LinkType').description).to.equal(
           'A new type linking the Property type.',
         );

src/test/testSchemaGenerator.ts

@@ -890,19 +890,27 @@ describe('generating schema from shorthand', () => {
           RED
         }
 
+        enum NumericEnum {
+          TEST
+        }
+
         schema {
           query: Query
         }
 
         type Query {
           color: Color
+          numericEnum: NumericEnum
         }
       `;
 
       const resolveFunctions = {
         Color: {
           RED: '#EA3232',
         },
+        NumericEnum: {
+          TEST: 1
+        }
       };
 
       const jsSchema = makeExecutableSchema({
@@ -912,6 +920,7 @@ describe('generating schema from shorthand', () => {
 
       expect(jsSchema.getQueryType().name).to.equal('Query');
       expect(jsSchema.getType('Color')).to.be.an.instanceof(GraphQLEnumType);
+      expect(jsSchema.getType('NumericEnum')).to.be.an.instanceof(GraphQLEnumType);
     });
 
     it('supports passing the value for a GraphQLEnumType in resolveFunctions', () => {
@@ -920,27 +929,39 @@ describe('generating schema from shorthand', () => {
           RED
         }
 
+        enum NumericEnum {
+          TEST
+        }
+
         schema {
           query: Query
         }
 
         type Query {
           color: Color
+          numericEnum: NumericEnum
         }
       `;
 
       const testQuery = `{
         color
+        numericEnum
        }`;
 
       const resolveFunctions = {
         Color: {
           RED: '#EA3232',
         },
+        NumericEnum: {
+          TEST: 1,
+        },
         Query: {
           color() {
             return '#EA3232';
           },
+          numericEnum() {
+            return 1;
+          }
         },
       };
 
@@ -952,6 +973,7 @@ describe('generating schema from shorthand', () => {
       const resultPromise = graphql(jsSchema, testQuery);
       return resultPromise.then(result => {
         assert.equal(result.data['color'], 'RED');
+        assert.equal(result.data['numericEnum'], 'TEST');
         assert.equal(result.errors, undefined);
       });
     });