Merge branch 'master' into tgriesser/feat/894-context-lifecycle-subscription

* master:
  TS: remove TS-specific TSource argument for resolveFieldValueOr… (graphql#2491)
  TS: remove TS-specific TData from ExecutionResult (graphql#2490)
  TS(definition): remove TS-specific TArgs (graphql#2488)

Author: tgriesser

src/execution/execute.d.ts

@@ -37,20 +37,15 @@ export interface ExecutionContext {
   errors: Array<GraphQLError>;
 }
 
-export interface ExecutionResultDataDefault {
-  [key: string]: any;
-}
-
 /**
  * The result of GraphQL execution.
  *
  *   - `errors` is included when any errors occurred as a non-empty array.
  *   - `data` is the result of a successful execution of the query.
  */
-// TS_SPECIFIC: TData and ExecutionResultDataDefault
-export interface ExecutionResult<TData = ExecutionResultDataDefault> {
+export interface ExecutionResult {
   errors?: ReadonlyArray<GraphQLError>;
-  data?: TData | null;
+  data?: { [key: string]: any } | null;
 }
 
 export type ExecutionArgs = {
@@ -76,10 +71,8 @@ export type ExecutionArgs = {
  *
  * Accepts either an object with named arguments, or individual arguments.
  */
-export function execute<TData = ExecutionResultDataDefault>(
-  args: ExecutionArgs,
-): PromiseOrValue<ExecutionResult<TData>>;
-export function execute<TData = ExecutionResultDataDefault>(
+export function execute(args: ExecutionArgs): PromiseOrValue<ExecutionResult>;
+export function execute(
   schema: GraphQLSchema,
   document: DocumentNode,
   rootValue?: any,
@@ -88,7 +81,7 @@ export function execute<TData = ExecutionResultDataDefault>(
   operationName?: Maybe<string>,
   fieldResolver?: Maybe<GraphQLFieldResolver<any, any>>,
   typeResolver?: Maybe<GraphQLTypeResolver<any, any>>,
-): PromiseOrValue<ExecutionResult<TData>>;
+): PromiseOrValue<ExecutionResult>;
 
 /**
  * Essential assertions before executing to provide developer feedback for
@@ -141,15 +134,18 @@ export function buildResolveInfo(
   path: Path,
 ): GraphQLResolveInfo;
 
-// Isolates the "ReturnOrAbrupt" behavior to not de-opt the `resolveField`
-// function. Returns the result of resolveFn or the abrupt-return Error object.
-// TS_SPECIFIC: TSource
-export function resolveFieldValueOrError<TSource>(
+/**
+ * Isolates the "ReturnOrAbrupt" behavior to not de-opt the `resolveField`
+ * function. Returns the result of resolveFn or the abrupt-return Error object.
+ *
+ * @internal
+ */
+export function resolveFieldValueOrError(
   exeContext: ExecutionContext,
-  fieldDef: GraphQLField<TSource, any>,
+  fieldDef: GraphQLField<any, any>,
   fieldNodes: ReadonlyArray<FieldNode>,
-  resolveFn: GraphQLFieldResolver<TSource, any>,
-  source: TSource,
+  resolveFn: GraphQLFieldResolver<any, any>,
+  source: any,
   info: GraphQLResolveInfo,
 ): Error | any;
 

src/graphql.d.ts

@@ -2,10 +2,7 @@ import Maybe from './tsutils/Maybe';
 import { Source } from './language/source';
 import { GraphQLSchema } from './type/schema';
 import { GraphQLFieldResolver, GraphQLTypeResolver } from './type/definition';
-import {
-  ExecutionResult,
-  ExecutionResultDataDefault,
-} from './execution/execute';
+import { ExecutionResult } from './execution/execute';
 
 /**
  * This is the primary entry point function for fulfilling GraphQL operations
@@ -53,10 +50,8 @@ export interface GraphQLArgs {
   typeResolver?: Maybe<GraphQLTypeResolver<any, any>>;
 }
 
-export function graphql<TData = ExecutionResultDataDefault>(
-  args: GraphQLArgs,
-): Promise<ExecutionResult<TData>>;
-export function graphql<TData = ExecutionResultDataDefault>(
+export function graphql(args: GraphQLArgs): Promise<ExecutionResult>;
+export function graphql(
   schema: GraphQLSchema,
   source: Source | string,
   rootValue?: any,
@@ -65,18 +60,16 @@ export function graphql<TData = ExecutionResultDataDefault>(
   operationName?: Maybe<string>,
   fieldResolver?: Maybe<GraphQLFieldResolver<any, any>>,
   typeResolver?: Maybe<GraphQLTypeResolver<any, any>>,
-): Promise<ExecutionResult<TData>>;
+): Promise<ExecutionResult>;
 
 /**
  * The graphqlSync function also fulfills GraphQL operations by parsing,
  * validating, and executing a GraphQL document along side a GraphQL schema.
  * However, it guarantees to complete synchronously (or throw an error) assuming
  * that all field resolvers are also synchronous.
  */
-export function graphqlSync<TData = ExecutionResultDataDefault>(
-  args: GraphQLArgs,
-): ExecutionResult<TData>;
-export function graphqlSync<TData = ExecutionResultDataDefault>(
+export function graphqlSync(args: GraphQLArgs): ExecutionResult;
+export function graphqlSync(
   schema: GraphQLSchema,
   source: Source | string,
   rootValue?: any,
@@ -85,4 +78,4 @@ export function graphqlSync<TData = ExecutionResultDataDefault>(
   operationName?: Maybe<string>,
   fieldResolver?: Maybe<GraphQLFieldResolver<any, any>>,
   typeResolver?: Maybe<GraphQLTypeResolver<any, any>>,
-): ExecutionResult<TData>;
+): ExecutionResult;

src/subscription/subscribe.d.ts

@@ -1,9 +1,6 @@
 import Maybe from '../tsutils/Maybe';
 import { DocumentNode } from '../language/ast';
-import {
-  ExecutionResult,
-  ExecutionResultDataDefault,
-} from '../execution/execute';
+import { ExecutionResult } from '../execution/execute';
 import { GraphQLSchema } from '../type/schema';
 import { GraphQLFieldResolver } from '../type/definition';
 
@@ -42,13 +39,11 @@ export interface SubscriptionArgs {
  *
  * Accepts either an object with named arguments, or individual arguments.
  */
-export function subscribe<TData = ExecutionResultDataDefault>(
+export function subscribe(
   args: SubscriptionArgs,
-): Promise<
-  AsyncIterableIterator<ExecutionResult<TData>> | ExecutionResult<TData>
->;
+): Promise<AsyncIterableIterator<ExecutionResult> | ExecutionResult>;
 
-export function subscribe<TData = ExecutionResultDataDefault>(
+export function subscribe(
   schema: GraphQLSchema,
   document: DocumentNode,
   rootValue?: any,
@@ -58,9 +53,7 @@ export function subscribe<TData = ExecutionResultDataDefault>(
   fieldResolver?: Maybe<GraphQLFieldResolver<any, any>>,
   subscribeFieldResolver?: Maybe<GraphQLFieldResolver<any, any>>,
   perEventContextResolver?: Maybe<(contextValue: any) => any>,
-): Promise<
-  AsyncIterableIterator<ExecutionResult<TData>> | ExecutionResult<TData>
->;
+): Promise<AsyncIterableIterator<ExecutionResult> | ExecutionResult>;
 
 /**
  * Implements the "CreateSourceEventStream" algorithm described in the
@@ -80,12 +73,12 @@ export function subscribe<TData = ExecutionResultDataDefault>(
  * or otherwise separating these two steps. For more on this, see the
  * "Supporting Subscriptions at Scale" information in the GraphQL specification.
  */
-export function createSourceEventStream<TData = ExecutionResultDataDefault>(
+export function createSourceEventStream(
   schema: GraphQLSchema,
   document: DocumentNode,
   rootValue?: any,
   contextValue?: any,
   variableValues?: { [key: string]: any },
   operationName?: Maybe<string>,
   fieldResolver?: Maybe<GraphQLFieldResolver<any, any>>,
-): Promise<AsyncIterable<any> | ExecutionResult<TData>>;
+): Promise<AsyncIterable<any> | ExecutionResult>;

src/type/definition.d.ts

@@ -375,23 +375,17 @@ export interface GraphQLScalarTypeConfig<TInternal, TExternal> {
  *     });
  *
  */
-export class GraphQLObjectType<
-  TSource = any,
-  TContext = any,
-  TArgs = { [key: string]: any }
-> {
+export class GraphQLObjectType<TSource = any, TContext = any> {
   name: string;
   description: Maybe<string>;
   isTypeOf: Maybe<GraphQLIsTypeOfFn<TSource, TContext>>;
   extensions: Maybe<Readonly<Record<string, any>>>;
   astNode: Maybe<ObjectTypeDefinitionNode>;
   extensionASTNodes: Maybe<ReadonlyArray<ObjectTypeExtensionNode>>;
 
-  constructor(
-    config: Readonly<GraphQLObjectTypeConfig<TSource, TContext, TArgs>>,
-  );
+  constructor(config: Readonly<GraphQLObjectTypeConfig<TSource, TContext>>);
 
-  getFields(): GraphQLFieldMap<any, TContext, TArgs>;
+  getFields(): GraphQLFieldMap<any, TContext>;
   getInterfaces(): Array<GraphQLInterfaceType>;
 
   toConfig(): GraphQLObjectTypeConfig<any, any> & {
@@ -410,35 +404,23 @@ export function argsToArgsConfig(
   args: ReadonlyArray<GraphQLArgument>,
 ): GraphQLFieldConfigArgumentMap;
 
-// TS_SPECIFIC: TArgs
-export interface GraphQLObjectTypeConfig<
-  TSource,
-  TContext,
-  TArgs = { [key: string]: any }
-> {
+export interface GraphQLObjectTypeConfig<TSource, TContext> {
   name: string;
   description?: Maybe<string>;
   interfaces?: Thunk<Maybe<Array<GraphQLInterfaceType>>>;
-  fields: Thunk<GraphQLFieldConfigMap<TSource, TContext, TArgs>>;
+  fields: Thunk<GraphQLFieldConfigMap<TSource, TContext>>;
   isTypeOf?: Maybe<GraphQLIsTypeOfFn<TSource, TContext>>;
   extensions?: Maybe<Readonly<Record<string, any>>>;
   astNode?: Maybe<ObjectTypeDefinitionNode>;
   extensionASTNodes?: Maybe<ReadonlyArray<ObjectTypeExtensionNode>>;
 }
 
-// TS_SPECIFIC: TArgs
-export type GraphQLTypeResolver<
-  TSource,
-  TContext,
-  TArgs = { [key: string]: any }
-> = (
+export type GraphQLTypeResolver<TSource, TContext> = (
   value: TSource,
   context: TContext,
   info: GraphQLResolveInfo,
   abstractType: GraphQLAbstractType,
-) => PromiseOrValue<
-  Maybe<GraphQLObjectType<TSource, TContext, TArgs> | string>
->;
+) => PromiseOrValue<Maybe<GraphQLObjectType<TSource, TContext> | string>>;
 
 export type GraphQLIsTypeOfFn<TSource, TContext> = (
   source: TSource,
@@ -497,13 +479,8 @@ export interface GraphQLArgumentConfig {
   astNode?: Maybe<InputValueDefinitionNode>;
 }
 
-// TS_SPECIFIC: TArgs
-export type GraphQLFieldConfigMap<
-  TSource,
-  TContext,
-  TArgs = { [key: string]: any }
-> = {
-  [key: string]: GraphQLFieldConfig<TSource, TContext, TArgs>;
+export type GraphQLFieldConfigMap<TSource, TContext> = {
+  [key: string]: GraphQLFieldConfig<TSource, TContext>;
 };
 
 export interface GraphQLField<
@@ -534,13 +511,8 @@ export interface GraphQLArgument {
 
 export function isRequiredArgument(arg: GraphQLArgument): boolean;
 
-// TS_SPECIFIC: TArgs
-export type GraphQLFieldMap<
-  TSource,
-  TContext,
-  TArgs = { [key: string]: any }
-> = {
-  [key: string]: GraphQLField<TSource, TContext, TArgs>;
+export type GraphQLFieldMap<TSource, TContext> = {
+  [key: string]: GraphQLField<TSource, TContext>;
 };
 
 /**
@@ -585,22 +557,17 @@ export class GraphQLInterfaceType {
   inspect(): string;
 }
 
-// TS_SPECIFIC: TArgs
-export interface GraphQLInterfaceTypeConfig<
-  TSource,
-  TContext,
-  TArgs = { [key: string]: any }
-> {
+export interface GraphQLInterfaceTypeConfig<TSource, TContext> {
   name: string;
   description?: Maybe<string>;
   interfaces?: Thunk<Maybe<Array<GraphQLInterfaceType>>>;
-  fields: Thunk<GraphQLFieldConfigMap<TSource, TContext, TArgs>>;
+  fields: Thunk<GraphQLFieldConfigMap<TSource, TContext>>;
   /**
    * Optionally provide a custom type resolver function. If one is not provided,
    * the default implementation will call `isTypeOf` on each implementing
    * Object type.
    */
-  resolveType?: Maybe<GraphQLTypeResolver<TSource, TContext, TArgs>>;
+  resolveType?: Maybe<GraphQLTypeResolver<TSource, TContext>>;
   extensions?: Maybe<Readonly<Record<string, any>>>;
   astNode?: Maybe<InterfaceTypeDefinitionNode>;
   extensionASTNodes?: Maybe<ReadonlyArray<InterfaceTypeExtensionNode>>;