Merge pull request #1389 from dotansimha/fix/iresolvers-index-signature

Fix IResolvers index signature
dotansimha · Mar 4, 2019 · ca269f7 · ca269f7
2 parents edb3d7f + 69f4329
commit ca269f7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/dev-test/test-schema/resolvers-root.ts b/dev-test/test-schema/resolvers-root.ts
@@ -171,13 +171,11 @@ export interface DeprecatedDirectiveArgs {
   reason?: string;
 }
 
-
-
 export type IResolvers<TContext = {}> = {
     QueryRoot?: QueryRootResolvers.Resolvers<TContext>;
     User?: UserResolvers.Resolvers<TContext>;
     SubscriptionRoot?: SubscriptionRootResolvers.Resolvers<TContext>;
-} & { [typeName: string] : never };
+} & { [typeName: string] : { [ fieldName: string ]: ( Resolver<any, any, TContext, any> | SubscriptionResolver<any, any, TContext, any> ) } };
 
 export type IDirectiveResolvers<Result> = {
     skip?: SkipDirectiveResolver<Result>;

diff --git a/packages/plugins/typescript-resolvers/src/root.handlebars b/packages/plugins/typescript-resolvers/src/root.handlebars
@@ -79,10 +79,10 @@ export type IResolvers<TContext = {{{ getContext }}}> = {
   {{#each scalars}}
     {{ convert name 'typeNames'}}{{#unless @root.config.strict}}?{{/unless}}: GraphQLScalarType;
   {{/each}}
-} & { [typeName: string] : never };
+} & { [typeName: string] : { [ fieldName: string ]: ( Resolver<any, any, TContext, any> | SubscriptionResolver<any, any, TContext, any> ) } };
 
-export type IDirectiveResolvers<Result> = {
+export type IDirectiveResolvers<Result, TContext = {{{ getContext }}}> = {
   {{#each definedDirectives}}
     {{ name }}{{#unless @root.config.strict}}?{{/unless}}: {{ convert name 'typeNames'}}DirectiveResolver<Result>;
   {{/each}}
-} & { [directiveName: string] : never };
+} & { [directiveName: string] : DirectiveResolverFn<any, any, TContext> };
diff --git a/packages/plugins/typescript-resolvers/tests/typescript-resolvers.spec.ts b/packages/plugins/typescript-resolvers/tests/typescript-resolvers.spec.ts
@@ -1237,16 +1237,16 @@ describe('Resolvers', () => {
         Node?: NodeResolvers;
         PostOrUser?: PostOrUserResolvers;
         Date?: GraphQLScalarType;
-      } & { [typeName: string] : never };
+      } & { [typeName: string] : { [ fieldName: string ]: ( Resolver<any, any, TContext, any> | SubscriptionResolver<any, any, TContext, any> ) } };
     `);
 
     expect(content).toBeSimilarStringTo(`
-      export type IDirectiveResolvers<Result> = {
+      export type IDirectiveResolvers<Result, TContext = {}> = {
         modify?: ModifyDirectiveResolver<Result>;
         skip?: SkipDirectiveResolver<Result>;
         include?: IncludeDirectiveResolver<Result>;
         deprecated?: DeprecatedDirectiveResolver<Result>;
-      } & { [directiveName: string] : never };
+      } & { [directiveName: string] : DirectiveResolverFn<any, any, TContext> };
     `);
   });