Check field name validity too

Author: jmandel

src/type/__tests__/validation.js

@@ -296,6 +296,17 @@ describe('Type System: Objects must have fields', () => {
     );
   });
 
+  it('rejects an Object type with incorrectly named fields', () => {
+    expect(
+      () => schemaWithFieldType(new GraphQLObjectType({
+        name: 'SomeObject',
+        fields: { 'bad-name-with-dashes': { type: GraphQLString } }
+      }))
+    ).to.throw(
+      'Names must match /^[_a-zA-Z][_a-zA-Z0-9]*$/ but "bad-name-with-dashes" does not.'
+    );
+  });
+
   it('rejects an Object type with incorrectly typed fields', () => {
     expect(
       () => schemaWithFieldType(new GraphQLObjectType({
@@ -387,7 +398,7 @@ describe('Type System: Fields args must be properly named', () => {
         });
         return new GraphQLSchema({ query: QueryType });
       }).to.throw(
-      'Field arg names must match /^[_a-zA-Z][_a-zA-Z0-9]*$/ but "bad-name-with-dashes" does not.'
+      'Names must match /^[_a-zA-Z][_a-zA-Z0-9]*$/ but "bad-name-with-dashes" does not.'
     );
   });
 

src/type/schema.js

@@ -147,15 +147,12 @@ function typeMapReducer(map: TypeMap, type: ?GraphQLType): TypeMap {
     var fieldMap = type.getFields();
     Object.keys(fieldMap).forEach(fieldName => {
       var field = fieldMap[fieldName];
+      assertValidName(fieldName);
+
       if (field.args) {
         var fieldArgTypes = field.args.map(arg => arg.type);
 
-        field.args.forEach(arg =>
-          invariant(
-            /^[_a-zA-Z][_a-zA-Z0-9]*$/.test(arg.name),
-            `Field arg names must match /^[_a-zA-Z][_a-zA-Z0-9]*$/ ` +
-            `but "${arg.name}" does not.`
-        ));
+        field.args.forEach(arg => assertValidName(arg.name));
 
         reducedMap = fieldArgTypes.reduce(typeMapReducer, reducedMap);
       }
@@ -166,6 +163,13 @@ function typeMapReducer(map: TypeMap, type: ?GraphQLType): TypeMap {
   return reducedMap;
 }
 
+function assertValidName(name: string): void {
+  invariant(
+  /^[_a-zA-Z][_a-zA-Z0-9]*$/.test(name),
+  `Names must match /^[_a-zA-Z][_a-zA-Z0-9]*$/ ` +
+  `but "${name}" does not.`);
+}
+
 function assertObjectImplementsInterface(
   object: GraphQLObjectType,
   iface: GraphQLInterfaceType