From 1dbf65b425f81cac152c5b75efd856920c2c2798 Mon Sep 17 00:00:00 2001 From: Ivan Goncharov Date: Mon, 25 May 2020 23:08:02 +0300 Subject: [PATCH] ts: used named export for 'Maybe' type (#2586) --- src/error/GraphQLError.d.ts | 2 +- src/error/locatedError.d.ts | 2 +- src/execution/execute.d.ts | 3 ++- src/execution/values.d.ts | 3 ++- src/graphql.d.ts | 3 ++- src/language/visitor.d.ts | 2 +- src/subscription/subscribe.d.ts | 3 ++- src/tsutils/Maybe.d.ts | 6 +----- src/type/definition.d.ts | 3 ++- src/type/directives.d.ts | 2 +- src/type/schema.d.ts | 2 +- src/utilities/TypeInfo.d.ts | 3 ++- src/utilities/astFromValue.d.ts | 3 ++- src/utilities/extendSchema.d.ts | 3 ++- src/utilities/getIntrospectionQuery.d.ts | 3 ++- src/utilities/getOperationAST.d.ts | 3 ++- src/utilities/valueFromAST.d.ts | 3 ++- src/utilities/valueFromASTUntyped.d.ts | 3 ++- src/validation/ValidationContext.d.ts | 3 ++- src/validation/validate.d.ts | 2 +- 20 files changed, 33 insertions(+), 24 deletions(-) diff --git a/src/error/GraphQLError.d.ts b/src/error/GraphQLError.d.ts index f27c7af215..9d22dc48c4 100644 --- a/src/error/GraphQLError.d.ts +++ b/src/error/GraphQLError.d.ts @@ -1,4 +1,4 @@ -import Maybe from '../tsutils/Maybe'; +import { Maybe } from '../tsutils/Maybe'; import { ASTNode } from '../language/ast'; import { Source } from '../language/source'; diff --git a/src/error/locatedError.d.ts b/src/error/locatedError.d.ts index 5e9d02dffc..8941e9ed75 100644 --- a/src/error/locatedError.d.ts +++ b/src/error/locatedError.d.ts @@ -1,4 +1,4 @@ -import Maybe from '../tsutils/Maybe'; +import { Maybe } from '../tsutils/Maybe'; import { ASTNode } from '../language/ast'; diff --git a/src/execution/execute.d.ts b/src/execution/execute.d.ts index 240f3b5713..3be852f164 100644 --- a/src/execution/execute.d.ts +++ b/src/execution/execute.d.ts @@ -1,4 +1,5 @@ -import Maybe from '../tsutils/Maybe'; +import { Maybe } from '../tsutils/Maybe'; + import { PromiseOrValue } from '../jsutils/PromiseOrValue'; import { Path } from '../jsutils/Path'; diff --git a/src/execution/values.d.ts b/src/execution/values.d.ts index 82e2ce8cbe..7c0d866fc9 100644 --- a/src/execution/values.d.ts +++ b/src/execution/values.d.ts @@ -1,4 +1,5 @@ -import Maybe from '../tsutils/Maybe'; +import { Maybe } from '../tsutils/Maybe'; + import { GraphQLError } from '../error/GraphQLError'; import { FieldNode, diff --git a/src/graphql.d.ts b/src/graphql.d.ts index c4ef398ba9..18a7d3a22c 100644 --- a/src/graphql.d.ts +++ b/src/graphql.d.ts @@ -1,4 +1,5 @@ -import Maybe from './tsutils/Maybe'; +import { Maybe } from './tsutils/Maybe'; + import { Source } from './language/source'; import { GraphQLSchema } from './type/schema'; import { GraphQLFieldResolver, GraphQLTypeResolver } from './type/definition'; diff --git a/src/language/visitor.d.ts b/src/language/visitor.d.ts index fadc23cfd7..85552963ff 100644 --- a/src/language/visitor.d.ts +++ b/src/language/visitor.d.ts @@ -1,4 +1,4 @@ -import Maybe from '../tsutils/Maybe'; +import { Maybe } from '../tsutils/Maybe'; import { ASTNode, ASTKindToNode } from './ast'; diff --git a/src/subscription/subscribe.d.ts b/src/subscription/subscribe.d.ts index f9af6c7e69..f5a65b001b 100644 --- a/src/subscription/subscribe.d.ts +++ b/src/subscription/subscribe.d.ts @@ -1,4 +1,5 @@ -import Maybe from '../tsutils/Maybe'; +import { Maybe } from '../tsutils/Maybe'; + import { DocumentNode } from '../language/ast'; import { ExecutionResult } from '../execution/execute'; import { GraphQLSchema } from '../type/schema'; diff --git a/src/tsutils/Maybe.d.ts b/src/tsutils/Maybe.d.ts index eb9563a382..e8b5e217d0 100644 --- a/src/tsutils/Maybe.d.ts +++ b/src/tsutils/Maybe.d.ts @@ -1,6 +1,2 @@ // Conveniently represents flow's "Maybe" type https://flow.org/en/docs/types/maybe/ -type Maybe = null | undefined | T; - -// See https://github.com/typescript-eslint/typescript-eslint/issues/131 -// eslint-disable-next-line no-undef -export default Maybe; +export type Maybe = null | undefined | T; diff --git a/src/type/definition.d.ts b/src/type/definition.d.ts index c2293ec70a..fbb8a2cc4b 100644 --- a/src/type/definition.d.ts +++ b/src/type/definition.d.ts @@ -1,7 +1,8 @@ // FIXME /* eslint-disable import/no-cycle */ -import Maybe from '../tsutils/Maybe'; +import { Maybe } from '../tsutils/Maybe'; + import { PromiseOrValue } from '../jsutils/PromiseOrValue'; import { Path } from '../jsutils/Path'; diff --git a/src/type/directives.d.ts b/src/type/directives.d.ts index 4c6801485d..270c956ebd 100644 --- a/src/type/directives.d.ts +++ b/src/type/directives.d.ts @@ -1,7 +1,7 @@ // FIXME /* eslint-disable import/no-cycle */ -import Maybe from '../tsutils/Maybe'; +import { Maybe } from '../tsutils/Maybe'; import { DirectiveDefinitionNode } from '../language/ast'; import { DirectiveLocationEnum } from '../language/directiveLocation'; diff --git a/src/type/schema.d.ts b/src/type/schema.d.ts index 5a834f1bbf..f0e4e70c2e 100644 --- a/src/type/schema.d.ts +++ b/src/type/schema.d.ts @@ -1,7 +1,7 @@ // FIXME /* eslint-disable import/no-cycle */ -import Maybe from '../tsutils/Maybe'; +import { Maybe } from '../tsutils/Maybe'; import { SchemaDefinitionNode, SchemaExtensionNode } from '../language/ast'; diff --git a/src/utilities/TypeInfo.d.ts b/src/utilities/TypeInfo.d.ts index 4f9b4265d6..e8468cea8b 100644 --- a/src/utilities/TypeInfo.d.ts +++ b/src/utilities/TypeInfo.d.ts @@ -1,4 +1,5 @@ -import Maybe from '../tsutils/Maybe'; +import { Maybe } from '../tsutils/Maybe'; + import { Visitor } from '../language/visitor'; import { ASTNode, ASTKindToNode, FieldNode } from '../language/ast'; import { GraphQLSchema } from '../type/schema'; diff --git a/src/utilities/astFromValue.d.ts b/src/utilities/astFromValue.d.ts index ed84eb458f..7135c8bc1e 100644 --- a/src/utilities/astFromValue.d.ts +++ b/src/utilities/astFromValue.d.ts @@ -1,4 +1,5 @@ -import Maybe from '../tsutils/Maybe'; +import { Maybe } from '../tsutils/Maybe'; + import { ValueNode } from '../language/ast'; import { GraphQLInputType } from '../type/definition'; diff --git a/src/utilities/extendSchema.d.ts b/src/utilities/extendSchema.d.ts index a7fa97c84f..7b409837de 100644 --- a/src/utilities/extendSchema.d.ts +++ b/src/utilities/extendSchema.d.ts @@ -1,4 +1,5 @@ -import Maybe from '../tsutils/Maybe'; +import { Maybe } from '../tsutils/Maybe'; + import { Location, DocumentNode, StringValueNode } from '../language/ast'; import { GraphQLSchemaValidationOptions, diff --git a/src/utilities/getIntrospectionQuery.d.ts b/src/utilities/getIntrospectionQuery.d.ts index 6e2a9e5054..e643e6493e 100644 --- a/src/utilities/getIntrospectionQuery.d.ts +++ b/src/utilities/getIntrospectionQuery.d.ts @@ -1,4 +1,5 @@ -import Maybe from '../tsutils/Maybe'; +import { Maybe } from '../tsutils/Maybe'; + import { DirectiveLocationEnum } from '../language/directiveLocation'; export interface IntrospectionOptions { diff --git a/src/utilities/getOperationAST.d.ts b/src/utilities/getOperationAST.d.ts index 9f72b7eeca..b960b1b3d4 100644 --- a/src/utilities/getOperationAST.d.ts +++ b/src/utilities/getOperationAST.d.ts @@ -1,4 +1,5 @@ -import Maybe from '../tsutils/Maybe'; +import { Maybe } from '../tsutils/Maybe'; + import { DocumentNode, OperationDefinitionNode } from '../language/ast'; /** diff --git a/src/utilities/valueFromAST.d.ts b/src/utilities/valueFromAST.d.ts index bef11b75d3..d63e3d154d 100644 --- a/src/utilities/valueFromAST.d.ts +++ b/src/utilities/valueFromAST.d.ts @@ -1,4 +1,5 @@ -import Maybe from '../tsutils/Maybe'; +import { Maybe } from '../tsutils/Maybe'; + import { ValueNode } from '../language/ast'; import { GraphQLInputType } from '../type/definition'; diff --git a/src/utilities/valueFromASTUntyped.d.ts b/src/utilities/valueFromASTUntyped.d.ts index ab7512e465..0452f5dcc8 100644 --- a/src/utilities/valueFromASTUntyped.d.ts +++ b/src/utilities/valueFromASTUntyped.d.ts @@ -1,4 +1,5 @@ -import Maybe from '../tsutils/Maybe'; +import { Maybe } from '../tsutils/Maybe'; + import { ValueNode } from '../language/ast'; /** diff --git a/src/validation/ValidationContext.d.ts b/src/validation/ValidationContext.d.ts index b349ce6fd1..72492bdfcc 100644 --- a/src/validation/ValidationContext.d.ts +++ b/src/validation/ValidationContext.d.ts @@ -1,4 +1,5 @@ -import Maybe from '../tsutils/Maybe'; +import { Maybe } from '../tsutils/Maybe'; + import { GraphQLError } from '../error/GraphQLError'; import { ASTVisitor } from '../language/visitor'; import { diff --git a/src/validation/validate.d.ts b/src/validation/validate.d.ts index 9230c52814..0dec47af29 100644 --- a/src/validation/validate.d.ts +++ b/src/validation/validate.d.ts @@ -1,4 +1,4 @@ -import Maybe from '../tsutils/Maybe'; +import { Maybe } from '../tsutils/Maybe'; import { GraphQLError } from '../error/GraphQLError';