convert ? (flow) to Maybe (TS)

saihaj · saihaj · commit caa8334c9098 · 2020-11-05T22:30:13.000-06:00
diff --git a/src/__testUtils__/inspectStr.ts b/src/__testUtils__/inspectStr.ts
@@ -1,7 +1,9 @@
+import { Maybe } from '../jsutils/Maybe';
+
 /**
  * Special inspect function to produce readable string literal for error messages in tests
  */
-export default function inspectStr(str: ?string): string {
+export default function inspectStr(str: Maybe<string>): string {
   if (str == null) {
     return 'null';
   }
diff --git a/src/error/GraphQLError.ts b/src/error/GraphQLError.ts
@@ -68,7 +68,7 @@ export class GraphQLError extends Error {
   /**
    * The original error thrown from a field resolver during execution.
    */
-  readonly originalError: ?Error;
+  readonly originalError: Maybe<Error>;
 
   /**
    * Extension fields to add to the formatted error.
diff --git a/src/execution/values.ts b/src/execution/values.ts
@@ -21,6 +21,7 @@ import { isInputType, isNonNullType } from '../type/definition';
 import { typeFromAST } from '../utilities/typeFromAST';
 import { valueFromAST } from '../utilities/valueFromAST';
 import { coerceInputValue } from '../utilities/coerceInputValue';
+import { Maybe } from '../jsutils/Maybe';
 
 type CoercedVariableValues =
   | { errors: ReadonlyArray<GraphQLError> }
@@ -245,7 +246,7 @@ export function getArgumentValues(
 export function getDirectiveValues(
   directiveDef: GraphQLDirective,
   node: { readonly directives?: ReadonlyArray<DirectiveNode> },
-  variableValues?: ?ObjMap<unknown>,
+  variableValues?: Maybe<ObjMap<unknown>>,
 ): void | { [argument: string]: unknown } {
   // istanbul ignore next (See: 'https://github.com/graphql/graphql-js/issues/2203')
   const directiveNode = node.directives?.find(
diff --git a/src/jsutils/Path.ts b/src/jsutils/Path.ts
@@ -1,3 +1,5 @@
+import { Maybe } from './Maybe';
+
 export type Path = {
   readonly prev: Path | void;
   readonly key: string | number;
@@ -18,7 +20,7 @@ export function addPath(
 /**
  * Given a Path, return an Array of the path keys.
  */
-export function pathToArray(path: ?Readonly<Path>): Array<string | number> {
+export function pathToArray(path: Maybe<Readonly<Path>>): Array<string | number> {
   const flattened = [];
   let curr = path;
   while (curr) {
diff --git a/src/language/experimentalOnlineParser/grammar.ts b/src/language/experimentalOnlineParser/grammar.ts
@@ -1,3 +1,5 @@
+import { Maybe } from "../../jsutils/Maybe";
+
 export type GraphQLGrammarType = {
   [name: string]: GraphQLGrammarRule,
 };
@@ -16,8 +18,8 @@ export type GraphQLGrammarRule =
   | GraphQLGrammarConstraintsSet;
 export interface GraphQLGrammarBaseRuleConstraint {
   butNot?:
-    | ?GraphQLGrammarTokenConstraint
-    | ?Array<GraphQLGrammarTokenConstraint>;
+    | Maybe<GraphQLGrammarTokenConstraint>
+    | Maybe<Array<GraphQLGrammarTokenConstraint>>;
   optional?: boolean;
   eatNextOnFail?: boolean;
 }
@@ -44,8 +46,8 @@ export interface GraphQLGrammarTokenConstraint
     | 'String'
     | 'BlockString'
     | 'Comment';
-  ofValue?: ?string;
-  oneOf?: ?Array<string>;
+  ofValue?: Maybe<string>;
+  oneOf?: Maybe<Array<string>>;
   tokenName?: string;
   definitionName?: boolean;
   typeName?: boolean;
diff --git a/src/language/experimentalOnlineParser/onlineParser.ts b/src/language/experimentalOnlineParser/onlineParser.ts
@@ -101,7 +101,7 @@ type OnlineParserConfig = {
 };
 
 type OnlineParserConfigOption = {
-  tabSize: ?number,
+  tabSize: Maybe<number>,
 };
 
 export class OnlineParser {
@@ -453,7 +453,7 @@ export class OnlineParser {
     return this.state.rules[this.state.rules.length - 1] || null;
   }
 
-  _popMatchedRule(token: ?Token) {
+  _popMatchedRule(token: Maybe<Token>) {
     const rule = this.state.rules.pop();
     if (!rule) {
       return;
diff --git a/src/language/printer.ts b/src/language/printer.ts
@@ -2,6 +2,7 @@ import type { ASTNode } from './ast';
 
 import { visit } from './visitor';
 import { printBlockString } from './blockString';
+import { Maybe } from '../jsutils/Maybe';
 
 /**
  * Converts an AST into a string, using one set of reasonable
@@ -257,22 +258,22 @@ function addDescription(cb) {
  * Given maybeArray, print an empty string if it is null or empty, otherwise
  * print all items together separated by separator if provided
  */
-function join(maybeArray: ?Array<string>, separator = ''): string {
+function join(maybeArray: Maybe<Array<string>>, separator = ''): string {
   return maybeArray?.filter((x) => x).join(separator) ?? '';
 }
 
 /**
  * Given array, print each item on its own line, wrapped in an
  * indented "{ }" block.
  */
-function block(array: ?Array<string>): string {
+function block(array: Maybe<Array<string>>): string {
   return wrap('{\n', indent(join(array, '\n')), '\n}');
 }
 
 /**
  * If maybeString is not null or empty, then wrap with start and end, otherwise print an empty string.
  */
-function wrap(start: string, maybeString: ?string, end: string = ''): string {
+function wrap(start: string, maybeString: Maybe<string>, end: string = ''): string {
   return maybeString != null && maybeString !== ''
     ? start + maybeString + end
     : '';
@@ -286,6 +287,6 @@ function isMultiline(str: string): boolean {
   return str.indexOf('\n') !== -1;
 }
 
-function hasMultilineItems(maybeArray: ?Array<string>): boolean {
+function hasMultilineItems(maybeArray: Maybe<Array<string>>): boolean {
   return maybeArray != null && maybeArray.some(isMultiline);
 }
diff --git a/src/language/visitor.ts b/src/language/visitor.ts
@@ -1,4 +1,5 @@
 import inspect from '../jsutils/inspect';
+import { Maybe } from '../jsutils/Maybe';
 
 import type { ASTNode, ASTKindToNode } from './ast';
 import { isNode } from './ast';
@@ -405,7 +406,7 @@ export function getVisitFn(
   visitor: Visitor<any>,
   kind: string,
   isLeaving: boolean,
-): ?VisitFn<any> {
+): Maybe<VisitFn<any>> {
   const kindVisitor = visitor[kind];
   if (kindVisitor) {
     if (!isLeaving && typeof kindVisitor === 'function') {
diff --git a/src/type/validate.ts b/src/type/validate.ts
@@ -652,15 +652,15 @@ function getAllImplementsInterfaceNodes(
 function getUnionMemberTypeNodes(
   union: GraphQLUnionType,
   typeName: string,
-): ?ReadonlyArray<NamedTypeNode> {
+): Maybe<ReadonlyArray<NamedTypeNode>> {
   return getAllSubNodes(union, (unionNode) => unionNode.types).filter(
     (typeNode) => typeNode.name.value === typeName,
   );
 }
 
 function getDeprecatedDirectiveNode(
-  definitionNode: ?{ readonly directives?: ReadonlyArray<DirectiveNode> },
-): ?DirectiveNode {
+  definitionNode: Maybe<{ readonly directives?: ReadonlyArray<DirectiveNode> }>,
+): Maybe<DirectiveNode> {
   // istanbul ignore next (See: 'https://github.com/graphql/graphql-js/issues/2203')
   return definitionNode?.directives?.find(
     (node) => node.name.value === GraphQLDeprecatedDirective.name,
diff --git a/src/utilities/extendSchema.ts b/src/utilities/extendSchema.ts
@@ -697,7 +697,7 @@ function getDeprecationReason(
     | EnumValueDefinitionNode
     | FieldDefinitionNode
     | InputValueDefinitionNode,
-): ?string {
+): Maybe<string> {
   const deprecated = getDirectiveValues(GraphQLDeprecatedDirective, node);
   return (deprecated?.reason as any);
 }
@@ -707,7 +707,7 @@ function getDeprecationReason(
  */
 function getSpecifiedByUrl(
   node: ScalarTypeDefinitionNode | ScalarTypeExtensionNode,
-): ?string {
+): Maybe<string> {
   const specifiedBy = getDirectiveValues(GraphQLSpecifiedByDirective, node);
   return (specifiedBy?.url as any);
 }
diff --git a/src/utilities/lexicographicSortSchema.ts b/src/utilities/lexicographicSortSchema.ts
@@ -32,6 +32,7 @@ import {
   isEnumType,
   isInputObjectType,
 } from '../type/definition';
+import { Maybe } from '../jsutils/Maybe';
 
 /**
  * Sort GraphQLSchema.
@@ -69,8 +70,8 @@ export function lexicographicSortSchema(schema: GraphQLSchema): GraphQLSchema {
   function replaceNamedType<T extends GraphQLNamedType>(type: T): T {
     return (typeMap[type.name]as T);
   }
-
-  function replaceMaybeType<T extends ?GraphQLNamedType>(maybeType: T): T {
+  
+  function replaceMaybeType<T extends Maybe<GraphQLNamedType>>(maybeType: T): T {
     return maybeType && replaceNamedType(maybeType);
   }
 
diff --git a/src/utilities/printSchema.ts b/src/utilities/printSchema.ts
@@ -72,7 +72,7 @@ function printFilteredSchema(
   );
 }
 
-function printSchemaDefinition(schema: GraphQLSchema): ?string {
+function printSchemaDefinition(schema: GraphQLSchema): Maybe<string> {
   if (schema.description == null && isSchemaOfCommonNames(schema)) {
     return;
   }
@@ -282,7 +282,7 @@ function printDirective(directive: GraphQLDirective): string {
   );
 }
 
-function printDeprecated(reason: ?string): string {
+function printDeprecated(reason: Maybe<string>): string {
   if (reason == null) {
     return '';
   }
