From 1f2ced43262ad9a5a0c27b2d531784c000b07555 Mon Sep 17 00:00:00 2001 From: korovka Date: Thu, 24 Jun 2021 16:41:46 +0300 Subject: [PATCH] align NetworkError and GraphQLErrors types --- src/errors/index.ts | 6 +++++- src/link/error/index.ts | 12 +++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/errors/index.ts b/src/errors/index.ts index 333ae2853a3..2e4f059c5a2 100644 --- a/src/errors/index.ts +++ b/src/errors/index.ts @@ -37,9 +37,13 @@ const generateErrorMessage = (err: ApolloError) => { return message; }; +export type GraphQLErrors = ReadonlyArray; + +export type NetworkError = Error | ServerParseError | ServerError | null; + export class ApolloError extends Error { public message: string; - public graphQLErrors: ReadonlyArray; + public graphQLErrors: GraphQLErrors; public clientErrors: ReadonlyArray; public networkError: Error | ServerParseError | ServerError | null; diff --git a/src/link/error/index.ts b/src/link/error/index.ts index 68027391319..110383880b7 100644 --- a/src/link/error/index.ts +++ b/src/link/error/index.ts @@ -1,14 +1,12 @@ -import { GraphQLError, ExecutionResult } from 'graphql'; +import { ExecutionResult } from 'graphql'; -import { ApolloLink, Operation, FetchResult, NextLink } from '../core'; +import { NetworkError, GraphQLErrors } from '../../errors'; import { Observable } from '../../utilities'; - -import { ServerError } from '../utils'; -import { ServerParseError } from '../http'; +import { ApolloLink, Operation, FetchResult, NextLink } from '../core'; export interface ErrorResponse { - graphQLErrors?: ReadonlyArray; - networkError?: Error | ServerError | ServerParseError; + graphQLErrors?: GraphQLErrors; + networkError?: NetworkError; response?: ExecutionResult; operation: Operation; forward: NextLink;