Skip to content

Commit 3ac1bc1

Browse files
author
Robert Zhu
committed
Update eslintrc to allow smart '== null'
1 parent d77f6a5 commit 3ac1bc1

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

.eslintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"dot-location": [2, "property"],
7070
"dot-notation": 0,
7171
"eol-last": 2,
72-
"eqeqeq": 2,
72+
"eqeqeq": ["error", "smart"],
7373
"func-names": 0,
7474
"func-style": 0,
7575
"generator-star-spacing": [2, {"before": true, "after": false}],

src/type/__tests__/validation-test.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1148,15 +1148,15 @@ describe('Type System: Object fields must have valid resolve values', () => {
11481148

11491149
it('rejects an empty Object field resolver', () => {
11501150
expect(() => schemaWithObjectWithFieldResolver({})).to.throw(
1151-
'BadResolver.badField field resolver must be function or null/undefined' +
1152-
', but got: [object Object].'
1151+
'BadResolver.badField field resolver must be a function if provided, ' +
1152+
'but got: [object Object].'
11531153
);
11541154
});
11551155

11561156
it('rejects a constant scalar value resolver', () => {
11571157
expect(() => schemaWithObjectWithFieldResolver(0)).to.throw(
1158-
'BadResolver.badField field resolver must be function or null/undefined' +
1159-
', but got: 0.'
1158+
'BadResolver.badField field resolver must be a function if provided, ' +
1159+
'but got: 0.'
11601160
);
11611161
});
11621162
});

src/type/definition.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -508,8 +508,8 @@ function defineFieldMap<TSource, TContext>(
508508
);
509509
invariant(
510510
isValidResolver(field.resolve),
511-
`${type.name}.${fieldName} field resolver must be function or null/` +
512-
`undefined, but got: ${String(field.resolve)}.`
511+
`${type.name}.${fieldName} field resolver must be a function if ` +
512+
`provided, but got: ${String(field.resolve)}.`
513513
);
514514
const argsConfig = fieldConfig.args;
515515
if (!argsConfig) {
@@ -547,10 +547,7 @@ function isPlainObj(obj) {
547547

548548
// If a resolver is defined, it must be a function.
549549
function isValidResolver(resolver: any): boolean {
550-
if (resolver === null || resolver === undefined) {
551-
return true;
552-
}
553-
return typeof resolver === 'function';
550+
return (resolver == null || typeof resolver === 'function');
554551
}
555552

556553
export type GraphQLObjectTypeConfig<TSource, TContext> = {

0 commit comments

Comments
 (0)