allow directives on variable definitions

fix vektah#102
vikstrous · Oct 22, 2020 · 9914f67 · 9914f67
1 parent 83ee611
commit 9914f67
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git a/ast/operation.go b/ast/operation.go
@@ -21,6 +21,7 @@ type VariableDefinition struct {
 	Variable     string
 	Type         *Type
 	DefaultValue *Value
+	Directives   DirectiveList
 	Position     *Position `dump:"-"`
 
 	// Requires validation

diff --git a/parser/query.go b/parser/query.go
@@ -101,6 +101,8 @@ func (p *parser) parseVariableDefinition() *VariableDefinition {
 		def.DefaultValue = p.parseValueLiteral(true)
 	}
 
+	def.Directives = p.parseDirectives(false)
+
 	return &def
 }
 

diff --git a/parser/query_test.yml b/parser/query_test.yml
@@ -41,6 +41,30 @@ variables:
       message: 'Unexpected $'
       locations: [{ line: 1, column: 37 }]
 
+  - name: can have directives
+    input: 'query ($withDirective: String @first @second, $withoutDirective: String) { f }'
+    ast: |
+      <QueryDocument>
+        Operations: [OperationDefinition]
+        - <OperationDefinition>
+            Operation: Operation("query")
+            VariableDefinitions: [VariableDefinition]
+            - <VariableDefinition>
+                Variable: "withDirective"
+                Type: String
+                Directives: [Directive]
+                - <Directive>
+                    Name: "first"
+                - <Directive>
+                    Name: "second"
+            - <VariableDefinition>
+                Variable: "withoutDirective"
+                Type: String
+            SelectionSet: [Selection]
+            - <Field>
+                Alias: "f"
+                Name: "f"
+
 fragments:
   - name: can not be named 'on'
     input: 'fragment on on on { on }'