Skip to content

Commit 2707bd4

Browse files
n1ru4ln1ru4l
committed
1 parent 3dec1b1 commit 2707bd4

15 files changed

+24
-73
lines changed

‎src/error/__tests__/GraphQLError-test.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -313,9 +313,7 @@ describe('toJSON', () => {
313313

314314
it('includes extension fields', () => {
315315
const error = new GraphQLError('msg', {
316-
extensions: {
317-
foo: 'bar',
318-
},
316+
extensions: { foo: 'bar' },
319317
});
320318

321319
expect(error.toJSON()).to.deep.equal({

‎src/validation/rules/KnownTypeNamesRule.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,7 @@ export function KnownTypeNamesRule(
6262
context.reportError(
6363
new GraphQLError(
6464
`Unknown type "${typeName}".` + didYouMean(suggestedTypes),
65-
{
66-
nodes: node,
67-
},
65+
{ nodes: node },
6866
),
6967
);
7068
}

‎src/validation/rules/UniqueDirectiveNamesRule.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ export function UniqueDirectiveNamesRule(
3333
context.reportError(
3434
new GraphQLError(
3535
`There can be only one directive named "@${directiveName}".`,
36-
{
37-
nodes: [knownDirectiveNames[directiveName], node.name],
38-
},
36+
{ nodes: [knownDirectiveNames[directiveName], node.name] },
3937
),
4038
);
4139
} else {

‎src/validation/rules/UniqueDirectivesPerLocationRule.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,7 @@ export function UniqueDirectivesPerLocationRule(
7878
context.reportError(
7979
new GraphQLError(
8080
`The directive "@${directiveName}" can only be used once at this location.`,
81-
{
82-
nodes: [seenDirectives[directiveName], directive],
83-
},
81+
{ nodes: [seenDirectives[directiveName], directive] },
8482
),
8583
);
8684
} else {

‎src/validation/rules/UniqueEnumValueNamesRule.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,14 @@ export function UniqueEnumValueNamesRule(
4949
context.reportError(
5050
new GraphQLError(
5151
`Enum value "${typeName}.${valueName}" already exists in the schema. It cannot also be defined in this type extension.`,
52-
{
53-
nodes: valueDef.name,
54-
},
52+
{ nodes: valueDef.name },
5553
),
5654
);
5755
} else if (valueNames[valueName]) {
5856
context.reportError(
5957
new GraphQLError(
6058
`Enum value "${typeName}.${valueName}" can only be defined once.`,
61-
{
62-
nodes: [valueNames[valueName], valueDef.name],
63-
},
59+
{ nodes: [valueNames[valueName], valueDef.name] },
6460
),
6561
);
6662
} else {

‎src/validation/rules/UniqueFieldDefinitionNamesRule.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,18 +61,14 @@ export function UniqueFieldDefinitionNamesRule(
6161
context.reportError(
6262
new GraphQLError(
6363
`Field "${typeName}.${fieldName}" already exists in the schema. It cannot also be defined in this type extension.`,
64-
{
65-
nodes: fieldDef.name,
66-
},
64+
{ nodes: fieldDef.name },
6765
),
6866
);
6967
} else if (fieldNames[fieldName]) {
7068
context.reportError(
7169
new GraphQLError(
7270
`Field "${typeName}.${fieldName}" can only be defined once.`,
73-
{
74-
nodes: [fieldNames[fieldName], fieldDef.name],
75-
},
71+
{ nodes: [fieldNames[fieldName], fieldDef.name] },
7672
),
7773
);
7874
} else {

‎src/validation/rules/UniqueFragmentNamesRule.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@ export function UniqueFragmentNamesRule(
2323
context.reportError(
2424
new GraphQLError(
2525
`There can be only one fragment named "${fragmentName}".`,
26-
{
27-
nodes: [knownFragmentNames[fragmentName], node.name],
28-
},
26+
{ nodes: [knownFragmentNames[fragmentName], node.name] },
2927
),
3028
);
3129
} else {

‎src/validation/rules/UniqueInputFieldNamesRule.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,7 @@ export function UniqueInputFieldNamesRule(
4040
context.reportError(
4141
new GraphQLError(
4242
`There can be only one input field named "${fieldName}".`,
43-
{
44-
nodes: [knownNames[fieldName], node.name],
45-
},
43+
{ nodes: [knownNames[fieldName], node.name] },
4644
),
4745
);
4846
} else {

‎src/validation/rules/UniqueOperationTypesRule.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,7 @@ export function UniqueOperationTypesRule(
5353
context.reportError(
5454
new GraphQLError(
5555
`There can be only one ${operation} type in schema.`,
56-
{
57-
nodes: [alreadyDefinedOperationType, operationType],
58-
},
56+
{ nodes: [alreadyDefinedOperationType, operationType] },
5957
),
6058
);
6159
} else {

‎src/validation/rules/UniqueVariableNamesRule.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ export function UniqueVariableNamesRule(
3030
context.reportError(
3131
new GraphQLError(
3232
`There can be only one variable named "$${variableName}".`,
33-
{
34-
nodes: variableNodes.map((node) => node.variable.name),
35-
},
33+
{ nodes: variableNodes.map((node) => node.variable.name) },
3634
),
3735
);
3836
}

‎src/validation/rules/ValuesOfCorrectTypeRule.ts

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,7 @@ export function ValuesOfCorrectTypeRule(
8686
context.reportError(
8787
new GraphQLError(
8888
`Expected value of type "${inspect(type)}", found ${print(node)}.`,
89-
{
90-
nodes: node,
91-
},
89+
{ nodes: node },
9290
),
9391
);
9492
}
@@ -119,9 +117,7 @@ function isValidValueNode(context: ValidationContext, node: ValueNode): void {
119117
context.reportError(
120118
new GraphQLError(
121119
`Expected value of type "${typeStr}", found ${print(node)}.`,
122-
{
123-
nodes: node,
124-
},
120+
{ nodes: node },
125121
),
126122
);
127123
return;
@@ -136,9 +132,7 @@ function isValidValueNode(context: ValidationContext, node: ValueNode): void {
136132
context.reportError(
137133
new GraphQLError(
138134
`Expected value of type "${typeStr}", found ${print(node)}.`,
139-
{
140-
nodes: node,
141-
},
135+
{ nodes: node },
142136
),
143137
);
144138
}
@@ -151,10 +145,7 @@ function isValidValueNode(context: ValidationContext, node: ValueNode): void {
151145
new GraphQLError(
152146
`Expected value of type "${typeStr}", found ${print(node)}; ` +
153147
error.message,
154-
{
155-
nodes: node,
156-
originalError: error, // Ensure a reference to the original error is maintained.
157-
},
148+
{ nodes: node, originalError: error },
158149
),
159150
);
160151
}

‎src/validation/rules/VariablesAreInputTypesRule.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@ export function VariablesAreInputTypesRule(
3232
context.reportError(
3333
new GraphQLError(
3434
`Variable "$${variableName}" cannot be non-input type "${typeName}".`,
35-
{
36-
nodes: node.type,
37-
},
35+
{ nodes: node.type },
3836
),
3937
);
4038
}

‎src/validation/rules/VariablesInAllowedPositionRule.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,7 @@ export function VariablesInAllowedPositionRule(
6262
context.reportError(
6363
new GraphQLError(
6464
`Variable "$${varName}" of type "${varTypeStr}" used in position expecting type "${typeStr}".`,
65-
{
66-
nodes: [varDef, node],
67-
},
65+
{ nodes: [varDef, node] },
6866
),
6967
);
7068
}

‎src/validation/rules/custom/NoDeprecatedCustomRule.ts

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ export function NoDeprecatedCustomRule(context: ValidationContext): ASTVisitor {
2929
context.reportError(
3030
new GraphQLError(
3131
`The field ${parentType.name}.${fieldDef.name} is deprecated. ${deprecationReason}`,
32-
{
33-
nodes: node,
34-
},
32+
{ nodes: node },
3533
),
3634
);
3735
}
@@ -45,9 +43,7 @@ export function NoDeprecatedCustomRule(context: ValidationContext): ASTVisitor {
4543
context.reportError(
4644
new GraphQLError(
4745
`Directive "@${directiveDef.name}" argument "${argDef.name}" is deprecated. ${deprecationReason}`,
48-
{
49-
nodes: node,
50-
},
46+
{ nodes: node },
5147
),
5248
);
5349
} else {
@@ -57,9 +53,7 @@ export function NoDeprecatedCustomRule(context: ValidationContext): ASTVisitor {
5753
context.reportError(
5854
new GraphQLError(
5955
`Field "${parentType.name}.${fieldDef.name}" argument "${argDef.name}" is deprecated. ${deprecationReason}`,
60-
{
61-
nodes: node,
62-
},
56+
{ nodes: node },
6357
),
6458
);
6559
}
@@ -74,9 +68,7 @@ export function NoDeprecatedCustomRule(context: ValidationContext): ASTVisitor {
7468
context.reportError(
7569
new GraphQLError(
7670
`The input field ${inputObjectDef.name}.${inputFieldDef.name} is deprecated. ${deprecationReason}`,
77-
{
78-
nodes: node,
79-
},
71+
{ nodes: node },
8072
),
8173
);
8274
}
@@ -91,9 +83,7 @@ export function NoDeprecatedCustomRule(context: ValidationContext): ASTVisitor {
9183
context.reportError(
9284
new GraphQLError(
9385
`The enum value "${enumTypeDef.name}.${enumValueDef.name}" is deprecated. ${deprecationReason}`,
94-
{
95-
nodes: node,
96-
},
86+
{ nodes: node },
9787
),
9888
);
9989
}

‎src/validation/rules/custom/NoSchemaIntrospectionCustomRule.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ export function NoSchemaIntrospectionCustomRule(
2828
context.reportError(
2929
new GraphQLError(
3030
`GraphQL introspection has been disabled, but the requested query contained the field "${node.name.value}".`,
31-
{
32-
nodes: node,
33-
},
31+
{ nodes: node },
3432
),
3533
);
3634
}

0 commit comments

Comments
 (0)