Skip to content

Commit

Permalink
convert ? (flow) to Maybe (TS)
Browse files Browse the repository at this point in the history
  • Loading branch information
saihaj committed Oct 27, 2020
1 parent cd55ba9 commit 41b6975
Show file tree
Hide file tree
Showing 29 changed files with 285 additions and 258 deletions.
11 changes: 6 additions & 5 deletions src/error/GraphQLError.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import type { Source } from '../language/source';
import type { SourceLocation } from '../language/location';
import { getLocation } from '../language/location';
import { printLocation, printSourceLocation } from '../language/printLocation';
import { Maybe } from '../jsutils/Maybe';

/**
* A GraphQLError describes an Error found during the parse, validate, or
Expand Down Expand Up @@ -77,11 +78,11 @@ export class GraphQLError extends Error {
constructor(
message: string,
nodes?: ReadonlyArray<ASTNode> | ASTNode | void | null,
source?: ?Source,
positions?: ?ReadonlyArray<number>,
path?: ?ReadonlyArray<string | number>,
originalError?: ?(Error & { readonly extensions?: unknown, ... }),
extensions?: ?{ [key: string]: unknown, ... },
source?: Maybe<Source>,
positions?: Maybe<ReadonlyArray<number>>,
path?: Maybe<ReadonlyArray<string | number>>,
originalError?: Maybe<(Error & { readonly extensions?: unknown, ... })>,
extensions?: Maybe<{ [key: string]: unknown, ... }>,
): void {
super(message);

Expand Down
3 changes: 2 additions & 1 deletion src/error/locatedError.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import inspect from '../jsutils/inspect';
import { Maybe } from '../jsutils/Maybe';

import type { ASTNode } from '../language/ast';

Expand All @@ -12,7 +13,7 @@ import { GraphQLError } from './GraphQLError';
export function locatedError(
rawOriginalError: unknown,
nodes: ASTNode | ReadonlyArray<ASTNode> | void | null,
path?: ?ReadonlyArray<string | number>,
path?: Maybe<ReadonlyArray<string | number>>,
): GraphQLError {
// Sometimes a non-error is thrown, wrap it as an Error instance to ensure a consistent Error interface.
const originalError: Error | GraphQLError =
Expand Down
25 changes: 13 additions & 12 deletions src/execution/execute.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ import {
getArgumentValues,
getDirectiveValues,
} from './values';
import { Maybe } from '../jsutils/Maybe';

/**
* Terminology
Expand Down Expand Up @@ -126,12 +127,12 @@ export type FormattedExecutionResult = {
export type ExecutionArgs = {
schema: GraphQLSchema,
document: DocumentNode,
rootValue?: mixed,
contextValue?: mixed,
variableValues?: ?{ readonly [variable: string]: unknown, ... },
operationName?: ?string,
fieldResolver?: ?GraphQLFieldResolver<any, any>,
typeResolver?: ?GraphQLTypeResolver<any, any>,
rootValue?: unknown,
contextValue?: unknown,
variableValues?: Maybe<{ readonly [variable: string]: unknown, ... }>,
operationName?: Maybe<string>,
fieldResolver?: Maybe<GraphQLFieldResolver<any, any>>,
typeResolver?: Maybe<GraphQLTypeResolver<any, any>>,
};

/**
Expand Down Expand Up @@ -229,7 +230,7 @@ function buildResponse(
export function assertValidExecutionArguments(
schema: GraphQLSchema,
document: DocumentNode,
rawVariableValues: ?{ readonly [variable: string]: unknown, ... },
rawVariableValues: Maybe<{ readonly [variable: string]: unknown, ... }>,
): void {
devAssert(document, 'Must provide document.');

Expand All @@ -256,10 +257,10 @@ export function buildExecutionContext(
document: DocumentNode,
rootValue: unknown,
contextValue: unknown,
rawVariableValues: ?{ readonly [variable: string]: unknown, ... },
operationName: ?string,
fieldResolver: ?GraphQLFieldResolver<unknown, unknown>,
typeResolver?: ?GraphQLTypeResolver<unknown, unknown>,
rawVariableValues: Maybe<{ readonly [variable: string]: unknown, ... }>,
operationName: Maybe<string>,
fieldResolver: Maybe<GraphQLFieldResolver<unknown, unknown>>,
typeResolver?: Maybe<GraphQLTypeResolver<unknown, unknown>>,
): ReadonlyArray<GraphQLError> | ExecutionContext {
let operation: OperationDefinitionNode | void;
const fragments: ObjMap<FragmentDefinitionNode> = Object.create(null);
Expand Down Expand Up @@ -1186,7 +1187,7 @@ export function getFieldDef(
schema: GraphQLSchema,
parentType: GraphQLObjectType,
fieldName: string,
): ?GraphQLField<unknown, unknown> {
): Maybe<GraphQLField<unknown, unknown>> {
if (
fieldName === SchemaMetaFieldDef.name &&
schema.getQueryType() === parentType
Expand Down
9 changes: 5 additions & 4 deletions src/graphql.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { validateSchema } from './type/validate';

import type { ExecutionResult } from './execution/execute';
import { execute } from './execution/execute';
import { Maybe } from './jsutils/Maybe';

/**
* This is the primary entry point function for fulfilling GraphQL operations
Expand Down Expand Up @@ -60,10 +61,10 @@ export type GraphQLArgs = {
source: string | Source,
rootValue?: unknown,
contextValue?: unknown,
variableValues?: ?{ readonly [variable: string]: unknown, ... },
operationName?: ?string,
fieldResolver?: ?GraphQLFieldResolver<any, any>,
typeResolver?: ?GraphQLTypeResolver<any, any>,
variableValues?: Maybe<{ readonly [variable: string]: unknown, ... }>,
operationName?: Maybe<string>,
fieldResolver?: Maybe<GraphQLFieldResolver<any, any>>,
typeResolver?: Maybe<GraphQLTypeResolver<any, any>>,
};

export function graphql(args: GraphQLArgs): Promise<ExecutionResult> {
Expand Down
7 changes: 4 additions & 3 deletions src/language/experimentalOnlineParser/onlineParser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import type {
GraphQLGrammarPeekConstraint,
GraphQLGrammarConstraintsSet,
} from './grammar';
import { Maybe } from '../../jsutils/Maybe';

export const TokenKind = {
NAME: 'Name',
Expand Down Expand Up @@ -86,13 +87,13 @@ export type OnlineParserState = {
type Token = {
kind: string,
value: string,
tokenName?: ?string,
ruleName?: ?string,
tokenName?: Maybe<string>,
ruleName?: Maybe<string>,
};

type LexerToken = {
kind: string,
value: ?string,
value: Maybe<string>,
};

type OnlineParserConfig = {
Expand Down
15 changes: 8 additions & 7 deletions src/subscription/subscribe.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,17 @@ import type { GraphQLFieldResolver } from '../type/definition';
import { getOperationRootType } from '../utilities/getOperationRootType';

import mapAsyncIterator from './mapAsyncIterator';
import { Maybe } from '../jsutils/Maybe';

export type SubscriptionArgs = {
schema: GraphQLSchema,
document: DocumentNode,
rootValue?: unknown,
contextValue?: unknown,
variableValues?: ?{ readonly [variable: string]: unknown, ... },
operationName?: ?string,
fieldResolver?: ?GraphQLFieldResolver<any, any>,
subscribeFieldResolver?: ?GraphQLFieldResolver<any, any>,
variableValues?: Maybe<{ readonly [variable: string]: unknown, ... }>,
operationName?: Maybe<string>,
fieldResolver?: Maybe<GraphQLFieldResolver<any, any>>,
subscribeFieldResolver?: Maybe<GraphQLFieldResolver<any, any>>,
};

/**
Expand Down Expand Up @@ -157,9 +158,9 @@ export function createSourceEventStream(
document: DocumentNode,
rootValue?: unknown,
contextValue?: unknown,
variableValues?: ?{ readonly [variable: string]: unknown, ... },
operationName?: ?string,
fieldResolver?: ?GraphQLFieldResolver<any, any>,
variableValues?: Maybe<{ readonly [variable: string]: unknown, ... }>,
operationName?: Maybe<string>,
fieldResolver?: Maybe<GraphQLFieldResolver<any, any>>,
): Promise<AsyncIterable<unknown> | ExecutionResult> {
// If arguments are missing or incorrectly typed, this is an internal
// developer mistake which should throw an early error.
Expand Down
Loading

0 comments on commit 41b6975

Please sign in to comment.