fix(graphql/@searchBy)!: Directive locations.

LastDragon-ru · Mar 1, 2024 · b56b21b · b56b21b
1 parent eedf598
commit b56b21b
Show file tree

Hide file tree

Showing 22 changed files with 47 additions and 88 deletions.
diff --git a/packages/graphql/src/Builder/Directives/OperatorDirective.php b/packages/graphql/src/Builder/Directives/OperatorDirective.php
@@ -46,7 +46,7 @@ public static function definition(): string {
     }
 
     /**
-     * @return non-empty-list<string>
+     * @return list<string>
      */
     protected static function getDirectiveLocations(): array {
         return [

diff --git a/packages/graphql/src/SearchBy/Directives/DirectiveTest/AllowedDirectives.expected.graphql b/packages/graphql/src/SearchBy/Directives/DirectiveTest/AllowedDirectives.expected.graphql
@@ -7,9 +7,7 @@ on
 
 directive @searchByOperatorCondition
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
-    | SCALAR
 
 directive @searchByOperatorEqual
 on
@@ -19,7 +17,6 @@ on
 
 directive @searchByOperatorField
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
     | SCALAR
 

diff --git a/...ages/graphql/src/SearchBy/Directives/DirectiveTest/CustomComplexOperator.expected.graphql b/...ages/graphql/src/SearchBy/Directives/DirectiveTest/CustomComplexOperator.expected.graphql
@@ -13,13 +13,11 @@ on
 
 directive @searchByOperatorAllOf
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
     | SCALAR
 
 directive @searchByOperatorAnyOf
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
     | SCALAR
 
@@ -61,9 +59,7 @@ on
 
 directive @searchByOperatorCondition
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
-    | SCALAR
 
 directive @searchByOperatorContains
 on
@@ -85,7 +81,6 @@ on
 
 directive @searchByOperatorField
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
     | SCALAR
 
@@ -139,7 +134,6 @@ on
 
 directive @searchByOperatorNot
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
     | SCALAR
 
@@ -187,7 +181,6 @@ on
 
 directive @searchByOperatorRelationship
 on
-    | ENUM
     | FIELD_DEFINITION
     | INPUT_FIELD_DEFINITION
     | SCALAR

diff --git a/packages/graphql/src/SearchBy/Directives/DirectiveTest/Example.expected.graphql b/packages/graphql/src/SearchBy/Directives/DirectiveTest/Example.expected.graphql
@@ -7,13 +7,11 @@ on
 
 directive @searchByOperatorAllOf
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
     | SCALAR
 
 directive @searchByOperatorAnyOf
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
     | SCALAR
 
@@ -55,9 +53,7 @@ on
 
 directive @searchByOperatorCondition
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
-    | SCALAR
 
 directive @searchByOperatorContains
 on
@@ -79,7 +75,6 @@ on
 
 directive @searchByOperatorField
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
     | SCALAR
 
@@ -133,7 +128,6 @@ on
 
 directive @searchByOperatorNot
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
     | SCALAR
 
@@ -181,7 +175,6 @@ on
 
 directive @searchByOperatorRelationship
 on
-    | ENUM
     | FIELD_DEFINITION
     | INPUT_FIELD_DEFINITION
     | SCALAR

diff --git a/packages/graphql/src/SearchBy/Directives/DirectiveTest/Explicit.expected.graphql b/packages/graphql/src/SearchBy/Directives/DirectiveTest/Explicit.expected.graphql
@@ -7,13 +7,11 @@ on
 
 directive @searchByOperatorAllOf
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
     | SCALAR
 
 directive @searchByOperatorAnyOf
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
     | SCALAR
 
@@ -55,9 +53,7 @@ on
 
 directive @searchByOperatorCondition
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
-    | SCALAR
 
 directive @searchByOperatorContains
 on
@@ -79,7 +75,6 @@ on
 
 directive @searchByOperatorField
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
     | SCALAR
 
@@ -133,7 +128,6 @@ on
 
 directive @searchByOperatorNot
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
     | SCALAR
 
@@ -181,7 +175,6 @@ on
 
 directive @searchByOperatorRelationship
 on
-    | ENUM
     | FIELD_DEFINITION
     | INPUT_FIELD_DEFINITION
     | SCALAR

diff --git a/packages/graphql/src/SearchBy/Directives/DirectiveTest/Ignored.expected.graphql b/packages/graphql/src/SearchBy/Directives/DirectiveTest/Ignored.expected.graphql
@@ -19,9 +19,7 @@ on
 
 directive @searchByOperatorCondition
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
-    | SCALAR
 
 directive @searchByOperatorEqual
 on
@@ -31,7 +29,6 @@ on
 
 directive @searchByOperatorField
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
     | SCALAR
 

diff --git a/packages/graphql/src/SearchBy/Directives/DirectiveTest/Implicit.expected.graphql b/packages/graphql/src/SearchBy/Directives/DirectiveTest/Implicit.expected.graphql
@@ -7,13 +7,11 @@ on
 
 directive @searchByOperatorAllOf
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
     | SCALAR
 
 directive @searchByOperatorAnyOf
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
     | SCALAR
 
@@ -55,9 +53,7 @@ on
 
 directive @searchByOperatorCondition
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
-    | SCALAR
 
 directive @searchByOperatorContains
 on
@@ -79,7 +75,6 @@ on
 
 directive @searchByOperatorField
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
     | SCALAR
 
@@ -133,7 +128,6 @@ on
 
 directive @searchByOperatorNot
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
     | SCALAR
 
@@ -181,7 +175,6 @@ on
 
 directive @searchByOperatorRelationship
 on
-    | ENUM
     | FIELD_DEFINITION
     | INPUT_FIELD_DEFINITION
     | SCALAR

diff --git a/packages/graphql/src/SearchBy/Directives/DirectiveTest/InterfaceUpdate.expected.graphql b/packages/graphql/src/SearchBy/Directives/DirectiveTest/InterfaceUpdate.expected.graphql
@@ -7,9 +7,7 @@ on
 
 directive @searchByOperatorCondition
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
-    | SCALAR
 
 directive @searchByOperatorEqual
 on
@@ -19,7 +17,6 @@ on
 
 directive @searchByOperatorField
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
     | SCALAR
 

diff --git a/packages/graphql/src/SearchBy/Directives/DirectiveTest/Query.expected.graphql b/packages/graphql/src/SearchBy/Directives/DirectiveTest/Query.expected.graphql
@@ -7,21 +7,17 @@ on
 
 directive @searchByOperatorAllOf
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
     | SCALAR
 
 directive @searchByOperatorAnyOf
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
     | SCALAR
 
 directive @searchByOperatorCondition
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
-    | SCALAR
 
 directive @searchByOperatorContains
 on
@@ -43,7 +39,6 @@ on
 
 directive @searchByOperatorField
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
     | SCALAR
 
@@ -73,7 +68,6 @@ on
 
 directive @searchByOperatorNot
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
     | SCALAR
 

diff --git a/packages/graphql/src/SearchBy/Directives/DirectiveTest/ScalarOperators.expected.graphql b/packages/graphql/src/SearchBy/Directives/DirectiveTest/ScalarOperators.expected.graphql
@@ -18,15 +18,12 @@ on
 
 directive @searchByOperatorAllOf
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
     | SCALAR
 
 directive @searchByOperatorCondition
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
-    | SCALAR
 
 directive @searchByOperatorEqual
 on
@@ -36,7 +33,6 @@ on
 
 directive @searchByOperatorField
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
     | SCALAR
 

diff --git a/packages/graphql/src/SearchBy/Directives/DirectiveTest/Scout.expected.graphql b/packages/graphql/src/SearchBy/Directives/DirectiveTest/Scout.expected.graphql
@@ -30,21 +30,17 @@ on
 
 directive @searchByOperatorAllOf
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
     | SCALAR
 
 directive @searchByOperatorChild
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
     | SCALAR
 
 directive @searchByOperatorCondition
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
-    | SCALAR
 
 directive @searchByOperatorEqual
 on
@@ -54,7 +50,6 @@ on
 
 directive @searchByOperatorField
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
     | SCALAR
 

diff --git a/packages/graphql/src/SearchBy/Directives/DirectiveTest/Scout.expected.v10.3.0.graphql b/packages/graphql/src/SearchBy/Directives/DirectiveTest/Scout.expected.v10.3.0.graphql
@@ -30,21 +30,17 @@ on
 
 directive @searchByOperatorAllOf
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
     | SCALAR
 
 directive @searchByOperatorChild
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
     | SCALAR
 
 directive @searchByOperatorCondition
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
-    | SCALAR
 
 directive @searchByOperatorEqual
 on
@@ -54,7 +50,6 @@ on
 
 directive @searchByOperatorField
 on
-    | ENUM
     | INPUT_FIELD_DEFINITION
     | SCALAR