fix(typescript-resolvers): Fix optional resolver types (#7004)

* Failing test

* Organize better

* Fix it

* Revert mistaken test

* Failing test

* Organize better

* Revert mistaken test

* Revert Maybe change

* Add new resolvers AvoidOptionasConfig key

* Create fluffy-pumpkins-build.md

Co-authored-by: Noah Seger <noah.seger@youearnedit.com>
Co-authored-by: Charly POLY <1252066+charlypoly@users.noreply.github.com>

.changeset/fluffy-pumpkins-build.md

@@ -0,0 +1,6 @@
+---
+"@graphql-codegen/typescript-resolvers": patch
+"@graphql-codegen/visitor-plugin-common": patch
+---
+
+fix(typescript-resolvers): Fix optional field types

packages/plugins/other/visitor-plugin-common/src/avoid-optionals.ts

@@ -5,6 +5,7 @@ export const DEFAULT_AVOID_OPTIONALS: AvoidOptionalsConfig = {
   inputValue: false,
   field: false,
   defaultValue: false,
+  resolvers: false,
 };
 
 export function normalizeAvoidOptionals(avoidOptionals?: boolean | AvoidOptionalsConfig): AvoidOptionalsConfig {
@@ -14,6 +15,7 @@ export function normalizeAvoidOptionals(avoidOptionals?: boolean | AvoidOptional
       inputValue: avoidOptionals,
       field: avoidOptionals,
       defaultValue: avoidOptionals,
+      resolvers: avoidOptionals,
     };
   }
 

packages/plugins/other/visitor-plugin-common/src/base-resolvers-visitor.ts

@@ -987,14 +987,15 @@ export class BaseResolversVisitor<
 
       const resolverType = isSubscriptionType ? 'SubscriptionResolver' : directiveMappings[0] ?? 'Resolver';
 
+      const avoidOptionals = this.config.avoidOptionals?.resolvers ?? this.config.avoidOptionals === true;
       const signature: {
         name: string;
         modifier: string;
         type: string;
         genericTypes: string[];
       } = {
         name: node.name as any,
-        modifier: this.config.avoidOptionals ? '' : '?',
+        modifier: avoidOptionals ? '' : '?',
         type: resolverType,
         genericTypes: [
           mappedTypeKey,

packages/plugins/other/visitor-plugin-common/src/types.ts

@@ -95,6 +95,7 @@ export interface AvoidOptionalsConfig {
   object?: boolean;
   inputValue?: boolean;
   defaultValue?: boolean;
+  resolvers?: boolean;
 }
 
 export interface ParsedImport {

packages/plugins/typescript/resolvers/src/visitor.ts

@@ -74,9 +74,8 @@ export class TypeScriptResolversVisitor extends BaseResolversVisitor<
   }
 
   protected formatRootResolver(schemaTypeName: string, resolverType: string, declarationKind: DeclarationKind): string {
-    return `${schemaTypeName}${this.config.avoidOptionals ? '' : '?'}: ${resolverType}${this.getPunctuation(
-      declarationKind
-    )}`;
+    const avoidOptionals = this.config.avoidOptionals?.resolvers ?? this.config.avoidOptionals === true;
+    return `${schemaTypeName}${avoidOptionals ? '' : '?'}: ${resolverType}${this.getPunctuation(declarationKind)}`;
   }
 
   private clearOptional(str: string): string {

packages/plugins/typescript/resolvers/tests/ts-resolvers.spec.ts

@@ -2290,4 +2290,43 @@ export type ResolverFn<TResult, TParent, TContext, TArgs> = (
 
     await validate(result);
   });
+
+  it('#7005 - avoidOptionals should preserve optional resolvers', async () => {
+    const testSchema = buildSchema(/* GraphQL */ `
+      type Query {
+        users(filter: UserFilterInput = {}): [User!]!
+        ping: String!
+      }
+
+      input UserFilterInput {
+        status: String = "ACTIVE"
+      }
+
+      type User {
+        id: ID!
+      }
+    `);
+
+    const output = (await plugin(
+      testSchema,
+      [],
+      {
+        avoidOptionals: {
+          defaultValue: true,
+          field: true,
+          inputValue: true,
+          object: true,
+          resolvers: false,
+        },
+      } as any,
+      { outputFile: 'graphql.ts' }
+    )) as Types.ComplexPluginOutput;
+
+    expect(output.content).toBeSimilarStringTo(`
+      export type QueryResolvers<ContextType = any, ParentType extends ResolversParentTypes['Query'] = ResolversParentTypes['Query']> = {
+        users?: Resolver<Array<ResolversTypes['User']>, ParentType, ContextType, RequireFields<QueryUsersArgs, 'filter'>>;
+        ping?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+      };
+    `);
+  });
 });