Skip to content

Commit 9c3e816

Browse files
Jackson KearlIvanGoncharov
authored andcommitted
Sync validation TS definitions with flow (#2119)
* Sync tstypes/validation TS definitions with Flow Note: not tstypes/validation/rules yet * Sync validation/rules TS with Flow
1 parent 7b9bfda commit 9c3e816

36 files changed

+176
-46
lines changed

tstypes/validation/ValidationContext.d.ts

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import Maybe from '../tsutils/Maybe';
22
import { GraphQLError } from '../error';
3+
import { ASTVisitor } from '../language/visitor';
34
import {
45
DocumentNode,
56
OperationDefinitionNode,
@@ -9,16 +10,15 @@ import {
910
FragmentDefinitionNode,
1011
} from '../language/ast';
1112
import { GraphQLSchema } from '../type/schema';
13+
import { GraphQLDirective } from '../type/directives';
1214
import {
1315
GraphQLInputType,
1416
GraphQLOutputType,
1517
GraphQLCompositeType,
1618
GraphQLField,
1719
GraphQLArgument,
1820
} from '../type/definition';
19-
import { GraphQLDirective } from '../type/directives';
2021
import { TypeInfo } from '../utilities/TypeInfo';
21-
import { ASTVisitor } from '../language/visitor';
2222

2323
type NodeWithSelectionSet = OperationDefinitionNode | FragmentDefinitionNode;
2424
type VariableUsage = {
@@ -40,35 +40,44 @@ export class ASTValidationContext {
4040
getErrors(): ReadonlyArray<GraphQLError>;
4141

4242
getDocument(): DocumentNode;
43+
44+
getFragment(name: string): Maybe<FragmentDefinitionNode>;
45+
46+
getFragmentSpreads(node: SelectionSetNode): ReadonlyArray<FragmentSpreadNode>;
47+
48+
getRecursivelyReferencedFragments(
49+
operation: OperationDefinitionNode,
50+
): ReadonlyArray<FragmentDefinitionNode>;
4351
}
4452

4553
export class SDLValidationContext extends ASTValidationContext {
46-
constructor(ast: DocumentNode, schema?: Maybe<GraphQLSchema>);
54+
constructor(
55+
ast: DocumentNode,
56+
schema: Maybe<GraphQLSchema>,
57+
onError?: (err: GraphQLError) => void,
58+
);
4759

4860
getSchema(): Maybe<GraphQLSchema>;
4961
}
5062

5163
export type SDLValidationRule = (context: SDLValidationContext) => ASTVisitor;
5264

5365
export class ValidationContext extends ASTValidationContext {
54-
constructor(schema: GraphQLSchema, ast: DocumentNode, typeInfo: TypeInfo);
66+
constructor(
67+
schema: GraphQLSchema,
68+
ast: DocumentNode,
69+
typeInfo: TypeInfo,
70+
onError?: (err: GraphQLError) => void,
71+
);
5572

5673
getSchema(): GraphQLSchema;
5774

58-
getFragment(name: string): Maybe<FragmentDefinitionNode>;
59-
60-
getFragmentSpreads(node: SelectionSetNode): ReadonlyArray<FragmentSpreadNode>;
75+
getVariableUsages(node: NodeWithSelectionSet): ReadonlyArray<VariableUsage>;
6176

6277
getRecursivelyReferencedFragments(
6378
operation: OperationDefinitionNode,
6479
): ReadonlyArray<FragmentDefinitionNode>;
6580

66-
getVariableUsages(node: NodeWithSelectionSet): ReadonlyArray<VariableUsage>;
67-
68-
getRecursiveVariableUsages(
69-
operation: OperationDefinitionNode,
70-
): ReadonlyArray<VariableUsage>;
71-
7281
getType(): Maybe<GraphQLOutputType>;
7382

7483
getParentType(): Maybe<GraphQLCompositeType>;

tstypes/validation/rules/ExecutableDefinitions.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { ASTValidationContext } from '../ValidationContext';
21
import { ASTVisitor } from '../../language/visitor';
2+
import { ASTValidationContext } from '../ValidationContext';
33

44
export function nonExecutableDefinitionMessage(defName: string): string;
55

tstypes/validation/rules/FieldsOnCorrectType.d.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
1-
import { ValidationContext } from '../ValidationContext';
21
import { ASTVisitor } from '../../language/visitor';
2+
import { ValidationContext } from '../ValidationContext';
3+
4+
export function undefinedFieldMessage(
5+
fieldName: string,
6+
type: string,
7+
suggestedTypeNames: ReadonlyArray<string>,
8+
suggestedFieldNames: ReadonlyArray<string>,
9+
): string;
310

411
/**
512
* Fields on correct type

tstypes/validation/rules/FragmentsOnCompositeTypes.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { ValidationContext } from '../ValidationContext';
21
import { ASTVisitor } from '../../language/visitor';
2+
import { ValidationContext } from '../ValidationContext';
33

44
export function inlineFragmentOnNonCompositeErrorMessage(type: string): string;
55

tstypes/validation/rules/KnownArgumentNames.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ export function unknownArgMessage(
55
argName: string,
66
fieldName: string,
77
typeName: string,
8-
suggestedArgs: Array<string>,
8+
suggestedArgs: ReadonlyArray<string>,
99
): string;
1010

1111
export function unknownDirectiveArgMessage(
1212
argName: string,
1313
directiveName: string,
14-
suggestedArgs: Array<string>,
14+
suggestedArgs: ReadonlyArray<string>,
1515
): string;
1616

1717
/**

tstypes/validation/rules/KnownDirectives.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { ValidationContext, SDLValidationContext } from '../ValidationContext';
21
import { ASTVisitor } from '../../language/visitor';
2+
import { ValidationContext, SDLValidationContext } from '../ValidationContext';
33

44
export function unknownDirectiveMessage(directiveName: string): string;
55

tstypes/validation/rules/KnownFragmentNames.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { ValidationContext } from '../ValidationContext';
21
import { ASTVisitor } from '../../language/visitor';
2+
import { ValidationContext } from '../ValidationContext';
33

44
export function unknownFragmentMessage(fragName: string): string;
55

tstypes/validation/rules/KnownTypeNames.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { ValidationContext } from '../ValidationContext';
21
import { ASTVisitor } from '../../language/visitor';
2+
import { ValidationContext } from '../ValidationContext';
33

44
export function unknownTypeMessage(
55
typeName: string,

tstypes/validation/rules/LoneAnonymousOperation.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { ASTValidationContext } from '../ValidationContext';
21
import { ASTVisitor } from '../../language/visitor';
2+
import { ASTValidationContext } from '../ValidationContext';
33

44
export function anonOperationNotAloneMessage(): string;
55

tstypes/validation/rules/LoneSchemaDefinition.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { SDLValidationContext } from '../ValidationContext';
21
import { ASTVisitor } from '../../language/visitor';
2+
import { SDLValidationContext } from '../ValidationContext';
33

44
export function schemaDefinitionNotAloneMessage(): string;
55

0 commit comments

Comments
 (0)