chore(Prettier): Add prettier and refactor code style

Author: nodkz

.eslintrc

@@ -1,17 +1,38 @@
 {
-  "extends": "airbnb-base",
+  "extends": [
+    "airbnb-base",
+    "prettier"
+  ],
   "parser": "babel-eslint",
   "rules": {
     "no-underscore-dangle": 0,
-    "no-unused-expressions": 0,
     "arrow-body-style": 0,
+    "arrow-parens": 0,
+    "prefer-template": 0,
+    "no-use-before-define": 0,
+    "no-else-return": 0,
+    "comma-dangle": ["error", {
+      "arrays": "always-multiline",
+      "objects": "always-multiline",
+      "imports": "always-multiline",
+      "exports": "always-multiline",
+      "functions": "ignore",
+    }],
+    "no-plusplus": 0,
+    "import/no-extraneous-dependencies": 0,
     "import/prefer-default-export": 0,
-    "import/no-extraneous-dependencies": 0
+    "prettier/prettier": ["error", {
+      "printWidth": 100,
+      "singleQuote": true,
+      "trailingComma": "es5",
+    }],
+    "no-unused-expressions": 0,
   },
   "env": {
     "mocha": true
   },
   "plugins": [
-    "flowtype"
+    "flowtype",
+    "prettier"
   ]
 }

package.json

@@ -24,7 +24,6 @@
   },
   "homepage": "https://github.com/nodkz/graphql-compose-relay",
   "peerDependencies": {
-    "graphql": ">=0.7.1 || >=0.8.0 || >=0.9.0",
     "graphql-compose": ">=1.19.3"
   },
   "devDependencies": {
@@ -44,13 +43,16 @@
     "cz-conventional-changelog": "^2.0.0",
     "eslint": "^3.19.0",
     "eslint-config-airbnb-base": "^11.2.0",
+    "eslint-config-prettier": "^2.1.1",
     "eslint-plugin-flowtype": "^2.34.0",
     "eslint-plugin-import": "^2.3.0",
+    "eslint-plugin-prettier": "^2.1.1",
     "flow-bin": "^0.47.0",
     "graphql": "^0.10.1",
     "graphql-compose": "^1.19.3",
     "mocha": "^3.4.2",
     "nyc": "^11.0.2",
+    "prettier": "^1.4.2",
     "rimraf": "^2.6.1",
     "sane": "^1.7.0",
     "semantic-release": "^6.3.6"
@@ -84,8 +86,8 @@
     "lint": "eslint src test *.js",
     "test": "babel-node ./node_modules/.bin/_mocha --compilers js:babel-core/register --reporter dot --require ./resources/mocha-bootload src/**/__tests__/**/*-test.js",
     "watch": "babel-node ./resources/watch.js",
-    "link": "yarn build && yarn link graphql && yarn link graphql-compose && yarn link",
-    "unlink": "yarn unlink graphql && yarn unlink graphql-compose && yarn add graphql graphql-compose",
+    "link": "yarn build && yarn link graphql-compose && yarn link",
+    "unlink": "yarn unlink graphql-compose && graphql-compose",
     "semantic-release": "semantic-release pre && npm publish && semantic-release post"
   }
 }

src/__mocks__/rootMutationTypeComposer.js

@@ -5,8 +5,7 @@ import { TypeComposer } from 'graphql-compose';
 
 const RootMutation = new GraphQLObjectType({
   name: 'Mutation',
-  fields: {
-  },
+  fields: {},
 });
 
 export const rootMutationTypeComposer = new TypeComposer(RootMutation);

src/__mocks__/rootQueryTypeComposer.js

@@ -5,8 +5,7 @@ import { TypeComposer } from 'graphql-compose';
 
 const RootQuery = new GraphQLObjectType({
   name: 'Query',
-  fields: {
-  },
+  fields: {},
 });
 
 export const rootQueryTypeComposer = new TypeComposer(RootQuery);

src/__mocks__/userTypeComposer.js

@@ -35,7 +35,7 @@ export const findByIdResolver = new Resolver({
       type: new GraphQLNonNull(GraphQLInt),
     },
   },
-  resolve: (resolveParams) => {
+  resolve: resolveParams => {
     const args = resolveParams.args || {};
     if (args._id.toString() === '1') {
       return Promise.resolve({
@@ -80,7 +80,7 @@ export const createOneResolver = new Resolver({
       }),
     },
   },
-  resolve: (resolveParams) => {
+  resolve: resolveParams => {
     return Promise.resolve({
       recordId: resolveParams.args.input.id,
       record: (resolveParams.args && resolveParams.args.input) || {},
@@ -121,7 +121,7 @@ export const manyArgsWithInputResolver = new Resolver({
       type: GraphQLInt,
     },
   },
-  resolve: (resolveParams) => {
+  resolve: resolveParams => {
     return Promise.resolve({
       recordId: resolveParams.args.input.id,
       record: (resolveParams.args && resolveParams.args.input) || {},
@@ -151,7 +151,7 @@ export const manyArgsWithoutInputResolver = new Resolver({
       type: GraphQLInt,
     },
   },
-  resolve: (resolveParams) => {
+  resolve: resolveParams => {
     return Promise.resolve({
       recordId: resolveParams.args.input.id,
       record: (resolveParams.args && resolveParams.args.input) || {},

src/__tests__/composeWithRelay-test.js

@@ -36,7 +36,7 @@ describe('composeWithRelay', () => {
     it('should thow error if typeComposer does not have findById resolver', () => {
       const tc = userTypeComposer.clone('AnotherUserType');
       tc.removeResolver('findById');
-      expect(() => composeWithRelay(tc)).to.throw('does not have resolver with name \'findById\'');
+      expect(() => composeWithRelay(tc)).to.throw("does not have resolver with name 'findById'");
     });
   });
 
@@ -61,7 +61,8 @@ describe('composeWithRelay', () => {
     });
 
     it('should resolve globalId in `user.id` field', async () => {
-      rootQueryTypeComposer.setField('user',
+      rootQueryTypeComposer.setField(
+        'user',
         userTypeComposer.getResolver('findById').getFieldConfig()
       );
       const schema = new GraphQLSchema({
@@ -73,13 +74,14 @@ describe('composeWithRelay', () => {
           name
         }
       }`;
-      const result = await graphql(schema, query);
+      const result = await graphql.graphql(schema, query);
       expect(result).nested.property('data.user.id').equal(toGlobalId('User', 1));
       expect(result).nested.property('data.user.name').equal('Pavel');
     });
 
     it('should resolve globalId in `node.id` field', async () => {
-      rootQueryTypeComposer.setField('user',
+      rootQueryTypeComposer.setField(
+        'user',
         userTypeComposer.getResolver('findById').getFieldConfig()
       );
       const schema = new GraphQLSchema({
@@ -94,13 +96,14 @@ describe('composeWithRelay', () => {
         id
         name
       }`;
-      const result = await graphql(schema, query);
+      const result = await graphql.graphql(schema, query);
       expect(result).nested.property('data.node.id').equal(toGlobalId('User', 1));
       expect(result).nested.property('data.node.name').equal('Pavel');
     });
 
     it('should passthru clientMutationId in mutations', async () => {
-      rootMutationComposer.setField('createUser',
+      rootMutationComposer.setField(
+        'createUser',
         userTypeComposer.getResolver('createOne').getFieldConfig()
       );
       const schema = new GraphQLSchema({
@@ -115,11 +118,9 @@ describe('composeWithRelay', () => {
           clientMutationId
         }
       }`;
-      const result = await graphql(schema, query);
-      expect(result).nested.property('data.createUser.record.name')
-        .equal('Ok');
-      expect(result).nested.property('data.createUser.clientMutationId')
-        .equal('123');
+      const result = await graphql.graphql(schema, query);
+      expect(result).nested.property('data.createUser.record.name').equal('Ok');
+      expect(result).nested.property('data.createUser.clientMutationId').equal('123');
     });
   });
 });

src/__tests__/globalId-test.js

@@ -1,11 +1,5 @@
 import { expect } from 'chai';
-import {
-  base64,
-  unbase64,
-  toGlobalId,
-  fromGlobalId,
-} from '../globalId';
-
+import { base64, unbase64, toGlobalId, fromGlobalId } from '../globalId';
 
 describe('globalId', () => {
   it('should have correct method base64()', () => {
@@ -24,8 +18,13 @@ describe('globalId', () => {
   });
 
   it('should have correct method fromGlobalId()', () => {
-    expect(fromGlobalId('VXNlcjo3ODk=')).to.deep.equal({ type: 'User', id: '789' });
-    expect(fromGlobalId('QXJ0aWNsZToyMg=='))
-      .to.deep.equal({ type: 'Article', id: '22' });
+    expect(fromGlobalId('VXNlcjo3ODk=')).to.deep.equal({
+      type: 'User',
+      id: '789',
+    });
+    expect(fromGlobalId('QXJ0aWNsZToyMg==')).to.deep.equal({
+      type: 'Article',
+      id: '22',
+    });
   });
 });

src/__tests__/nodeFieldConfig-test.js

@@ -13,7 +13,7 @@ describe('nodeFieldConfig', () => {
     User: {
       resolver: findByIdResolver,
       tc: userTypeComposer,
-    }
+    },
   };
   const config = getNodeFieldConfig(typeToFindByIdMap);
 
@@ -36,15 +36,11 @@ describe('nodeFieldConfig', () => {
   });
 
   it('should return null if findById not defined for type', () => {
-    expect(
-      config.resolve({}, { id: toGlobalId('UnexistedType', 1) })
-    ).to.be.null;
+    expect(config.resolve({}, { id: toGlobalId('UnexistedType', 1) })).to.be.null;
   });
 
   it('should return Promise if type exists, but id not exist', () => {
-    expect(
-      config.resolve({}, { id: toGlobalId('User', 666) })
-    ).instanceof(Promise);
+    expect(config.resolve({}, { id: toGlobalId('User', 666) })).instanceof(Promise);
   });
 
   it('should return Promise with user data', async () => {

src/__tests__/wrapMutationResolver.js

@@ -1,23 +1,19 @@
 import { expect } from 'chai';
-import {
-  GraphQLString,
-  GraphQLID,
-  GraphQLNonNull,
-  getNamedType,
-} from 'graphql';
+import { GraphQLString, GraphQLID, GraphQLNonNull, getNamedType } from 'graphql';
 import { TypeComposer, InputTypeComposer } from 'graphql-compose';
 import { composeWithRelay } from '../composeWithRelay';
 import { userTypeComposer } from '../__mocks__/userTypeComposer';
 import { toGlobalId } from '../globalId';
 
-
 describe('wrapMutationResolver', () => {
   composeWithRelay(userTypeComposer);
   const fieldConfig = userTypeComposer.getResolver('createOne').getFieldConfig();
-  const fieldConfigManyArgsWithInput
-    = userTypeComposer.getResolver('manyArgsWithInput').getFieldConfig();
-  const fieldConfigManyArgsWithoutInput
-    = userTypeComposer.getResolver('manyArgsWithoutInput').getFieldConfig();
+  const fieldConfigManyArgsWithInput = userTypeComposer
+    .getResolver('manyArgsWithInput')
+    .getFieldConfig();
+  const fieldConfigManyArgsWithoutInput = userTypeComposer
+    .getResolver('manyArgsWithoutInput')
+    .getFieldConfig();
 
   describe('args', () => {
     it('should add `clientMutationId` field to args.input', () => {
@@ -26,12 +22,12 @@ describe('wrapMutationResolver', () => {
       expect(itc.getFieldType('clientMutationId')).equal(GraphQLString);
     });
 
-
     it('should create required args.input! if not exists', () => {
       expect(fieldConfigManyArgsWithoutInput.args).property('input').to.be.ok;
 
-      expect(fieldConfigManyArgsWithoutInput.args)
-        .nested.property('input.type').instanceof(GraphQLNonNull);
+      expect(fieldConfigManyArgsWithoutInput.args).nested
+        .property('input.type')
+        .instanceof(GraphQLNonNull);
     });
 
     it('should create args.input if not exists and move all args into it', () => {
@@ -71,18 +67,12 @@ describe('wrapMutationResolver', () => {
 
   describe('resolve', () => {
     it('should passthru `clientMutationId`', async () => {
-      const result = await fieldConfig.resolve(
-        {},
-        { input: { clientMutationId: '333' } }
-      );
+      const result = await fieldConfig.resolve({}, { input: { clientMutationId: '333' } });
       expect(result).property('clientMutationId').equal('333');
     });
 
     it('should return `nodeId` with globalId', async () => {
-      const result = await fieldConfig.resolve(
-        {},
-        { input: { id: 'newRecord' } }
-      );
+      const result = await fieldConfig.resolve({}, { input: { id: 'newRecord' } });
       expect(result).property('nodeId').equal(toGlobalId('User', 'newRecord'));
     });
   });

src/composeWithRelay.js

@@ -13,9 +13,7 @@ import { getNodeFieldConfig } from './nodeFieldConfig';
 export const typeMapForNode = {};
 export const nodeFieldConfig = getNodeFieldConfig(typeMapForNode);
 
-export function composeWithRelay(
-  typeComposer: TypeComposer
-): TypeComposer {
+export function composeWithRelay(typeComposer: TypeComposer): TypeComposer {
   if (!(typeComposer instanceof TypeComposer)) {
     throw new Error('You should provide TypeComposer instance to composeWithRelay method');
   }
@@ -31,14 +29,18 @@ export function composeWithRelay(
   }
 
   if (!typeComposer.hasRecordIdFn()) {
-    throw new Error(`TypeComposer(${typeComposer.getTypeName()}) should have recordIdFn. `
-                  + 'This function returns ID from provided object.');
+    throw new Error(
+      `TypeComposer(${typeComposer.getTypeName()}) should have recordIdFn. ` +
+        'This function returns ID from provided object.'
+    );
   }
 
   const findById = typeComposer.getResolver('findById');
   if (!findById) {
-    throw new Error(`TypeComposer(${typeComposer.getTypeName()}) provided to composeWithRelay `
-                  + 'should have findById resolver.');
+    throw new Error(
+      `TypeComposer(${typeComposer.getTypeName()}) provided to composeWithRelay ` +
+        'should have findById resolver.'
+    );
   }
   typeMapForNode[typeComposer.getTypeName()] = {
     resolver: findById,
@@ -49,10 +51,7 @@ export function composeWithRelay(
     id: {
       type: new GraphQLNonNull(GraphQLID),
       description: 'The globally unique ID among all types',
-      resolve: (source) => toGlobalId(
-        typeComposer.getTypeName(),
-        typeComposer.getRecordId(source)
-      ),
+      resolve: source => toGlobalId(typeComposer.getTypeName(), typeComposer.getRecordId(source)),
     },
   });