Split out 'ASTValidationContext'

src/utilities/isValidLiteralValue.js

@@ -15,7 +15,7 @@ import { visit, visitWithTypeInfo } from '../language/visitor';
 import type { GraphQLInputType } from '../type/definition';
 import { GraphQLSchema } from '../type/schema';
 import { ValuesOfCorrectType } from '../validation/rules/ValuesOfCorrectType';
-import ValidationContext from '../validation/ValidationContext';
+import { ValidationContext } from '../validation/ValidationContext';
 
 /**
  * Utility which determines if a value literal node is valid for an input type.

src/validation/ValidationContext.js

@@ -42,11 +42,31 @@ type VariableUsage = {|
  * allowing access to commonly useful contextual information from within a
  * validation rule.
  */
-export default class ValidationContext {
-  _schema: GraphQLSchema;
+export class ASTValidationContext {
   _ast: DocumentNode;
-  _typeInfo: TypeInfo;
   _errors: Array<GraphQLError>;
+
+  constructor(ast: DocumentNode): void {
+    this._ast = ast;
+    this._errors = [];
+  }
+
+  reportError(error: GraphQLError): void {
+    this._errors.push(error);
+  }
+
+  getErrors(): $ReadOnlyArray<GraphQLError> {
+    return this._errors;
+  }
+
+  getDocument(): DocumentNode {
+    return this._ast;
+  }
+}
+
+export class ValidationContext extends ASTValidationContext {
+  _schema: GraphQLSchema;
+  _typeInfo: TypeInfo;
   _fragments: ObjMap<FragmentDefinitionNode>;
   _fragmentSpreads: Map<SelectionSetNode, $ReadOnlyArray<FragmentSpreadNode>>;
   _recursivelyReferencedFragments: Map<
@@ -64,32 +84,19 @@ export default class ValidationContext {
     ast: DocumentNode,
     typeInfo: TypeInfo,
   ): void {
+    super(ast);
     this._schema = schema;
-    this._ast = ast;
     this._typeInfo = typeInfo;
-    this._errors = [];
     this._fragmentSpreads = new Map();
     this._recursivelyReferencedFragments = new Map();
     this._variableUsages = new Map();
     this._recursiveVariableUsages = new Map();
   }
 
-  reportError(error: GraphQLError): void {
-    this._errors.push(error);
-  }
-
-  getErrors(): $ReadOnlyArray<GraphQLError> {
-    return this._errors;
-  }
-
   getSchema(): GraphQLSchema {
     return this._schema;
   }
 
-  getDocument(): DocumentNode {
-    return this._ast;
-  }
-
   getFragment(name: string): ?FragmentDefinitionNode {
     let fragments = this._fragments;
     if (!fragments) {

src/validation/index.js

@@ -9,9 +9,7 @@
 
 export { validate } from './validate';
 
-// https://github.com/tc39/proposal-export-default-from
-import ValidationContext from './ValidationContext';
-export { ValidationContext };
+export { ValidationContext } from './ValidationContext';
 
 export { specifiedRules } from './specifiedRules';
 

src/validation/rules/ExecutableDefinitions.js

@@ -7,7 +7,7 @@
  * @flow strict
  */
 
-import type ValidationContext from '../ValidationContext';
+import type { ASTValidationContext } from '../ValidationContext';
 import { GraphQLError } from '../../error';
 import { Kind } from '../../language/kinds';
 import type { ASTVisitor } from '../../language/visitor';
@@ -22,7 +22,9 @@ export function nonExecutableDefinitionMessage(defName: string): string {
  * A GraphQL document is only valid for execution if all definitions are either
  * operation or fragment definitions.
  */
-export function ExecutableDefinitions(context: ValidationContext): ASTVisitor {
+export function ExecutableDefinitions(
+  context: ASTValidationContext,
+): ASTVisitor {
   return {
     Document(node) {
       for (const definition of node.definitions) {

src/validation/rules/FieldsOnCorrectType.js

@@ -7,7 +7,7 @@
  * @flow strict
  */
 
-import type ValidationContext from '../ValidationContext';
+import type { ValidationContext } from '../ValidationContext';
 import { GraphQLError } from '../../error';
 import suggestionList from '../../jsutils/suggestionList';
 import quotedOrList from '../../jsutils/quotedOrList';

src/validation/rules/FragmentsOnCompositeTypes.js

@@ -7,7 +7,7 @@
  * @flow strict
  */
 
-import type ValidationContext from '../ValidationContext';
+import type { ValidationContext } from '../ValidationContext';
 import { GraphQLError } from '../../error';
 import { print } from '../../language/printer';
 import type { ASTVisitor } from '../../language/visitor';

src/validation/rules/KnownArgumentNames.js

@@ -7,7 +7,7 @@
  * @flow strict
  */
 
-import type ValidationContext from '../ValidationContext';
+import type { ValidationContext } from '../ValidationContext';
 import { GraphQLError } from '../../error';
 import type { ASTVisitor } from '../../language/visitor';
 import suggestionList from '../../jsutils/suggestionList';

src/validation/rules/KnownDirectives.js

@@ -7,7 +7,7 @@
  * @flow strict
  */
 
-import type ValidationContext from '../ValidationContext';
+import type { ValidationContext } from '../ValidationContext';
 import { GraphQLError } from '../../error';
 import find from '../../jsutils/find';
 import { Kind } from '../../language/kinds';

src/validation/rules/KnownFragmentNames.js

@@ -7,7 +7,7 @@
  * @flow strict
  */
 
-import type ValidationContext from '../ValidationContext';
+import type { ValidationContext } from '../ValidationContext';
 import { GraphQLError } from '../../error';
 import type { ASTVisitor } from '../../language/visitor';
 

src/validation/rules/KnownTypeNames.js

@@ -7,7 +7,7 @@
  * @flow strict
  */
 
-import type ValidationContext from '../ValidationContext';
+import type { ValidationContext } from '../ValidationContext';
 import { GraphQLError } from '../../error';
 import suggestionList from '../../jsutils/suggestionList';
 import quotedOrList from '../../jsutils/quotedOrList';

src/validation/rules/LoneAnonymousOperation.js

@@ -7,7 +7,7 @@
  * @flow strict
  */
 
-import type ValidationContext from '../ValidationContext';
+import type { ASTValidationContext } from '../ValidationContext';
 import { GraphQLError } from '../../error';
 import { Kind } from '../../language/kinds';
 import type { ASTVisitor } from '../../language/visitor';
@@ -22,7 +22,9 @@ export function anonOperationNotAloneMessage(): string {
  * A GraphQL document is only valid if when it contains an anonymous operation
  * (the query short-hand) that it contains only that one operation definition.
  */
-export function LoneAnonymousOperation(context: ValidationContext): ASTVisitor {
+export function LoneAnonymousOperation(
+  context: ASTValidationContext,
+): ASTVisitor {
   let operationCount = 0;
   return {
     Document(node) {

src/validation/rules/NoFragmentCycles.js

@@ -7,7 +7,7 @@
  * @flow strict
  */
 
-import type ValidationContext from '../ValidationContext';
+import type { ValidationContext } from '../ValidationContext';
 import { GraphQLError } from '../../error';
 import type { FragmentDefinitionNode } from '../../language/ast';
 import type { ASTVisitor } from '../../language/visitor';

src/validation/rules/NoUndefinedVariables.js

@@ -7,7 +7,7 @@
  * @flow strict
  */
 
-import type ValidationContext from '../ValidationContext';
+import type { ValidationContext } from '../ValidationContext';
 import { GraphQLError } from '../../error';
 import type { ASTVisitor } from '../../language/visitor';
 

src/validation/rules/NoUnusedFragments.js

@@ -7,7 +7,7 @@
  * @flow strict
  */
 
-import type ValidationContext from '../ValidationContext';
+import type { ValidationContext } from '../ValidationContext';
 import { GraphQLError } from '../../error';
 import type { ASTVisitor } from '../../language/visitor';
 

src/validation/rules/NoUnusedVariables.js

@@ -7,7 +7,7 @@
  * @flow strict
  */
 
-import type ValidationContext from '../ValidationContext';
+import type { ValidationContext } from '../ValidationContext';
 import { GraphQLError } from '../../error';
 import type { ASTVisitor } from '../../language/visitor';
 

src/validation/rules/OverlappingFieldsCanBeMerged.js

@@ -7,7 +7,7 @@
  * @flow strict
  */
 
-import type ValidationContext from '../ValidationContext';
+import type { ValidationContext } from '../ValidationContext';
 import { GraphQLError } from '../../error';
 import inspect from '../../jsutils/inspect';
 import find from '../../jsutils/find';

src/validation/rules/PossibleFragmentSpreads.js

@@ -8,7 +8,7 @@
  */
 
 import inspect from '../../jsutils/inspect';
-import type ValidationContext from '../ValidationContext';
+import type { ValidationContext } from '../ValidationContext';
 import { GraphQLError } from '../../error';
 import type { ASTVisitor } from '../../language/visitor';
 import { doTypesOverlap } from '../../utilities/typeComparators';

src/validation/rules/ProvidedRequiredArguments.js

@@ -7,7 +7,7 @@
  * @flow strict
  */
 
-import type ValidationContext from '../ValidationContext';
+import type { ValidationContext } from '../ValidationContext';
 import { GraphQLError } from '../../error';
 import inspect from '../../jsutils/inspect';
 import keyMap from '../../jsutils/keyMap';

src/validation/rules/ScalarLeafs.js

@@ -8,7 +8,7 @@
  */
 
 import inspect from '../../jsutils/inspect';
-import type ValidationContext from '../ValidationContext';
+import type { ValidationContext } from '../ValidationContext';
 import { GraphQLError } from '../../error';
 import type { FieldNode } from '../../language/ast';
 import { getNamedType, isLeafType } from '../../type/definition';

src/validation/rules/SingleFieldSubscriptions.js

@@ -7,7 +7,7 @@
  * @flow strict
  */
 
-import type ValidationContext from '../ValidationContext';
+import type { ASTValidationContext } from '../ValidationContext';
 import { GraphQLError } from '../../error';
 import type { OperationDefinitionNode } from '../../language/ast';
 import type { ASTVisitor } from '../../language/visitor';
@@ -25,7 +25,7 @@ export function singleFieldOnlyMessage(name: ?string): string {
  * A GraphQL subscription is valid only if it contains a single root field.
  */
 export function SingleFieldSubscriptions(
-  context: ValidationContext,
+  context: ASTValidationContext,
 ): ASTVisitor {
   return {
     OperationDefinition(node: OperationDefinitionNode) {

src/validation/rules/UniqueArgumentNames.js

@@ -7,7 +7,7 @@
  * @flow strict
  */
 
-import type ValidationContext from '../ValidationContext';
+import type { ASTValidationContext } from '../ValidationContext';
 import { GraphQLError } from '../../error';
 import type { ASTVisitor } from '../../language/visitor';
 
@@ -21,7 +21,7 @@ export function duplicateArgMessage(argName: string): string {
  * A GraphQL field or directive is only valid if all supplied arguments are
  * uniquely named.
  */
-export function UniqueArgumentNames(context: ValidationContext): ASTVisitor {
+export function UniqueArgumentNames(context: ASTValidationContext): ASTVisitor {
   let knownArgNames = Object.create(null);
   return {
     Field() {

src/validation/rules/UniqueDirectivesPerLocation.js

@@ -7,7 +7,7 @@
  * @flow strict
  */
 
-import type ValidationContext from '../ValidationContext';
+import type { ASTValidationContext } from '../ValidationContext';
 import { GraphQLError } from '../../error';
 import type { DirectiveNode } from '../../language/ast';
 import type { ASTVisitor } from '../../language/visitor';
@@ -26,7 +26,7 @@ export function duplicateDirectiveMessage(directiveName: string): string {
  * are uniquely named.
  */
 export function UniqueDirectivesPerLocation(
-  context: ValidationContext,
+  context: ASTValidationContext,
 ): ASTVisitor {
   return {
     // Many different AST nodes may contain directives. Rather than listing

src/validation/rules/UniqueFragmentNames.js

@@ -7,7 +7,7 @@
  * @flow strict
  */
 
-import type ValidationContext from '../ValidationContext';
+import type { ASTValidationContext } from '../ValidationContext';
 import { GraphQLError } from '../../error';
 import type { ASTVisitor } from '../../language/visitor';
 
@@ -20,7 +20,7 @@ export function duplicateFragmentNameMessage(fragName: string): string {
  *
  * A GraphQL document is only valid if all defined fragments have unique names.
  */
-export function UniqueFragmentNames(context: ValidationContext): ASTVisitor {
+export function UniqueFragmentNames(context: ASTValidationContext): ASTVisitor {
   const knownFragmentNames = Object.create(null);
   return {
     OperationDefinition: () => false,

src/validation/rules/UniqueInputFieldNames.js

@@ -7,7 +7,7 @@
  * @flow strict
  */
 
-import type ValidationContext from '../ValidationContext';
+import type { ASTValidationContext } from '../ValidationContext';
 import { GraphQLError } from '../../error';
 import type { ASTVisitor } from '../../language/visitor';
 
@@ -21,7 +21,9 @@ export function duplicateInputFieldMessage(fieldName: string): string {
  * A GraphQL input object value is only valid if all supplied fields are
  * uniquely named.
  */
-export function UniqueInputFieldNames(context: ValidationContext): ASTVisitor {
+export function UniqueInputFieldNames(
+  context: ASTValidationContext,
+): ASTVisitor {
   const knownNameStack = [];
   let knownNames = Object.create(null);
 

src/validation/rules/UniqueOperationNames.js

@@ -7,7 +7,7 @@
  * @flow strict
  */
 
-import type ValidationContext from '../ValidationContext';
+import type { ASTValidationContext } from '../ValidationContext';
 import { GraphQLError } from '../../error';
 import type { ASTVisitor } from '../../language/visitor';
 
@@ -20,7 +20,9 @@ export function duplicateOperationNameMessage(operationName: string): string {
  *
  * A GraphQL document is only valid if all defined operations have unique names.
  */
-export function UniqueOperationNames(context: ValidationContext): ASTVisitor {
+export function UniqueOperationNames(
+  context: ASTValidationContext,
+): ASTVisitor {
   const knownOperationNames = Object.create(null);
   return {
     OperationDefinition(node) {

src/validation/rules/UniqueVariableNames.js

@@ -7,7 +7,7 @@
  * @flow strict
  */
 
-import type ValidationContext from '../ValidationContext';
+import type { ASTValidationContext } from '../ValidationContext';
 import type { VariableDefinitionNode } from '../../language/ast';
 import { GraphQLError } from '../../error';
 import type { ASTVisitor } from '../../language/visitor';
@@ -21,7 +21,7 @@ export function duplicateVariableMessage(variableName: string): string {
  *
  * A GraphQL operation is only valid if all its variables are uniquely named.
  */
-export function UniqueVariableNames(context: ValidationContext): ASTVisitor {
+export function UniqueVariableNames(context: ASTValidationContext): ASTVisitor {
   let knownVariableNames = Object.create(null);
   return {
     OperationDefinition() {

src/validation/rules/ValuesOfCorrectType.js

@@ -7,7 +7,7 @@
  * @flow strict
  */
 
-import type ValidationContext from '../ValidationContext';
+import type { ValidationContext } from '../ValidationContext';
 import { GraphQLError } from '../../error';
 import type { ValueNode } from '../../language/ast';
 import { print } from '../../language/printer';