suggestionList: lexicographically sort options with the same lexical distance

src/jsutils/__tests__/suggestionList-test.js

@@ -14,10 +14,18 @@ describe('suggestionList', () => {
     expect(suggestionList('input', [])).to.deep.equal([]);
   });
 
-  it('Returns options sorted based on similarity', () => {
+  it('Returns options sorted based on lexical distance', () => {
     expect(suggestionList('abc', ['a', 'ab', 'abc'])).to.deep.equal([
       'abc',
       'ab',
     ]);
   });
+
+  it('Returns options with the same lexical distance sorted lexicographically', () => {
+    expect(suggestionList('a', ['az', 'ax', 'ay'])).to.deep.equal([
+      'ax',
+      'ay',
+      'az',
+    ]);
+  });
 });

src/jsutils/suggestionList.js

@@ -17,9 +17,10 @@ export default function suggestionList(
       optionsByDistance[option] = distance;
     }
   }
-  return Object.keys(optionsByDistance).sort(
-    (a, b) => optionsByDistance[a] - optionsByDistance[b],
-  );
+  return Object.keys(optionsByDistance).sort((a, b) => {
+    const diff = optionsByDistance[a] - optionsByDistance[b];
+    return diff !== 0 ? diff : a.localeCompare(b);
+  });
 }
 
 /**

src/validation/__tests__/FieldsOnCorrectType-test.js

@@ -293,34 +293,34 @@ describe('Validate: Fields on correct type', () => {
     it('Works with no small numbers of field suggestions', () => {
       const schema = buildSchema(`
         type T {
-          z: String
           y: String
+          z: String
         }
         type Query { t: T }
       `);
 
       expectErrorMessage(schema, '{ t { f } }').to.equal(
-        'Cannot query field "f" on type "T". Did you mean "z" or "y"?',
+        'Cannot query field "f" on type "T". Did you mean "y" or "z"?',
       );
     });
 
     it('Only shows one set of suggestions at a time, preferring types', () => {
       const schema = buildSchema(`
         interface T {
-          z: String
           y: String
+          z: String
         }
         type Query { t: T }
 
         type A implements T {
           f: String
-          z: String
           y: String
+          z: String
         }
         type B implements T {
           f: String
-          z: String
           y: String
+          z: String
         }
       `);
 
@@ -350,18 +350,18 @@ describe('Validate: Fields on correct type', () => {
     it('Limits lots of field suggestions', () => {
       const schema = buildSchema(`
         type T {
-          z: String
-          y: String
-          x: String
-          w: String
-          v: String
           u: String
+          v: String
+          w: String
+          x: String
+          y: String
+          z: String
         }
         type Query { t: T }
       `);
 
       expectErrorMessage(schema, '{ t { f } }').to.equal(
-        'Cannot query field "f" on type "T". Did you mean "z", "y", "x", "w", or "v"?',
+        'Cannot query field "f" on type "T". Did you mean "u", "v", "w", "x", or "y"?',
       );
     });
   });

src/validation/__tests__/KnownTypeNames-test.js

@@ -176,7 +176,7 @@ describe('Validate: Known type names', () => {
           locations: [{ line: 5, column: 36 }],
         },
         {
-          message: 'Unknown type "D". Did you mean "ID", "A", or "B"?',
+          message: 'Unknown type "D". Did you mean "A", "B", or "ID"?',
           locations: [{ line: 6, column: 16 }],
         },
         {
@@ -196,7 +196,7 @@ describe('Validate: Known type names', () => {
           locations: [{ line: 12, column: 16 }],
         },
         {
-          message: 'Unknown type "I". Did you mean "ID", "A", or "B"?',
+          message: 'Unknown type "I". Did you mean "A", "B", or "ID"?',
           locations: [{ line: 12, column: 20 }],
         },
         {
@@ -306,7 +306,7 @@ describe('Validate: Known type names', () => {
           locations: [{ line: 4, column: 36 }],
         },
         {
-          message: 'Unknown type "D". Did you mean "ID", "A", or "B"?',
+          message: 'Unknown type "D". Did you mean "A", "B", or "ID"?',
           locations: [{ line: 5, column: 16 }],
         },
         {
@@ -326,7 +326,7 @@ describe('Validate: Known type names', () => {
           locations: [{ line: 11, column: 16 }],
         },
         {
-          message: 'Unknown type "I". Did you mean "ID", "A", or "B"?',
+          message: 'Unknown type "I". Did you mean "A", "B", or "ID"?',
           locations: [{ line: 11, column: 20 }],
         },
         {

src/validation/__tests__/ValuesOfCorrectType-test.js

@@ -930,7 +930,7 @@ describe('Validate: Values of correct type', () => {
       `).to.deep.equal([
         {
           message:
-            'Field "unknownField" is not defined by type "ComplexInput". Did you mean "nonNullField", "intField", or "booleanField"?',
+            'Field "unknownField" is not defined by type "ComplexInput". Did you mean "booleanField", "intField", or "nonNullField"?',
           locations: [{ line: 6, column: 15 }],
         },
       ]);