GraphQLError: don't wrap single node in array (#1757)

graphql · Mar 1, 2019 · fbd9c47 · fbd9c47
1 parent 8013c0d
commit fbd9c47
Show file tree

Hide file tree

Showing 17 changed files with 39 additions and 35 deletions.
diff --git a/src/error/__tests__/GraphQLError-test.js b/src/error/__tests__/GraphQLError-test.js
@@ -90,7 +90,7 @@ describe('GraphQLError', () => {
   });
 
   it('converts node with loc.start === 0 to positions and locations', () => {
-    const e = new GraphQLError('msg', [operationNode]);
+    const e = new GraphQLError('msg', operationNode);
     expect(e).to.have.property('source', source);
     expect(e).to.deep.include({
       nodes: [operationNode],
@@ -115,7 +115,7 @@ describe('GraphQLError', () => {
   });
 
   it('serializes to include message and locations', () => {
-    const e = new GraphQLError('msg', [fieldNode]);
+    const e = new GraphQLError('msg', fieldNode);
     expect(JSON.stringify(e)).to.equal(
       '{"message":"msg","locations":[{"line":2,"column":3}]}',
     );

diff --git a/src/execution/values.js b/src/execution/values.js
@@ -62,7 +62,7 @@ export function getVariableValues(
             `"${print(
               varDefNode.type,
             )}" which cannot be used as an input type.`,
-          [varDefNode.type],
+          varDefNode.type,
         ),
       );
     } else {
@@ -82,7 +82,7 @@ export function getVariableValues(
                 `"${inspect(varType)}" must not be null.`
               : `Variable "$${varName}" of required type ` +
                 `"${inspect(varType)}" was not provided.`,
-            [varDefNode],
+            varDefNode,
           ),
         );
       } else if (hasValue) {
@@ -161,21 +161,21 @@ export function getArgumentValues(
         throw new GraphQLError(
           `Argument "${name}" of non-null type "${inspect(argType)}" ` +
             'must not be null.',
-          [argumentNode.value],
+          argumentNode.value,
         );
       } else if (argumentNode && argumentNode.value.kind === Kind.VARIABLE) {
         const variableName = argumentNode.value.name.value;
         throw new GraphQLError(
           `Argument "${name}" of required type "${inspect(argType)}" ` +
             `was provided the variable "$${variableName}" ` +
             'which was not provided a runtime value.',
-          [argumentNode.value],
+          argumentNode.value,
         );
       } else {
         throw new GraphQLError(
           `Argument "${name}" of required type "${inspect(argType)}" ` +
             'was not provided.',
-          [node],
+          node,
         );
       }
     } else if (hasValue) {
@@ -199,7 +199,7 @@ export function getArgumentValues(
           // continue with an invalid argument value.
           throw new GraphQLError(
             `Argument "${name}" has invalid value ${print(valueNode)}.`,
-            [argumentNode.value],
+            argumentNode.value,
           );
         }
         coercedValues[name] = coercedValue;

diff --git a/src/type/validate.js b/src/type/validate.js
@@ -101,7 +101,7 @@ class SchemaValidationContext {
     message: string,
     nodes?: $ReadOnlyArray<?ASTNode> | ?ASTNode,
   ): void {
-    const _nodes = (Array.isArray(nodes) ? nodes : [nodes]).filter(Boolean);
+    const _nodes = Array.isArray(nodes) ? nodes.filter(Boolean) : nodes;
     this.addError(new GraphQLError(message, _nodes));
   }
 

diff --git a/src/utilities/findDeprecatedUsages.js b/src/utilities/findDeprecatedUsages.js
@@ -39,7 +39,7 @@ export function findDeprecatedUsages(
               new GraphQLError(
                 `The field ${parentType.name}.${fieldDef.name} is deprecated.` +
                   (reason ? ' ' + reason : ''),
-                [node],
+                node,
               ),
             );
           }
@@ -55,7 +55,7 @@ export function findDeprecatedUsages(
               new GraphQLError(
                 `The enum value ${type.name}.${enumVal.name} is deprecated.` +
                   (reason ? ' ' + reason : ''),
-                [node],
+                node,
               ),
             );
           }

diff --git a/src/utilities/getOperationRootType.js b/src/utilities/getOperationRootType.js
@@ -28,30 +28,32 @@ export function getOperationRootType(
       if (!queryType) {
         throw new GraphQLError(
           'Schema does not define the required query root type.',
-          [operation],
+          operation,
         );
       }
       return queryType;
     case 'mutation':
       const mutationType = schema.getMutationType();
       if (!mutationType) {
-        throw new GraphQLError('Schema is not configured for mutations.', [
+        throw new GraphQLError(
+          'Schema is not configured for mutations.',
           operation,
-        ]);
+        );
       }
       return mutationType;
     case 'subscription':
       const subscriptionType = schema.getSubscriptionType();
       if (!subscriptionType) {
-        throw new GraphQLError('Schema is not configured for subscriptions.', [
+        throw new GraphQLError(
+          'Schema is not configured for subscriptions.',
           operation,
-        ]);
+        );
       }
       return subscriptionType;
     default:
       throw new GraphQLError(
         'Can only have query, mutation and subscription operations.',
-        [operation],
+        operation,
       );
   }
 }
diff --git a/src/validation/rules/ExecutableDefinitions.js b/src/validation/rules/ExecutableDefinitions.js
@@ -38,7 +38,7 @@ export function ExecutableDefinitions(
                   ? 'schema'
                   : definition.name.value,
               ),
-              [definition],
+              definition,
             ),
           );
         }

diff --git a/src/validation/rules/FieldsOnCorrectType.js b/src/validation/rules/FieldsOnCorrectType.js
@@ -74,7 +74,7 @@ export function FieldsOnCorrectType(context: ValidationContext): ASTVisitor {
                 suggestedTypeNames,
                 suggestedFieldNames,
               ),
-              [node],
+              node,
             ),
           );
         }

diff --git a/src/validation/rules/FragmentsOnCompositeTypes.js b/src/validation/rules/FragmentsOnCompositeTypes.js
@@ -47,7 +47,7 @@ export function FragmentsOnCompositeTypes(
           context.reportError(
             new GraphQLError(
               inlineFragmentOnNonCompositeErrorMessage(print(typeCondition)),
-              [typeCondition],
+              typeCondition,
             ),
           );
         }
@@ -62,7 +62,7 @@ export function FragmentsOnCompositeTypes(
               node.name.value,
               print(node.typeCondition),
             ),
-            [node.typeCondition],
+            node.typeCondition,
           ),
         );
       }

diff --git a/src/validation/rules/KnownDirectives.js b/src/validation/rules/KnownDirectives.js
@@ -61,16 +61,17 @@ export function KnownDirectives(
 
       if (!locations) {
         context.reportError(
-          new GraphQLError(unknownDirectiveMessage(name), [node]),
+          new GraphQLError(unknownDirectiveMessage(name), node),
         );
         return;
       }
       const candidateLocation = getDirectiveLocationForASTPath(ancestors);
       if (candidateLocation && locations.indexOf(candidateLocation) === -1) {
         context.reportError(
-          new GraphQLError(misplacedDirectiveMessage(name, candidateLocation), [
+          new GraphQLError(
+            misplacedDirectiveMessage(name, candidateLocation),
             node,
-          ]),
+          ),
         );
       }
     },

diff --git a/src/validation/rules/KnownFragmentNames.js b/src/validation/rules/KnownFragmentNames.js
@@ -28,7 +28,7 @@ export function KnownFragmentNames(context: ValidationContext): ASTVisitor {
       const fragment = context.getFragment(fragmentName);
       if (!fragment) {
         context.reportError(
-          new GraphQLError(unknownFragmentMessage(fragmentName), [node.name]),
+          new GraphQLError(unknownFragmentMessage(fragmentName), node.name),
         );
       }
     },

diff --git a/src/validation/rules/LoneAnonymousOperation.js b/src/validation/rules/LoneAnonymousOperation.js
@@ -35,7 +35,7 @@ export function LoneAnonymousOperation(
     OperationDefinition(node) {
       if (!node.name && operationCount > 1) {
         context.reportError(
-          new GraphQLError(anonOperationNotAloneMessage(), [node]),
+          new GraphQLError(anonOperationNotAloneMessage(), node),
         );
       }
     },

diff --git a/src/validation/rules/NoUnusedFragments.js b/src/validation/rules/NoUnusedFragments.js
@@ -49,7 +49,7 @@ export function NoUnusedFragments(context: ASTValidationContext): ASTVisitor {
           const fragName = fragmentDef.name.value;
           if (fragmentNameUsed[fragName] !== true) {
             context.reportError(
-              new GraphQLError(unusedFragMessage(fragName), [fragmentDef]),
+              new GraphQLError(unusedFragMessage(fragName), fragmentDef),
             );
           }
         }

diff --git a/src/validation/rules/NoUnusedVariables.js b/src/validation/rules/NoUnusedVariables.js
@@ -47,9 +47,10 @@ export function NoUnusedVariables(context: ValidationContext): ASTVisitor {
           const variableName = variableDef.variable.name.value;
           if (variableNameUsed[variableName] !== true) {
             context.reportError(
-              new GraphQLError(unusedVariableMessage(variableName, opName), [
+              new GraphQLError(
+                unusedVariableMessage(variableName, opName),
                 variableDef,
-              ]),
+              ),
             );
           }
         }

diff --git a/src/validation/rules/PossibleFragmentSpreads.js b/src/validation/rules/PossibleFragmentSpreads.js
@@ -61,7 +61,7 @@ export function PossibleFragmentSpreads(
               inspect(parentType),
               inspect(fragType),
             ),
-            [node],
+            node,
           ),
         );
       }
@@ -82,7 +82,7 @@ export function PossibleFragmentSpreads(
               inspect(parentType),
               inspect(fragType),
             ),
-            [node],
+            node,
           ),
         );
       }

diff --git a/src/validation/rules/ProvidedRequiredArguments.js b/src/validation/rules/ProvidedRequiredArguments.js
@@ -73,7 +73,7 @@ export function ProvidedRequiredArguments(
                   argDef.name,
                   inspect(argDef.type),
                 ),
-                [fieldNode],
+                fieldNode,
               ),
             );
           }

diff --git a/src/validation/rules/ScalarLeafs.js b/src/validation/rules/ScalarLeafs.js
@@ -51,15 +51,15 @@ export function ScalarLeafs(context: ValidationContext): ASTVisitor {
             context.reportError(
               new GraphQLError(
                 noSubselectionAllowedMessage(node.name.value, inspect(type)),
-                [selectionSet],
+                selectionSet,
               ),
             );
           }
         } else if (!selectionSet) {
           context.reportError(
             new GraphQLError(
               requiredSubselectionMessage(node.name.value, inspect(type)),
-              [node],
+              node,
             ),
           );
         }

diff --git a/src/validation/rules/VariablesAreInputTypes.js b/src/validation/rules/VariablesAreInputTypes.js
@@ -39,7 +39,7 @@ export function VariablesAreInputTypes(context: ValidationContext): ASTVisitor {
         context.reportError(
           new GraphQLError(
             nonInputTypeOnVarMessage(variableName, print(node.type)),
-            [node.type],
+            node.type,
           ),
         );
       }