Skip to content

Commit

Permalink
fix: improve Resolver type definitions
Browse files Browse the repository at this point in the history
  • Loading branch information
nodkz committed Apr 30, 2021
1 parent 08bd5e4 commit bac71df
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
9 changes: 6 additions & 3 deletions src/Resolver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,9 @@ export type ResolverWrapCb<TNewSource, TPrevSource, TContext, TNewArgs = any, TP
export type ResolverRpCb<TSource, TContext, TArgs = any> = (
resolveParams: ResolverResolveParams<TSource, TContext, TArgs>
) => Promise<any> | any;
export type ResolverRpCbPartial<TSource, TContext, TArgs = any> = (
resolveParams: Partial<ResolverResolveParams<TSource, TContext, TArgs>>
) => Promise<any> | any;
export type ResolverNextRpCb<TSource, TContext, TArgs = any> = (
next: ResolverRpCb<TSource, TContext, TArgs>
) => ResolverRpCb<TSource, TContext, TArgs>;
Expand Down Expand Up @@ -154,7 +157,7 @@ export class Resolver<TSource = any, TContext = any, TArgs = any, TReturn = any>
projection: ProjectionType;
parent: Resolver<TSource, TContext, any> | undefined;
extensions: Extensions | undefined;
resolve: ResolverRpCb<TSource, TContext, TArgs> = () => Promise.resolve();
resolve: ResolverRpCbPartial<TSource, TContext, TArgs> = () => Promise.resolve();

constructor(
opts: ResolverDefinition<TSource, TContext, TArgs>,
Expand Down Expand Up @@ -186,7 +189,7 @@ export class Resolver<TSource = any, TContext = any, TArgs = any, TReturn = any>
this.setArgs(opts.args || ({} as ObjectTypeComposerArgumentConfigMapDefinition<any>));

if (opts.resolve) {
this.resolve = opts.resolve;
this.resolve = opts.resolve as any;
}
}

Expand Down Expand Up @@ -649,7 +652,7 @@ export class Resolver<TSource = any, TContext = any, TArgs = any, TReturn = any>
}

setResolve(resolve: ResolverRpCb<TSource, TContext, TArgs>): this {
this.resolve = resolve;
this.resolve = resolve as any;
return this;
}

Expand Down
6 changes: 4 additions & 2 deletions src/SchemaComposer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -553,8 +553,10 @@ export class SchemaComposer<TContext = any> extends TypeStorage<any, NamedTypeCo
return ScalarTypeComposer.create(typeDef, this);
}

createResolver(opts: ResolverDefinition<any, TContext>): Resolver<any, TContext> {
return new Resolver<any, TContext, any>(opts, this);
createResolver<TSource = any, TArgs = any>(
opts: ResolverDefinition<TSource, TContext, TArgs>
): Resolver<any, TContext> {
return new Resolver<TSource, TContext, TArgs>(opts, this);
}

/**
Expand Down

0 comments on commit bac71df

Please sign in to comment.