didYouMean: quote suggested values (#2165)

Author: IvanGoncharov

src/jsutils/__tests__/didYouMean-test.js

@@ -11,26 +11,28 @@ describe('didYouMean', () => {
   });
 
   it('Handles single suggestion', () => {
-    expect(didYouMean(['A'])).to.equal(' Did you mean A?');
+    expect(didYouMean(['A'])).to.equal(' Did you mean "A"?');
   });
 
   it('Handles two suggestions', () => {
-    expect(didYouMean(['A', 'B'])).to.equal(' Did you mean A or B?');
+    expect(didYouMean(['A', 'B'])).to.equal(' Did you mean "A" or "B"?');
   });
 
   it('Handles multiple suggestions', () => {
-    expect(didYouMean(['A', 'B', 'C'])).to.equal(' Did you mean A, B, or C?');
+    expect(didYouMean(['A', 'B', 'C'])).to.equal(
+      ' Did you mean "A", "B", or "C"?',
+    );
   });
 
   it('Limits to five suggestions', () => {
     expect(didYouMean(['A', 'B', 'C', 'D', 'E', 'F'])).to.equal(
-      ' Did you mean A, B, C, D, or E?',
+      ' Did you mean "A", "B", "C", "D", or "E"?',
     );
   });
 
   it('Adds sub-message', () => {
     expect(didYouMean('the letter', ['A'])).to.equal(
-      ' Did you mean the letter A?',
+      ' Did you mean the letter "A"?',
     );
   });
 });

src/jsutils/didYouMean.js

@@ -14,7 +14,7 @@ declare function didYouMean(
 
 // eslint-disable-next-line no-redeclare
 export default function didYouMean(firstArg, secondArg) {
-  const [subMessage, suggestions] =
+  const [subMessage, suggestionsArg] =
     typeof firstArg === 'string'
       ? [firstArg, secondArg]
       : [undefined, firstArg];
@@ -24,6 +24,7 @@ export default function didYouMean(firstArg, secondArg) {
     message += subMessage + ' ';
   }
 
+  const suggestions = suggestionsArg.map(x => `"${x}"`);
   switch (suggestions.length) {
     case 0:
       return '';

src/utilities/coerceInputValue.js

@@ -149,7 +149,7 @@ function coerceInputValueImpl(
           inputValue,
           new GraphQLError(
             `Field "${fieldName}" is not defined by type "${type.name}".` +
-              didYouMean(suggestions.map(x => `"${x}"`)),
+              didYouMean(suggestions),
           ),
         );
       }
@@ -206,7 +206,7 @@ function coerceInputValueImpl(
       inputValue,
       new GraphQLError(
         `Expected type "${type.name}".` +
-          didYouMean('the enum value', suggestions.map(x => `"${x}"`)),
+          didYouMean('the enum value', suggestions),
       ),
     );
     return;

src/validation/rules/FieldsOnCorrectType.js

@@ -47,13 +47,13 @@ export function FieldsOnCorrectType(context: ValidationContext): ASTVisitor {
               : getSuggestedFieldNames(schema, type, fieldName);
 
           // Report an error, including helpful suggestions.
-          const quotedTypeNames = suggestedTypeNames.map(x => `"${x}"`);
-          const quotedFieldNames = suggestedFieldNames.map(x => `"${x}"`);
           context.reportError(
             new GraphQLError(
               `Cannot query field "${fieldName}" on type "${type.name}".` +
-                (didYouMean('to use an inline fragment on', quotedTypeNames) ||
-                  didYouMean(quotedFieldNames)),
+                (didYouMean(
+                  'to use an inline fragment on',
+                  suggestedTypeNames,
+                ) || didYouMean(suggestedFieldNames)),
               node,
             ),
           );

src/validation/rules/KnownArgumentNames.js

@@ -36,7 +36,7 @@ export function KnownArgumentNames(context: ValidationContext): ASTVisitor {
         context.reportError(
           new GraphQLError(
             `Unknown argument "${argName}" on field "${parentType.name}.${fieldDef.name}".` +
-              didYouMean(suggestions.map(x => `"${x}"`)),
+              didYouMean(suggestions),
             argNode,
           ),
         );
@@ -81,7 +81,7 @@ export function KnownArgumentNamesOnDirectives(
             context.reportError(
               new GraphQLError(
                 `Unknown argument "${argName}" on directive "@${directiveName}".` +
-                  didYouMean(suggestions.map(x => `"${x}"`)),
+                  didYouMean(suggestions),
                 argNode,
               ),
             );

src/validation/rules/KnownTypeNames.js

@@ -59,8 +59,7 @@ export function KnownTypeNames(
         );
         context.reportError(
           new GraphQLError(
-            `Unknown type "${typeName}".` +
-              didYouMean(suggestedTypes.map(x => `"${x}"`)),
+            `Unknown type "${typeName}".` + didYouMean(suggestedTypes),
             node,
           ),
         );

src/validation/rules/PossibleTypeExtensions.js

@@ -78,7 +78,7 @@ export function PossibleTypeExtensions(
       context.reportError(
         new GraphQLError(
           `Cannot extend type "${typeName}" because it is not defined.` +
-            didYouMean(suggestedTypes.map(x => `"${x}"`)),
+            didYouMean(suggestedTypes),
           node.name,
         ),
       );

src/validation/rules/ValuesOfCorrectType.js

@@ -77,7 +77,7 @@ export function ValuesOfCorrectType(context: ValidationContext): ASTVisitor {
         context.reportError(
           new GraphQLError(
             `Field "${node.name.value}" is not defined by type "${parentType.name}".` +
-              didYouMean(suggestions.map(name => '"' + name + '"')),
+              didYouMean(suggestions),
             node,
           ),
         );
@@ -118,9 +118,7 @@ function isValidValueNode(context: ValidationContext, node: ValueNode): void {
   if (isEnumType(type)) {
     if (node.kind !== Kind.ENUM || !type.getValue(node.value)) {
       const allNames = type.getValues().map(value => value.name);
-      const suggestedValues = suggestionList(print(node), allNames).map(
-        x => '"' + x + '"',
-      );
+      const suggestedValues = suggestionList(print(node), allNames);
 
       context.reportError(
         new GraphQLError(