Align Utils::suggestionList() with the reference implementation

CHANGELOG.md

@@ -41,6 +41,7 @@ You can find and compare releases at the [GitHub release page](https://github.co
 - Throw if `Introspection::fromSchema()` returns no data
 - Reorganize abstract class `ASTValidationContext` to interface `ValidationContext`
 - Reorganize AST interfaces related to schema and type extensions
+- Align `Utils::suggestionList()` with the reference implementation (#1075)
 
 ### Added
 

src/Utils/LexicalDistance.php

@@ -0,0 +1,129 @@
+<?php declare(strict_types=1);
+
+namespace GraphQL\Utils;
+
+/**
+ * Computes the lexical distance between strings A and B.
+ *
+ * The "distance" between two strings is given by counting the minimum number
+ * of edits needed to transform string A into string B. An edit can be an
+ * insertion, deletion, or substitution of a single character, or a swap of two
+ * adjacent characters.
+ *
+ * Includes a custom alteration from Damerau-Levenshtein to treat case changes
+ * as a single edit which helps identify mis-cased values with an edit distance
+ * of 1.
+ *
+ * This distance can be useful for detecting typos in input or sorting
+ *
+ * Unlike the native levenshtein() function that always returns int, LexicalDistance::measure() returns int|null.
+ * It takes into account the threshold and returns null if the measured distance is bigger.
+ */
+class LexicalDistance
+{
+    private string $input;
+
+    private string $inputLowerCase;
+
+    /**
+     * List of char codes in the input string.
+     *
+     * @var array<int>
+     */
+    private array $inputArray;
+
+    public function __construct(string $input)
+    {
+        $this->input = $input;
+        $this->inputLowerCase = \strtolower($input);
+        $this->inputArray = self::stringToArray($this->inputLowerCase);
+    }
+
+    public function measure(string $option, float $threshold): ?int
+    {
+        if ($this->input === $option) {
+            return 0;
+        }
+
+        $optionLowerCase = \strtolower($option);
+
+        // Any case change counts as a single edit
+        if ($this->inputLowerCase === $optionLowerCase) {
+            return 1;
+        }
+
+        $a = self::stringToArray($optionLowerCase);
+        $b = $this->inputArray;
+
+        if (\count($a) < \count($b)) {
+            $tmp = $a;
+            $a = $b;
+            $b = $tmp;
+        }
+
+        $aLength = \count($a);
+        $bLength = \count($b);
+
+        if ($aLength - $bLength > $threshold) {
+            return null;
+        }
+
+        /** @var array<array<int>> $rows */
+        $rows = [];
+        for ($i = 0; $i <= $bLength; ++$i) {
+            $rows[0][$i] = $i;
+        }
+
+        for ($i = 1; $i <= $aLength; ++$i) {
+            $upRow = &$rows[($i - 1) % 3];
+            $currentRow = &$rows[$i % 3];
+
+            $smallestCell = ($currentRow[0] = $i);
+            for ($j = 1; $j <= $bLength; ++$j) {
+                $cost = $a[$i - 1] === $b[$j - 1] ? 0 : 1;
+
+                $currentCell = \min(
+                    $upRow[$j] + 1, // delete
+                    $currentRow[$j - 1] + 1, // insert
+                    $upRow[$j - 1] + $cost, // substitute
+                );
+
+                if ($i > 1 && $j > 1 && $a[$i - 1] === $b[$j - 2] && $a[$i - 2] === $b[$j - 1]) {
+                    // transposition
+                    $doubleDiagonalCell = $rows[($i - 2) % 3][$j - 2];
+                    $currentCell = \min($currentCell, $doubleDiagonalCell + 1);
+                }
+
+                if ($currentCell < $smallestCell) {
+                    $smallestCell = $currentCell;
+                }
+
+                $currentRow[$j] = $currentCell;
+            }
+
+            // Early exit, since distance can't go smaller than smallest element of the previous row.
+            if ($smallestCell > $threshold) {
+                return null;
+            }
+        }
+
+        $distance = $rows[$aLength % 3][$bLength];
+
+        return $distance <= $threshold ? $distance : null;
+    }
+
+    /**
+     * Returns a list of char codes in the given string.
+     *
+     * @return array<int>
+     */
+    private static function stringToArray(string $str): array
+    {
+        $array = [];
+        foreach (\mb_str_split($str) as $char) {
+            $array[] = \mb_ord($char);
+        }
+
+        return $array;
+    }
+}

src/Utils/Utils.php

@@ -6,7 +6,6 @@
 use function array_map;
 use function array_reduce;
 use function array_slice;
-use function asort;
 use function count;
 use function dechex;
 use function get_class;
@@ -20,7 +19,6 @@
 use function is_scalar;
 use function is_string;
 use function json_encode;
-use function levenshtein;
 use function mb_convert_encoding;
 use function mb_strlen;
 use function mb_substr;
@@ -31,7 +29,6 @@
 use function property_exists;
 use function range;
 use stdClass;
-use function strtolower;
 use function unpack;
 
 class Utils
@@ -284,34 +281,30 @@ static function ($list, $index) use ($selected, $selectedLength): string {
      * Given an invalid input string and a list of valid options, returns a filtered
      * list of valid options sorted based on their similarity with the input.
      *
-     * Includes a custom alteration from Damerau-Levenshtein to treat case changes
-     * as a single edit which helps identify mis-cased values with an edit distance
-     * of 1
-     *
      * @param array<string> $options
      *
      * @return array<int, string>
      */
     public static function suggestionList(string $input, array $options): array
     {
+        /** @var array<string, int> $optionsByDistance */
         $optionsByDistance = [];
+        $lexicalDistance = new LexicalDistance($input);
         $threshold = mb_strlen($input) * 0.4 + 1;
         foreach ($options as $option) {
-            if ($input === $option) {
-                $distance = 0;
-            } else {
-                $distance = (strtolower($input) === strtolower($option)
-                    ? 1
-                    : levenshtein($input, $option));
-            }
+            $distance = $lexicalDistance->measure($option, $threshold);
 
-            if ($distance <= $threshold) {
+            if ($distance !== null) {
                 $optionsByDistance[$option] = $distance;
             }
         }
 
-        asort($optionsByDistance);
+        \uksort($optionsByDistance, static function (string $a, string $b) use ($optionsByDistance) {
+            $distanceDiff = $optionsByDistance[$a] - $optionsByDistance[$b];
+
+            return $distanceDiff !== 0 ? $distanceDiff : \strnatcmp($a, $b);
+        });
 
-        return array_keys($optionsByDistance);
+        return array_map('strval', array_keys($optionsByDistance));
     }
 }

tests/Error/ErrorTest.php

@@ -201,7 +201,7 @@ public function getNodes(): ?array
         self::assertEquals([1 => 2], $locatedError->getPositions());
         self::assertNotNull($locatedError->getSource());
 
-        $error = new class('msg', new NullValueNode([]), null, [], ) extends Error {
+        $error = new class('msg', new NullValueNode([]), null, []) extends Error {
             public function getNodes(): ?array
             {
                 return [new NullValueNode([])];

tests/Executor/DeferredFieldsTest.php

@@ -592,10 +592,10 @@ public function testDeferredChaining(): void
             }
         ');
 
-        $author1 = ['name' => 'John'/*, 'bestFriend' => ['name' => 'Dirk']*/];
-        $author2 = ['name' => 'Jane'/*, 'bestFriend' => ['name' => 'Joe']*/];
-        $author3 = ['name' => 'Joe'/*, 'bestFriend' => ['name' => 'Jane']*/];
-        $author4 = ['name' => 'Dirk'/*, 'bestFriend' => ['name' => 'John']*/];
+        $author1 = ['name' => 'John'/* , 'bestFriend' => ['name' => 'Dirk'] */];
+        $author2 = ['name' => 'Jane'/* , 'bestFriend' => ['name' => 'Joe'] */];
+        $author3 = ['name' => 'Joe'/* , 'bestFriend' => ['name' => 'Jane'] */];
+        $author4 = ['name' => 'Dirk'/* , 'bestFriend' => ['name' => 'John'] */];
 
         $story1 = ['title' => 'Story #8', 'author' => $author1];
         $story2 = ['title' => 'Story #3', 'author' => $author3];

tests/Type/EnumTypeTest.php

@@ -348,8 +348,7 @@ public function testDoesNotAcceptValuesWithIncorrectCasing(): void
             '{ colorEnum(fromEnum: green) }',
             null,
             [
-                // Improves upon the reference implementation
-                'message' => 'Value "green" does not exist in "Color" enum. Did you mean the enum value "GREEN"?',
+                'message' => 'Value "green" does not exist in "Color" enum. Did you mean the enum value "GREEN" or "RED"?',
                 'locations' => [new SourceLocation(1, 23)],
             ]
         );

tests/Type/ResolveInfoTest.php

@@ -322,7 +322,7 @@ public function testMergedFragmentsFieldSelection(): void
                 'url' => true,
             ],
             'replies' => [
-                'body' => true, //this would be missing if not for the fix https://github.com/webonyx/graphql-php/pull/98
+                'body' => true, // this would be missing if not for the fix https://github.com/webonyx/graphql-php/pull/98
                 'author' => [
                     'id' => true,
                     'name' => true,

tests/Utils/BreakingChangesFinderTest.php

@@ -30,7 +30,7 @@ public function setUp(): void
         ]);
     }
 
-    //DESCRIBE: findBreakingChanges
+    // DESCRIBE: findBreakingChanges
 
     /**
      * @see it('should detect if a type was removed or not')
@@ -1769,7 +1769,7 @@ public function testShouldDetectIfATypeWasAddedToAUnionType(): void
             ],
         ]);
         // logially equivalent to type1; findTypesRemovedFromUnions should not
-        //treat this as different than type1
+        // treat this as different than type1
         $type1a = new ObjectType([
             'name' => 'Type1',
             'fields' => [