fix(graphql/SchemaPrinter): Directives location for enum.

LastDragon-ru · Dec 24, 2022 · 581be04 · 581be04
1 parent 1c1b718
commit 581be04
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 12 deletions.
diff --git a/packages/graphql/src/SchemaPrinter/Blocks/Types/EnumTypeDefinitionBlock.php b/packages/graphql/src/SchemaPrinter/Blocks/Types/EnumTypeDefinitionBlock.php
@@ -28,6 +28,10 @@ protected function type(): string {
     }
 
     protected function body(int $used): Block|string|null {
+        return null;
+    }
+
+    protected function fields(int $used): Block|string|null {
         $space  = $this->space();
         $values = $this->addUsed(
             new EnumValuesDefinitionList(
@@ -38,10 +42,6 @@ protected function body(int $used): Block|string|null {
             ),
         );
 
-        return "{$space}{$values}";
-    }
-
-    protected function fields(int $used): Block|string|null {
-        return null;
+        return $values;
     }
 }
diff --git a/packages/graphql/src/SchemaPrinter/Blocks/Types/EnumTypeDefinitionBlockTest.php b/packages/graphql/src/SchemaPrinter/Blocks/Types/EnumTypeDefinitionBlockTest.php
@@ -104,6 +104,27 @@ enum Test {
                     'values' => ['C', 'B', 'A'],
                 ]),
             ],
+            'directives' => [
+                <<<'STRING'
+                enum Test
+                @a
+                {
+                    A
+                }
+                STRING,
+                $settings,
+                0,
+                0,
+                new EnumType([
+                    'name'    => 'Test',
+                    'values'  => ['A'],
+                    'astNode' => Parser::enumTypeDefinition(
+                        <<<'STRING'
+                        enum Test @a { A }
+                        STRING,
+                    ),
+                ]),
+            ],
         ];
     }
     // </editor-fold>

diff --git a/packages/graphql/src/SchemaPrinter/SchemaPrinterTest~printSchema-schema.graphql b/packages/graphql/src/SchemaPrinter/SchemaPrinterTest~printSchema-schema.graphql
@@ -10,7 +10,7 @@ directive @schemaDirective(
 
 scalar SchemaScalar @scalar(class: "GraphQL\\Type\\Definition\\StringType") @codeDirective
 
-enum SchemaEnum {
+enum SchemaEnum @schemaDirective @codeDirective {
   A @deprecated
 
   "Description"

diff --git a/...maPrinter/SchemaPrinterTest~printSchema-test-settings-directive-definition-filter.graphql b/...maPrinter/SchemaPrinterTest~printSchema-test-settings-directive-definition-filter.graphql
@@ -4,7 +4,10 @@ enum CodeEnum {
     C
 }
 
-enum SchemaEnum {
+enum SchemaEnum
+@schemaDirective
+@codeDirective
+{
     A
     @deprecated
 

diff --git a/.../graphql/src/SchemaPrinter/SchemaPrinterTest~printSchema-test-settings-everything.graphql b/.../graphql/src/SchemaPrinter/SchemaPrinterTest~printSchema-test-settings-everything.graphql
@@ -10,7 +10,10 @@ enum CodeEnum {
     C
 }
 
-enum SchemaEnum {
+enum SchemaEnum
+@schemaDirective
+@codeDirective
+{
     A
     @deprecated
 

diff --git a/...hemaPrinter/SchemaPrinterTest~printSchema-test-settings-no-directives-definitions.graphql b/...hemaPrinter/SchemaPrinterTest~printSchema-test-settings-no-directives-definitions.graphql
@@ -4,7 +4,10 @@ enum CodeEnum {
     C
 }
 
-enum SchemaEnum {
+enum SchemaEnum
+@schemaDirective
+@codeDirective
+{
     A
     @deprecated
 

diff --git a/...ql/src/SchemaPrinter/SchemaPrinterTest~printSchema-test-settings-no-normalization.graphql b/...ql/src/SchemaPrinter/SchemaPrinterTest~printSchema-test-settings-no-normalization.graphql
@@ -82,7 +82,10 @@ represent free-form human-readable text.
 """
 scalar CodeScalar
 
-enum SchemaEnum {
+enum SchemaEnum
+@schemaDirective
+@codeDirective
+{
     A
     @deprecated
 

diff --git a/.../SchemaPrinter/SchemaPrinterTest~printSchema-test-settings-type-definition-filter.graphql b/.../SchemaPrinter/SchemaPrinterTest~printSchema-test-settings-type-definition-filter.graphql
@@ -1,4 +1,7 @@
-enum SchemaEnum {
+enum SchemaEnum
+@schemaDirective
+@codeDirective
+{
     A
     @deprecated
 

diff --git a/packages/graphql/src/SchemaPrinter/SchemaPrinterTest~printSchema-test-settings.graphql b/packages/graphql/src/SchemaPrinter/SchemaPrinterTest~printSchema-test-settings.graphql
@@ -10,7 +10,10 @@ enum CodeEnum {
     C
 }
 
-enum SchemaEnum {
+enum SchemaEnum
+@schemaDirective
+@codeDirective
+{
     A
     @deprecated