fix(resolvers): fix conflict between typesPrefix: true and enumPrefix: false (#7626)

* fix(resolvers): fix conflict between `typesPrefix: true` and `enumPrefix: false`

* Create weak-radios-join.md

* test(resolvers): naming

Author: charlypoly

.changeset/weak-radios-join.md

@@ -0,0 +1,5 @@
+---
+"@graphql-codegen/visitor-plugin-common": patch
+---
+
+fix(resolvers): fix conflict between `typesPrefix: true` and `enumPrefix: false`

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

@@ -563,9 +563,11 @@ export class BaseResolversVisitor<
           .getTypes()
           .map(type => getTypeToUse(type.name))
           .join(' | ');
+      } else if (isEnumType(schemaType)) {
+        prev[typeName] = this.convertName(typeName, { useTypesPrefix: this.config.enumPrefix }, true);
       } else {
         shouldApplyOmit = true;
-        prev[typeName] = this.convertName(typeName, { useTypesPrefix: this.config.enumPrefix }, true);
+        prev[typeName] = this.convertName(typeName, {}, true);
       }
 
       if (shouldApplyOmit && prev[typeName] !== 'any' && isObjectType(schemaType)) {

packages/plugins/other/visitor-plugin-common/tests/create-resolvers-fields.spec.ts

@@ -45,6 +45,41 @@ export type ResolversParentTypes = {
   Boolean: Scalars['Boolean']
   String: Scalars['String']
 };
+`
+    );
+  });
+
+  it('generates proper types when typesPrefix is used along with `enumPrefix: false`', () => {
+    /**
+     * This makes sure that https://github.com/dotansimha/graphql-code-generator/issues/6709 doesn't occur again.
+     * The result looked like this without the fix:
+     * export type ResolversParentTypes = {
+     *   Query: {}
+     *   A: Omit<A, 'b'> & { b?: Maybe<ResolversParentTypes['B']> }
+     *   Boolean: Scalars['Boolean']
+     *   String: Scalars['String']
+     * };
+     */
+    const visitor = new BaseResolversVisitor(
+      {
+        mappers: {
+          B: './some-file#B',
+        },
+        typesPrefix: 'I',
+        enumPrefix: false,
+      },
+      {} as ParsedResolversConfig,
+      schema
+    );
+
+    expect(visitor.buildResolversParentTypes()).toEqual(
+      `/** Mapping between all available schema types and the resolvers parents */
+export type IResolversParentTypes = {
+  Query: {}
+  A: IA
+  Boolean: Scalars['Boolean']
+  String: Scalars['String']
+};
 `
     );
   });