diff --git a/src/definition.js b/src/definition.js index 091526fb..210616d1 100644 --- a/src/definition.js +++ b/src/definition.js @@ -261,25 +261,6 @@ export type ResolveParams = { export type ResolverMWMethodKeys = "args" | "resolve" | "type"; export type ResolverKinds = "query" | "mutation" | "subscription"; -export type ResolverMWArgsFn = ( - args: GraphQLFieldConfigArgumentMap -) => GraphQLFieldConfigArgumentMap; -export type ResolverMWArgs = (next: ResolverMWArgsFn) => ResolverMWArgsFn; - -export type ResolverNextRpCbFn = ( - resolveParams: $Shape> -) => Promise<*> | *; -export type ResolverNextRpCb = ( - next: ResolverNextRpCbFn -) => ResolverNextRpCbFn; - -export type ResolverMWOutputTypeFn = ( - outputType: GraphQLOutputType -) => GraphQLOutputType; -export type ResolverMWOutputType = ( - next: ResolverMWOutputTypeFn -) => ResolverMWOutputTypeFn; - export type GetRecordIdFn = ( source: TSource, args: ?mixed, @@ -314,7 +295,7 @@ export type ResolverSortArgConfig = { export type ResolverOpts = { type?: ComposeOutputType, - resolve?: ResolverNextRpCbFn, + resolve?: ResolverRpCb, args?: ComposeFieldConfigArgumentMap, name?: string, displayName?: string, @@ -328,10 +309,17 @@ export type ResolverWrapCb = ( prevResolver: Resolver ) => Resolver; -export type ResolverWrapArgsFn = ( +export type ResolverRpCb = ( + resolveParams: $Shape> +) => Promise<*> | *; +export type ResolverNextRpCb = ( + next: ResolverRpCb +) => ResolverRpCb; + +export type ResolverWrapArgsCb = ( prevArgs: GraphQLFieldConfigArgumentMap ) => ComposeFieldConfigArgumentMap; -export type ResolverWrapTypeFn = ( +export type ResolverWrapTypeCb = ( prevType: GraphQLOutputType ) => GraphQLOutputType; diff --git a/src/resolver.js b/src/resolver.js index b2ea7a5d..0721b2b3 100644 --- a/src/resolver.js +++ b/src/resolver.js @@ -27,7 +27,7 @@ import type { GraphQLOutputType, GraphQLFieldConfig, ResolverNextRpCb, - ResolverNextRpCbFn, + ResolverRpCb, ResolveParams, ResolverKinds, ProjectionType, @@ -35,8 +35,8 @@ import type { ResolverSortArgConfig, ResolverOpts, ResolverWrapCb, - ResolverWrapArgsFn, - ResolverWrapTypeFn, + ResolverWrapArgsCb, + ResolverWrapTypeCb, GraphQLInputType, ComposeOutputType, ComposeArgumentConfig, @@ -54,7 +54,7 @@ export type ResolveDebugOpts = { export default class Resolver { type: GraphQLOutputType; args: GraphQLFieldConfigArgumentMap; - resolve: ResolverNextRpCbFn; + resolve: ResolverRpCb; name: string; displayName: ?string; kind: ?ResolverKinds; @@ -258,11 +258,11 @@ export default class Resolver { } /* eslint-enable */ - getResolve(): ResolverNextRpCbFn { + getResolve(): ResolverRpCb { return this.resolve; } - setResolve(resolve: ResolverNextRpCbFn): Resolver { + setResolve(resolve: ResolverRpCb): Resolver { this.resolve = resolve; return this; } @@ -383,7 +383,7 @@ export default class Resolver { ); } - wrapArgs(cb: ResolverWrapArgsFn, wrapperName: string = 'wrapArgs'): Resolver { + wrapArgs(cb: ResolverWrapArgsCb, wrapperName: string = 'wrapArgs'): Resolver { return this.wrap( (newResolver, prevResolver) => { // clone prevArgs, to avoid changing args in callback @@ -402,7 +402,7 @@ export default class Resolver { }); } - wrapType(cb: ResolverWrapTypeFn, wrapperName: string = 'wrapType'): Resolver { + wrapType(cb: ResolverWrapTypeCb, wrapperName: string = 'wrapType'): Resolver { return this.wrap( (newResolver, prevResolver) => { const prevType = prevResolver.getType(); diff --git a/types/definition.d.ts b/types/definition.d.ts index 6f8ee392..aff82f46 100644 --- a/types/definition.d.ts +++ b/types/definition.d.ts @@ -165,20 +165,6 @@ export type ResolveParams = { export type ResolverMWMethodKeys = 'args' | 'resolve' | 'type'; export type ResolverKinds = 'query' | 'mutation' | 'subscription'; -export type ResolverMWArgsFn = (args: graphql.GraphQLFieldConfigArgumentMap) => graphql.GraphQLFieldConfigArgumentMap; - -export type ResolverMWArgs = (next: ResolverMWArgsFn) => ResolverMWArgsFn; - -export type ResolverNextRpCbFn = ( - resolveParams: Partial>) => Promise | any; - -export type ResolverNextRpCb = ( - next: ResolverNextRpCbFn) => ResolverNextRpCbFn; - -export type ResolverMWOutputTypeFn = (outputType: graphql.GraphQLOutputType) => graphql.GraphQLOutputType; - -export type ResolverMWOutputType = (next: ResolverMWOutputTypeFn) => ResolverMWOutputTypeFn; - export type GetRecordIdFn = (source: TSource, args: any, context: TContext) => string; export type ResolverFilterArgFn = ( @@ -206,7 +192,7 @@ export type ResolverSortArgConfig = { export type ResolverOpts = { type?: ComposeOutputType, - resolve?: ResolverNextRpCbFn, + resolve?: ResolverRpCb, args?: ComposeFieldConfigArgumentMap, name?: string, displayName?: string, @@ -219,6 +205,11 @@ export type ResolverWrapCb = ( newResolver: Resolver, prevResolver: Resolver) => Resolver; -export type ResolverWrapArgsFn = (prevArgs: graphql.GraphQLFieldConfigArgumentMap) => ComposeFieldConfigArgumentMap; +export type ResolverRpCb = ( + resolveParams: Partial>) => Promise | any; +export type ResolverNextRpCb = ( + next: ResolverRpCb) => ResolverRpCb; + +export type ResolverWrapArgsCb = (prevArgs: graphql.GraphQLFieldConfigArgumentMap) => ComposeFieldConfigArgumentMap; -export type ResolverWrapTypeFn = (prevType: graphql.GraphQLOutputType) => graphql.GraphQLOutputType; +export type ResolverWrapTypeCb = (prevType: graphql.GraphQLOutputType) => graphql.GraphQLOutputType; diff --git a/types/resolver.d.ts b/types/resolver.d.ts index e144f47f..d9f5e49c 100644 --- a/types/resolver.d.ts +++ b/types/resolver.d.ts @@ -4,8 +4,8 @@ import { } from 'graphql'; import { ComposeArgumentConfig, ComposeFieldConfigArgumentMap, ComposeOutputType, ProjectionType, ResolverFilterArgConfig, - ResolverKinds, ResolverNextRpCb, ResolverNextRpCbFn, ResolverOpts, ResolverSortArgConfig, ResolverWrapArgsFn, - ResolverWrapCb, ResolverWrapTypeFn + ResolverKinds, ResolverNextRpCb, ResolverRpCb, ResolverOpts, ResolverSortArgConfig, ResolverWrapArgsCb, + ResolverWrapCb, ResolverWrapTypeCb } from './definition'; import InputTypeComposer from './inputTypeComposer'; import TypeComposer from './typeComposer'; @@ -19,7 +19,7 @@ export interface ResolveDebugOpts { export default class Resolver { public type: GraphQLOutputType; public args: GraphQLFieldConfigArgumentMap; - public resolve: ResolverNextRpCbFn; + public resolve: ResolverRpCb; public name: string; public displayName: string | null; public kind: ResolverKinds | null; @@ -60,9 +60,9 @@ export default class Resolver { public makeOptional(argNameOrArray: string | string[]): this; - public getResolve(): ResolverNextRpCbFn; + public getResolve(): ResolverRpCb; - public setResolve(resolve: ResolverNextRpCbFn): Resolver; + public setResolve(resolve: ResolverRpCb): Resolver; public getType(): GraphQLOutputType; @@ -90,11 +90,11 @@ export default class Resolver { public wrapResolve(cb: ResolverNextRpCb, wrapperName?: string): Resolver; - public wrapArgs(cb: ResolverWrapArgsFn, wrapperName?: string): Resolver; + public wrapArgs(cb: ResolverWrapArgsCb, wrapperName?: string): Resolver; public wrapCloneArg(argName: string, newTypeName: string): Resolver; - public wrapType(cb: ResolverWrapTypeFn, wrapperName?: string): Resolver; + public wrapType(cb: ResolverWrapTypeCb, wrapperName?: string): Resolver; public addFilterArg(opts: ResolverFilterArgConfig): Resolver;