Merge pull request #21 from marmelab/change_trailing_comma_policy

fzaninotto · web-flow · commit 374095c52a16 · 2017-08-28T15:28:45.000+02:00
[RFR] Change Trailing Comma Policy
diff --git a/.eslintrc b/.eslintrc
@@ -23,7 +23,7 @@
             {
                 "singleQuote": true,
                 "tabWidth": 4,
-                "trailingComma": "all"
+                "trailingComma": "es5"
             }
         ],
         "import/no-extraneous-dependencies": "off",
@@ -43,4 +43,4 @@
             }
         ]
     }
-}
+}
diff --git a/src/graphQLClientServer.js b/src/graphQLClientServer.js
@@ -56,7 +56,7 @@ export default function(data, url = 'http://localhost:3000/graphql') {
             query.query,
             undefined,
             undefined,
-            query.variables,
+            query.variables
         ).then(
             result => {
                 const body = JSON.stringify(result);
@@ -66,7 +66,7 @@ export default function(data, url = 'http://localhost:3000/graphql') {
             error => {
                 req.setResponseHeader('Content-Type', 'application/json');
                 req.receive(500, JSON.stringify(error));
-            },
+            }
         );
     });
 
diff --git a/src/introspection/DateType.js b/src/introspection/DateType.js
@@ -18,7 +18,7 @@ export default new GraphQLScalarType({
         if (ast.kind !== Kind.STRING) {
             throw new GraphQLError(
                 `Query error: Can only parse dates strings, got a: ${ast.kind}`,
-                [ast],
+                [ast]
             );
         }
         if (isNaN(Date.parse(ast.value))) {
diff --git a/src/introspection/getFieldsFromEntities.js b/src/introspection/getFieldsFromEntities.js
@@ -36,7 +36,7 @@ export default (entities, checkRequired = true) => {
                 fieldValues[fieldName],
                 checkRequired
                     ? fieldValues[fieldName].length === nbValues
-                    : false,
+                    : false
             ),
         };
         return fields;
diff --git a/src/introspection/getFieldsFromEntities.spec.js b/src/introspection/getFieldsFromEntities.spec.js
@@ -7,7 +7,7 @@ test('does infer field types', () => {
             { id: 1, foo: 'foo1' },
             { id: 2, foo: 'foo2', bar: 'bar1' },
             { id: 3, bar: 'bar2' },
-        ]),
+        ])
     ).toEqual({
         id: { type: new GraphQLNonNull(GraphQLID) },
         foo: { type: GraphQLString },
diff --git a/src/introspection/getFilterTypesFromData.js b/src/introspection/getFilterTypesFromData.js
@@ -15,7 +15,7 @@ const getRangeFiltersFromEntities = entities => {
         const fieldType = getTypeFromValues(
             fieldName,
             fieldValues[fieldName],
-            false,
+            false
         );
         if (
             fieldType == GraphQLInt ||
@@ -98,9 +98,9 @@ export default data =>
                             q: { type: GraphQLString },
                         },
                         getFieldsFromEntities(data[key], false),
-                        getRangeFiltersFromEntities(data[key]),
+                        getRangeFiltersFromEntities(data[key])
                     ),
                 }),
             }),
-        {},
+        {}
     );
diff --git a/src/introspection/getSchemaFromData.js b/src/introspection/getSchemaFromData.js
@@ -128,7 +128,7 @@ export default data => {
         fields: types.reduce((fields, type) => {
             const typeFields = typesByName[type.name].getFields();
             const nullableTypeFields = Object.keys(
-                typeFields,
+                typeFields
             ).reduce((f, fieldName) => {
                 f[fieldName] = Object.assign({}, typeFields[fieldName], {
                     type:
diff --git a/src/introspection/getSchemaFromData.spec.js b/src/introspection/getSchemaFromData.spec.js
@@ -107,11 +107,11 @@ test('creates one type per data type', () => {
     const typeMap = getSchemaFromData(data).getTypeMap();
     expect(typeMap['Post'].name).toEqual(PostType.name);
     expect(Object.keys(typeMap['Post'].getFields())).toEqual(
-        Object.keys(PostType.getFields()),
+        Object.keys(PostType.getFields())
     );
     expect(typeMap['User'].name).toEqual(UserType.name);
     expect(Object.keys(typeMap['User'].getFields())).toEqual(
-        Object.keys(UserType.getFields()),
+        Object.keys(UserType.getFields())
     );
 });
 
diff --git a/src/introspection/getTypeFromValues.js b/src/introspection/getTypeFromValues.js
@@ -42,33 +42,33 @@ export default (name, values = [], isRequired = false) => {
             if (valuesAreBoolean(leafValues)) {
                 return requiredTypeOrNormal(
                     new GraphQLList(GraphQLBoolean),
-                    isRequired,
+                    isRequired
                 );
             }
             if (valuesAreString(leafValues)) {
                 return requiredTypeOrNormal(
                     new GraphQLList(GraphQLString),
-                    isRequired,
+                    isRequired
                 );
             }
             if (valuesAreInteger(leafValues)) {
                 return requiredTypeOrNormal(
                     new GraphQLList(GraphQLInt),
-                    isRequired,
+                    isRequired
                 );
             }
             if (valuesAreNumeric(leafValues)) {
                 return requiredTypeOrNormal(
                     new GraphQLList(GraphQLFloat),
-                    isRequired,
+                    isRequired
                 );
             }
             if (valuesAreObject(leafValues)) {
                 return requiredTypeOrNormal(GraphQLJSON, isRequired);
             }
             return requiredTypeOrNormal(
                 new GraphQLList(GraphQLString),
-                isRequired,
+                isRequired
             ); // FIXME introspect further
         }
         if (valuesAreBoolean(values)) {
diff --git a/src/introspection/getTypeFromValues.spec.js b/src/introspection/getTypeFromValues.spec.js
@@ -18,22 +18,22 @@ test('returns GraphQLID for fields named id or xxx_id', () => {
 
 test('returns GraphQLList for arrays', () => {
     expect(getTypeFromValues('foo', [[true, false], [true]])).toEqual(
-        new GraphQLList(GraphQLBoolean),
+        new GraphQLList(GraphQLBoolean)
     );
     expect(getTypeFromValues('foo', [['a', 'b'], ['c', 'd']])).toEqual(
-        new GraphQLList(GraphQLString),
+        new GraphQLList(GraphQLString)
     );
     expect(getTypeFromValues('foo', [[123, 456], [789, 123]])).toEqual(
-        new GraphQLList(GraphQLInt),
+        new GraphQLList(GraphQLInt)
     );
     expect(getTypeFromValues('foo', [[1.23, 456], [-5, 123]])).toEqual(
-        new GraphQLList(GraphQLFloat),
+        new GraphQLList(GraphQLFloat)
     );
 });
 
 test('returns GraphQLBoolean for booleans', () =>
     expect(getTypeFromValues('foo', [true, true, false])).toEqual(
-        GraphQLBoolean,
+        GraphQLBoolean
     ));
 
 test('returns GraphQLString for strings', () => {
@@ -49,28 +49,28 @@ test('returns GraphQLFloat for floats', () =>
 
 test('returns DateType for Dates', () =>
     expect(
-        getTypeFromValues('foo', [new Date('2017-03-15'), new Date()]),
+        getTypeFromValues('foo', [new Date('2017-03-15'), new Date()])
     ).toEqual(DateType));
 
 test('returns GraphQLJSON for objects', () =>
     expect(
-        getTypeFromValues('foo', [{ foo: 1 }, { bar: 2 }, { id: 'a' }]),
+        getTypeFromValues('foo', [{ foo: 1 }, { bar: 2 }, { id: 'a' }])
     ).toEqual(GraphQLJSON));
 
 test('returns GraphQLJSON for arrays of objects', () =>
     expect(
-        getTypeFromValues('foo', [[{ foo: 1 }, { bar: 2 }], [{ id: 'a' }]]),
+        getTypeFromValues('foo', [[{ foo: 1 }, { bar: 2 }], [{ id: 'a' }]])
     ).toEqual(GraphQLJSON));
 
 test('returns GraphQLString for mixed values', () =>
     expect(getTypeFromValues('foo', [0, '&', new Date()])).toEqual(
-        GraphQLString,
+        GraphQLString
     ));
 
 test('returns GraphQLString for no values', () =>
     expect(getTypeFromValues('foo')).toEqual(GraphQLString));
 
 test('returns GraphQLNonNull when all values are filled', () =>
     expect(getTypeFromValues('foo', [], true)).toEqual(
-        new GraphQLNonNull(GraphQLString),
+        new GraphQLNonNull(GraphQLString)
     ));
diff --git a/src/introspection/getValuesFromEntities.spec.js b/src/introspection/getValuesFromEntities.spec.js
@@ -7,7 +7,7 @@ test('does not take empty values into account', () => {
 });
 test('returns an array of values for every field', () => {
     expect(
-        getValuesFromEntities([{ id: 1, foo: 'bar' }, { id: 2, foo: 'baz' }]),
+        getValuesFromEntities([{ id: 1, foo: 'bar' }, { id: 2, foo: 'baz' }])
     ).toEqual({
         id: [1, 2],
         foo: ['bar', 'baz'],
@@ -24,7 +24,7 @@ test('can handle sparse fieldsets', () => {
             { id: 1, foo: 'foo1' },
             { id: 2, foo: 'foo2', bar: 'bar1' },
             { id: 3, bar: 'bar2' },
-        ]),
+        ])
     ).toEqual({
         id: [1, 2, 3],
         foo: ['foo1', 'foo2'],
diff --git a/src/jsonGraphqlExpress.js b/src/jsonGraphqlExpress.js
@@ -3,14 +3,14 @@ import schemaBuilder from './schemaBuilder';
 
 /**
  * An express middleware for a GraphQL endpoint serving data from the supplied json.
- * 
- * @param {any} data 
+ *
+ * @param {any} data
  * @returns An array of middlewares
- * 
+ *
  * @example
  * import express from 'express';
  * import { jsonGraphqlExpress } from 'json-graphql-server';
- * 
+ *
  * const data = {
  *    "posts": [
  *        {
@@ -37,12 +37,12 @@ import schemaBuilder from './schemaBuilder';
  *        }
  *    ],
  * };
- * 
+ *
  * const PORT = 3000;
  * var app = express();
- * 
+ *
  * app.use('/graphql', jsonGraphqlExpress(data));
- * 
+ *
  * app.listen(PORT);
  */
 export default data =>
diff --git a/src/resolver/Entity/index.js b/src/resolver/Entity/index.js
@@ -58,10 +58,10 @@ export default (entityName, data) => {
             Object.assign({}, resolvers, {
                 [getRelatedType(fieldName)]: entity =>
                     data[getRelatedKey(fieldName)].find(
-                        relatedRecord => relatedRecord.id == entity[fieldName],
+                        relatedRecord => relatedRecord.id == entity[fieldName]
                     ),
             }),
-        {},
+        {}
     );
     const relatedField = getReverseRelatedField(entityName); // 'posts' => 'post_id'
     const hasReverseRelationship = entityName =>
@@ -72,10 +72,10 @@ export default (entityName, data) => {
             Object.assign({}, resolvers, {
                 [getRelationshipFromKey(entityName)]: entity =>
                     data[entityName].filter(
-                        record => record[relatedField] == entity.id,
+                        record => record[relatedField] == entity.id
                     ),
             }),
-        {},
+        {}
     );
 
     return Object.assign({}, manyToOneResolvers, oneToManyResolvers);
diff --git a/src/resolver/Mutation/update.js b/src/resolver/Mutation/update.js
@@ -5,7 +5,7 @@ export default (entityData = []) => (_, params) => {
         entityData[indexOfEntity] = Object.assign(
             {},
             entityData[indexOfEntity],
-            params,
+            params
         );
         return entityData[indexOfEntity];
     }
diff --git a/src/resolver/Query/all.js b/src/resolver/Query/all.js
@@ -1,6 +1,6 @@
 export default (entityData = []) => (
     _,
-    { sortField, sortOrder = 'asc', page, perPage = 25, filter = {} },
+    { sortField, sortOrder = 'asc', page, perPage = 25, filter = {} }
 ) => {
     let items = [...entityData];
 
@@ -49,7 +49,7 @@ export default (entityData = []) => (
                 d =>
                     filter[key] instanceof Date
                         ? +d[key] == +filter[key]
-                        : d[key] == filter[key],
+                        : d[key] == filter[key]
             );
         });
 
@@ -61,8 +61,8 @@ export default (entityData = []) => (
                         d[key]
                             .toString()
                             .toLowerCase()
-                            .includes(filter.q.toLowerCase()),
-                ),
+                            .includes(filter.q.toLowerCase())
+                )
             );
         }
     }
diff --git a/src/resolver/Query/all.spec.js b/src/resolver/Query/all.spec.js
@@ -70,14 +70,14 @@ describe('sort', () => {
     });
     test('sorts data using sortOrder for the sort direction', () => {
         expect(
-            all(data)(null, { sortField: 'views', sortOrder: 'asc' }),
+            all(data)(null, { sortField: 'views', sortOrder: 'asc' })
         ).toEqual([
             { id: 2, title: 'Ut enim ad minim', user_id: 456, views: 65 },
             { id: 3, title: 'Sic Dolor amet', user_id: 123, views: 76 },
             { id: 1, title: 'Lorem Ipsum', user_id: 123, views: 254 },
         ]);
         expect(
-            all(data)(null, { sortField: 'views', sortOrder: 'desc' }),
+            all(data)(null, { sortField: 'views', sortOrder: 'desc' })
         ).toEqual([
             { id: 1, title: 'Lorem Ipsum', user_id: 123, views: 254 },
             { id: 3, title: 'Sic Dolor amet', user_id: 123, views: 76 },
@@ -100,7 +100,7 @@ describe('filter', () => {
             { id: 2, title: 'Ut enim ad minim', user_id: 456, views: 65 },
         ]);
         expect(
-            all(data)(null, { filter: { title: 'Sic Dolor amet' } }),
+            all(data)(null, { filter: { title: 'Sic Dolor amet' } })
         ).toEqual([
             { id: 3, title: 'Sic Dolor amet', user_id: 123, views: 76 },
         ]);
diff --git a/src/resolver/Query/meta.js b/src/resolver/Query/meta.js
@@ -37,8 +37,8 @@ export default entityData => (_, { page, perPage = 25, filter = '{}' }) => {
         if (filters.q) {
             items = items.filter(d =>
                 Object.keys(d).some(key =>
-                    d[key].toString().includes(filters.q),
-                ),
+                    d[key].toString().includes(filters.q)
+                )
             );
         }
     }
diff --git a/src/resolver/index.js b/src/resolver/index.js
@@ -33,28 +33,28 @@ export default data => {
                     Object.assign(
                         {},
                         resolvers,
-                        getQueryResolvers(getTypeFromKey(key), data[key]),
+                        getQueryResolvers(getTypeFromKey(key), data[key])
                     ),
-                {},
+                {}
             ),
             Mutation: Object.keys(data).reduce(
                 (resolvers, key) =>
                     Object.assign(
                         {},
                         resolvers,
-                        getMutationResolvers(getTypeFromKey(key), data[key]),
+                        getMutationResolvers(getTypeFromKey(key), data[key])
                     ),
-                {},
+                {}
             ),
         },
         Object.keys(data).reduce(
             (resolvers, key) =>
                 Object.assign({}, resolvers, {
                     [getTypeFromKey(key)]: entityResolver(key, data),
                 }),
-            {},
+            {}
         ),
         hasType('Date', data) ? { Date: DateType } : {}, // required because makeExecutableSchema strips resolvers from typeDefs
-        hasType('JSON', data) ? { JSON: GraphQLJSON } : {}, // required because makeExecutableSchema strips resolvers from typeDefs
+        hasType('JSON', data) ? { JSON: GraphQLJSON } : {} // required because makeExecutableSchema strips resolvers from typeDefs
     );
 };
diff --git a/src/schemaBuilder.spec.js b/src/schemaBuilder.spec.js

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`{`
`24`	`24`	`"singleQuote": true,`
`25`	`25`	`"tabWidth": 4,`
`26`		`- "trailingComma": "all"`
	`26`	`+ "trailingComma": "es5"`
`27`	`27`	`}`
`28`	`28`	`],`
`29`	`29`	`"import/no-extraneous-dependencies": "off",`
`@@ -43,4 +43,4 @@`
`43`	`43`	`}`
`44`	`44`	`]`
`45`	`45`	`}`
`46`		`-}`
	`46`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ export default new GraphQLScalarType({`
`18`	`18`	`if (ast.kind !== Kind.STRING) {`
`19`	`19`	`throw new GraphQLError(`
`20`	`20`	`Query error: Can only parse dates strings, got a: ${ast.kind}`,
`21`		`- [ast],`
	`21`	`+ [ast]`
`22`	`22`	`);`
`23`	`23`	`}`
`24`	`24`	`if (isNaN(Date.parse(ast.value))) {`