Skip to content

Commit f588046

Browse files
committed
Lint fixes
1 parent c2196a0 commit f588046

File tree

10 files changed

+37
-34
lines changed

10 files changed

+37
-34
lines changed

src/execution/execute.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ import {
4242
isLeafType,
4343
isListType,
4444
isNonNullType,
45-
isSemanticNonNullType,
4645
isObjectType,
46+
isSemanticNonNullType,
4747
} from '../type/definition';
4848
import {
4949
SchemaMetaFieldDef,
@@ -155,7 +155,8 @@ export interface ExecutionArgs {
155155
typeResolver?: Maybe<GraphQLTypeResolver<any, any>>;
156156
subscribeFieldResolver?: Maybe<GraphQLFieldResolver<any, any>>;
157157
/**
158-
* @default {true}
158+
* Set to `false` to disable error propagation. Experimental.
159+
*
159160
* @experimental
160161
*/
161162
errorPropagation?: boolean;

src/language/parser.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ import type {
3737
NamedTypeNode,
3838
NameNode,
3939
NonNullTypeNode,
40-
SemanticNonNullTypeNode,
4140
NullValueNode,
4241
ObjectFieldNode,
4342
ObjectTypeDefinitionNode,
@@ -51,6 +50,7 @@ import type {
5150
SchemaExtensionNode,
5251
SelectionNode,
5352
SelectionSetNode,
53+
SemanticNonNullTypeNode,
5454
StringValueNode,
5555
Token,
5656
TypeNode,

src/type/__tests__/predicate-test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ import {
1919
assertListType,
2020
assertNamedType,
2121
assertNonNullType,
22-
assertSemanticNonNullType,
2322
assertNullableType,
2423
assertObjectType,
2524
assertOutputType,
2625
assertScalarType,
26+
assertSemanticNonNullType,
2727
assertType,
2828
assertUnionType,
2929
assertWrappingType,
@@ -34,9 +34,9 @@ import {
3434
GraphQLInterfaceType,
3535
GraphQLList,
3636
GraphQLNonNull,
37-
GraphQLSemanticNonNull,
3837
GraphQLObjectType,
3938
GraphQLScalarType,
39+
GraphQLSemanticNonNull,
4040
GraphQLUnionType,
4141
isAbstractType,
4242
isCompositeType,
@@ -48,13 +48,13 @@ import {
4848
isListType,
4949
isNamedType,
5050
isNonNullType,
51-
isSemanticNonNullType,
5251
isNullableType,
5352
isObjectType,
5453
isOutputType,
5554
isRequiredArgument,
5655
isRequiredInputField,
5756
isScalarType,
57+
isSemanticNonNullType,
5858
isType,
5959
isUnionType,
6060
isWrappingType,

src/type/introspection.ts

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,19 @@ import { print } from '../language/printer';
66

77
import { astFromValue } from '../utilities/astFromValue';
88

9-
import {
9+
import type {
1010
GraphQLEnumValue,
1111
GraphQLField,
1212
GraphQLFieldConfigMap,
1313
GraphQLInputField,
1414
GraphQLNamedType,
15-
GraphQLType,
16-
isSemanticNonNullType,
17-
} from './definition';
15+
GraphQLType} from './definition';
1816
import {
1917
GraphQLEnumType,
2018
GraphQLList,
2119
GraphQLNonNull,
22-
GraphQLSemanticNonNull,
2320
GraphQLObjectType,
21+
GraphQLSemanticNonNull,
2422
isAbstractType,
2523
isEnumType,
2624
isInputObjectType,
@@ -29,6 +27,7 @@ import {
2927
isNonNullType,
3028
isObjectType,
3129
isScalarType,
30+
isSemanticNonNullType,
3231
isUnionType,
3332
} from './definition';
3433
import type { GraphQLDirective } from './directives';
@@ -414,15 +413,15 @@ export const __Field: GraphQLObjectType = new GraphQLObjectType({
414413
resolve: (field, { nullability }, _context, info) => {
415414
if (nullability === TypeNullability.FULL) {
416415
return field.type;
417-
} else {
416+
}
418417
const mode =
419418
nullability === TypeNullability.AUTO
420419
? info.errorPropagation
421420
? TypeNullability.TRADITIONAL
422421
: TypeNullability.SEMANTIC
423422
: nullability;
424423
return convertOutputTypeToNullabilityMode(field.type, mode);
425-
}
424+
426425
},
427426
},
428427
isDeprecated: {
@@ -452,10 +451,10 @@ function convertOutputTypeToNullabilityMode(
452451
return new GraphQLList(
453452
convertOutputTypeToNullabilityMode(type.ofType, mode),
454453
);
455-
} else {
454+
}
456455
return type;
457-
}
458-
} else {
456+
457+
}
459458
if (isNonNullType(type) || isSemanticNonNullType(type)) {
460459
return new GraphQLSemanticNonNull(
461460
convertOutputTypeToNullabilityMode(type.ofType, mode),
@@ -464,10 +463,10 @@ function convertOutputTypeToNullabilityMode(
464463
return new GraphQLList(
465464
convertOutputTypeToNullabilityMode(type.ofType, mode),
466465
);
467-
} else {
466+
}
468467
return type;
469-
}
470-
}
468+
469+
471470
}
472471

473472
export const __InputValue: GraphQLObjectType = new GraphQLObjectType({

src/utilities/buildClientSchema.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import {
2020
GraphQLInterfaceType,
2121
GraphQLList,
2222
GraphQLNonNull,
23-
GraphQLSemanticNonNull,
2423
GraphQLObjectType,
2524
GraphQLScalarType,
25+
GraphQLSemanticNonNull,
2626
GraphQLUnionType,
2727
isInputType,
2828
isOutputType,

src/utilities/extendSchema.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,18 @@ import {
5151
GraphQLInterfaceType,
5252
GraphQLList,
5353
GraphQLNonNull,
54-
GraphQLSemanticNonNull,
5554
GraphQLObjectType,
5655
GraphQLScalarType,
56+
GraphQLSemanticNonNull,
5757
GraphQLUnionType,
5858
isEnumType,
5959
isInputObjectType,
6060
isInterfaceType,
6161
isListType,
6262
isNonNullType,
63-
isSemanticNonNullType,
6463
isObjectType,
6564
isScalarType,
65+
isSemanticNonNullType,
6666
isUnionType,
6767
} from '../type/definition';
6868
import {

src/utilities/findBreakingChanges.ts

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ import {
2222
isListType,
2323
isNamedType,
2424
isNonNullType,
25-
isSemanticNonNullType,
2625
isObjectType,
2726
isRequiredArgument,
2827
isRequiredInputField,
2928
isScalarType,
29+
isSemanticNonNullType,
3030
isUnionType,
3131
} from '../type/definition';
3232
import { isSpecifiedScalarType } from '../type/scalars';
@@ -462,7 +462,7 @@ function isChangeSafeForObjectOrInterfaceField(
462462
isChangeSafeForObjectOrInterfaceField(oldType, newType.ofType)) ||
463463
// moving from nullable to semantic-non-null of the same underlying type is safe
464464
(isSemanticNonNullType(newType) &&
465-
isChangeSafeForObjectOrInterfaceField(oldType, newType.ofType)) ||
465+
isChangeSafeForObjectOrInterfaceField(oldType, newType.ofType))
466466
);
467467
}
468468

@@ -477,11 +477,14 @@ function isChangeSafeForObjectOrInterfaceField(
477477
if (isSemanticNonNullType(oldType)) {
478478
return (
479479
// if they're both semantic-non-null, make sure the underlying types are compatible
480-
(isSemanticNonNullType(newType) &&
481-
isChangeSafeForObjectOrInterfaceField(oldType.ofType, newType.ofType)) ||
480+
(isSemanticNonNullType(newType) &&
481+
isChangeSafeForObjectOrInterfaceField(
482+
oldType.ofType,
483+
newType.ofType,
484+
)) ||
482485
// moving from semantic-non-null to non-null of the same underlying type is safe
483-
isNonNullType(newType) &&
484-
isChangeSafeForObjectOrInterfaceField(oldType.ofType, newType.ofType)
486+
(isNonNullType(newType) &&
487+
isChangeSafeForObjectOrInterfaceField(oldType.ofType, newType.ofType))
485488
);
486489
}
487490

src/utilities/lexicographicSortSchema.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,16 @@ import {
1919
GraphQLList,
2020
GraphQLNonNull,
2121
GraphQLObjectType,
22+
GraphQLSemanticNonNull,
2223
GraphQLUnionType,
2324
isEnumType,
2425
isInputObjectType,
2526
isInterfaceType,
2627
isListType,
2728
isNonNullType,
28-
isSemanticNonNullType,
2929
isObjectType,
3030
isScalarType,
31+
isSemanticNonNullType,
3132
isUnionType,
3233
} from '../type/definition';
3334
import { GraphQLDirective } from '../type/directives';

src/utilities/typeComparators.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import {
44
isInterfaceType,
55
isListType,
66
isNonNullType,
7-
isSemanticNonNullType,
87
isObjectType,
8+
isSemanticNonNullType,
99
} from '../type/definition';
1010
import type { GraphQLSchema } from '../type/schema';
1111

src/validation/rules/OverlappingFieldsCanBeMergedRule.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,18 @@ import { Kind } from '../../language/kinds';
1515
import { print } from '../../language/printer';
1616
import type { ASTVisitor } from '../../language/visitor';
1717

18-
import {
18+
import type {
1919
GraphQLField,
2020
GraphQLNamedType,
21-
GraphQLOutputType,
22-
isSemanticNonNullType,
23-
} from '../../type/definition';
21+
GraphQLOutputType} from '../../type/definition';
2422
import {
2523
getNamedType,
2624
isInterfaceType,
2725
isLeafType,
2826
isListType,
2927
isNonNullType,
3028
isObjectType,
29+
isSemanticNonNullType,
3130
} from '../../type/definition';
3231

3332
import { sortValueNode } from '../../utilities/sortValueNode';

0 commit comments

Comments
 (0)