Merge branch 'master' of github.com:mickhansen/graphql-sequelize

Author: mickhansen

README.md

@@ -172,6 +172,12 @@ userType = new GraphQLObjectType({
 });
 ```
 
+### ENUM attributes with non-alphanumeric characters
+
+GraphQL enum types [only support ASCII alphanumeric characters and underscores](https://facebook.github.io/graphql/#Name).
+If you have other characters, like a dash (`-`) in your Sequelize enum types,
+they will be converted to camelCase. For example: `foo-bar` becomes `fooBar`.
+
 ### VIRTUAL attributes and GraphQL fields
 
 If you have `Sequelize.VIRTUAL` attributes on your sequelize model, you need to explicitly set the return type and any field dependencies via `new Sequelize.VIRTUAL(returnType, [dependencies ... ])`.

src/typeMapper.js

@@ -32,7 +32,7 @@ export function toGraphQL(sequelizeType, sequelizeTypes) {
   } = sequelizeTypes;
 
   // Regex for finding special characters
-  const specialChars = /[^a-z\d]/i;
+  const specialChars = /[^a-z\d_]/i;
 
   if (sequelizeType instanceof BOOLEAN) return GraphQLBoolean;
   if (sequelizeType instanceof FLOAT) return GraphQLFloat;
@@ -58,16 +58,17 @@ export function toGraphQL(sequelizeType, sequelizeTypes) {
   if (sequelizeType instanceof ENUM) {
     return new GraphQLEnumType({
       values: sequelizeType.values.reduce((obj, value) => {
+        let sanitizedValue = value;
         if (specialChars.test(value)) {
-          value = value.split(specialChars).reduce((reduced, val, idx) => {
+          sanitizedValue = value.split(specialChars).reduce((reduced, val, idx) => {
             let newVal = val;
             if (idx > 0) {
               newVal = `${val[0].toUpperCase()}${val.slice(1)}`;
             }
             return `${reduced}${newVal}`;
           });
         }
-        obj[value] = {value};
+        obj[sanitizedValue] = {value};
         return obj;
       }, {})
     });

test/attributeFields.test.js

@@ -39,7 +39,7 @@ describe('attributeFields', function () {
         type: Sequelize.ENUM('first', 'second')
       },
       enumTwo: {
-        type: Sequelize.ENUM('first', 'second')
+        type: Sequelize.ENUM('foo_bar', 'foo-bar')
       },
       list: {
         type: Sequelize.ARRAY(Sequelize.STRING)
@@ -108,4 +108,20 @@ describe('attributeFields', function () {
     expect(fields.enum.type.name).to.equal(modelName + 'enum' + 'EnumType');
     expect(fields.enumTwo.type.name).to.equal(modelName + 'enumTwo' + 'EnumType');
   });
+
+  it('should support enum values with characters not allowed by GraphQL', function () {
+    var fields = attributeFields(Model);
+
+    expect(fields.enumTwo.type.getValues()).to.not.be.undefined;
+    expect(fields.enumTwo.type.getValues()[1].name).to.equal('fooBar');
+    expect(fields.enumTwo.type.getValues()[1].value).to.equal('foo-bar');
+  });
+
+  it('should support enum values with underscores', function () {
+    var fields = attributeFields(Model);
+
+    expect(fields.enumTwo.type.getValues()).to.not.be.undefined;
+    expect(fields.enumTwo.type.getValues()[0].name).to.equal('foo_bar');
+    expect(fields.enumTwo.type.getValues()[0].value).to.equal('foo_bar');
+  });
 });