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

Author: leebyron

.eslintrc

@@ -1,6 +1,10 @@
 {
   "parser": "babel-eslint",
 
+  "plugins": [
+    "babel"
+  ],
+
   "env": {
     "es6": true,
     "node": true
@@ -34,8 +38,9 @@
   },
 
   "rules": {
+    "babel/arrow-parens": [2, "as-needed"],
+
     "array-bracket-spacing": [2, "always"],
-    "arrow-parens": [0, "as-needed"],
     "arrow-spacing": 2,
     "block-scoped-var": 0,
     "brace-style": [2, "1tbs", {"allowSingleLine": true}],

package.json

@@ -43,12 +43,13 @@
   "devDependencies": {
     "babel": "5.8.21",
     "babel-core": "5.8.22",
-    "babel-eslint": "4.0.5",
+    "babel-eslint": "4.0.10",
     "bluebird": "2.9.34",
     "chai": "3.2.0",
     "chai-subset": "1.0.1",
     "coveralls": "2.11.3",
     "eslint": "1.1.0",
+    "eslint-plugin-babel": "^2.1.1",
     "flow-bin": "0.14.0",
     "isparta": "3.0.3",
     "minimist": "1.1.3",

src/__tests__/starWarsSchema.js

@@ -126,7 +126,7 @@ var characterInterface = new GraphQLInterfaceType({
       description: 'Which movies they appear in.',
     },
   }),
-  resolveType: (character) => {
+  resolveType: character => {
     return getHuman(character.id) ? humanType : droidType;
   }
 });
@@ -158,7 +158,7 @@ var humanType = new GraphQLObjectType({
       type: new GraphQLList(characterInterface),
       description: 'The friends of the human, or an empty list if they ' +
                    'have none.',
-      resolve: (human) => getFriends(human),
+      resolve: human => getFriends(human),
     },
     appearsIn: {
       type: new GraphQLList(episodeEnum),
@@ -200,7 +200,7 @@ var droidType = new GraphQLObjectType({
       type: new GraphQLList(characterInterface),
       description: 'The friends of the droid, or an empty list if they ' +
                    'have none.',
-      resolve: (droid) => getFriends(droid),
+      resolve: droid => getFriends(droid),
     },
     appearsIn: {
       type: new GraphQLList(episodeEnum),

src/execution/__tests__/nonnull.js

@@ -51,14 +51,14 @@ var throwingData = {
   },
   promiseNest() {
     return new Promise(
-      (resolve) => {
+      resolve => {
         resolve(throwingData);
       }
     );
   },
   nonNullPromiseNest() {
     return new Promise(
-      (resolve) => {
+      resolve => {
         resolve(throwingData);
       }
     );
@@ -70,14 +70,14 @@ var nullingData = {
   nonNullSync() { return null; },
   promise() {
     return new Promise(
-      (resolve) => {
+      resolve => {
         resolve(null);
       }
     );
   },
   nonNullPromise() {
     return new Promise(
-      (resolve) => {
+      resolve => {
         resolve(null);
       }
     );
@@ -90,14 +90,14 @@ var nullingData = {
   },
   promiseNest() {
     return new Promise(
-      (resolve) => {
+      resolve => {
         resolve(nullingData);
       }
     );
   },
   nonNullPromiseNest() {
     return new Promise(
-      (resolve) => {
+      resolve => {
         resolve(nullingData);
       }
     );

src/execution/execute.js

@@ -250,7 +250,7 @@ function executeFieldsSerially(
   fields: {[key: string]: Array<Field>}
 ): Promise<Object> {
   return Object.keys(fields).reduce(
-    (prevPromise, responseName) => prevPromise.then((results) => {
+    (prevPromise, responseName) => prevPromise.then(results => {
       var fieldASTs = fields[responseName];
       var result = resolveField(exeContext, parentType, sourceValue, fieldASTs);
       if (result === undefined) {

src/language/__tests__/parser.js

@@ -149,7 +149,7 @@ fragment MissingOn Type
       'true',
       'false'
     ];
-    nonKeywords.forEach((keyword) => {
+    nonKeywords.forEach(keyword => {
       let fragmentName = keyword;
       // You can't define or reference a fragment named `on`.
       if (keyword === 'on') {

src/type/__tests__/definition.js

@@ -302,7 +302,7 @@ describe('Type System: Example', () => {
       EnumType,
       InputObjectType
     ];
-    badUnionTypes.forEach((x) => {
+    badUnionTypes.forEach(x => {
       expect(() =>
         new GraphQLUnionType({ name: 'BadUnion', types: [ x ] })
       ).to.throw(

src/type/definition.js

@@ -595,7 +595,7 @@ export type GraphQLInterfaceTypeConfig = {
   fields: GraphQLFieldConfigMapThunk | GraphQLFieldConfigMap,
   /**
    * Optionally provide a custom type resolver function. If one is not provided,
-   * the default implemenation will call `isTypeOf` on each implementing
+   * the default implementation will call `isTypeOf` on each implementing
    * Object type.
    */
   resolveType?: (value: any, info?: GraphQLResolveInfo) => ?GraphQLObjectType,
@@ -701,7 +701,7 @@ export type GraphQLUnionTypeConfig = {
   types: Array<GraphQLObjectType>,
   /**
    * Optionally provide a custom type resolver function. If one is not provided,
-   * the default implemenation will call `isTypeOf` on each implementing
+   * the default implementation will call `isTypeOf` on each implementing
    * Object type.
    */
   resolveType?: (value: any, info?: GraphQLResolveInfo) => ?GraphQLObjectType;

src/utilities/buildASTSchema.js

@@ -126,7 +126,7 @@ export function buildASTSchema(
       ID: GraphQLID,
     };
 
-    return (typeAST) => {
+    return typeAST => {
       var typeName = getInnerTypeName(typeAST);
       if (!isNullish(innerTypeMap[typeName])) {
         return buildWrappedType(innerTypeMap[typeName], typeAST);