fix(graphql): @searchBy will correctly extends operators for aliases.

LastDragon-ru · Aug 20, 2022 · ad3dd45 · ad3dd45
1 parent 3b1c246
commit ad3dd45
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/packages/graphql/src/SearchBy/Scalars.php b/packages/graphql/src/SearchBy/Scalars.php
@@ -168,11 +168,17 @@ public function getScalarOperators(string $scalar, bool $nullable): array {
         }
 
         // Base
+        $base      = $scalar;
         $operators = $scalar;
 
         do {
             $operators = $this->scalars[$operators] ?? [];
-        } while (!is_array($operators));
+            $isAlias   = !is_array($operators);
+
+            if ($isAlias) {
+                $base = $operators;
+            }
+        } while ($isAlias);
 
         // Create Instances
         $container = $this->getContainer();
@@ -181,8 +187,8 @@ public function getScalarOperators(string $scalar, bool $nullable): array {
         }, array_unique($operators));
 
         // Extends
-        if (isset($this->extends[$scalar])) {
-            $extends   = $this->getScalarOperators($this->extends[$scalar], $nullable);
+        if (isset($this->extends[$base])) {
+            $extends   = $this->getScalarOperators($this->extends[$base], $nullable);
             $operators = array_merge($operators, $extends);
         }
 

diff --git a/packages/graphql/src/SearchBy/ScalarsTest.php b/packages/graphql/src/SearchBy/ScalarsTest.php
@@ -110,6 +110,7 @@ public function testGetScalarOperatorsExtends(): void {
 
         $scalars->addScalar('test', [Equal::class, Equal::class]);
         $scalars->addScalar('base', [NotEqual::class]);
+        $scalars->addScalar('alias', 'test');
 
         self::assertEquals(
             [Equal::class, NotEqual::class],
@@ -119,6 +120,10 @@ public function testGetScalarOperatorsExtends(): void {
             [Equal::class, NotEqual::class, IsNull::class, IsNotNull::class],
             $this->toClassNames($scalars->getScalarOperators('test', true)),
         );
+        self::assertEquals(
+            [Equal::class, NotEqual::class, IsNull::class, IsNotNull::class],
+            $this->toClassNames($scalars->getScalarOperators('alias', true)),
+        );
     }
 
     /**