diff --git a/graphql_parser/lib/src/language/ast/array_value.dart b/graphql_parser/lib/src/language/ast/array_value.dart
index ff6ed44b..1408a5bd 100644
--- a/graphql_parser/lib/src/language/ast/array_value.dart
+++ b/graphql_parser/lib/src/language/ast/array_value.dart
@@ -1,11 +1,10 @@
 import 'package:source_span/source_span.dart';
 import '../token.dart';
-import 'constant.dart';
 import 'input_value.dart';
 
-class ListValueContext extends ValueContext {
+class ListValueContext extends InputValueContext {
   final Token LBRACKET, RBRACKET;
-  final List<ValueContext> values = [];
+  final List<InputValueContext> values = [];
 
   ListValueContext(this.LBRACKET, this.RBRACKET);
 
@@ -16,5 +15,7 @@ class ListValueContext extends ValueContext {
   }
 
   @override
-  List get value => values.map((v) => v.value).toList();
+  computeValue(Map<String, dynamic> variables) {
+    return values.map((v) => v.computeValue(variables)).toList();
+  }
 }
diff --git a/graphql_parser/lib/src/language/ast/constant.dart b/graphql_parser/lib/src/language/ast/constant.dart
index fff707cf..2f71709c 100644
--- a/graphql_parser/lib/src/language/ast/constant.dart
+++ b/graphql_parser/lib/src/language/ast/constant.dart
@@ -1,12 +1,8 @@
-import 'node.dart';
-
-abstract class ConstantContext<T> extends Node {
-  T get value;
-  T computeValue(Map<String, dynamic> variables) => value;
-}
+import 'input_value.dart';
 
 /// Use [ConstantContext] instead. This class remains solely for backwards compatibility.
 @deprecated
-abstract class ValueContext<T> extends ConstantContext<T> {
+abstract class ValueContext<T> extends InputValueContext<T> {
   T get value;
+  T computeValue(Map<String, dynamic> variables) => value;
 }