fix(Flowtype): Rename some type names and remove unused

graphql-compose · Sep 6, 2017 · 8a03ef9 · 8a03ef9
1 parent c3b2b19
commit 8a03ef9
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 54 deletions.
diff --git a/src/definition.js b/src/definition.js
@@ -261,25 +261,6 @@ export type ResolveParams<TSource, TContext> = {
 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<TSource, TContext> = (
-  resolveParams: $Shape<ResolveParams<TSource, TContext>>
-) => Promise<*> | *;
-export type ResolverNextRpCb<TSource, TContext> = (
-  next: ResolverNextRpCbFn<TSource, TContext>
-) => ResolverNextRpCbFn<TSource, TContext>;
-
-export type ResolverMWOutputTypeFn = (
-  outputType: GraphQLOutputType
-) => GraphQLOutputType;
-export type ResolverMWOutputType = (
-  next: ResolverMWOutputTypeFn
-) => ResolverMWOutputTypeFn;
-
 export type GetRecordIdFn<TSource, TContext> = (
   source: TSource,
   args: ?mixed,
@@ -314,7 +295,7 @@ export type ResolverSortArgConfig<TSource, TContext> = {
 
 export type ResolverOpts<TSource, TContext> = {
   type?: ComposeOutputType,
-  resolve?: ResolverNextRpCbFn<TSource, TContext>,
+  resolve?: ResolverRpCb<TSource, TContext>,
   args?: ComposeFieldConfigArgumentMap,
   name?: string,
   displayName?: string,
@@ -328,10 +309,17 @@ export type ResolverWrapCb<TSource, TContext> = (
   prevResolver: Resolver<TSource, TContext>
 ) => Resolver<TSource, TContext>;
 
-export type ResolverWrapArgsFn = (
+export type ResolverRpCb<TSource, TContext> = (
+  resolveParams: $Shape<ResolveParams<TSource, TContext>>
+) => Promise<*> | *;
+export type ResolverNextRpCb<TSource, TContext> = (
+  next: ResolverRpCb<TSource, TContext>
+) => ResolverRpCb<TSource, TContext>;
+
+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
@@ -27,16 +27,16 @@ import type {
   GraphQLOutputType,
   GraphQLFieldConfig,
   ResolverNextRpCb,
-  ResolverNextRpCbFn,
+  ResolverRpCb,
   ResolveParams,
   ResolverKinds,
   ProjectionType,
   ResolverFilterArgConfig,
   ResolverSortArgConfig,
   ResolverOpts,
   ResolverWrapCb,
-  ResolverWrapArgsFn,
-  ResolverWrapTypeFn,
+  ResolverWrapArgsCb,
+  ResolverWrapTypeCb,
   GraphQLInputType,
   ComposeOutputType,
   ComposeArgumentConfig,
@@ -54,7 +54,7 @@ export type ResolveDebugOpts = {
 export default class Resolver<TSource, TContext> {
   type: GraphQLOutputType;
   args: GraphQLFieldConfigArgumentMap;
-  resolve: ResolverNextRpCbFn<TSource, TContext>;
+  resolve: ResolverRpCb<TSource, TContext>;
   name: string;
   displayName: ?string;
   kind: ?ResolverKinds;
@@ -258,11 +258,11 @@ export default class Resolver<TSource, TContext> {
   }
   /* eslint-enable */
 
-  getResolve(): ResolverNextRpCbFn<TSource, TContext> {
+  getResolve(): ResolverRpCb<TSource, TContext> {
     return this.resolve;
   }
 
-  setResolve(resolve: ResolverNextRpCbFn<TSource, TContext>): Resolver<TSource, TContext> {
+  setResolve(resolve: ResolverRpCb<TSource, TContext>): Resolver<TSource, TContext> {
     this.resolve = resolve;
     return this;
   }
@@ -383,7 +383,7 @@ export default class Resolver<TSource, TContext> {
     );
   }
 
-  wrapArgs(cb: ResolverWrapArgsFn, wrapperName: string = 'wrapArgs'): Resolver<TSource, TContext> {
+  wrapArgs(cb: ResolverWrapArgsCb, wrapperName: string = 'wrapArgs'): Resolver<TSource, TContext> {
     return this.wrap(
       (newResolver, prevResolver) => {
         // clone prevArgs, to avoid changing args in callback
@@ -402,7 +402,7 @@ export default class Resolver<TSource, TContext> {
     });
   }
 
-  wrapType(cb: ResolverWrapTypeFn, wrapperName: string = 'wrapType'): Resolver<TSource, TContext> {
+  wrapType(cb: ResolverWrapTypeCb, wrapperName: string = 'wrapType'): Resolver<TSource, TContext> {
     return this.wrap(
       (newResolver, prevResolver) => {
         const prevType = prevResolver.getType();

diff --git a/types/definition.d.ts b/types/definition.d.ts
@@ -165,20 +165,6 @@ export type ResolveParams<TSource, TContext> = {
 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<TSource, TContext> = (
-    resolveParams: Partial<ResolveParams<TSource, TContext>>) => Promise<any> | any;
-
-export type ResolverNextRpCb<TSource, TContext> = (
-    next: ResolverNextRpCbFn<TSource, TContext>) => ResolverNextRpCbFn<TSource, TContext>;
-
-export type ResolverMWOutputTypeFn = (outputType: graphql.GraphQLOutputType) => graphql.GraphQLOutputType;
-
-export type ResolverMWOutputType = (next: ResolverMWOutputTypeFn) => ResolverMWOutputTypeFn;
-
 export type GetRecordIdFn<TSource, TContext> = (source: TSource, args: any, context: TContext) => string;
 
 export type ResolverFilterArgFn<TSource, TContext> = (
@@ -206,7 +192,7 @@ export type ResolverSortArgConfig<TSource, TContext> = {
 
 export type ResolverOpts<TSource, TContext> = {
     type?: ComposeOutputType,
-    resolve?: ResolverNextRpCbFn<TSource, TContext>,
+    resolve?: ResolverRpCb<TSource, TContext>,
     args?: ComposeFieldConfigArgumentMap,
     name?: string,
     displayName?: string,
@@ -219,6 +205,11 @@ export type ResolverWrapCb<TSource, TContext> = (
     newResolver: Resolver<TSource, TContext>,
     prevResolver: Resolver<TSource, TContext>) => Resolver<TSource, TContext>;
 
-export type ResolverWrapArgsFn = (prevArgs: graphql.GraphQLFieldConfigArgumentMap) => ComposeFieldConfigArgumentMap;
+export type ResolverRpCb<TSource, TContext> = (
+    resolveParams: Partial<ResolveParams<TSource, TContext>>) => Promise<any> | any;
+export type ResolverNextRpCb<TSource, TContext> = (
+    next: ResolverRpCb<TSource, TContext>) => ResolverRpCb<TSource, TContext>;
+
+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
@@ -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<TSource, TContext> {
     public type: GraphQLOutputType;
     public args: GraphQLFieldConfigArgumentMap;
-    public resolve: ResolverNextRpCbFn<TSource, TContext>;
+    public resolve: ResolverRpCb<TSource, TContext>;
     public name: string;
     public displayName: string | null;
     public kind: ResolverKinds | null;
@@ -60,9 +60,9 @@ export default class Resolver<TSource, TContext> {
 
     public makeOptional(argNameOrArray: string | string[]): this;
 
-    public getResolve(): ResolverNextRpCbFn<TSource, TContext>;
+    public getResolve(): ResolverRpCb<TSource, TContext>;
 
-    public setResolve(resolve: ResolverNextRpCbFn<TSource, TContext>): Resolver<TSource, TContext>;
+    public setResolve(resolve: ResolverRpCb<TSource, TContext>): Resolver<TSource, TContext>;
 
     public getType(): GraphQLOutputType;
 
@@ -90,11 +90,11 @@ export default class Resolver<TSource, TContext> {
 
     public wrapResolve(cb: ResolverNextRpCb<TSource, TContext>, wrapperName?: string): Resolver<TSource, TContext>;
 
-    public wrapArgs(cb: ResolverWrapArgsFn, wrapperName?: string): Resolver<TSource, TContext>;
+    public wrapArgs(cb: ResolverWrapArgsCb, wrapperName?: string): Resolver<TSource, TContext>;
 
     public wrapCloneArg(argName: string, newTypeName: string): Resolver<TSource, TContext>;
 
-    public wrapType(cb: ResolverWrapTypeFn, wrapperName?: string): Resolver<TSource, TContext>;
+    public wrapType(cb: ResolverWrapTypeCb, wrapperName?: string): Resolver<TSource, TContext>;
 
     public addFilterArg(opts: ResolverFilterArgConfig<TSource, TContext>): Resolver<TSource, TContext>;