From d572537ab3463c8cc59be8f6791e96f5d5f3e52c Mon Sep 17 00:00:00 2001 From: Yaacov Rydzinski Date: Wed, 1 Jul 2020 09:59:14 -0400 Subject: [PATCH] standardize ExecutionResult to be from internal polyfill this can probably be changed back to import from graphql after support for versions < 15.2 is dropped See: https://github.com/graphql/graphql-js/releases/tag/v15.2.0 graphql/graphql-js#2644 --- packages/delegate/src/delegateToSchema.ts | 3 +-- .../delegate/src/transforms/CheckResultAndHandleErrors.ts | 4 ++-- packages/mock/src/types.ts | 4 +++- packages/schema/tests/resolution.test.ts | 3 ++- packages/schema/tests/schemaGenerator.test.ts | 4 ++-- packages/stitch/tests/alternateStitchSchemas.test.ts | 5 +++-- packages/stitch/tests/stitchSchemas.test.ts | 2 +- packages/stitch/tests/typeMerging.example.test.ts | 4 +++- packages/utils/tests/directives.test.ts | 6 ++++-- packages/utils/tests/schemaTransforms.test.ts | 2 +- packages/wrap/tests/fragmentsAreNotDuplicated.test.ts | 3 ++- 11 files changed, 24 insertions(+), 16 deletions(-) diff --git a/packages/delegate/src/delegateToSchema.ts b/packages/delegate/src/delegateToSchema.ts index b7c3d98ded7..5051e7b3abf 100644 --- a/packages/delegate/src/delegateToSchema.ts +++ b/packages/delegate/src/delegateToSchema.ts @@ -3,7 +3,6 @@ import { execute, validate, GraphQLSchema, - ExecutionResult, isSchema, FieldDefinitionNode, getOperationAST, @@ -14,7 +13,7 @@ import { GraphQLObjectType, } from 'graphql'; -import { mapAsyncIterator, Transform } from '@graphql-tools/utils'; +import { mapAsyncIterator, Transform, ExecutionResult } from '@graphql-tools/utils'; import { IDelegateToSchemaOptions, IDelegateRequestOptions, SubschemaConfig, ExecutionParams } from './types'; diff --git a/packages/delegate/src/transforms/CheckResultAndHandleErrors.ts b/packages/delegate/src/transforms/CheckResultAndHandleErrors.ts index 351075e8cc1..83d4561a431 100644 --- a/packages/delegate/src/transforms/CheckResultAndHandleErrors.ts +++ b/packages/delegate/src/transforms/CheckResultAndHandleErrors.ts @@ -1,6 +1,6 @@ -import { GraphQLResolveInfo, ExecutionResult, GraphQLOutputType, GraphQLSchema } from 'graphql'; +import { GraphQLResolveInfo, GraphQLOutputType, GraphQLSchema } from 'graphql'; -import { Transform, getResponseKeyFromInfo } from '@graphql-tools/utils'; +import { Transform, getResponseKeyFromInfo, ExecutionResult } from '@graphql-tools/utils'; import { handleResult } from '../results/handleResult'; import { SubschemaConfig } from '../types'; diff --git a/packages/mock/src/types.ts b/packages/mock/src/types.ts index c5154544d33..e5b81ad6fb9 100644 --- a/packages/mock/src/types.ts +++ b/packages/mock/src/types.ts @@ -1,4 +1,6 @@ -import { GraphQLFieldResolver, GraphQLType, GraphQLSchema, ExecutionResult } from 'graphql'; +import { GraphQLFieldResolver, GraphQLType, GraphQLSchema } from 'graphql'; + +import { ExecutionResult } from '@graphql-tools/utils'; /* XXX on mocks, args are optional, Not sure if a bug. */ export type IMockFn = GraphQLFieldResolver; diff --git a/packages/schema/tests/resolution.test.ts b/packages/schema/tests/resolution.test.ts index 9e672d4d74b..ef037009b44 100644 --- a/packages/schema/tests/resolution.test.ts +++ b/packages/schema/tests/resolution.test.ts @@ -3,13 +3,14 @@ import { parse, graphql, subscribe, - ExecutionResult, graphqlSync, } from 'graphql'; import { PubSub } from 'graphql-subscriptions'; import { makeExecutableSchema, addSchemaLevelResolver } from '@graphql-tools/schema'; +import { ExecutionResult } from '@graphql-tools/utils'; + import { forAwaitEach } from './forAwaitEach'; describe('Resolve', () => { diff --git a/packages/schema/tests/schemaGenerator.test.ts b/packages/schema/tests/schemaGenerator.test.ts index c59f32e8126..6c4d10ba5d1 100644 --- a/packages/schema/tests/schemaGenerator.test.ts +++ b/packages/schema/tests/schemaGenerator.test.ts @@ -13,7 +13,6 @@ import { Kind, IntValueNode, parse, - ExecutionResult, GraphQLError, GraphQLEnumType, execute, @@ -42,7 +41,8 @@ import { NextResolverFn, VisitSchemaKind, ITypeDefinitions, - visitSchema + visitSchema, + ExecutionResult } from '@graphql-tools/utils'; import TypeA from './fixtures/circularSchemaA'; diff --git a/packages/stitch/tests/alternateStitchSchemas.test.ts b/packages/stitch/tests/alternateStitchSchemas.test.ts index 732b7b8c368..4148f83e4ca 100644 --- a/packages/stitch/tests/alternateStitchSchemas.test.ts +++ b/packages/stitch/tests/alternateStitchSchemas.test.ts @@ -1,7 +1,6 @@ import { graphql, GraphQLSchema, - ExecutionResult, subscribe, parse, GraphQLScalarType, @@ -40,7 +39,9 @@ import { makeExecutableSchema } from '@graphql-tools/schema'; import { wrapFieldNode, renameFieldNode, - hoistFieldNodes, filterSchema + hoistFieldNodes, + filterSchema, + ExecutionResult, } from '@graphql-tools/utils'; import { stitchSchemas } from '../src/stitchSchemas'; diff --git a/packages/stitch/tests/stitchSchemas.test.ts b/packages/stitch/tests/stitchSchemas.test.ts index 928682c3c3f..7c470c86369 100644 --- a/packages/stitch/tests/stitchSchemas.test.ts +++ b/packages/stitch/tests/stitchSchemas.test.ts @@ -6,7 +6,6 @@ import { GraphQLScalarType, subscribe, parse, - ExecutionResult, defaultFieldResolver, findDeprecatedUsages, printSchema, @@ -20,6 +19,7 @@ import { getResolversFromSchema, SchemaDirectiveVisitor, IResolvers, + ExecutionResult, } from '@graphql-tools/utils'; import { addMocksToSchema } from '@graphql-tools/mock'; diff --git a/packages/stitch/tests/typeMerging.example.test.ts b/packages/stitch/tests/typeMerging.example.test.ts index 179a7ac26b2..3c16786464d 100644 --- a/packages/stitch/tests/typeMerging.example.test.ts +++ b/packages/stitch/tests/typeMerging.example.test.ts @@ -1,10 +1,12 @@ // Conversion of Apollo Federation demo from https://github.com/apollographql/federation-demo. // See: https://github.com/ardatan/graphql-tools/issues/1697 -import { graphql, ExecutionResult } from 'graphql'; +import { graphql } from 'graphql'; import { makeExecutableSchema } from '@graphql-tools/schema'; +import { ExecutionResult } from '@graphql-tools/utils'; + import { stitchSchemas } from '../src/stitchSchemas'; describe('merging using type merging', () => { diff --git a/packages/utils/tests/directives.test.ts b/packages/utils/tests/directives.test.ts index 735e860951c..1fe8deb06e6 100644 --- a/packages/utils/tests/directives.test.ts +++ b/packages/utils/tests/directives.test.ts @@ -1,7 +1,6 @@ import { createHash } from 'crypto'; import { - ExecutionResult, GraphQLArgument, GraphQLEnumType, GraphQLEnumValue, @@ -29,9 +28,12 @@ import { import formatDate from 'dateformat'; import { makeExecutableSchema } from '@graphql-tools/schema'; -import { VisitableSchemaType, SchemaDirectiveVisitor, +import { + VisitableSchemaType, + SchemaDirectiveVisitor, SchemaVisitor, visitSchema, + ExecutionResult, } from '@graphql-tools/utils'; const typeDefs = ` diff --git a/packages/utils/tests/schemaTransforms.test.ts b/packages/utils/tests/schemaTransforms.test.ts index 618e315a18f..f950779dbb4 100644 --- a/packages/utils/tests/schemaTransforms.test.ts +++ b/packages/utils/tests/schemaTransforms.test.ts @@ -7,7 +7,6 @@ import { defaultFieldResolver, graphql, GraphQLString, - ExecutionResult, GraphQLScalarType, StringValueNode, GraphQLInputFieldConfig, @@ -31,6 +30,7 @@ import { mapSchema, MapperKind, getDirectives, + ExecutionResult, } from '@graphql-tools/utils'; const typeDefs = ` diff --git a/packages/wrap/tests/fragmentsAreNotDuplicated.test.ts b/packages/wrap/tests/fragmentsAreNotDuplicated.test.ts index 8f360fded4c..533ea1e5d22 100644 --- a/packages/wrap/tests/fragmentsAreNotDuplicated.test.ts +++ b/packages/wrap/tests/fragmentsAreNotDuplicated.test.ts @@ -1,8 +1,9 @@ -import { ExecutionResult, graphql } from 'graphql'; +import { graphql } from 'graphql'; import { wrapSchema } from '../src'; import { makeExecutableSchema } from '@graphql-tools/schema' import { addMocksToSchema } from '@graphql-tools/mock'; +import { ExecutionResult } from '@graphql-tools/utils'; describe('Merging schemas', () => { test('should not throw `There can be only one fragment named "FieldName"` errors', async () => {